Merge pull request #30 from nfrigus/main

Agent fixes
d7561985 · Oct 10, 2023 · 136c3ab · 136c3ab
2 parents f3d66cd + a3be060
commit 136c3ab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 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.0.3
+version: 1.1.0
 
 # 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
@@ -274,9 +274,6 @@ config:
           key: time
     resource/loki:
       attributes:
-        - action: insert
-          key: loki.format
-          value: logfmt
         - action: insert
           key: loki.resource.labels
           value: project, license, deployment_environment, service, namespace, container, aws_region
@@ -439,10 +436,10 @@ prometheus:
         # prometheus.io/port: "7777"
         # prometheus.io/scrape: "true"
         # prometheus.io/param: "xxx=yyy"
-        # prometheus.io/custom.label.key: "value"
+        # prometheus.io/label.key: "value"
         #
         # example:
-        #  prometheus.io/custom.label.origin_prometheus: "observability/com/dev"
+        #  prometheus.io/label.origin_prometheus: "observability/com/dev"
         # use for self-monitoring
         # dashboard: ID: 17728 https://grafana.com/grafana/dashboards/17728-opentelemetry-collector-0-68-0-v20221229/
         - job_name: kubernetes-pods
@@ -471,9 +468,12 @@ prometheus:
                 - __address__
                 - __meta_kubernetes_pod_annotation_prometheus_io_port
               target_label: __address__
+            # SRE-26 Allow to add static labels to pod metrics via pod annotations
+            # Example:
+            #   Annotation on pod "prometheus.io/label-custom-label: custom-label-value"
+            #   will be added to a metrics produced by the bod as label custom_label with value custom-label-value
             - action: labelmap
-              regex: __meta_kubernetes_pod_annotation_prometheus_io_custom_label_(.+)
-              replacement: $$1
+              regex: __meta_kubernetes_pod_annotation_prometheus_io_label_(.+)
             - action: labelmap
               regex: __meta_kubernetes_pod_annotation_prometheus_io_param_(.+)
               replacement: __param_$$1