feat: use showMultiCluster instead of cluster label

kubernetes-monitoring · Nov 19, 2024 · d8a8fc2 · d8a8fc2
1 parent 1122d94
commit d8a8fc2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/alerts/kube_apiserver.libsonnet b/alerts/kube_apiserver.libsonnet
@@ -61,7 +61,7 @@ local utils = import '../lib/utils.libsonnet';
             annotations: {
               description: 'A client certificate used to authenticate to kubernetes apiserver is expiring in less than %s%s.' % [
                 (utils.humanizeSeconds($._config.certExpirationWarningSeconds)),
-                utils.ifClusterLabelSet($._config, ' on cluster {{ $labels.%(clusterLabel)s }}' % $._config),
+                utils.ifShowMultiCluster($._config, ' on cluster {{ $labels.%(clusterLabel)s }}' % $._config),
               ],
               summary: 'Client certificate is about to expire.',
             },
@@ -80,7 +80,7 @@ local utils = import '../lib/utils.libsonnet';
             annotations: {
               description: 'A client certificate used to authenticate to kubernetes apiserver is expiring in less than %s%s.' % [
                 (utils.humanizeSeconds($._config.certExpirationCriticalSeconds)),
-                utils.ifClusterLabelSet($._config, ' on cluster {{ $labels.%(clusterLabel)s }}' % $._config),
+                utils.ifShowMultiCluster($._config, ' on cluster {{ $labels.%(clusterLabel)s }}' % $._config),
               ],
               summary: 'Client certificate is about to expire.',
             },

diff --git a/lib/utils.libsonnet b/lib/utils.libsonnet
@@ -57,7 +57,7 @@
         },
       },
 
-  // if clusterLabel is set, return the string, otherwise return an empty string
-  ifClusterLabelSet(config, string)::
-    if std.length(config.clusterLabel) > 0 then string else '',
+  // if showMultiCluster is true in config, return the string, otherwise return an empty string
+  ifShowMultiCluster(config, string)::
+    if config.showMultiCluster then string else '',
 }