fix: Remove namespace dependency

To improve usage in non-k8s environments
adinhodovic · Jul 11, 2024 · 4685515 · 4685515
1 parent 7078af9
commit 4685515
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 24 deletions.
diff --git a/dashboards/django-overview.libsonnet b/dashboards/django-overview.libsonnet
@@ -50,8 +50,9 @@ local tbQueryOptions = tablePanel.queryOptions;
       query.withDatasourceFromVariable(datasourceVariable) +
       query.withSort(1) +
       query.generalOptions.withLabel('Namespace') +
-      query.selectionOptions.withMulti(false) +
-      query.selectionOptions.withIncludeAll(false) +
+      query.selectionOptions.withMulti(true) +
+      // Custom AllValue for non K8s environments where namespace is not set
+      query.selectionOptions.withIncludeAll(true, '.*') +
       query.refresh.onLoad() +
       query.refresh.onTime(),
 
@@ -371,7 +372,7 @@ local tbQueryOptions = tablePanel.queryOptions;
     local migrationsAppliedQuery = |||
       max (
         django_migrations_applied_total {
-            namespace="$namespace",
+            namespace=~"$namespace",
             job=~"$job"
         }
       ) by (namespace, job)
@@ -397,7 +398,7 @@ local tbQueryOptions = tablePanel.queryOptions;
     local migrationsUnAppliedQuery = |||
       max (
         django_migrations_unapplied_total {
-            namespace="$namespace",
+            namespace=~"$namespace",
             job=~"$job"
         }
       ) by (namespace, job)

diff --git a/dashboards/django-requests-by-view.libsonnet b/dashboards/django-requests-by-view.libsonnet
@@ -44,8 +44,9 @@ local tsOverride = tsStandardOptions.override;
       query.withDatasourceFromVariable(datasourceVariable) +
       query.withSort(1) +
       query.generalOptions.withLabel('Namespace') +
-      query.selectionOptions.withMulti(false) +
-      query.selectionOptions.withIncludeAll(false) +
+      query.selectionOptions.withMulti(true) +
+      // Custom AllValue for non K8s environments where namespace is not set
+      query.selectionOptions.withIncludeAll(true, '.*') +
       query.refresh.onLoad() +
       query.refresh.onTime(),
 

diff --git a/dashboards/django-requests-overview.libsonnet b/dashboards/django-requests-overview.libsonnet
@@ -52,8 +52,9 @@ local tbOverride = tbStandardOptions.override;
       query.withDatasourceFromVariable(datasourceVariable) +
       query.withSort(1) +
       query.generalOptions.withLabel('Namespace') +
-      query.selectionOptions.withMulti(false) +
-      query.selectionOptions.withIncludeAll(false) +
+      query.selectionOptions.withMulti(true) +
+      // Custom AllValue for non K8s environments where namespace is not set
+      query.selectionOptions.withIncludeAll(true, '.*') +
       query.refresh.onLoad() +
       query.refresh.onTime(),
 
@@ -425,7 +426,7 @@ local tbOverride = tbStandardOptions.override;
             tbPanelOptions.link.withTitle('Go To View') +
             tbPanelOptions.link.withType('dashboard') +
             tbPanelOptions.link.withUrl(
-              '/d/%s/django-requests-by-view?var-namespace=${__data.fields.Namespace}&var-job=${__data.fields.Job}&var-view=${__data.fields.View}' % $._config.requestsByViewDashboardUid
+              '/d/%s/django-requests-by-view?var-job=${__data.fields.Job}&var-view=${__data.fields.View}' % $._config.requestsByViewDashboardUid
             ) +
             tbPanelOptions.link.withTargetBlank(true)
           )
@@ -571,7 +572,7 @@ local tbOverride = tbStandardOptions.override;
             tbPanelOptions.link.withTitle('Go To View') +
             tbPanelOptions.link.withType('dashboard') +
             tbPanelOptions.link.withUrl(
-              '/d/%s/django-requests-by-view?var-namespace=${__data.fields.Namespace}&var-job=${__data.fields.Job}&var-view=${__data.fields.View}' % $._config.requestsByViewDashboardUid
+              '/d/%s/django-requests-by-view?var-job=${__data.fields.Job}&var-view=${__data.fields.View}' % $._config.requestsByViewDashboardUid
             ) +
             tbPanelOptions.link.withTargetBlank(true)
           )
@@ -641,7 +642,7 @@ local tbOverride = tbStandardOptions.override;
             tbPanelOptions.link.withTitle('Go To View') +
             tbPanelOptions.link.withType('dashboard') +
             tbPanelOptions.link.withUrl(
-              '/d/%s/django-requests-by-view?var-namespace=${__data.fields.Namespace}&var-job=${__data.fields.Job}&var-view=${__data.fields.View}' % $._config.requestsByViewDashboardUid
+              '/d/%s/django-requests-by-view?var-job=${__data.fields.Job}&var-view=${__data.fields.View}' % $._config.requestsByViewDashboardUid
             ) +
             tbPanelOptions.link.withTargetBlank(true)
           )
