Add namespace label on metrics (#574)

* Add namespace label on metrics * Add changelog entry * Address Michael's comment
k8ssandra · Oct 2, 2023 · 34e2ae6 · 34e2ae6
1 parent d9dfbc5
commit 34e2ae6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ Changelog for Cass Operator, new PRs should update the `main / unreleased` secti
 
 ## unreleased
 
+* [CHANGE] [#573](https://github.com/k8ssandra/cass-operator/issues/573) Add the namespace as env variable in the server-system-logger container to label metrics with.
+
 ## v1.17.2
 
 * [ENHANCEMENT] [#571](https://github.com/k8ssandra/cass-operator/issues/571) Ensure both "server-config-init" as well as "server-config-init-base" are always created in the initContainers if 4.1.x is used.  

diff --git a/pkg/reconciliation/construct_podtemplatespec.go b/pkg/reconciliation/construct_podtemplatespec.go
@@ -710,6 +710,7 @@ func buildContainers(dc *api.CassandraDatacenter, baseTemplate *corev1.PodTempla
 		{Name: "CLUSTER_NAME", Value: dc.Spec.ClusterName},
 		{Name: "DATACENTER_NAME", Value: dc.DatacenterName()},
 		{Name: "RACK_NAME", ValueFrom: selectorFromFieldPath("metadata.labels['cassandra.datastax.com/rack']")},
+		{Name: "NAMESPACE", ValueFrom: selectorFromFieldPath("metadata.namespace")},
 	}
 
 	loggerContainer.Env = combineEnvSlices(loggerEnvDefaults, loggerContainer.Env)

diff --git a/pkg/reconciliation/construct_podtemplatespec_test.go b/pkg/reconciliation/construct_podtemplatespec_test.go
@@ -461,6 +461,7 @@ func TestLoggerContainerEnvVars(t *testing.T) {
 	podNameEnvVar := corev1.EnvVar{Name: "POD_NAME", ValueFrom: selectorFromFieldPath("metadata.name")}
 	nodeNameEnvVar := corev1.EnvVar{Name: "NODE_NAME", ValueFrom: selectorFromFieldPath("spec.nodeName")}
 	rackNameEnvVar := corev1.EnvVar{Name: "RACK_NAME", ValueFrom: selectorFromFieldPath("metadata.labels['cassandra.datastax.com/rack']")}
+	namespaceEnvVar := corev1.EnvVar{Name: "NAMESPACE", ValueFrom: selectorFromFieldPath("metadata.namespace")}
 
 	templateSpec := &corev1.PodTemplateSpec{}
 	dc := &api.CassandraDatacenter{
@@ -482,11 +483,12 @@ func TestLoggerContainerEnvVars(t *testing.T) {
 	loggerContainer := findContainer(templateSpec.Spec.Containers, SystemLoggerContainerName)
 	assert.Equal(SystemLoggerContainerName, loggerContainer.Name)
 
-	assert.Equal(5, len(loggerContainer.Env))
+	assert.Equal(6, len(loggerContainer.Env))
 
 	assert.True(envVarsContains(loggerContainer.Env, podNameEnvVar))
 	assert.True(envVarsContains(loggerContainer.Env, nodeNameEnvVar))
 	assert.True(envVarsContains(loggerContainer.Env, rackNameEnvVar))
+	assert.True(envVarsContains(loggerContainer.Env, namespaceEnvVar))
 	assert.True(envVarsContains(loggerContainer.Env, corev1.EnvVar{Name: "CLUSTER_NAME", Value: dc.Spec.ClusterName}))
 	assert.True(envVarsContains(loggerContainer.Env, corev1.EnvVar{Name: "DATACENTER_NAME", Value: dc.DatacenterName()}))
 }

diff --git a/tests/testdata/configs/vector-config.yaml b/tests/testdata/configs/vector-config.yaml
@@ -50,6 +50,11 @@ data:
     if err == null {
       .rack = rack
     }
+
+    namespace, err = get_env_var("NAMESPACE")
+    if err == null {
+      .namespace = namespace
+    }
     '''
 
     [sinks.console]