Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion logs/charts/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
apiVersion: v2
appVersion: 0.152.0
name: logs
version: 0.4.8
version: 0.4.9
description: OpenTelemetry Operator Helm chart for Kubernetes
icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
type: application
Expand Down
18 changes: 18 additions & 0 deletions logs/charts/templates/_syslog-audit-filter-config.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,24 @@ attributes/syslog_audit_failover_username_b:
key: failover_username_opensearch
value: ${audit_failover_username_b}
{{- end }}
{{/*
============================================================================
Extract forwarded_by attribute from message body
Logs forwarded via Logstash have "forwarded_by=octobus_logstash" appended
to the message. This extracts it into a proper attribute and removes it
from the message body.
============================================================================
*/}}
transform/syslog_forwarded_by:
error_mode: ignore
log_statements:
- context: log
statements:
- 'set(attributes["forwarded_by"], "octobus_logstash") where attributes["message"] != nil and IsMatch(attributes["message"], ".*forwarded_by=octobus_logstash.*")'
- 'set(attributes["forwarded_by"], "octobus_logstash") where attributes["message"] == nil and body != nil and IsMatch(body, ".*forwarded_by=octobus_logstash.*")'
- 'replace_pattern(attributes["message"], " forwarded_by=octobus_logstash", "") where attributes["forwarded_by"] == "octobus_logstash" and attributes["message"] != nil'
- 'replace_pattern(body, " forwarded_by=octobus_logstash", "") where attributes["forwarded_by"] == "octobus_logstash" and body != nil'
Comment thread
timojohlo marked this conversation as resolved.

{{/*
============================================================================
Early drop of non-audit-relevant messages
Expand Down
3 changes: 3 additions & 0 deletions logs/charts/templates/_syslog-config.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ logs/syslog_tcp:
processors:
- filter/syslog_early_drop
- filter/syslog_drop_verbose
- transform/syslog_forwarded_by
- transform/syslog_user_extraction
- transform/syslog_hostname_parsing
- transform/syslog_esxi_vm_events
Expand All @@ -98,6 +99,7 @@ logs/syslog_udp:
processors:
- filter/syslog_early_drop
- filter/syslog_drop_verbose
- transform/syslog_forwarded_by
- transform/syslog_user_extraction
- transform/syslog_hostname_parsing
- transform/syslog_esxi_vm_events
Expand All @@ -114,6 +116,7 @@ logs/syslog_tcp_tls:
processors:
- filter/syslog_early_drop
- filter/syslog_drop_verbose
- transform/syslog_forwarded_by
- transform/syslog_user_extraction
- transform/syslog_hostname_parsing
- transform/syslog_esxi_vm_events
Expand Down
4 changes: 2 additions & 2 deletions logs/plugindefinition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ kind: PluginDefinition
metadata:
name: logs
spec:
version: 0.15.8
version: 0.15.9
displayName: Logs
description: Observability framework for instrumenting, generating, collecting, and exporting logs.
icon: https://raw.githubusercontent.com/cloudoperators/greenhouse-extensions/main/logs/logo.png
helmChart:
name: logs
repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts
version: 0.4.8
version: 0.4.9
options:
- default: true
description: Set to true to enable the installation of the OpenTelemetry Operator.
Expand Down
Loading