Merge pull request #871 from azun/default-datasource-name

Selected datasource support for all dashboards
kubernetes-monitoring · Sep 25, 2023 · 31169fd · 31169fd
2 parents baffdc1 + 4a78534
commit 31169fd
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 12 deletions.
diff --git a/dashboards/apiserver.libsonnet b/dashboards/apiserver.libsonnet
@@ -205,7 +205,8 @@ local singlestat = grafana.singlestat;
       ).addTemplate(
         {
           current: {
-            text: 'default',
+            selected: true,
+            text: $._config.datasourceName,
             value: $._config.datasourceName,
           },
           hide: 0,

diff --git a/dashboards/controller-manager.libsonnet b/dashboards/controller-manager.libsonnet
@@ -135,7 +135,8 @@ local singlestat = grafana.singlestat;
       ).addTemplate(
         {
           current: {
-            text: 'default',
+            selected: true,
+            text: $._config.datasourceName,
             value: $._config.datasourceName,
           },
           hide: 0,

diff --git a/dashboards/kubelet.libsonnet b/dashboards/kubelet.libsonnet
@@ -293,7 +293,8 @@ local statPanel = grafana.statPanel;
       ).addTemplate(
         {
           current: {
-            text: 'default',
+            selected: true,
+            text: $._config.datasourceName,
             value: $._config.datasourceName,
           },
           hide: 0,

diff --git a/dashboards/network-usage/cluster-total.libsonnet b/dashboards/network-usage/cluster-total.libsonnet
@@ -360,7 +360,8 @@ local annotation = grafana.annotation;
       .addTemplate(
         {
           current: {
-            text: 'default',
+            selected: true,
+            text: $._config.datasourceName,
             value: $._config.datasourceName,
           },
           hide: 0,

diff --git a/dashboards/network-usage/namespace-by-pod.libsonnet b/dashboards/network-usage/namespace-by-pod.libsonnet
@@ -357,7 +357,8 @@ local singlestat = grafana.singlestat;
       .addTemplate(
         {
           current: {
-            text: 'default',
+            selected: true,
+            text: $._config.datasourceName,
             value: $._config.datasourceName,
           },
           hide: 0,

diff --git a/dashboards/network-usage/namespace-by-workload.libsonnet b/dashboards/network-usage/namespace-by-workload.libsonnet
@@ -386,7 +386,8 @@ local annotation = grafana.annotation;
       .addTemplate(
         {
           current: {
-            text: 'default',
+            selected: true,
+            text: $._config.datasourceName,
             value: $._config.datasourceName,
           },
           hide: 0,

diff --git a/dashboards/network-usage/pod-total.libsonnet b/dashboards/network-usage/pod-total.libsonnet
@@ -256,7 +256,8 @@ local singlestat = grafana.singlestat;
       .addTemplate(
         {
           current: {
-            text: 'default',
+            selected: true,
+            text: $._config.datasourceName,
             value: $._config.datasourceName,
           },
           hide: 0,

diff --git a/dashboards/network-usage/workload-total.libsonnet b/dashboards/network-usage/workload-total.libsonnet
@@ -269,7 +269,8 @@ local annotation = grafana.annotation;
       .addTemplate(
         {
           current: {
-            text: 'default',
+            selected: true,
+            text: $._config.datasourceName,
             value: $._config.datasourceName,
           },
           hide: 0,

diff --git a/dashboards/persistentvolumesusage.libsonnet b/dashboards/persistentvolumesusage.libsonnet
@@ -114,7 +114,8 @@ local gauge = promgrafonnet.gauge;
       ).addTemplate(
         {
           current: {
-            text: 'default',
+            selected: true,
+            text: $._config.datasourceName,
             value: $._config.datasourceName,
           },
           hide: 0,

diff --git a/dashboards/proxy.libsonnet b/dashboards/proxy.libsonnet
@@ -142,7 +142,8 @@ local singlestat = grafana.singlestat;
       ).addTemplate(
         {
           current: {
-            text: 'default',
+            selected: true,
+            text: $._config.datasourceName,
             value: $._config.datasourceName,
           },
           hide: 0,

diff --git a/dashboards/resources/cluster.libsonnet b/dashboards/resources/cluster.libsonnet
@@ -132,6 +132,7 @@ local template = grafana.template;
         '%(dashboardNamePrefix)sCompute Resources / Cluster' % $._config.grafanaK8s,
         uid=($._config.grafanaDashboardIDs['k8s-resources-cluster.json']),
         datasource_regex=$._config.datasourceFilterRegex,
+        datasource=$._config.datasourceName,
       )
       .addRow(
         (g.row('Headlines') +

diff --git a/dashboards/resources/multi-cluster.libsonnet b/dashboards/resources/multi-cluster.libsonnet
@@ -15,6 +15,7 @@ local g = import 'github.com/grafana/jsonnet-libs/grafana-builder/grafana.libson
           '%(dashboardNamePrefix)sCompute Resources /  Multi-Cluster' % $._config.grafanaK8s,
           uid=($._config.grafanaDashboardIDs['k8s-resources-multicluster.json']),
           datasource_regex=$._config.datasourceFilterRegex,
+          datasource=$._config.datasourceName,
         ).addRow(
           (g.row('Headlines') +
            {

diff --git a/dashboards/resources/namespace.libsonnet b/dashboards/resources/namespace.libsonnet
@@ -133,6 +133,7 @@ local template = grafana.template;
         '%(dashboardNamePrefix)sCompute Resources / Namespace (Pods)' % $._config.grafanaK8s,
         uid=($._config.grafanaDashboardIDs['k8s-resources-namespace.json']),
         datasource_regex=$._config.datasourceFilterRegex,
+        datasource=$._config.datasourceName,
       )
       .addRow(
         (g.row('Headlines') +

diff --git a/dashboards/resources/node.libsonnet b/dashboards/resources/node.libsonnet
@@ -40,6 +40,7 @@ local template = grafana.template;
         '%(dashboardNamePrefix)sCompute Resources / Node (Pods)' % $._config.grafanaK8s,
         uid=($._config.grafanaDashboardIDs['k8s-resources-node.json']),
         datasource_regex=$._config.datasourceFilterRegex,
+        datasource=$._config.datasourceName,
       )
       .addRow(
         g.row('CPU Usage')

diff --git a/dashboards/resources/pod.libsonnet b/dashboards/resources/pod.libsonnet
@@ -104,6 +104,7 @@ local template = grafana.template;
         '%(dashboardNamePrefix)sCompute Resources / Pod' % $._config.grafanaK8s,
         uid=($._config.grafanaDashboardIDs['k8s-resources-pod.json']),
         datasource_regex=$._config.datasourceFilterRegex,
+        datasource=$._config.datasourceName,
       )
       .addRow(
         g.row('CPU Usage')

diff --git a/dashboards/resources/workload-namespace.libsonnet b/dashboards/resources/workload-namespace.libsonnet
@@ -165,6 +165,7 @@ local template = grafana.template;
         '%(dashboardNamePrefix)sCompute Resources / Namespace (Workloads)' % $._config.grafanaK8s,
         uid=($._config.grafanaDashboardIDs['k8s-resources-workloads-namespace.json']),
         datasource_regex=$._config.datasourceFilterRegex,
+        datasource=$._config.datasourceName,
       )
       .addRow(
         g.row('CPU Usage')

diff --git a/dashboards/resources/workload.libsonnet b/dashboards/resources/workload.libsonnet
@@ -157,6 +157,7 @@ local template = grafana.template;
         '%(dashboardNamePrefix)sCompute Resources / Workload' % $._config.grafanaK8s,
         uid=($._config.grafanaDashboardIDs['k8s-resources-workload.json']),
         datasource_regex=$._config.datasourceFilterRegex,
+        datasource=$._config.datasourceName,
       )
       .addRow(
         g.row('CPU Usage')

diff --git a/dashboards/scheduler.libsonnet b/dashboards/scheduler.libsonnet
@@ -130,7 +130,8 @@ local singlestat = grafana.singlestat;
       ).addTemplate(
         {
           current: {
-            text: 'default',
+            selected: true,
+            text: $._config.datasourceName,
             value: $._config.datasourceName,
           },
           hide: 0,

diff --git a/dashboards/windows.libsonnet b/dashboards/windows.libsonnet
@@ -149,7 +149,8 @@ local g = import 'github.com/grafana/jsonnet-libs/grafana-builder/grafana.libson
       ).addTemplate(
         {
           current: {
-            text: 'default',
+            selected: true,
+            text: $._config.datasourceName,
             value: $._config.datasourceName,
           },
           hide: 0,