chore: refactor pod and namespace under dashboards/resources

Author: sleepyfoodie

dashboards/resources/namespace.libsonnet

@@ -1,12 +1,11 @@
-local g = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 local defaultQueries = import './queries/namespace.libsonnet';
 local defaultVariables = import './variables/namespace.libsonnet';
+local g = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local prometheus = g.query.prometheus;
 local stat = g.panel.stat;
 local table = g.panel.table;
 local timeSeries = g.panel.timeSeries;
-local var = g.dashboard.variable;
 
 {
   local statPanel(title, unit, query) =
@@ -39,13 +38,13 @@ local var = g.dashboard.variable;
     'k8s-resources-namespace.json':
       // Allow overriding queries via $._queries.namespace, otherwise use default
       local queries = if std.objectHas($, '_queries') && std.objectHas($._queries, 'namespace')
-        then $._queries.namespace
-        else defaultQueries;
+      then $._queries.namespace
+      else defaultQueries;
 
       // Allow overriding variables via $._variables.namespace, otherwise use default
       local variables = if std.objectHas($, '_variables') && std.objectHas($._variables, 'namespace')
-        then $._variables.namespace($._config)
-        else defaultVariables.namespace($._config);
+      then $._variables.namespace($._config)
+      else defaultVariables.namespace($._config);
 
       local links = {
         pod: {

dashboards/resources/pod.libsonnet

@@ -1,11 +1,10 @@
-local g = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 local defaultQueries = import './queries/pod.libsonnet';
 local defaultVariables = import './variables/pod.libsonnet';
+local g = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local prometheus = g.query.prometheus;
 local table = g.panel.table;
 local timeSeries = g.panel.timeSeries;
-local var = g.dashboard.variable;
 
 {
   local tsPanel =
@@ -28,13 +27,13 @@ local var = g.dashboard.variable;
     'k8s-resources-pod.json':
       // Allow overriding queries via $._queries.pod, otherwise use default
       local queries = if std.objectHas($, '_queries') && std.objectHas($._queries, 'pod')
-        then $._queries.pod
-        else defaultQueries;
+      then $._queries.pod
+      else defaultQueries;
 
       // Allow overriding variables via $._variables.pod, otherwise use default
       local variables = if std.objectHas($, '_variables') && std.objectHas($._variables, 'pod')
-        then $._variables.pod($._config)
-        else defaultVariables.pod($._config);
+      then $._variables.pod($._config)
+      else defaultVariables.pod($._config);
 
       local panels = [
         tsPanel.new('CPU Usage')

dashboards/resources/queries/namespace.libsonnet

@@ -131,4 +131,3 @@
   storageReadPlusWriteBytes(config)::
     'sum by(pod) (rate(container_fs_reads_bytes_total{%(cadvisorSelector)s, %(diskDeviceSelector)s, %(containerfsSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) + rate(container_fs_writes_bytes_total{%(cadvisorSelector)s, %(diskDeviceSelector)s, %(containerfsSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]))' % config,
 }
-

dashboards/resources/queries/pod.libsonnet

@@ -131,4 +131,3 @@
   storageReadPlusWriteBytes(config)::
     'sum by(container) (rate(container_fs_reads_bytes_total{%(cadvisorSelector)s, %(diskDeviceSelector)s, %(containerfsSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace", pod="$pod"}[%(grafanaIntervalVar)s]) + rate(container_fs_writes_bytes_total{%(cadvisorSelector)s, %(diskDeviceSelector)s, %(containerfsSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace", pod="$pod"}[%(grafanaIntervalVar)s]))' % config,
 }
-

dashboards/resources/variables/namespace.libsonnet

@@ -47,4 +47,3 @@ local var = g.dashboard.variable;
       + var.query.withSort(type='alphabetical'),
   },
 }
-

dashboards/resources/variables/pod.libsonnet

@@ -59,4 +59,3 @@ local var = g.dashboard.variable;
       + var.query.withSort(type='alphabetical'),
   },
 }
-