From 1451389b341ca225ecac7efbf0f1e56e479bae81 Mon Sep 17 00:00:00 2001 From: Cyrille Le Clerc Date: Thu, 27 Nov 2025 17:46:32 +0100 Subject: [PATCH 1/4] [Prometheus] More resource attribute promotion Promote more resource attributes: * `host.name`: host monitoring * `k8s.node.name`: K8s node oriented view when doing K8s monitoring * `postgresql.*` resource attributes used by otelcol/receiver/postgresql * `database`: resource attribute used by otelcol/receiver/mongodb * `kafka.cluster.alias`: resource attribute used by otelcol/receiver/kafkametrics Signed-off-by: Cyrille Le Clerc --- docker/prometheus.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docker/prometheus.yaml b/docker/prometheus.yaml index 3d71bfc1..b99faae8 100644 --- a/docker/prometheus.yaml +++ b/docker/prometheus.yaml @@ -10,6 +10,7 @@ otlp: - cloud.availability_zone - cloud.region - container.name + - deployment.environment # backward compatibility - deployment.environment.name - k8s.cluster.name - k8s.container.name @@ -18,10 +19,17 @@ otlp: - k8s.deployment.name - k8s.job.name - k8s.namespace.name + - k8s.node.name - k8s.pod.name - k8s.replicaset.name - k8s.statefulset.name - + - host.name + - postgresql.database.name + - postgresql.schema.name + - postgresql.table.name + - postgresql.index.name + - database # used by otelcol/receiver/mongodb + - kafka.cluster.alias storage: tsdb: # A 10min time window is enough because it can easily absorb retries and network delays. From 2b8c293a0c7037dafdcb52764abfd7a7fce87bd9 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Thu, 27 Nov 2025 17:48:22 +0100 Subject: [PATCH 2/4] Apply suggestion from @zeitlinger Signed-off-by: Gregor Zeitlinger --- docker/prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/prometheus.yaml b/docker/prometheus.yaml index b99faae8..68d958a9 100644 --- a/docker/prometheus.yaml +++ b/docker/prometheus.yaml @@ -29,7 +29,7 @@ otlp: - postgresql.table.name - postgresql.index.name - database # used by otelcol/receiver/mongodb - - kafka.cluster.alias + - kafka.cluster.alias storage: tsdb: # A 10min time window is enough because it can easily absorb retries and network delays. From a34a1b2722a226c7b83db46ef232c977cbf8cea8 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Thu, 27 Nov 2025 17:49:37 +0100 Subject: [PATCH 3/4] Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Gregor Zeitlinger --- docker/prometheus.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/prometheus.yaml b/docker/prometheus.yaml index 68d958a9..85a9ca0a 100644 --- a/docker/prometheus.yaml +++ b/docker/prometheus.yaml @@ -28,8 +28,8 @@ otlp: - postgresql.schema.name - postgresql.table.name - postgresql.index.name - - database # used by otelcol/receiver/mongodb - - kafka.cluster.alias + - database # used by otelcol/receiver/mongodb + - kafka.cluster.alias storage: tsdb: # A 10min time window is enough because it can easily absorb retries and network delays. From 77d9eee6d33c6503e05947ce9306fb42ed2f652c Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Thu, 27 Nov 2025 17:50:39 +0100 Subject: [PATCH 4/4] Apply suggestions from code review Signed-off-by: Gregor Zeitlinger --- docker/prometheus.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/prometheus.yaml b/docker/prometheus.yaml index 85a9ca0a..68d958a9 100644 --- a/docker/prometheus.yaml +++ b/docker/prometheus.yaml @@ -28,8 +28,8 @@ otlp: - postgresql.schema.name - postgresql.table.name - postgresql.index.name - - database # used by otelcol/receiver/mongodb - - kafka.cluster.alias + - database # used by otelcol/receiver/mongodb + - kafka.cluster.alias storage: tsdb: # A 10min time window is enough because it can easily absorb retries and network delays.