monitoring: retire duplicate jobs dashboard

scripts/dashboards_render_atlas.py

@@ -2110,7 +2110,7 @@ def build_overview():
             thresholds=age_thresholds,
             limit=12,
             decimals=2,
-            links=overview_link("atlas-jobs"),
+            links=overview_link("atlas-testing"),
             include_color=False,
         )
     )
@@ -2126,7 +2126,7 @@ def build_overview():
         ],
         legend_display="table",
         legend_placement="right",
-        links=overview_link("atlas-jobs"),
+        links=overview_link("atlas-testing"),
     )
     ariadne_volume["fieldConfig"]["overrides"] = fixed_color_overrides(
         {"Attempts": dark_blue, "Failures": dark_red}
@@ -2228,7 +2228,7 @@ def build_overview():
                     "text": {"titleSize": 11, "valueSize": 11},
                 },
                 "transformations": [{"id": "sortBy", "options": {"fields": ["Value"], "order": "asc"}}],
-                "links": overview_link("atlas-jobs"),
+                "links": overview_link("atlas-testing"),
                 "description": description,
             }
         )
@@ -4856,10 +4856,6 @@ DASHBOARDS = {
         "builder": build_mail_dashboard,
         "configmap": ROOT / "services" / "monitoring" / "grafana-dashboard-mail.yaml",
     },
-    "atlas-jobs": {
-        "builder": build_jobs_dashboard,
-        "configmap": ROOT / "services" / "monitoring" / "grafana-dashboard-jobs.yaml",
-    },
     "atlas-testing": {
         "builder": build_testing_dashboard,
         "configmap": ROOT / "services" / "monitoring" / "grafana-dashboard-testing.yaml",

scripts/tests/test_dashboards_render_atlas.py

@@ -70,6 +70,7 @@ def test_overview_uses_readable_quality_power_and_gitops_panels():
     assert dashboard["links"] == [
         {"title": "Open Atlas Testing", "url": "/d/atlas-testing", "targetBlank": True}
     ]
+    assert "atlas-jobs" not in repr(dashboard)
     assert "Platform Test Success Rate" not in panels_by_title
     assert panels_by_title["Gate Checks Passing by Suite"]["type"] == "bargauge"
     assert panels_by_title["Gate Checks Passing by Suite"]["options"]["displayMode"] == "basic"

services/monitoring/dashboards/atlas-overview.json

@@ -2149,8 +2149,8 @@
       },
       "links": [
         {
-          "title": "Open atlas-jobs dashboard",
+          "title": "Open atlas-testing dashboard",
-          "url": "/d/atlas-jobs",
+          "url": "/d/atlas-testing",
           "targetBlank": true
         }
       ],
@@ -2255,8 +2255,8 @@
       },
       "links": [
         {
-          "title": "Open atlas-jobs dashboard",
+          "title": "Open atlas-testing dashboard",
-          "url": "/d/atlas-jobs",
+          "url": "/d/atlas-testing",
           "targetBlank": true
         }
       ]
@@ -2451,8 +2451,8 @@
       ],
       "links": [
         {
-          "title": "Open atlas-jobs dashboard",
+          "title": "Open atlas-testing dashboard",
-          "url": "/d/atlas-jobs",
+          "url": "/d/atlas-testing",
           "targetBlank": true
         }
       ],
@@ -2558,8 +2558,8 @@
       ],
       "links": [
         {
-          "title": "Open atlas-jobs dashboard",
+          "title": "Open atlas-testing dashboard",
-          "url": "/d/atlas-jobs",
+          "url": "/d/atlas-testing",
           "targetBlank": true
         }
       ],

services/monitoring/grafana-dashboard-overview.yaml

@@ -2158,8 +2158,8 @@ data:
           },
           "links": [
             {
-              "title": "Open atlas-jobs dashboard",
+              "title": "Open atlas-testing dashboard",
-              "url": "/d/atlas-jobs",
+              "url": "/d/atlas-testing",
               "targetBlank": true
             }
           ],
@@ -2264,8 +2264,8 @@ data:
           },
           "links": [
             {
-              "title": "Open atlas-jobs dashboard",
+              "title": "Open atlas-testing dashboard",
-              "url": "/d/atlas-jobs",
+              "url": "/d/atlas-testing",
               "targetBlank": true
             }
           ]
@@ -2460,8 +2460,8 @@ data:
           ],
           "links": [
             {
-              "title": "Open atlas-jobs dashboard",
+              "title": "Open atlas-testing dashboard",
-              "url": "/d/atlas-jobs",
+              "url": "/d/atlas-testing",
               "targetBlank": true
             }
           ],
@@ -2567,8 +2567,8 @@ data:
           ],
           "links": [
             {
-              "title": "Open atlas-jobs dashboard",
+              "title": "Open atlas-testing dashboard",
-              "url": "/d/atlas-jobs",
+              "url": "/d/atlas-testing",
               "targetBlank": true
             }
           ],

services/monitoring/helmrelease.yaml

@@ -506,15 +506,6 @@ spec:
             updateIntervalSeconds: 10
             options:
               path: /var/lib/grafana/dashboards/mail
-          - name: jobs
-            orgId: 1
-            folder: Atlas Internal
-            type: file
-            disableDeletion: false
-            editable: true
-            updateIntervalSeconds: 10
-            options:
-              path: /var/lib/grafana/dashboards/jobs
           - name: testing
             orgId: 1
             folder: Atlas Public
@@ -551,7 +542,6 @@ spec:
       gpu: grafana-dashboard-gpu
       network: grafana-dashboard-network
       mail: grafana-dashboard-mail
-      jobs: grafana-dashboard-jobs
       testing: grafana-dashboard-testing
       testing-public: grafana-dashboard-testing
       power: grafana-dashboard-power

services/monitoring/kustomization.yaml

@@ -16,7 +16,6 @@ resources:
   - grafana-dashboard-gitops.yaml
   - grafana-dashboard-power.yaml
   - grafana-dashboard-mail.yaml
-  - grafana-dashboard-jobs.yaml
   - grafana-dashboard-testing.yaml
   - vmalert-atlas-availability.yaml
   - dcgm-exporter.yaml