Allow modifying series labels in the hierarchy

appuio · Dec 21, 2022 · c853f0b · c853f0b
1 parent 9c46053
commit c853f0b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 33 deletions.
diff --git a/pkg/db/seeds/promtest/appuio_cloud_memory.jsonnet b/pkg/db/seeds/promtest/appuio_cloud_memory.jsonnet
@@ -130,18 +130,18 @@ local cloudscaleFairUseRatio = 4294967296;
            }),
     c.test('unrelated kube node label changes do not throw errors - there is an overlap since series go stale only after a few missed scrapes',
            baseSeries {
-             flexNodeLabel: c.series('kube_node_labels', commonLabels {
-               label_csi_driver_id: 'A09B8DDE-5435-4D74-923C-4866513E8F02',
-               label_appuio_io_node_class: 'flex',
-               label_kubernetes_io_hostname: 'flex-x666',
-               node: 'flex-x666',
-             }, '1x10 _x10 stale'),
-             flexNodeLabelUpdated: c.series('kube_node_labels', commonLabels {
-               label_csi_driver_id: '18539CC3-0B6C-4E72-82BD-90A9BEF7D807',
-               label_appuio_io_node_class: 'flex',
-               label_kubernetes_io_hostname: 'flex-x666',
-               node: 'flex-x666',
-             }, '_x5 1x15'),
+             flexNodeLabel+: {
+               _labels+:: {
+                 label_csi_driver_id: 'A09B8DDE-5435-4D74-923C-4866513E8F02',
+               },
+               values: '1x10 _x10 stale',
+             },
+             flexNodeLabelUpdated: self.flexNodeLabel {
+               _labels+:: {
+                 label_csi_driver_id: '18539CC3-0B6C-4E72-82BD-90A9BEF7D807',
+               },
+               values: '_x5 1x15',
+             },
            },
            query,
            {
@@ -150,17 +150,15 @@ local cloudscaleFairUseRatio = 4294967296;
            }),
     c.test('unrelated kube node label adds do not throw errors - there is an overlap since series go stale only after a few missed scrapes',
            baseSeries {
-             flexNodeLabel: c.series('kube_node_labels', commonLabels {
-               label_appuio_io_node_class: 'flex',
-               label_kubernetes_io_hostname: 'flex-x666',
-               node: 'flex-x666',
-             }, '1x10 _x10 stale'),
-             flexNodeLabelUpdated: c.series('kube_node_labels', commonLabels {
-               label_csi_driver_id: '18539CC3-0B6C-4E72-82BD-90A9BEF7D807',
-               label_appuio_io_node_class: 'flex',
-               label_kubernetes_io_hostname: 'flex-x666',
-               node: 'flex-x666',
-             }, '_x5 1x15'),
+             flexNodeLabel+: {
+               values: '1x10 _x10 stale',
+             },
+             flexNodeLabelUpdated: self.flexNodeLabel {
+               _labels+:: {
+                 label_csi_driver_id: '18539CC3-0B6C-4E72-82BD-90A9BEF7D807',
+               },
+               values: '_x5 1x15',
+             },
            },
            query,
            {
@@ -169,15 +167,15 @@ local cloudscaleFairUseRatio = 4294967296;
            }),
     c.test('node class adds do not throw errors - there is an overlap since series go stale only after a few missed scrapes',
            baseSeries {
-             flexNodeLabel: c.series('kube_node_labels', commonLabels {
-               label_kubernetes_io_hostname: 'flex-x666',
-               node: 'flex-x666',
-             }, '1x10 _x10 stale'),
-             flexNodeLabelUpdated: c.series('kube_node_labels', commonLabels {
-               label_appuio_io_node_class: 'flex',
-               label_kubernetes_io_hostname: 'flex-x666',
-               node: 'flex-x666',
-             }, '_x5 1x15'),
+             flexNodeLabel+: {
+               _labels+:: {
+                 label_appuio_io_node_class:: null,
+               },
+               values: '1x10 _x10 stale',
+             },
+             flexNodeLabelUpdated: super.flexNodeLabel {
+               values: '_x5 1x15',
+             },
            },
            query,
            [

diff --git a/pkg/db/seeds/promtest/common.libsonnet b/pkg/db/seeds/promtest/common.libsonnet
@@ -2,8 +2,12 @@ local formatLabels = function(labels)
   local lf = std.join(', ', std.map(function(l) '%s="%s"' % [l, labels[l]], std.objectFields(labels)));
   '{%s}' % [lf];
 
+// returns a series object with correctly formatted labels.
+// labels can be modified post creation using `_labels`.
 local series = function(name, labels, values) {
-  series: name + formatLabels(labels),
+  _name:: name,
+  _labels:: labels,
+  series: self._name + formatLabels(self._labels),
   values: values,
 };