Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions app/vlagent/kubernetescollector/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func (lfp *logFileProcessor) addLineInternal(timestamp int64, line []byte) {
})
} else {
// vlagent should override the timestamp from CRI to the timestamp parsed from the log line.
n := fieldIndex(parser.Fields, *timeField)
n := fieldIndex(parser.Fields, getTimeFields())
if n >= 0 {
f := &parser.Fields[n]
v, ok := logstorage.TryParseTimestampRFC3339Nano(f.Value)
Expand All @@ -199,12 +199,12 @@ func (lfp *logFileProcessor) addLineInternal(timestamp int64, line []byte) {
}
}

logstorage.RenameField(parser.Fields, *msgField, "_msg")
logstorage.RenameField(parser.Fields, getMsgFields(), "_msg")
}

if len(parser.Fields) > 1000 {
line := logstorage.MarshalFieldsToJSON(nil, parser.Fields)
logger.Warnf("dropping log line with %d fields; %s", parser.Fields, line)
logger.Warnf("dropping log line with %d fields; %s", len(parser.Fields), line)
return
}

Expand Down Expand Up @@ -398,6 +398,24 @@ func initExtraFields() {
parsedExtraFields = fields
}

var defaultMsgFields = []string{"message", "msg", "log"}

func getMsgFields() []string {
if len(*msgField) == 0 {
return defaultMsgFields
}
return *msgField
}

var defaultTimeFields = []string{"time", "timestamp", "ts"}

func getTimeFields() []string {
if len(*timeField) == 0 {
return defaultTimeFields
}
return *timeField
}

var partialCRIContentBufPool bytesutil.ByteBufferPool

var criJSONParserPool fastjson.ParserPool
1 change: 1 addition & 0 deletions docs/victorialogs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ according to the follosing docs:
* BUGFIX: [OpenTelemetry data ingestion](https://docs.victoriametrics.com/victorialogs/data-ingestion/opentelemetry/): properly handle `null` values inside arrays. Previously, such arrays could cause a panic during ingestion. See [#869](https://github.com/VictoriaMetrics/VictoriaLogs/issues/869#issuecomment-3627177567). The issue has been introduced in [v1.40.0](https://github.com/VictoriaMetrics/VictoriaLogs/releases/tag/v1.40.0).
* BUGFIX: [OpenTelemetry data ingestion](https://docs.victoriametrics.com/victorialogs/data-ingestion/opentelemetry/): properly skip attributes with missing key. See [this report](https://github.com/VictoriaMetrics/VictoriaLogs/issues/869#issuecomment-3631307996).
* BUGFIX: [OpenTelemetry data ingestion](https://docs.victoriametrics.com/victorialogs/data-ingestion/opentelemetry/): reduce memory usage after [v1.40.0 release](https://github.com/VictoriaMetrics/VictoriaLogs/releases/tag/v1.40.0). See [#869](https://github.com/VictoriaMetrics/VictoriaLogs/issues/869).
* BUGFIX: [Kubernetes Collector](https://docs.victoriametrics.com/victorialogs/vlagent/#collect-kubernetes-pod-logs): properly handle unset [`-kubernetesCollector.msgField`](https://docs.victoriametrics.com/victorialogs/vlagent/#kubernetes-collector-configuration) and [`-kubernetesCollector.timeField`](https://docs.victoriametrics.com/victorialogs/vlagent/#kubernetes-collector-configuration) flags. Previously, vlagent failed to apply the default values described in the documentation.

## [v1.40.0](https://github.com/VictoriaMetrics/VictoriaLogs/releases/tag/v1.40.0)

Expand Down
2 changes: 1 addition & 1 deletion docs/victorialogs/vlagent.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ as [`_msg`](https://docs.victoriametrics.com/victorialogs/keyconcepts/#message-f
- `msg`
- `log`

You can change the default list of `_msg` fields by passing `-kubernetesCollector.msgFields` command-line flag with comma-separated list of field names.
You can change the default list of `_msg` fields by passing `-kubernetesCollector.msgField` command-line flag with comma-separated list of field names.

`vlagent` extracts timestamp from the log line and uses it as
[`_time`](https://docs.victoriametrics.com/victorialogs/keyconcepts/#time-field) field, using the following fields:
Expand Down