prometheus: add instance name to namespace label

This change adds the VM instance name to the `namespace` label so aggregation by namespace is more human readable. Signed-off-by: Ridwan Sharif <[email protected]>
GoogleCloudPlatform · Jan 11, 2024 · 30e880f · 30e880f
1 parent f8e2ffb
commit 30e880f
Show file tree

Hide file tree

Showing 59 changed files with 64 additions and 63 deletions.
diff --git a/apps/otlp.go b/apps/otlp.go
@@ -67,7 +67,7 @@ func (ReceiverOTLP) gmpResourceProcessors(ctx context.Context) []otel.Component
 						// location = cloud.availability_zone
 						stmt(`attributes["location"]`, `resource.attributes["cloud.availability_zone"]`, "gcp_compute_engine"),
 						// namespace = host.id
-						stmt(`attributes["namespace"]`, `resource.attributes["host.id"]`, "gcp_compute_engine"),
+						stmt(`attributes["namespace"]`, `Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")`, "gcp_compute_engine"),
 						// cluster = "__gce__"
 						stmt(`attributes["cluster"]`, `"__gce__"`, "gcp_compute_engine"),
 						// instance_name = host.name

diff --git a/confgenerator/resourcedetector/gce_detector.go b/confgenerator/resourcedetector/gce_detector.go
@@ -15,6 +15,7 @@
 package resourcedetector
 
 import (
+	"fmt"
 	"strings"
 
 	"github.com/prometheus/prometheus/util/strutil"
@@ -172,7 +173,7 @@ func (r GCEResource) PrometheusStyleMetadata() map[string]string {
 
 	// Set the location, namespace and cluster labels.
 	metaLabels["location"] = r.Zone
-	metaLabels["namespace"] = r.InstanceID
+	metaLabels["namespace"] = fmt.Sprintf("%s/%s", r.InstanceID, r.InstanceName)
 	metaLabels["cluster"] = "__gce__"
 
 	// Set some curated labels.

diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml
@@ -484,7 +484,7 @@ processors:
     - context: datapoint
       statements:
       - set(attributes["location"], resource.attributes["cloud.availability_zone"]) where resource.attributes["cloud.availability_zone"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
-      - set(attributes["namespace"], resource.attributes["host.id"]) where resource.attributes["host.id"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
+      - set(attributes["namespace"], Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")) where Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/") != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["cluster"], "__gce__") where "__gce__" != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["instance_name"], resource.attributes["host.name"]) where resource.attributes["host.name"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["machine_type"], resource.attributes["host.type"]) where resource.attributes["host.type"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"

diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml
@@ -455,7 +455,7 @@ processors:
     - context: datapoint
       statements:
       - set(attributes["location"], resource.attributes["cloud.availability_zone"]) where resource.attributes["cloud.availability_zone"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
-      - set(attributes["namespace"], resource.attributes["host.id"]) where resource.attributes["host.id"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
+      - set(attributes["namespace"], Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")) where Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/") != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["cluster"], "__gce__") where "__gce__" != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["instance_name"], resource.attributes["host.name"]) where resource.attributes["host.name"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["machine_type"], resource.attributes["host.type"]) where resource.attributes["host.type"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"

diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml
@@ -527,7 +527,7 @@ processors:
     - context: datapoint
       statements:
       - set(attributes["location"], resource.attributes["cloud.availability_zone"]) where resource.attributes["cloud.availability_zone"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
-      - set(attributes["namespace"], resource.attributes["host.id"]) where resource.attributes["host.id"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
+      - set(attributes["namespace"], Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")) where Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/") != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["cluster"], "__gce__") where "__gce__" != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["instance_name"], resource.attributes["host.name"]) where resource.attributes["host.name"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["machine_type"], resource.attributes["host.type"]) where resource.attributes["host.type"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"

diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml
@@ -527,7 +527,7 @@ processors:
     - context: datapoint
       statements:
       - set(attributes["location"], resource.attributes["cloud.availability_zone"]) where resource.attributes["cloud.availability_zone"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
-      - set(attributes["namespace"], resource.attributes["host.id"]) where resource.attributes["host.id"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
+      - set(attributes["namespace"], Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")) where Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/") != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["cluster"], "__gce__") where "__gce__" != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["instance_name"], resource.attributes["host.name"]) where resource.attributes["host.name"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["machine_type"], resource.attributes["host.type"]) where resource.attributes["host.type"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"

diff --git a/...estdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml b/...estdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml
@@ -484,7 +484,7 @@ processors:
     - context: datapoint
       statements:
       - set(attributes["location"], resource.attributes["cloud.availability_zone"]) where resource.attributes["cloud.availability_zone"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
-      - set(attributes["namespace"], resource.attributes["host.id"]) where resource.attributes["host.id"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
+      - set(attributes["namespace"], Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")) where Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/") != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["cluster"], "__gce__") where "__gce__" != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["instance_name"], resource.attributes["host.name"]) where resource.attributes["host.name"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["machine_type"], resource.attributes["host.type"]) where resource.attributes["host.type"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"

diff --git a/...or/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml b/...or/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml
@@ -455,7 +455,7 @@ processors:
     - context: datapoint
       statements:
       - set(attributes["location"], resource.attributes["cloud.availability_zone"]) where resource.attributes["cloud.availability_zone"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
-      - set(attributes["namespace"], resource.attributes["host.id"]) where resource.attributes["host.id"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
+      - set(attributes["namespace"], Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")) where Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/") != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["cluster"], "__gce__") where "__gce__" != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["instance_name"], resource.attributes["host.name"]) where resource.attributes["host.name"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["machine_type"], resource.attributes["host.type"]) where resource.attributes["host.type"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"

diff --git a/...data/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml b/...data/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml
@@ -527,7 +527,7 @@ processors:
     - context: datapoint
       statements:
       - set(attributes["location"], resource.attributes["cloud.availability_zone"]) where resource.attributes["cloud.availability_zone"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
-      - set(attributes["namespace"], resource.attributes["host.id"]) where resource.attributes["host.id"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
+      - set(attributes["namespace"], Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")) where Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/") != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["cluster"], "__gce__") where "__gce__" != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["instance_name"], resource.attributes["host.name"]) where resource.attributes["host.name"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["machine_type"], resource.attributes["host.type"]) where resource.attributes["host.type"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"

diff --git a/.../testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/otel.yaml b/.../testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/otel.yaml
@@ -527,7 +527,7 @@ processors:
     - context: datapoint
       statements:
       - set(attributes["location"], resource.attributes["cloud.availability_zone"]) where resource.attributes["cloud.availability_zone"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
-      - set(attributes["namespace"], resource.attributes["host.id"]) where resource.attributes["host.id"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
+      - set(attributes["namespace"], Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")) where Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/") != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["cluster"], "__gce__") where "__gce__" != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["instance_name"], resource.attributes["host.name"]) where resource.attributes["host.name"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["machine_type"], resource.attributes["host.type"]) where resource.attributes["host.type"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"

diff --git a/...generator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml b/...generator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml
@@ -484,7 +484,7 @@ processors:
     - context: datapoint
       statements:
       - set(attributes["location"], resource.attributes["cloud.availability_zone"]) where resource.attributes["cloud.availability_zone"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
-      - set(attributes["namespace"], resource.attributes["host.id"]) where resource.attributes["host.id"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
+      - set(attributes["namespace"], Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")) where Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/") != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["cluster"], "__gce__") where "__gce__" != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["instance_name"], resource.attributes["host.name"]) where resource.attributes["host.name"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["machine_type"], resource.attributes["host.type"]) where resource.attributes["host.type"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"

diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/otel.yaml
@@ -455,7 +455,7 @@ processors:
     - context: datapoint
       statements:
       - set(attributes["location"], resource.attributes["cloud.availability_zone"]) where resource.attributes["cloud.availability_zone"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
-      - set(attributes["namespace"], resource.attributes["host.id"]) where resource.attributes["host.id"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
+      - set(attributes["namespace"], Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")) where Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/") != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["cluster"], "__gce__") where "__gce__" != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["instance_name"], resource.attributes["host.name"]) where resource.attributes["host.name"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["machine_type"], resource.attributes["host.type"]) where resource.attributes["host.type"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"

diff --git a/...erator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml b/...erator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml
@@ -527,7 +527,7 @@ processors:
     - context: datapoint
       statements:
       - set(attributes["location"], resource.attributes["cloud.availability_zone"]) where resource.attributes["cloud.availability_zone"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
-      - set(attributes["namespace"], resource.attributes["host.id"]) where resource.attributes["host.id"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
+      - set(attributes["namespace"], Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")) where Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/") != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["cluster"], "__gce__") where "__gce__" != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["instance_name"], resource.attributes["host.name"]) where resource.attributes["host.name"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["machine_type"], resource.attributes["host.type"]) where resource.attributes["host.type"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"

diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/otel.yaml
@@ -527,7 +527,7 @@ processors:
     - context: datapoint
       statements:
       - set(attributes["location"], resource.attributes["cloud.availability_zone"]) where resource.attributes["cloud.availability_zone"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
-      - set(attributes["namespace"], resource.attributes["host.id"]) where resource.attributes["host.id"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
+      - set(attributes["namespace"], Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")) where Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/") != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["cluster"], "__gce__") where "__gce__" != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["instance_name"], resource.attributes["host.name"]) where resource.attributes["host.name"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["machine_type"], resource.attributes["host.type"]) where resource.attributes["host.type"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"

diff --git a/...tor/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml b/...tor/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml
@@ -484,7 +484,7 @@ processors:
     - context: datapoint
       statements:
       - set(attributes["location"], resource.attributes["cloud.availability_zone"]) where resource.attributes["cloud.availability_zone"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
-      - set(attributes["namespace"], resource.attributes["host.id"]) where resource.attributes["host.id"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
+      - set(attributes["namespace"], Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")) where Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/") != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["cluster"], "__gce__") where "__gce__" != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["instance_name"], resource.attributes["host.name"]) where resource.attributes["host.name"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["machine_type"], resource.attributes["host.type"]) where resource.attributes["host.type"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"

diff --git a/...nerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml b/...nerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml
@@ -455,7 +455,7 @@ processors:
     - context: datapoint
       statements:
       - set(attributes["location"], resource.attributes["cloud.availability_zone"]) where resource.attributes["cloud.availability_zone"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
-      - set(attributes["namespace"], resource.attributes["host.id"]) where resource.attributes["host.id"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
+      - set(attributes["namespace"], Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")) where Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/") != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["cluster"], "__gce__") where "__gce__" != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["instance_name"], resource.attributes["host.name"]) where resource.attributes["host.name"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["machine_type"], resource.attributes["host.type"]) where resource.attributes["host.type"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"

diff --git a/.../testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml b/.../testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml
@@ -527,7 +527,7 @@ processors:
     - context: datapoint
       statements:
       - set(attributes["location"], resource.attributes["cloud.availability_zone"]) where resource.attributes["cloud.availability_zone"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
-      - set(attributes["namespace"], resource.attributes["host.id"]) where resource.attributes["host.id"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
+      - set(attributes["namespace"], Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/")) where Concat([resource.attributes["host.id"], resource.attributes["host.name"]], "/") != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["cluster"], "__gce__") where "__gce__" != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["instance_name"], resource.attributes["host.name"]) where resource.attributes["host.name"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"
       - set(attributes["machine_type"], resource.attributes["host.type"]) where resource.attributes["host.type"] != nil and resource.attributes["cloud.platform"] == "gcp_compute_engine"