Docs and fix

grafana · Nov 25, 2024 · 7e9ad52 · 7e9ad52
1 parent 28e5b24
commit 7e9ad52
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/docs/sources/configure/options.md b/docs/sources/configure/options.md
@@ -624,6 +624,7 @@ and metrics with the Standard OpenTelemetry labels:
 - `k8s.daemonset.name`
 - `k8s.node.name`
 - `k8s.pod.name`
+- `k8s.container.name`
 - `k8s.pod.uid`
 - `k8s.pod.start_time`
 - `k8s.cluster.name`

diff --git a/docs/sources/metrics.md b/docs/sources/metrics.md
@@ -56,6 +56,7 @@ In order to configure which attributes to show or which attributes to hide, chec
 | Application (all)              | `k8s.node.name`              | shown if Kubernetes metadata is enabled           |
 | Application (all)              | `k8s.owner.name`             | shown if Kubernetes metadata is enabled           |
 | Application (all)              | `k8s.pod.name`               | shown if Kubernetes metadata is enabled           |
+| Application (all)              | `k8s.container.name`         | shown if Kubernetes metadata is enabled           |
 | Application (all)              | `k8s.pod.start_time`         | shown if Kubernetes metadata is enabled           |
 | Application (all)              | `k8s.pod.uid`                | shown if Kubernetes metadata is enabled           |
 | Application (all)              | `k8s.replicaset.name`        | shown if Kubernetes metadata is enabled           |

diff --git a/docs/sources/setup/kubernetes.md b/docs/sources/setup/kubernetes.md
@@ -45,6 +45,7 @@ Beyla can decorate your traces with the following Kubernetes labels:
 - `k8s.daemonset.name`
 - `k8s.node.name`
 - `k8s.pod.name`
+- `k8s.container.name`
 - `k8s.pod.uid`
 - `k8s.pod.start_time`
 - `k8s.cluster.name`

diff --git a/pkg/export/prom/prom.go b/pkg/export/prom/prom.go
@@ -50,6 +50,7 @@ const (
 
 	k8sNamespaceName   = "k8s_namespace_name"
 	k8sPodName         = "k8s_pod_name"
+	k8sContainerName   = "k8s_container_name"
 	k8sDeploymentName  = "k8s_deployment_name"
 	k8sStatefulSetName = "k8s_statefulset_name"
 	k8sReplicaSetName  = "k8s_replicaset_name"
@@ -677,7 +678,7 @@ func (r *metricsReporter) observe(span *request.Span) {
 }
 
 func appendK8sLabelNames(names []string) []string {
-	names = append(names, k8sNamespaceName, k8sPodName, k8sNodeName, k8sPodUID, k8sPodStartTime,
+	names = append(names, k8sNamespaceName, k8sPodName, k8sContainerName, k8sNodeName, k8sPodUID, k8sPodStartTime,
 		k8sDeploymentName, k8sReplicaSetName, k8sStatefulSetName, k8sDaemonSetName, k8sClusterName)
 	return names
 }