fix all ids

Azure · Aug 25, 2022 · c6649a9 · c6649a9
1 parent d7e8ee2
commit c6649a9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/mixins/kubernetes/dashboards/defaults.libsonnet b/mixins/kubernetes/dashboards/defaults.libsonnet
@@ -6,7 +6,8 @@
   // of the file name and set the timezone to be 'default'.
   grafanaDashboards:: {
     [filename]: grafanaDashboards[filename] {
-      uid: std.md5(filename),
+      [if filename == 'kubelet.json' then 'uid']: ($._config.grafanaDashboardIDs['kubelet.json']),
+      [if filename != 'kubelet.json' then 'uid']: std.md5(filename),
       timezone: kubernetesMixin._config.grafanaK8s.grafanaTimezone,
       refresh: kubernetesMixin._config.grafanaK8s.refresh,
       tags: kubernetesMixin._config.grafanaK8s.dashboardTags,

diff --git a/mixins/kubernetes/dashboards/kubelet.libsonnet b/mixins/kubernetes/dashboards/kubelet.libsonnet
@@ -284,12 +284,11 @@ local statPanel = grafana.statPanel;
         )
         .addTarget(prometheus.target('go_goroutines{%(clusterLabel)s="$cluster",%(kubeletSelector)s,instance=~"$instance"}' % $._config, legendFormat='{{instance}}'));
 
-      local uid = ($._config.grafanaDashboardIDs['kubelet.json']);
 
       dashboard.new(
         '%(dashboardNamePrefix)sKubelet' % $._config.grafanaK8s,
         time_from='now-1h',
-        uid=uid,
+        uid=($._config.grafanaDashboardIDs['kubelet.json']),
         tags=($._config.grafanaK8s.dashboardTags),
       ).addTemplate(
         {

diff --git a/mixins/node/lib/prom-mixin.libsonnet b/mixins/node/lib/prom-mixin.libsonnet
@@ -481,7 +481,7 @@ local table = grafana70.panel.table;
       dashboard.new(
         '%sNodes' % config.dashboardNamePrefix,
         time_from='now-1h',
-        uid=($._config.grafanaDashboardIDs['nodes.json']),
+        uid=(config.grafanaDashboardIDs['nodes.json']),
         tags=(config.dashboardTags),
         timezone='utc',
         refresh='30s',
@@ -493,7 +493,7 @@ local table = grafana70.panel.table;
       dashboard.new(
         '%sMacOS' % config.dashboardNamePrefix,
         time_from='now-1h',
-        uid=($._config.grafanaDashboardIDs['nodes.json']),
+        uid=(config.grafanaDashboardIDs['nodes.json']),
         tags=(config.dashboardTags),
         timezone='utc',
         refresh='30s',