chore: refactor variables

Author: sleepyfoodie

dashboards/resources/variables/cluster.libsonnet

@@ -1,37 +1,12 @@
-local g = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
-local var = g.dashboard.variable;
+local common = import './common.libsonnet';
 
 {
   // Cluster dashboard variables
   // Returns both datasource and cluster variables
-  cluster(config):: {
-    datasource:
-      var.datasource.new('datasource', 'prometheus')
-      + var.datasource.withRegex(config.datasourceFilterRegex)
-      + var.datasource.generalOptions.showOnDashboard.withLabelAndValue()
-      + var.datasource.generalOptions.withLabel('Data source')
-      + {
-        current: {
-          selected: true,
-          text: config.datasourceName,
-          value: config.datasourceName,
-        },
-      },
-
-    cluster:
-      var.query.new('cluster')
-      + var.query.withDatasourceFromVariable(self.datasource)
-      + var.query.queryTypes.withLabelValues(
-        config.clusterLabel,
-        'up{%(cadvisorSelector)s}' % config,
-      )
-      + var.query.generalOptions.withLabel('cluster')
-      + var.query.refresh.onTime()
-      + (
-        if config.showMultiCluster
-        then var.query.generalOptions.showOnDashboard.withLabelAndValue()
-        else var.query.generalOptions.showOnDashboard.withNothing()
-      )
-      + var.query.withSort(type='alphabetical'),
-  },
+  cluster(config)::
+    local datasource = common.datasource(config);
+    {
+      datasource: datasource,
+      cluster: common.cluster(config, datasource, 'up{%(cadvisorSelector)s}'),
+    },
 }

dashboards/resources/variables/common.libsonnet

@@ -0,0 +1,58 @@
+local g = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
+local var = g.dashboard.variable;
+
+{
+  datasource(config):: 
+    var.datasource.new('datasource', 'prometheus')
+    + var.datasource.withRegex(config.datasourceFilterRegex)
+    + var.datasource.generalOptions.showOnDashboard.withLabelAndValue()
+    + var.datasource.generalOptions.withLabel('Data source')
+    + {
+      current: {
+        selected: true,
+        text: config.datasourceName,
+        value: config.datasourceName,
+      },
+    },
+
+  cluster(config, datasourceVar, selectorTemplate):: 
+    var.query.new('cluster')
+    + var.query.withDatasourceFromVariable(datasourceVar)
+    + var.query.queryTypes.withLabelValues(
+      config.clusterLabel,
+      selectorTemplate % config,
+    )
+    + var.query.generalOptions.withLabel('cluster')
+    + var.query.refresh.onTime()
+    + (
+      if config.showMultiCluster
+      then var.query.generalOptions.showOnDashboard.withLabelAndValue()
+      else var.query.generalOptions.showOnDashboard.withNothing()
+    )
+    + var.query.withSort(type='alphabetical'),
+
+  namespace(config, datasourceVar):: 
+    var.query.new('namespace')
+    + var.query.withDatasourceFromVariable(datasourceVar)
+    + var.query.queryTypes.withLabelValues(
+      'namespace',
+      'kube_namespace_status_phase{%(kubeStateMetricsSelector)s, %(clusterLabel)s="$cluster"}' % config,
+    )
+    + var.query.generalOptions.withLabel('namespace')
+    + var.query.refresh.onTime()
+    + var.query.generalOptions.showOnDashboard.withLabelAndValue()
+    + var.query.withSort(type='alphabetical'),
+
+  pod(config, datasourceVar):: 
+    var.query.new('pod')
+    + var.query.withDatasourceFromVariable(datasourceVar)
+    + var.query.queryTypes.withLabelValues(
+      'pod',
+      'kube_pod_info{%(kubeStateMetricsSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}' % config,
+    )
+    + var.query.generalOptions.withLabel('pod')
+    + var.query.refresh.onTime()
+    + var.query.generalOptions.showOnDashboard.withLabelAndValue()
+    + var.query.withSort(type='alphabetical'),
+}
+

dashboards/resources/variables/namespace.libsonnet

