feat(gitlab-runner): Adjust dashboard to show different runner

This patch adjusts the dashboard to function as expected and provide the
info regarding multiple, different runners in one overview.

apps/base/gitlab-runner/dashboards/gitlab-runner-metrics.json

@@ -71,8 +71,8 @@
       },
       "id": 43,
       "panels": [],
-      "repeat": "app",
-      "title": "About $app",
+      "repeat": "service",
+      "title": "About $service",
       "type": "row"
     },
     {
@@ -162,7 +162,7 @@
       "repeat": null,
       "targets": [
         {
-          "expr": "gitlab_runner_version_info{app=~\"^$app$\"}",
+          "expr": "gitlab_runner_version_info{service=~\"^$service$\"}",
           "format": "table",
           "instant": true,
           "interval": "",
@@ -236,7 +236,7 @@
       "repeat": null,
       "targets": [
         {
-          "expr": "gitlab_runner_concurrent{app=~\"^$app$\"}",
+          "expr": "gitlab_runner_concurrent{service=~\"^$service$\"}",
           "format": "table",
           "instant": false,
           "interval": "",
@@ -310,7 +310,7 @@
       "pluginVersion": "7.4.2",
       "targets": [
         {
-          "expr": "gitlab_runner_limit{app=~\"^$app$\"}",
+          "expr": "gitlab_runner_limit{service=~\"^$service$\"}",
           "format": "table",
           "instant": false,
           "interval": "",
@@ -384,7 +384,7 @@
       "pluginVersion": "7.4.2",
       "targets": [
         {
-          "expr": "process_virtual_memory_max_bytes{app=~\"^$app$\"}",
+          "expr": "process_virtual_memory_max_bytes{service=~\"^$service$\"}",
           "format": "table",
           "instant": false,
           "interval": "",
@@ -458,7 +458,7 @@
       "pluginVersion": "7.4.2",
       "targets": [
         {
-          "expr": "process_max_fds{app=~\"^$app$\"}",
+          "expr": "process_max_fds{service=~\"^$service$\"}",
           "format": "table",
           "instant": false,
           "interval": "",
@@ -540,12 +540,12 @@
       "targets": [
         {
           "exemplar": false,
-          "expr": "delta(gitlab_runner_api_request_statuses_total{app=~\"^$app$\"} [2m])",
+          "expr": "delta(gitlab_runner_api_request_statuses_total{service=~\"^$service$\"} [2m])",
           "format": "time_series",
           "instant": false,
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{app}} : {{endpoint}} : {{status}}",
+          "legendFormat": "{{service}} : {{endpoint}} : {{status}}",
           "refId": "A"
         }
       ],
@@ -646,11 +646,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "delta(gitlab_runner_errors_total{app=~\"^$app$\"} [2m])",
+          "expr": "delta(gitlab_runner_errors_total{service=~\"^$service$\"} [2m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{app}} : {{level}}",
+          "legendFormat": "{{service}} : {{level}}",
           "refId": "A"
         }
       ],
@@ -750,12 +750,12 @@
       "targets": [
         {
           "exemplar": false,
-          "expr": "sum(gitlab_runner_jobs{job=~\"kubernetes-pods\", state=\"running\",app=~\"^$app$\"}) by (app,job,executor_stage,stage)",
+          "expr": "sum(gitlab_runner_jobs{job=~\"kubernetes-pods\", state=\"running\",service=~\"^$service$\"}) by (service,job,executor_stage,stage)",
           "format": "time_series",
           "instant": false,
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{app}} : {{job}} : {{executor_stage}} : {{stage}}",
+          "legendFormat": "{{service}} : {{job}} : {{executor_stage}} : {{stage}}",
           "refId": "A"
         }
       ],
@@ -869,11 +869,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "gitlab_runner_request_concurrency{app=~\"^$app$\"}",
+          "expr": "gitlab_runner_request_concurrency{service=~\"^$service$\"}",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{app}} : {{runner}}",
+          "legendFormat": "{{service}} : {{runner}}",
           "refId": "A"
         }
       ],
@@ -972,11 +972,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "delta(gitlab_runner_request_concurrency_exceeded_total{app=~\"^$app$\"} [2m])",
+          "expr": "delta(gitlab_runner_request_concurrency_exceeded_total{service=~\"^$service$\"} [2m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{app}} : {{ runner}} ",
+          "legendFormat": "{{service}} : {{ runner}} ",
           "refId": "A"
         }
       ],
@@ -1090,11 +1090,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(process_cpu_seconds_total{app=~\"^$app$\"} [2m])",
+          "expr": "rate(process_cpu_seconds_total{service=~\"^$service$\"} [2m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{app}} ",
+          "legendFormat": "{{service}} ",
           "refId": "A"
         }
       ],
@@ -1193,11 +1193,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "process_open_fds{app=~\"^$app$\"}",
+          "expr": "process_open_fds{service=~\"^$service$\"}",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{app}} ",
+          "legendFormat": "{{service}} ",
           "refId": "A"
         }
       ],
@@ -1296,11 +1296,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "process_virtual_memory_bytes{app=~\"^$app$\"}",
+          "expr": "process_virtual_memory_bytes{service=~\"^$service$\"}",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{app}} ",
+          "legendFormat": "{{service}} ",
           "refId": "A"
         }
       ],
@@ -1399,11 +1399,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "process_resident_memory_bytes{app=~\"^$app$\"}",
+          "expr": "process_resident_memory_bytes{service=~\"^$service$\"}",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{app}} ",
+          "legendFormat": "{{service}} ",
           "refId": "A"
         }
       ],
@@ -1480,17 +1480,17 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(gitlab_runner_api_request_statuses_total, app)",
+        "definition": "label_values(gitlab_runner_api_request_statuses_total, service)",
         "description": null,
         "error": null,
         "hide": 0,
         "includeAll": false,
         "label": null,
         "multi": true,
-        "name": "app",
+        "name": "service",
         "options": [],
         "query": {
-          "query": "label_values(gitlab_runner_api_request_statuses_total, app)",
+          "query": "label_values(gitlab_runner_api_request_statuses_total, service)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,