Merge pull request #716 from arajkumar/workload-ordering-ux

Author: paulfantom

dashboards/resources/workload.libsonnet

@@ -29,23 +29,23 @@ local template = grafana.template;
         sort=1
       ),
 
-    local workloadTemplate =
+    local workloadTypeTemplate =
       template.new(
-        name='workload',
+        name='type',
         datasource='$datasource',
-        query='label_values(namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace"}, workload)' % $._config.clusterLabel,
+        query='label_values(namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace"}, workload_type)' % $._config.clusterLabel,
         current='',
         hide='',
         refresh=2,
         includeAll=false,
         sort=1
       ),
 
-    local workloadTypeTemplate =
+    local workloadTemplate =
       template.new(
-        name='type',
+        name='workload',
         datasource='$datasource',
-        query='label_values(namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace", workload="$workload"}, workload_type)' % $._config.clusterLabel,
+        query='label_values(namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace", workload_type="$type"}, workload)' % $._config.clusterLabel,
         current='',
         hide='',
         refresh=2,
@@ -315,7 +315,7 @@ local template = grafana.template;
         )
       ) + {
         templating+: {
-          list+: [clusterTemplate, namespaceTemplate, workloadTemplate, workloadTypeTemplate],
+          list+: [clusterTemplate, namespaceTemplate, workloadTypeTemplate, workloadTemplate],
         },
       },
   },