fix: Remove multi/all from job templates

adinhodovic · Dec 7, 2023 · cd544bc · cd544bc
1 parent 458b29d
commit cd544bc
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/.lint b/.lint
@@ -1,5 +1,7 @@
 ---
 exclusions:
+  template-job-rule:
+    reason: Jobs are not set to multi in our case.
   template-instance-rule:
     reason: We don't use instances.
   panel-datasource-rule:

diff --git a/dashboards/django-overview.libsonnet b/dashboards/django-overview.libsonnet
@@ -64,8 +64,8 @@ local tbQueryOptions = tablePanel.queryOptions;
       query.withDatasourceFromVariable(datasourceVariable) +
       query.withSort(1) +
       query.generalOptions.withLabel('Job') +
-      query.selectionOptions.withMulti(true) +
-      query.selectionOptions.withIncludeAll(true, '.+') +
+      query.selectionOptions.withMulti(false) +
+      query.selectionOptions.withIncludeAll(false) +
       query.refresh.onLoad() +
       query.refresh.onTime(),
 

diff --git a/dashboards/django-requests-by-view.libsonnet b/dashboards/django-requests-by-view.libsonnet
@@ -58,8 +58,8 @@ local tsOverride = tsStandardOptions.override;
       query.withDatasourceFromVariable(datasourceVariable) +
       query.withSort(1) +
       query.generalOptions.withLabel('Job') +
-      query.selectionOptions.withMulti(true) +
-      query.selectionOptions.withIncludeAll(true, '.+') +
+      query.selectionOptions.withMulti(false) +
+      query.selectionOptions.withIncludeAll(false) +
       query.refresh.onLoad() +
       query.refresh.onTime(),
 

diff --git a/dashboards/django-requests-overview.libsonnet b/dashboards/django-requests-overview.libsonnet
@@ -66,8 +66,8 @@ local tbOverride = tbStandardOptions.override;
       query.withDatasourceFromVariable(datasourceVariable) +
       query.withSort(1) +
       query.generalOptions.withLabel('Job') +
-      query.selectionOptions.withMulti(true) +
-      query.selectionOptions.withIncludeAll(true, '.+') +
+      query.selectionOptions.withMulti(false) +
+      query.selectionOptions.withIncludeAll(false) +
       query.refresh.onLoad() +
       query.refresh.onTime(),
 

diff --git a/dashboards_out/django-overview.json b/dashboards_out/django-overview.json
@@ -713,14 +713,13 @@
             "type": "query"
          },
          {
-            "allValue": ".+",
             "datasource": {
                "type": "prometheus",
                "uid": "${datasource}"
             },
-            "includeAll": true,
+            "includeAll": false,
             "label": "Job",
-            "multi": true,
+            "multi": false,
             "name": "job",
             "query": "label_values(django_http_responses_total_by_status_view_method_total{namespace=~\"$namespace\"}, job)",
             "refresh": 2,

diff --git a/dashboards_out/django-requests-by-view.json b/dashboards_out/django-requests-by-view.json
@@ -617,14 +617,13 @@
             "type": "query"
          },
          {
-            "allValue": ".+",
             "datasource": {
                "type": "prometheus",
                "uid": "${datasource}"
             },
-            "includeAll": true,
+            "includeAll": false,
             "label": "Job",
-            "multi": true,
+            "multi": false,
             "name": "job",
             "query": "label_values(django_http_responses_total_by_status_view_method_total{namespace=~\"$namespace\"}, job)",
             "refresh": 2,

diff --git a/dashboards_out/django-requests-overview.json b/dashboards_out/django-requests-overview.json
@@ -1052,14 +1052,13 @@
             "type": "query"
          },
          {
-            "allValue": ".+",
             "datasource": {
                "type": "prometheus",
                "uid": "${datasource}"
             },
-            "includeAll": true,
+            "includeAll": false,
             "label": "Job",
-            "multi": true,
+            "multi": false,
             "name": "job",
             "query": "label_values(django_http_responses_total_by_status_view_method_total{namespace=~\"$namespace\"}, job)",
             "refresh": 2,