From f1a90e8e6cd4dac68dea9ac2318b43b4ed886755 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 6 Oct 2023 13:55:58 -0400 Subject: [PATCH] examples/quickstart: update grafana dashboards to consider source projects --- .../dashboards/dashboard_environments.json | 58 ++++++++--------- .../grafana/dashboards/dashboard_jobs.json | 64 +++++++++---------- .../dashboards/dashboard_pipelines.json | 60 ++++++++--------- 3 files changed, 91 insertions(+), 91 deletions(-) diff --git a/examples/quickstart/grafana/dashboards/dashboard_environments.json b/examples/quickstart/grafana/dashboards/dashboard_environments.json index 2569adf4..7df09db2 100644 --- a/examples/quickstart/grafana/dashboards/dashboard_environments.json +++ b/examples/quickstart/grafana/dashboards/dashboard_environments.json @@ -144,13 +144,13 @@ ], "targets": [ { - "expr": "gitlab_ci_environment_behind_commits_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}", + "expr": "gitlab_ci_environment_behind_commits_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}", "format": "time_series", "hide": false, "instant": true, "interval": "", "intervalFactor": 1, - "legendFormat": " {{ project }} - {{ environment }}", + "legendFormat": " {{ source_project }} - {{ environment }}", "refId": "A" } ], @@ -232,7 +232,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "count(gitlab_ci_environment_information{available=\"true\", project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) or vector(0)", + "expr": "count(gitlab_ci_environment_information{available=\"true\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) or vector(0)", "format": "time_series", "instant": false, "interval": "", @@ -315,7 +315,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "count(gitlab_ci_environment_behind_commits_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT.*\"} > 0) or vector(0)", + "expr": "count(gitlab_ci_environment_behind_commits_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT.*\"} > 0) or vector(0)", "format": "time_series", "instant": false, "interval": "", @@ -398,7 +398,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "count(gitlab_ci_environment_status{status=\"failed\", project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"} > 0) or vector(0)", + "expr": "count(gitlab_ci_environment_status{status=\"failed\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"} > 0) or vector(0)", "format": "time_series", "instant": false, "interval": "", @@ -507,7 +507,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "count(gitlab_ci_environment_information{available=\"false\", project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) or vector(0)", + "expr": "count(gitlab_ci_environment_information{available=\"false\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) or vector(0)", "format": "time_series", "instant": false, "interval": "", @@ -591,7 +591,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "avg(gitlab_ci_environment_behind_commits_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"})", + "expr": "avg(gitlab_ci_environment_behind_commits_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"})", "format": "time_series", "instant": false, "interval": "", @@ -671,11 +671,11 @@ "steppedLine": false, "targets": [ { - "expr": "sum(increase(gitlab_ci_environment_deployment_count{project=~\"($OWNER).*\",project=~\"$PROJECT\",environment=~\"$ENVIRONMENT\"}[1m])) by (project, environment) / sum(increase(gitlab_ci_environment_deployment_count{project=~\"($OWNER).*\",project=~\"$PROJECT\",environment=~\"$ENVIRONMENT\"}[1m])) by (project, environment)", + "expr": "sum(increase(gitlab_ci_environment_deployment_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\",environment=~\"$ENVIRONMENT\"}[1m])) by (source_project, environment) / sum(increase(gitlab_ci_environment_deployment_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\",environment=~\"$ENVIRONMENT\"}[1m])) by (source_project, environment)", "format": "time_series", "instant": false, "interval": "", - "legendFormat": "{{ environment }} - {{ project }}", + "legendFormat": "{{ environment }} - {{ source_project }}", "refId": "A" } ], @@ -785,7 +785,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "sum(increase(gitlab_ci_environment_deployment_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}[1h]))", + "expr": "sum(increase(gitlab_ci_environment_deployment_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}[1h]))", "format": "time_series", "instant": false, "interval": "", @@ -869,7 +869,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "avg(gitlab_ci_environment_behind_duration_seconds{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"})", + "expr": "avg(gitlab_ci_environment_behind_duration_seconds{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"})", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -927,7 +927,7 @@ { "targetBlank": true, "title": "View environment #${__value.numeric}", - "url": "https://${GITLAB_HOST}/${__data.fields.project:raw}/-/environments/${__value.numeric}" + "url": "https://${GITLAB_HOST}/${__data.fields.source_project:raw}/-/environments/${__value.numeric}" } ] }, @@ -1179,7 +1179,7 @@ { "targetBlank": true, "title": "View job #${__value.numeric}", - "url": "https://${GITLAB_HOST}/${__data.fields.project:raw}/-/jobs/${__value.numeric}" + "url": "https://${GITLAB_HOST}/${__data.fields.source_project:raw}/-/jobs/${__value.numeric}" } ] }, @@ -1330,7 +1330,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "(max(gitlab_ci_environment_deployment_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\", status=~\"success\"}) by (project, environment) * 1) > 0 or\n(max(gitlab_ci_environment_deployment_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\", status=~\"running\"}) by (project, environment) * 2) > 0 or\n(max(gitlab_ci_environment_deployment_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\", status=~\"failed\"}) by (project, environment) * 3) > 0 or\n(max(gitlab_ci_environment_deployment_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\", status=~\"canceled\"}) by (project, environment) * 4) > 0 or\n(max(gitlab_ci_environment_deployment_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\", status=~\"skipped\"}) by (project, environment) * 5) > 0 or\n(max(gitlab_ci_environment_deployment_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\", status=~\"created|waiting_for_resource|preparing|pending|manual|scheduled\"}) by (project, environment) * 6) > 0", + "expr": "(max(gitlab_ci_environment_deployment_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\", status=~\"success\"}) by (source_project, environment) * 1) > 0 or\n(max(gitlab_ci_environment_deployment_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\", status=~\"running\"}) by (source_project, environment) * 2) > 0 or\n(max(gitlab_ci_environment_deployment_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\", status=~\"failed\"}) by (source_project, environment) * 3) > 0 or\n(max(gitlab_ci_environment_deployment_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\", status=~\"canceled\"}) by (source_project, environment) * 4) > 0 or\n(max(gitlab_ci_environment_deployment_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\", status=~\"skipped\"}) by (source_project, environment) * 5) > 0 or\n(max(gitlab_ci_environment_deployment_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\", status=~\"created|waiting_for_resource|preparing|pending|manual|scheduled\"}) by (source_project, environment) * 6) > 0", "format": "table", "hide": false, "instant": true, @@ -1340,7 +1340,7 @@ "refId": "A" }, { - "expr": "-max(time() - gitlab_ci_environment_deployment_timestamp{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (project, environment)", + "expr": "-max(time() - gitlab_ci_environment_deployment_timestamp{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (source_project, environment)", "format": "table", "hide": false, "instant": true, @@ -1350,7 +1350,7 @@ "refId": "B" }, { - "expr": "max(gitlab_ci_environment_deployment_duration_seconds{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (project, environment)", + "expr": "max(gitlab_ci_environment_deployment_duration_seconds{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (source_project, environment)", "format": "table", "hide": false, "instant": true, @@ -1360,7 +1360,7 @@ "refId": "C" }, { - "expr": "max(gitlab_ci_environment_information{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (environment_id, project, environment, author_email, current_commit_short_id, ref, latest_commit_short_id)", + "expr": "max(gitlab_ci_environment_information{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (environment_id, source_project, environment, author_email, current_commit_short_id, ref, latest_commit_short_id)", "format": "table", "instant": true, "interval": "", @@ -1368,7 +1368,7 @@ "refId": "D" }, { - "expr": "max(gitlab_ci_environment_behind_commits_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (project, environment)", + "expr": "max(gitlab_ci_environment_behind_commits_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (source_project, environment)", "format": "table", "instant": true, "interval": "", @@ -1376,7 +1376,7 @@ "refId": "E" }, { - "expr": "max(gitlab_ci_environment_behind_duration_seconds{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (project, environment)", + "expr": "max(gitlab_ci_environment_behind_duration_seconds{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (source_project, environment)", "format": "table", "instant": true, "interval": "", @@ -1384,7 +1384,7 @@ "refId": "F" }, { - "expr": "max(gitlab_ci_environment_deployment_job_id{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (project, environment)", + "expr": "max(gitlab_ci_environment_deployment_job_id{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (source_project, environment)", "format": "table", "instant": true, "interval": "", @@ -1423,7 +1423,7 @@ "environment": 2, "environment_id": 1, "latest_commit_short_id": 11, - "project": 3, + "source_project": 3, "ref": 6, "status": 14 }, @@ -1442,7 +1442,7 @@ "job_name": "Job", "kind": "Ref Kind", "latest_commit_short_id": "Latest commit", - "project": "Project", + "source_project": "Project", "ref": "Ref Name", "status": "Status" } @@ -1491,7 +1491,7 @@ ] }, "datasource": "prometheus", - "definition": "label_values(gitlab_ci_environment_information, project)", + "definition": "label_values(gitlab_ci_environment_information, source_project)", "error": null, "hide": 0, "includeAll": true, @@ -1499,7 +1499,7 @@ "multi": true, "name": "OWNER", "options": [], - "query": "label_values(gitlab_ci_environment_information, project)", + "query": "label_values(gitlab_ci_environment_information, source_project)", "refresh": 2, "regex": "/(.*)\\/.*$/", "skipUrlSync": false, @@ -1522,15 +1522,15 @@ ] }, "datasource": "prometheus", - "definition": "label_values(gitlab_ci_environment_information{project=~\"($OWNER).*\"}, project)", + "definition": "label_values(gitlab_ci_environment_information{source_project=~\"($OWNER).*\"}, source_project)", "error": null, "hide": 0, "includeAll": true, - "label": "project", + "label": "source_project", "multi": true, "name": "PROJECT", "options": [], - "query": "label_values(gitlab_ci_environment_information{project=~\"($OWNER).*\"}, project)", + "query": "label_values(gitlab_ci_environment_information{source_project=~\"($OWNER).*\"}, source_project)", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -1553,7 +1553,7 @@ ] }, "datasource": "prometheus", - "definition": "label_values(gitlab_ci_environment_information{project=~\"($OWNER).*\",project=~\"$PROJECT\"}, environment)", + "definition": "label_values(gitlab_ci_environment_information{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\"}, environment)", "error": null, "hide": 0, "includeAll": true, @@ -1561,7 +1561,7 @@ "multi": true, "name": "ENVIRONMENT", "options": [], - "query": "label_values(gitlab_ci_environment_information{project=~\"($OWNER).*\",project=~\"$PROJECT\"}, environment)", + "query": "label_values(gitlab_ci_environment_information{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\"}, environment)", "refresh": 2, "regex": "", "skipUrlSync": false, diff --git a/examples/quickstart/grafana/dashboards/dashboard_jobs.json b/examples/quickstart/grafana/dashboards/dashboard_jobs.json index 82fb021f..fa24fd1c 100644 --- a/examples/quickstart/grafana/dashboards/dashboard_jobs.json +++ b/examples/quickstart/grafana/dashboards/dashboard_jobs.json @@ -110,7 +110,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "count(gitlab_ci_pipeline_job_run_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"})", + "expr": "count(gitlab_ci_pipeline_job_run_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"})", "format": "time_series", "hide": false, "instant": false, @@ -194,7 +194,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "count(gitlab_ci_pipeline_job_status{status=\"failed\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"} > 0) or vector(0)", + "expr": "count(gitlab_ci_pipeline_job_status{status=\"failed\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"} > 0) or vector(0)", "format": "time_series", "instant": false, "interval": "", @@ -273,7 +273,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "sum(increase(gitlab_ci_pipeline_job_run_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}[1h]))", + "expr": "sum(increase(gitlab_ci_pipeline_job_run_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}[1h]))", "format": "time_series", "instant": false, "interval": "", @@ -397,13 +397,13 @@ "savedOverrides": [], "targets": [ { - "expr": "(gitlab_ci_pipeline_job_status{status=\"success\", project=~\"($OWNER).*\", ref=~\"$REF\", job_name=~\"$JOB\"} * 1 > 0) or (gitlab_ci_pipeline_job_status{status=\"running\", project=~\"($OWNER).*\", ref=~\"$REF\", job_name=~\"$JOB\"} * 2 > 0) or (gitlab_ci_pipeline_job_status{status=~\"failed|canceled\", project=~\"($OWNER).*\", ref=~\"$REF\", job_name=~\"$JOB\"} * 3 > 0) or (gitlab_ci_pipeline_job_status{status!~\"success|running|failed|canceled\", project=~\"($OWNER).*\", ref=~\"$REF\", job_name=~\"$JOB\"} * 4 > 0)", + "expr": "(gitlab_ci_pipeline_job_status{status=\"success\", source_project=~\"($OWNER).*\", ref=~\"$REF\", job_name=~\"$JOB\"} * 1 > 0) or (gitlab_ci_pipeline_job_status{status=\"running\", source_project=~\"($OWNER).*\", ref=~\"$REF\", job_name=~\"$JOB\"} * 2 > 0) or (gitlab_ci_pipeline_job_status{status=~\"failed|canceled\", source_project=~\"($OWNER).*\", ref=~\"$REF\", job_name=~\"$JOB\"} * 3 > 0) or (gitlab_ci_pipeline_job_status{status!~\"success|running|failed|canceled\", source_project=~\"($OWNER).*\", ref=~\"$REF\", job_name=~\"$JOB\"} * 4 > 0)", "format": "time_series", "hide": false, "instant": true, "interval": "", "intervalFactor": 1, - "legendFormat": " {{project}} - {{ref}} - {{job_name}}", + "legendFormat": " {{source_project}} - {{ref}} - {{job_name}}", "refId": "A" } ], @@ -490,7 +490,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "avg(time() - gitlab_ci_pipeline_job_timestamp{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"})", + "expr": "avg(time() - gitlab_ci_pipeline_job_timestamp{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"})", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -573,7 +573,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "avg(gitlab_ci_pipeline_job_duration_seconds{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"})", + "expr": "avg(gitlab_ci_pipeline_job_duration_seconds{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"})", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -638,11 +638,11 @@ "steppedLine": false, "targets": [ { - "expr": "sum(increase(gitlab_ci_pipeline_job_run_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}[1m])) by (project, ref, job_name) / sum(increase(gitlab_ci_pipeline_job_run_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}[1m])) by (project, ref, job_name)", + "expr": "sum(increase(gitlab_ci_pipeline_job_run_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}[1m])) by (source_project, ref, job_name) / sum(increase(gitlab_ci_pipeline_job_run_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}[1m])) by (source_project, ref, job_name)", "format": "time_series", "instant": false, "interval": "", - "legendFormat": "{{ project }} - {{ ref }} - {{job_name}}", + "legendFormat": "{{ source_project }} - {{ ref }} - {{job_name}}", "refId": "A" } ], @@ -732,7 +732,7 @@ { "targetBlank": true, "title": "View job #${__value.numeric}", - "url": "https://${GITLAB_HOST}/${__data.fields.project}/-/jobs/${__value.numeric}" + "url": "https://${GITLAB_HOST}/${__data.fields.source_project}/-/jobs/${__value.numeric}" } ] }, @@ -908,7 +908,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "-max(time() - gitlab_ci_pipeline_job_timestamp{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (project, ref, job_name, kind) unless max(gitlab_ci_pipeline_job_status{status!~\"success\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (project, ref, job_name, kind) > 0", + "expr": "-max(time() - gitlab_ci_pipeline_job_timestamp{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (source_project, ref, job_name, kind) unless max(gitlab_ci_pipeline_job_status{status!~\"success\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (source_project, ref, job_name, kind) > 0", "format": "table", "hide": false, "instant": true, @@ -918,7 +918,7 @@ "refId": "B" }, { - "expr": "max(gitlab_ci_pipeline_job_duration_seconds{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (project, ref, job_name, kind) unless (max(gitlab_ci_pipeline_job_status{status!~\"success\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (project, ref, job_name, kind) > 0)", + "expr": "max(gitlab_ci_pipeline_job_duration_seconds{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (source_project, ref, job_name, kind) unless (max(gitlab_ci_pipeline_job_status{status!~\"success\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (source_project, ref, job_name, kind) > 0)", "format": "table", "hide": false, "instant": true, @@ -928,7 +928,7 @@ "refId": "C" }, { - "expr": "max(gitlab_ci_pipeline_job_id{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (project, ref, kind, job_name) unless (max(gitlab_ci_pipeline_job_status{status!~\"success\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (project, ref, kind, job_name) > 0)", + "expr": "max(gitlab_ci_pipeline_job_id{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (source_project, ref, kind, job_name) unless (max(gitlab_ci_pipeline_job_status{status!~\"success\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (source_project, ref, kind, job_name) > 0)", "format": "table", "instant": true, "interval": "", @@ -960,7 +960,7 @@ "Value #D": 1, "job_name": 3, "kind": 4, - "project": 2, + "source_project": 2, "ref": 5, "status": 8 }, @@ -971,7 +971,7 @@ "Value #D": "ID", "job_name": "Job", "kind": "Ref Kind", - "project": "Project", + "source_project": "Project", "ref": "Ref Name", "status": "Status" } @@ -1039,7 +1039,7 @@ { "targetBlank": true, "title": "View job #${__value.numeric}", - "url": "https://${GITLAB_HOST}/${__data.fields.project}/-/jobs/${__value.numeric}" + "url": "https://${GITLAB_HOST}/${__data.fields.source_project}/-/jobs/${__value.numeric}" } ] }, @@ -1321,7 +1321,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "-max(time() - gitlab_ci_pipeline_job_timestamp{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (project, ref, job_name, kind) unless max(gitlab_ci_pipeline_job_status{status=~\"success\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (project, ref, job_name, kind) > 0", + "expr": "-max(time() - gitlab_ci_pipeline_job_timestamp{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (source_project, ref, job_name, kind) unless max(gitlab_ci_pipeline_job_status{status=~\"success\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (source_project, ref, job_name, kind) > 0", "format": "table", "hide": false, "instant": true, @@ -1331,7 +1331,7 @@ "refId": "B" }, { - "expr": "max(gitlab_ci_pipeline_job_duration_seconds{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (project, ref, job_name, kind) unless (max(gitlab_ci_pipeline_job_status{status=~\"success\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (project, ref, job_name, kind) > 0)", + "expr": "max(gitlab_ci_pipeline_job_duration_seconds{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (source_project, ref, job_name, kind) unless (max(gitlab_ci_pipeline_job_status{status=~\"success\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (source_project, ref, job_name, kind) > 0)", "format": "table", "hide": false, "instant": true, @@ -1341,7 +1341,7 @@ "refId": "C" }, { - "expr": "(max(gitlab_ci_pipeline_job_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"running\"}) by (project, ref, job_name, kind) * 2) > 0 or\n(max(gitlab_ci_pipeline_job_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"failed\"}) by (project, ref, job_name, kind) * 3) > 0 or\n(max(gitlab_ci_pipeline_job_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"canceled\"}) by (project, ref, job_name, kind) * 4) > 0 or\n(max(gitlab_ci_pipeline_job_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"created\"}) by (project, ref, job_name, kind) * 5) > 0 or\n(max(gitlab_ci_pipeline_job_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"waiting_for_resource\"}) by (project, ref, job_name, kind) * 6) > 0 or\n(max(gitlab_ci_pipeline_job_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"preparing\"}) by (project, ref, job_name, kind) * 7) > 0 or\n(max(gitlab_ci_pipeline_job_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"pending\"}) by (project, ref, job_name, kind) * 8) > 0 or\n(max(gitlab_ci_pipeline_job_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"skipped\"}) by (project, ref, job_name, kind) * 9) > 0 or\n(max(gitlab_ci_pipeline_job_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"manual\"}) by (project, ref, job_name, kind) * 10) > 0 or\n(max(gitlab_ci_pipeline_job_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"scheduled\"}) by (project, ref, job_name, kind) * 11) > 0", + "expr": "(max(gitlab_ci_pipeline_job_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"running\"}) by (source_project, ref, job_name, kind) * 2) > 0 or\n(max(gitlab_ci_pipeline_job_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"failed\"}) by (source_project, ref, job_name, kind) * 3) > 0 or\n(max(gitlab_ci_pipeline_job_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"canceled\"}) by (source_project, ref, job_name, kind) * 4) > 0 or\n(max(gitlab_ci_pipeline_job_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"created\"}) by (source_project, ref, job_name, kind) * 5) > 0 or\n(max(gitlab_ci_pipeline_job_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"waiting_for_resource\"}) by (source_project, ref, job_name, kind) * 6) > 0 or\n(max(gitlab_ci_pipeline_job_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"preparing\"}) by (source_project, ref, job_name, kind) * 7) > 0 or\n(max(gitlab_ci_pipeline_job_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"pending\"}) by (source_project, ref, job_name, kind) * 8) > 0 or\n(max(gitlab_ci_pipeline_job_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"skipped\"}) by (source_project, ref, job_name, kind) * 9) > 0 or\n(max(gitlab_ci_pipeline_job_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"manual\"}) by (source_project, ref, job_name, kind) * 10) > 0 or\n(max(gitlab_ci_pipeline_job_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\", status=~\"scheduled\"}) by (source_project, ref, job_name, kind) * 11) > 0", "format": "table", "hide": false, "instant": true, @@ -1351,7 +1351,7 @@ "refId": "A" }, { - "expr": "max(gitlab_ci_pipeline_job_id{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (project, ref, kind, job_name) unless (max(gitlab_ci_pipeline_job_status{status=~\"success\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (project, ref, kind, job_name) > 0)", + "expr": "max(gitlab_ci_pipeline_job_id{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (source_project, ref, kind, job_name) unless (max(gitlab_ci_pipeline_job_status{status=~\"success\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", job_name=~\"$JOB\"}) by (source_project, ref, kind, job_name) > 0)", "format": "table", "instant": true, "interval": "", @@ -1383,7 +1383,7 @@ "Value #D": 1, "job_name": 3, "kind": 4, - "project": 2, + "source_project": 2, "ref": 5, "status": 8 }, @@ -1394,7 +1394,7 @@ "Value #D": "ID", "job_name": "Job", "kind": "Ref Kind", - "project": "Project", + "source_project": "Project", "ref": "Ref Name", "status": "Status" } @@ -1443,7 +1443,7 @@ ] }, "datasource": "prometheus", - "definition": "label_values(gitlab_ci_pipeline_id, project)", + "definition": "label_values(gitlab_ci_pipeline_id, source_project)", "error": null, "hide": 0, "includeAll": true, @@ -1451,7 +1451,7 @@ "multi": true, "name": "OWNER", "options": [], - "query": "label_values(gitlab_ci_pipeline_id, project)", + "query": "label_values(gitlab_ci_pipeline_id, source_project)", "refresh": 2, "regex": "/(.*)\\/.*$/", "skipUrlSync": false, @@ -1474,15 +1474,15 @@ ] }, "datasource": "prometheus", - "definition": "label_values(gitlab_ci_pipeline_id{project=~\"($OWNER).*\"}, project)", + "definition": "label_values(gitlab_ci_pipeline_id{source_project=~\"($OWNER).*\"}, source_project)", "error": null, "hide": 0, "includeAll": true, - "label": "project", + "label": "source_project", "multi": true, "name": "PROJECT", "options": [], - "query": "label_values(gitlab_ci_pipeline_id{project=~\"($OWNER).*\"}, project)", + "query": "label_values(gitlab_ci_pipeline_id{source_project=~\"($OWNER).*\"}, source_project)", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -1505,7 +1505,7 @@ ] }, "datasource": "prometheus", - "definition": "label_values(gitlab_ci_pipeline_id{project=~\"($OWNER).*\",project=~\"$PROJECT\"}, ref)", + "definition": "label_values(gitlab_ci_pipeline_id{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\"}, ref)", "error": null, "hide": 0, "includeAll": true, @@ -1513,7 +1513,7 @@ "multi": true, "name": "REF", "options": [], - "query": "label_values(gitlab_ci_pipeline_id{project=~\"($OWNER).*\",project=~\"$PROJECT\"}, ref)", + "query": "label_values(gitlab_ci_pipeline_id{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\"}, ref)", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -1536,7 +1536,7 @@ ] }, "datasource": "prometheus", - "definition": "label_values(gitlab_ci_pipeline_job_id{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}, job_name)", + "definition": "label_values(gitlab_ci_pipeline_job_id{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}, job_name)", "error": null, "hide": 0, "includeAll": true, @@ -1544,7 +1544,7 @@ "multi": true, "name": "JOB", "options": [], - "query": "label_values(gitlab_ci_pipeline_job_id{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}, job_name)", + "query": "label_values(gitlab_ci_pipeline_job_id{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}, job_name)", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -1589,4 +1589,4 @@ "title": "GitLab CI jobs", "uid": "gitlab_ci_jobs", "version": 2 -} \ No newline at end of file +} diff --git a/examples/quickstart/grafana/dashboards/dashboard_pipelines.json b/examples/quickstart/grafana/dashboards/dashboard_pipelines.json index 27cac808..55511c6c 100644 --- a/examples/quickstart/grafana/dashboards/dashboard_pipelines.json +++ b/examples/quickstart/grafana/dashboards/dashboard_pipelines.json @@ -110,7 +110,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "count(gitlab_ci_pipeline_run_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"})", + "expr": "count(gitlab_ci_pipeline_run_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"})", "format": "time_series", "instant": false, "interval": "", @@ -193,7 +193,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "count(gitlab_ci_pipeline_status{status=\"failed\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"} > 0) or vector(0)", + "expr": "count(gitlab_ci_pipeline_status{status=\"failed\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"} > 0) or vector(0)", "format": "time_series", "instant": false, "interval": "", @@ -272,7 +272,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "sum(increase(gitlab_ci_pipeline_run_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}[1h]))", + "expr": "sum(increase(gitlab_ci_pipeline_run_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}[1h]))", "format": "time_series", "instant": false, "interval": "", @@ -417,13 +417,13 @@ ], "targets": [ { - "expr": "(gitlab_ci_pipeline_status{status=\"success\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"} * 1 > 0) or (gitlab_ci_pipeline_status{status=\"running\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"} * 2 > 0) or (gitlab_ci_pipeline_status{status=~\"failed|canceled\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"} * 3 > 0) or (gitlab_ci_pipeline_status{status!~\"success|running|failed|canceled\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"} * 4 > 0)", + "expr": "(gitlab_ci_pipeline_status{status=\"success\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"} * 1 > 0) or (gitlab_ci_pipeline_status{status=\"running\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"} * 2 > 0) or (gitlab_ci_pipeline_status{status=~\"failed|canceled\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"} * 3 > 0) or (gitlab_ci_pipeline_status{status!~\"success|running|failed|canceled\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"} * 4 > 0)", "format": "time_series", "hide": false, "instant": true, "interval": "", "intervalFactor": 1, - "legendFormat": " {{project}} - {{ref}}", + "legendFormat": " {{source_project}} - {{ref}}", "refId": "A" } ], @@ -510,7 +510,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "avg(time() - gitlab_ci_pipeline_timestamp{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"})", + "expr": "avg(time() - gitlab_ci_pipeline_timestamp{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"})", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -593,7 +593,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "avg(gitlab_ci_pipeline_duration_seconds{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"})", + "expr": "avg(gitlab_ci_pipeline_duration_seconds{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"})", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -672,11 +672,11 @@ "steppedLine": false, "targets": [ { - "expr": "sum(increase(gitlab_ci_pipeline_run_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}[1m])) by (project, ref) / sum(increase(gitlab_ci_pipeline_run_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}[1m])) by (project, ref)", + "expr": "sum(increase(gitlab_ci_pipeline_run_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}[1m])) by (source_project, ref) / sum(increase(gitlab_ci_pipeline_run_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}[1m])) by (source_project, ref)", "format": "time_series", "instant": false, "interval": "", - "legendFormat": "{{ project }} - {{ ref }}", + "legendFormat": "{{ source_project }} - {{ ref }}", "refId": "A" } ], @@ -766,7 +766,7 @@ { "targetBlank": true, "title": "View pipeline #${__value.numeric}", - "url": "https://${GITLAB_HOST}/${__data.fields.project}/-/pipelines/${__value.numeric}" + "url": "https://${GITLAB_HOST}/${__data.fields.source_project}/-/pipelines/${__value.numeric}" } ] }, @@ -942,7 +942,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "-max(time() - gitlab_ci_pipeline_timestamp{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}) by (project, ref, kind) unless max(gitlab_ci_pipeline_status{status!~\"success\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}) by (project, ref, kind) > 0", + "expr": "-max(time() - gitlab_ci_pipeline_timestamp{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}) by (source_project, ref, kind) unless max(gitlab_ci_pipeline_status{status!~\"success\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}) by (source_project, ref, kind) > 0", "format": "table", "hide": false, "instant": true, @@ -952,7 +952,7 @@ "refId": "B" }, { - "expr": "max(gitlab_ci_pipeline_duration_seconds{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}) by (project, ref, kind) unless (max(gitlab_ci_pipeline_status{status!~\"success\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}) by (project, ref, kind) > 0)", + "expr": "max(gitlab_ci_pipeline_duration_seconds{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}) by (source_project, ref, kind) unless (max(gitlab_ci_pipeline_status{status!~\"success\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}) by (source_project, ref, kind) > 0)", "format": "table", "hide": false, "instant": true, @@ -962,7 +962,7 @@ "refId": "C" }, { - "expr": "max(gitlab_ci_pipeline_id{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}) by (project, ref, kind) unless (max(gitlab_ci_pipeline_status{status!~\"success\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}) by (project, ref, kind) > 0)", + "expr": "max(gitlab_ci_pipeline_id{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}) by (source_project, ref, kind) unless (max(gitlab_ci_pipeline_status{status!~\"success\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}) by (source_project, ref, kind) > 0)", "format": "table", "instant": true, "interval": "", @@ -994,7 +994,7 @@ "Value #D": 1, "job_name": 3, "kind": 4, - "project": 2, + "source_project": 2, "ref": 5, "status": 8 }, @@ -1005,7 +1005,7 @@ "Value #D": "ID", "job_name": "Job", "kind": "Ref Kind", - "project": "Project", + "source_project": "Project", "ref": "Ref Name", "status": "Status" } @@ -1072,7 +1072,7 @@ { "targetBlank": true, "title": "View pipeline #${__value.numeric}", - "url": "https://${GITLAB_HOST}/${__data.fields.project}/pipelines/${__value.numeric}" + "url": "https://${GITLAB_HOST}/${__data.fields.source_project}/pipelines/${__value.numeric}" } ] }, @@ -1354,7 +1354,7 @@ "pluginVersion": "7.3.1", "targets": [ { - "expr": "-max(time() - gitlab_ci_pipeline_timestamp{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}) by (project, ref, kind) unless max(gitlab_ci_pipeline_status{status=~\"success\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}) by (project, ref, kind) > 0", + "expr": "-max(time() - gitlab_ci_pipeline_timestamp{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}) by (source_project, ref, kind) unless max(gitlab_ci_pipeline_status{status=~\"success\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}) by (source_project, ref, kind) > 0", "format": "table", "hide": false, "instant": true, @@ -1364,7 +1364,7 @@ "refId": "B" }, { - "expr": "max(gitlab_ci_pipeline_duration_seconds{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}) by (project, ref, kind) unless (max(gitlab_ci_pipeline_status{status=~\"success\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}) by (project, ref, kind) > 0)", + "expr": "max(gitlab_ci_pipeline_duration_seconds{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}) by (source_project, ref, kind) unless (max(gitlab_ci_pipeline_status{status=~\"success\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}) by (source_project, ref, kind) > 0)", "format": "table", "hide": false, "instant": true, @@ -1374,7 +1374,7 @@ "refId": "C" }, { - "expr": "(max(gitlab_ci_pipeline_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", status=~\"running\"}) by (project, ref, kind) * 2) > 0 or\n(max(gitlab_ci_pipeline_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", status=~\"failed\"}) by (project, ref, kind) * 3) > 0 or\n(max(gitlab_ci_pipeline_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", status=~\"canceled\"}) by (project, ref, kind) * 4) > 0 or\n(max(gitlab_ci_pipeline_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", status=~\"created\"}) by (project, ref, kind) * 5) > 0 or\n(max(gitlab_ci_pipeline_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", status=~\"waiting_for_resource\"}) by (project, ref, kind) * 6) > 0 or\n(max(gitlab_ci_pipeline_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", status=~\"preparing\"}) by (project, ref, kind) * 7) > 0 or\n(max(gitlab_ci_pipeline_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", status=~\"pending\"}) by (project, ref, kind) * 8) > 0 or\n(max(gitlab_ci_pipeline_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", status=~\"skipped\"}) by (project, ref, kind) * 9) > 0 or\n(max(gitlab_ci_pipeline_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", status=~\"manual\"}) by (project, ref, kind) * 10) > 0 or\n(max(gitlab_ci_pipeline_status{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\", status=~\"scheduled\"}) by (project, ref, kind) * 11) > 0", + "expr": "(max(gitlab_ci_pipeline_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", status=~\"running\"}) by (source_project, ref, kind) * 2) > 0 or\n(max(gitlab_ci_pipeline_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", status=~\"failed\"}) by (source_project, ref, kind) * 3) > 0 or\n(max(gitlab_ci_pipeline_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", status=~\"canceled\"}) by (source_project, ref, kind) * 4) > 0 or\n(max(gitlab_ci_pipeline_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", status=~\"created\"}) by (source_project, ref, kind) * 5) > 0 or\n(max(gitlab_ci_pipeline_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", status=~\"waiting_for_resource\"}) by (source_project, ref, kind) * 6) > 0 or\n(max(gitlab_ci_pipeline_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", status=~\"preparing\"}) by (source_project, ref, kind) * 7) > 0 or\n(max(gitlab_ci_pipeline_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", status=~\"pending\"}) by (source_project, ref, kind) * 8) > 0 or\n(max(gitlab_ci_pipeline_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", status=~\"skipped\"}) by (source_project, ref, kind) * 9) > 0 or\n(max(gitlab_ci_pipeline_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", status=~\"manual\"}) by (source_project, ref, kind) * 10) > 0 or\n(max(gitlab_ci_pipeline_status{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\", status=~\"scheduled\"}) by (source_project, ref, kind) * 11) > 0", "format": "table", "hide": false, "instant": true, @@ -1384,7 +1384,7 @@ "refId": "A" }, { - "expr": "max(gitlab_ci_pipeline_id{project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}) by (project, ref, kind, job_name) unless (max(gitlab_ci_pipeline_status{status=~\"success\", project=~\"($OWNER).*\",project=~\"$PROJECT\", ref=~\"$REF\"}) by (project, ref, kind, job_name) > 0)", + "expr": "max(gitlab_ci_pipeline_id{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}) by (source_project, ref, kind, job_name) unless (max(gitlab_ci_pipeline_status{status=~\"success\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", ref=~\"$REF\"}) by (source_project, ref, kind, job_name) > 0)", "format": "table", "instant": true, "interval": "", @@ -1416,7 +1416,7 @@ "Value #D": 1, "job_name": 3, "kind": 4, - "project": 2, + "source_project": 2, "ref": 5, "status": 8 }, @@ -1427,7 +1427,7 @@ "Value #D": "ID", "job_name": "Job", "kind": "Ref Kind", - "project": "Project", + "source_project": "Project", "ref": "Ref Name", "status": "Status" } @@ -1476,7 +1476,7 @@ ] }, "datasource": "prometheus", - "definition": "label_values(gitlab_ci_pipeline_id, project)", + "definition": "label_values(gitlab_ci_pipeline_id, source_project)", "error": null, "hide": 0, "includeAll": true, @@ -1484,7 +1484,7 @@ "multi": true, "name": "OWNER", "options": [], - "query": "label_values(gitlab_ci_pipeline_id, project)", + "query": "label_values(gitlab_ci_pipeline_id, source_project)", "refresh": 1, "regex": "/(.*)\\/.*$/", "skipUrlSync": false, @@ -1507,15 +1507,15 @@ ] }, "datasource": "prometheus", - "definition": "label_values(gitlab_ci_pipeline_id{project=~\"($OWNER).*\"}, project)", + "definition": "label_values(gitlab_ci_pipeline_id{source_project=~\"($OWNER).*\"}, source_project)", "error": null, "hide": 0, "includeAll": true, - "label": "project", + "label": "source_project", "multi": true, "name": "PROJECT", "options": [], - "query": "label_values(gitlab_ci_pipeline_id{project=~\"($OWNER).*\"}, project)", + "query": "label_values(gitlab_ci_pipeline_id{source_project=~\"($OWNER).*\"}, source_project)", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -1538,7 +1538,7 @@ ] }, "datasource": "prometheus", - "definition": "label_values(gitlab_ci_pipeline_id{project=~\"($OWNER).*\",project=~\"$PROJECT\"}, ref)", + "definition": "label_values(gitlab_ci_pipeline_id{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\"}, ref)", "error": null, "hide": 0, "includeAll": true, @@ -1546,7 +1546,7 @@ "multi": true, "name": "REF", "options": [], - "query": "label_values(gitlab_ci_pipeline_id{project=~\"($OWNER).*\",project=~\"$PROJECT\"}, ref)", + "query": "label_values(gitlab_ci_pipeline_id{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\"}, ref)", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -1591,4 +1591,4 @@ "title": "GitLab CI pipelines", "uid": "gitlab_ci_pipelines", "version": 2 -} \ No newline at end of file +}