@@ -768,7 +769,7 @@ local tbOverride = tbStandardOptions.override;
             tbPanelOptions.link.withTitle('Go To View') +
             tbPanelOptions.link.withType('dashboard') +
             tbPanelOptions.link.withUrl(
-              '/d/%s/django-requests-by-view?var-namespace=${__data.fields.Namespace}&var-job=${__data.fields.Job}&var-view=${__data.fields.View}' % $._config.requestsByViewDashboardUid
+              '/d/%s/django-requests-by-view?var-job=${__data.fields.Job}&var-view=${__data.fields.View}' % $._config.requestsByViewDashboardUid
             ) +
             tbPanelOptions.link.withTargetBlank(true)
           )

diff --git a/dashboards_out/django-overview.json b/dashboards_out/django-overview.json
@@ -367,7 +367,7 @@
                   "type": "prometheus",
                   "uid": "$datasource"
                },
-               "expr": "max (\n  django_migrations_applied_total {\n      namespace=\"$namespace\",\n      job=~\"$job\"\n  }\n) by (namespace, job)\n"
+               "expr": "max (\n  django_migrations_applied_total {\n      namespace=~\"$namespace\",\n      job=~\"$job\"\n  }\n) by (namespace, job)\n"
             }
          ],
          "title": "Migrations Applied",
@@ -416,7 +416,7 @@
                   "type": "prometheus",
                   "uid": "$datasource"
                },
-               "expr": "max (\n  django_migrations_unapplied_total {\n      namespace=\"$namespace\",\n      job=~\"$job\"\n  }\n) by (namespace, job)\n"
+               "expr": "max (\n  django_migrations_unapplied_total {\n      namespace=~\"$namespace\",\n      job=~\"$job\"\n  }\n) by (namespace, job)\n"
             }
          ],
          "title": "Migrations Unapplied",
@@ -702,13 +702,14 @@
             "type": "datasource"
          },
          {
+            "allValue": ".*",
             "datasource": {
                "type": "prometheus",
                "uid": "${datasource}"
             },
-            "includeAll": false,
+            "includeAll": true,
             "label": "Namespace",
-            "multi": false,
+            "multi": true,
             "name": "namespace",
             "query": "label_values(django_http_responses_total_by_status_view_method_total{}, namespace)",
             "refresh": 2,

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

diff --git a/dashboards_out/django-requests-overview.json b/dashboards_out/django-requests-overview.json
@@ -388,7 +388,7 @@
                               "targetBlank": true,
                               "title": "Go To View",
                               "type": "dashboard",
-                              "url": "/d/django-requests-by-view-jkwq/django-requests-by-view?var-namespace=${__data.fields.Namespace}&var-job=${__data.fields.Job}&var-view=${__data.fields.View}"
+                              "url": "/d/django-requests-by-view-jkwq/django-requests-by-view?var-job=${__data.fields.Job}&var-view=${__data.fields.View}"
                            }
                         ]
                      }
@@ -629,7 +629,7 @@
                               "targetBlank": true,
                               "title": "Go To View",
                               "type": "dashboard",
-                              "url": "/d/django-requests-by-view-jkwq/django-requests-by-view?var-namespace=${__data.fields.Namespace}&var-job=${__data.fields.Job}&var-view=${__data.fields.View}"
+                              "url": "/d/django-requests-by-view-jkwq/django-requests-by-view?var-job=${__data.fields.Job}&var-view=${__data.fields.View}"
                            }
                         ]
                      }
@@ -756,7 +756,7 @@
                               "targetBlank": true,
                               "title": "Go To View",
                               "type": "dashboard",
-                              "url": "/d/django-requests-by-view-jkwq/django-requests-by-view?var-namespace=${__data.fields.Namespace}&var-job=${__data.fields.Job}&var-view=${__data.fields.View}"
+                              "url": "/d/django-requests-by-view-jkwq/django-requests-by-view?var-job=${__data.fields.Job}&var-view=${__data.fields.View}"
                            }
                         ]
                      }
@@ -903,7 +903,7 @@
                               "targetBlank": true,
                               "title": "Go To View",
                               "type": "dashboard",
-                              "url": "/d/django-requests-by-view-jkwq/django-requests-by-view?var-namespace=${__data.fields.Namespace}&var-job=${__data.fields.Job}&var-view=${__data.fields.View}"
+                              "url": "/d/django-requests-by-view-jkwq/django-requests-by-view?var-job=${__data.fields.Job}&var-view=${__data.fields.View}"
                            }
                         ]
                      }
@@ -1042,13 +1042,14 @@
             "type": "datasource"
          },
          {
+            "allValue": ".*",
             "datasource": {
                "type": "prometheus",
                "uid": "${datasource}"
             },
-            "includeAll": false,
+            "includeAll": true,
             "label": "Namespace",
-            "multi": false,
+            "multi": true,
             "name": "namespace",
             "query": "label_values(django_http_responses_total_by_status_view_method_total{}, namespace)",
             "refresh": 2,