@@ -1,49 +1,14 @@
-local g = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
-local var = g.dashboard.variable;
+local common = import './common.libsonnet';
 
 {
   // Namespace dashboard variables
   // Returns datasource, cluster, and namespace variables
-  namespace(config):: {
-    datasource:
-      var.datasource.new('datasource', 'prometheus')
-      + var.datasource.withRegex(config.datasourceFilterRegex)
-      + var.datasource.generalOptions.showOnDashboard.withLabelAndValue()
-      + var.datasource.generalOptions.withLabel('Data source')
-      + {
-        current: {
-          selected: true,
-          text: config.datasourceName,
-          value: config.datasourceName,
-        },
-      },
-
-    cluster:
-      var.query.new('cluster')
-      + var.query.withDatasourceFromVariable(self.datasource)
-      + var.query.queryTypes.withLabelValues(
-        config.clusterLabel,
-        'up{%(kubeStateMetricsSelector)s}' % config,
-      )
-      + var.query.generalOptions.withLabel('cluster')
-      + var.query.refresh.onTime()
-      + (
-        if config.showMultiCluster
-        then var.query.generalOptions.showOnDashboard.withLabelAndValue()
-        else var.query.generalOptions.showOnDashboard.withNothing()
-      )
-      + var.query.withSort(type='alphabetical'),
-
-    namespace:
-      var.query.new('namespace')
-      + var.query.withDatasourceFromVariable(self.datasource)
-      + var.query.queryTypes.withLabelValues(
-        'namespace',
-        'kube_namespace_status_phase{%(kubeStateMetricsSelector)s, %(clusterLabel)s="$cluster"}' % config,
-      )
-      + var.query.generalOptions.withLabel('namespace')
-      + var.query.refresh.onTime()
-      + var.query.generalOptions.showOnDashboard.withLabelAndValue()
-      + var.query.withSort(type='alphabetical'),
-  },
+  namespace(config)::
+    local datasource = common.datasource(config);
+    local clusterVar = common.cluster(config, datasource, 'up{%(kubeStateMetricsSelector)s}');
+    {
+      datasource: datasource,
+      cluster: clusterVar,
+      namespace: common.namespace(config, datasource),
+    },
 }

dashboards/resources/variables/pod.libsonnet

@@ -1,61 +1,15 @@
-local g = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
-local var = g.dashboard.variable;
+local common = import './common.libsonnet';
 
 {
   // Pod dashboard variables
   // Returns datasource, cluster, namespace, and pod variables
-  pod(config):: {
-    datasource:
-      var.datasource.new('datasource', 'prometheus')
-      + var.datasource.withRegex(config.datasourceFilterRegex)
-      + var.datasource.generalOptions.showOnDashboard.withLabelAndValue()
-      + var.datasource.generalOptions.withLabel('Data source')
-      + {
-        current: {
-          selected: true,
-          text: config.datasourceName,
-          value: config.datasourceName,
-        },
-      },
-
-    cluster:
-      var.query.new('cluster')
-      + var.query.withDatasourceFromVariable(self.datasource)
-      + var.query.queryTypes.withLabelValues(
-        config.clusterLabel,
-        'up{%(kubeStateMetricsSelector)s}' % config,
-      )
-      + var.query.generalOptions.withLabel('cluster')
-      + var.query.refresh.onTime()
-      + (
-        if config.showMultiCluster
-        then var.query.generalOptions.showOnDashboard.withLabelAndValue()
-        else var.query.generalOptions.showOnDashboard.withNothing()
-      )
-      + var.query.withSort(type='alphabetical'),
-
-    namespace:
-      var.query.new('namespace')
-      + var.query.withDatasourceFromVariable(self.datasource)
-      + var.query.queryTypes.withLabelValues(
-        'namespace',
-        'kube_namespace_status_phase{%(kubeStateMetricsSelector)s, %(clusterLabel)s="$cluster"}' % config,
-      )
-      + var.query.generalOptions.withLabel('namespace')
-      + var.query.refresh.onTime()
-      + var.query.generalOptions.showOnDashboard.withLabelAndValue()
-      + var.query.withSort(type='alphabetical'),
-
-    pod:
-      var.query.new('pod')
-      + var.query.withDatasourceFromVariable(self.datasource)
-      + var.query.queryTypes.withLabelValues(
-        'pod',
-        'kube_pod_info{%(kubeStateMetricsSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}' % config,
-      )
-      + var.query.generalOptions.withLabel('pod')
-      + var.query.refresh.onTime()
-      + var.query.generalOptions.showOnDashboard.withLabelAndValue()
-      + var.query.withSort(type='alphabetical'),
-  },
+  pod(config)::
+    local datasource = common.datasource(config);
+    local clusterVar = common.cluster(config, datasource, 'up{%(kubeStateMetricsSelector)s}');
+    {
+      datasource: datasource,
+      cluster: clusterVar,
+      namespace: common.namespace(config, datasource),
+      pod: common.pod(config, datasource),
+    },
 }