Merge pull request #35 from 123oleks123/loki-format

Refactoring pipeline order
d7561985 · Oct 31, 2023 · 70ba431 · 70ba431
2 parents 3ba4cba + f050f50
commit 70ba431
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/charts/agent/Chart.yaml b/charts/agent/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.5
+version: 1.1.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/agent/values.yaml b/charts/agent/values.yaml
@@ -293,16 +293,16 @@ config:
         exclude:
           match_type: regexp
           resource_attributes:
-            - key: container
-              value: ^.+$
+            - key: k8s.container.name
+              value: "^.+$"
     filter/container:
       error_mode: ignore
       logs:
         include:
           match_type: regexp
           resource_attributes:
-            - key: container
-              value: ^.+$
+            - key: k8s.container.name
+              value: "^.+$"
     resource:
       attributes:
         - key: project
@@ -376,11 +376,11 @@ config:
         exporters: [ logging, otlp/global ]
       logs:
         receivers: [  otlp, filelog ]
-        processors: [ memory_limiter, k8sattributes, resource, attributes/loki,resource/loki-labels,filter/non-container, resource/loki, transform, batch ]
+        processors: [ filter/non-container, memory_limiter, k8sattributes, resource, attributes/loki, resource/loki-labels, resource/loki, transform, batch ]
         exporters: [ logging, otlp/global ]
       logs/raw:
         receivers: [ otlp, filelog ]
-        processors: [ memory_limiter, k8sattributes, resource, attributes/loki,resource/loki-labels,filter/container, resource/loki-raw, transform, batch ]
+        processors: [ filter/container, memory_limiter, k8sattributes, resource, attributes/loki, resource/loki-labels, resource/loki-raw, transform, batch ]
         exporters: [ logging, otlp/global ]
 
 prometheus: