Skip to content

Commit

Permalink
[AMLII-1178] logs/tailers: rephrase process_raw_message feature warni…
Browse files Browse the repository at this point in the history
…ng notice (#20748)

* [AMLII-1178] logs/tailers: rephrase process_raw_message feature warning notice.

* tailers: wordings

* tailers: mention the concerned tailer.

* tailers: last shot at the wording.
  • Loading branch information
remeh committed Nov 10, 2023
1 parent 2ad9a35 commit 428666e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
7 changes: 3 additions & 4 deletions pkg/logs/tailers/journald/tailer.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,9 @@ type Tailer struct {
// NewTailer returns a new tailer.
func NewTailer(source *sources.LogSource, outputChan chan *message.Message, journal Journal, processRawMessage bool) *Tailer {
if len(source.Config.ProcessingRules) > 0 && processRawMessage {
log.Warn("Log processing rules with the journald collection will change in a future version of the Agent:")
log.Warn("The processing will soon apply on the message content only instead of on the structured log (e.g. on the collected JSON).")
log.Warn("In order to immediately switch to this new behaviour, set 'process_raw_message' to 'false' in your logs integration config.")
log.Warn("Please reach Datadog support if you have more questions.")
log.Warn("The logs processing rules currently apply to the raw journald JSON-structured log. These rules can now be applied to the message content only, and we plan to make this the default behavior in the future.")
log.Warn("In order to immediately switch to this new behavior, set 'process_raw_message' to 'false' in your logs integration config and adapt your processing rules accordingly.")
log.Warn("Please contact Datadog support for more information.")
telemetry.GetStatsTelemetryProvider().Gauge(processor.UnstructuredProcessingMetricName, 1, []string{"tailer:journald"})
}

Expand Down
7 changes: 3 additions & 4 deletions pkg/logs/tailers/windowsevent/tailer.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,9 @@ func NewTailer(evtapi evtapi.API, source *sources.LogSource, config *Config, out
}

if len(source.Config.ProcessingRules) > 0 && config.ProcessRawMessage {
log.Warn("Log processing rules with the Windows Events collection will change in a future version of the Agent:")
log.Warn("The processing will soon apply on the message content only instead of on the structured log (e.g. on the internal JSON).")
log.Warn("In order to immediately switch to this new behaviour, set 'process_raw_message' to 'false' in your logs integration config.")
log.Warn("Please reach Datadog support if you have more questions.")
log.Warn("The logs processing rules currently apply to the raw internal windowsevent log structure. These rules can now be applied to the message content only, and we plan to make this the default behavior in the future.")
log.Warn("In order to immediately switch to this new behavior, set 'process_raw_message' to 'false' in your logs integration config and adapt your processing rules accordingly.")
log.Warn("Please contact Datadog support for more information.")
telemetry.GetStatsTelemetryProvider().Gauge(processor.UnstructuredProcessingMetricName, 1, []string{"tailer:windowsevent"})
}

Expand Down

0 comments on commit 428666e

Please sign in to comment.