Get Prometheus Metrics When Label Matcher Is Not Given (#82)

aws · Jan 12, 2023 · ffbf6d1 · ffbf6d1
1 parent 0ded55f
commit ffbf6d1
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 3 deletions.
diff --git a/translator/tocwconfig/sampleConfig/prometheus_config_linux.conf b/translator/tocwconfig/sampleConfig/prometheus_config_linux.conf
@@ -80,6 +80,16 @@
       label_matcher = "default"
       metric_selectors = [".*"]
       source_labels = ["Namespace"]
+
+    [[processors.emfProcessor.metric_declaration]]
+      dimensions = [["name"]]
+      metric_selectors = ["^.*$"]
+      source_labels = ["name"]
+
+    [[processors.emfProcessor.metric_declaration]]
+      dimensions = [["name"]]
+      metric_selectors = ["^node_cpu_guest_seconds_total$"]
+      source_labels = ["name"]
     [processors.emfProcessor.metric_unit]
       jvm_memory_bytes_used = "Bytes"
       nginx_request_count = "Count"
diff --git a/translator/tocwconfig/sampleConfig/prometheus_config_linux.json b/translator/tocwconfig/sampleConfig/prometheus_config_linux.json
@@ -65,6 +65,20 @@
               "label_matcher": "default",
               "metric_selectors": [".*"],
               "source_labels": ["Namespace"]
+            },
+            {
+              "source_labels":["name"],
+              "dimensions":[
+                ["name"]
+              ],
+              "metric_selectors": ["^.*$"]
+            },
+            {
+              "source_labels":["name"],
+              "dimensions":[
+                ["name"]
+              ],
+              "metric_selectors": ["^node_cpu_guest_seconds_total$"]
             }
           ]
         }

diff --git a/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml b/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml
@@ -34,6 +34,22 @@ exporters:
             separator: ;
         metric_name_selectors:
           - .*
+      - dimensions: [ ["name"] ]
+        label_matchers:
+          - label_names:
+              - name
+            regex: .*
+            separator: ;
+        metric_name_selectors:
+          - ^.*$
+      - dimensions: [ ["name"] ]
+        label_matchers:
+          - label_names:
+              - name
+            regex: .*
+            separator: ;
+        metric_name_selectors:
+          - ^node_cpu_guest_seconds_total$
     namespace: CustomizedNamespace
     no_verify_ssl: false
     num_workers: 8

diff --git a/translator/translate/otel/exporter/awsemf/prometheus.go b/translator/translate/otel/exporter/awsemf/prometheus.go
@@ -53,9 +53,12 @@ func setPrometheusMetricDeclarations(conf map[string]interface{}, cfg *awsemfexp
 				// If no metric selectors are provided, that particular metric declaration is invalid
 				continue
 			}
-			sourceLabels, ok1 := metricDeclaration["source_labels"]
-			labelMatcher, ok2 := metricDeclaration["label_matcher"]
-			if ok1 && ok2 {
+			labelMatcher, ok := metricDeclaration["label_matcher"]
+			if !ok {
+				labelMatcher = ".*"
+			}
+			sourceLabels, ok := metricDeclaration["source_labels"]
+			if ok {
 				// OTel awsemfexporter allows specifying multiple label_matchers but CWA only allows specifying one
 				declaration["label_matchers"] = [...]map[string]interface{}{
 					{