Skip to content

Commit 25a856b

Browse files
authored
[logs] fix kvm parsing after consolidation (#1430)
1 parent c6186ef commit 25a856b

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

logs/charts/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
apiVersion: v2
55
name: logs
6-
version: 0.0.21
6+
version: 0.0.22
77
description: OpenTelemetry Operator Helm chart for Kubernetes
88
icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
99
type: application

logs/charts/templates/_kvm-config.tpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,15 @@ transform/kvm_monitoring:
9898
- attributes["log.type"] == "files-kvm-monitoring"
9999
statements:
100100
- merge_maps(log.attributes, ExtractPatterns(log.body, "level=(?P<loglevel>\\w+) msg=\"(?P<msg>[^\"]+)"), "upsert")
101-
- merge_maps(log.attributes, ExtractPatterns(log.body, "domain=(?P<domain>\\S+)"), "upsert")
101+
- merge_maps(log.attributes, ExtractPatterns(log.body, "domain=(?P<domainid>\\S+)"), "upsert")
102102
- merge_maps(log.attributes, ExtractPatterns(log.body, "runID=(?P<runID>\\S+)"), "upsert")
103103
- merge_maps(log.attributes, ExtractPatterns(log.body, "service_env=(?P<service_env>\\S+)"), "upsert")
104104
- merge_maps(log.attributes, ExtractPatterns(log.body, "service_name=(?P<service_name>\\S+)"), "upsert")
105105
- merge_maps(log.attributes, ExtractPatterns(log.body, "collector=\"(?P<collector>[^\"]+)"), "upsert")
106106
- set(attributes["log.level"], attributes["loglevel"])
107107
- delete_key(attributes, "loglevel")
108+
- set(attributes["domain.id"], attributes["domainid"])
109+
- delete_key(attributes, "domainid")
108110
- set(log.attributes["config.parsed"], "kvm_monitoring") where log.attributes["log.level"] != nil
109111
- set(log.observed_time, Now())
110112
- set(log.time, log.observed_time)

logs/plugindefinition.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ kind: PluginDefinition
66
metadata:
77
name: logs
88
spec:
9-
version: 0.11.31
9+
version: 0.11.32
1010
displayName: Logs
1111
description: Observability framework for instrumenting, generating, collecting, and exporting logs.
1212
icon: https://raw.githubusercontent.com/cloudoperators/greenhouse-extensions/main/logs/logo.png
1313
helmChart:
1414
name: logs
1515
repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts
16-
version: 0.0.21
16+
version: 0.0.22
1717
options:
1818
- default: true
1919
description: Set to true to enable the installation of the OpenTelemetry Operator.

0 commit comments

Comments
 (0)