Skip to content

Commit f1a90e8

Browse files
mathstufmathstuf
committed
examples/quickstart: update grafana dashboards to consider source projects
1 parent 2873df2 commit f1a90e8

File tree

3 files changed

+91
-91
lines changed

3 files changed

+91
-91
lines changed

‎examples/quickstart/grafana/dashboards/dashboard_environments.json‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,13 @@
144144
],
145145
"targets": [
146146
{
147-
"expr": "gitlab_ci_environment_behind_commits_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}",
147+
"expr": "gitlab_ci_environment_behind_commits_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}",
148148
"format": "time_series",
149149
"hide": false,
150150
"instant": true,
151151
"interval": "",
152152
"intervalFactor": 1,
153-
"legendFormat": " {{ project }} - {{ environment }}",
153+
"legendFormat": " {{ source_project }} - {{ environment }}",
154154
"refId": "A"
155155
}
156156
],
@@ -232,7 +232,7 @@
232232
"pluginVersion": "7.3.1",
233233
"targets": [
234234
{
235-
"expr": "count(gitlab_ci_environment_information{available=\"true\", project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) or vector(0)",
235+
"expr": "count(gitlab_ci_environment_information{available=\"true\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) or vector(0)",
236236
"format": "time_series",
237237
"instant": false,
238238
"interval": "",
@@ -315,7 +315,7 @@
315315
"pluginVersion": "7.3.1",
316316
"targets": [
317317
{
318-
"expr": "count(gitlab_ci_environment_behind_commits_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT.*\"} > 0) or vector(0)",
318+
"expr": "count(gitlab_ci_environment_behind_commits_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT.*\"} > 0) or vector(0)",
319319
"format": "time_series",
320320
"instant": false,
321321
"interval": "",
@@ -398,7 +398,7 @@
398398
"pluginVersion": "7.3.1",
399399
"targets": [
400400
{
401-
"expr": "count(gitlab_ci_environment_status{status=\"failed\", project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"} > 0) or vector(0)",
401+
"expr": "count(gitlab_ci_environment_status{status=\"failed\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"} > 0) or vector(0)",
402402
"format": "time_series",
403403
"instant": false,
404404
"interval": "",
@@ -507,7 +507,7 @@
507507
"pluginVersion": "7.3.1",
508508
"targets": [
509509
{
510-
"expr": "count(gitlab_ci_environment_information{available=\"false\", project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) or vector(0)",
510+
"expr": "count(gitlab_ci_environment_information{available=\"false\", source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) or vector(0)",
511511
"format": "time_series",
512512
"instant": false,
513513
"interval": "",
@@ -591,7 +591,7 @@
591591
"pluginVersion": "7.3.1",
592592
"targets": [
593593
{
594-
"expr": "avg(gitlab_ci_environment_behind_commits_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"})",
594+
"expr": "avg(gitlab_ci_environment_behind_commits_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"})",
595595
"format": "time_series",
596596
"instant": false,
597597
"interval": "",
@@ -671,11 +671,11 @@
671671
"steppedLine": false,
672672
"targets": [
673673
{
674-
"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)",
674+
"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)",
675675
"format": "time_series",
676676
"instant": false,
677677
"interval": "",
678-
"legendFormat": "{{ environment }} - {{ project }}",
678+
"legendFormat": "{{ environment }} - {{ source_project }}",
679679
"refId": "A"
680680
}
681681
],
@@ -785,7 +785,7 @@
785785
"pluginVersion": "7.3.1",
786786
"targets": [
787787
{
788-
"expr": "sum(increase(gitlab_ci_environment_deployment_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}[1h]))",
788+
"expr": "sum(increase(gitlab_ci_environment_deployment_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}[1h]))",
789789
"format": "time_series",
790790
"instant": false,
791791
"interval": "",
@@ -869,7 +869,7 @@
869869
"pluginVersion": "7.3.1",
870870
"targets": [
871871
{
872-
"expr": "avg(gitlab_ci_environment_behind_duration_seconds{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"})",
872+
"expr": "avg(gitlab_ci_environment_behind_duration_seconds{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"})",
873873
"format": "time_series",
874874
"interval": "",
875875
"intervalFactor": 1,
@@ -927,7 +927,7 @@
927927
{
928928
"targetBlank": true,
929929
"title": "View environment #${__value.numeric}",
930-
"url": "https://${GITLAB_HOST}/${__data.fields.project:raw}/-/environments/${__value.numeric}"
930+
"url": "https://${GITLAB_HOST}/${__data.fields.source_project:raw}/-/environments/${__value.numeric}"
931931
}
932932
]
933933
},
@@ -1179,7 +1179,7 @@
11791179
{
11801180
"targetBlank": true,
11811181
"title": "View job #${__value.numeric}",
1182-
"url": "https://${GITLAB_HOST}/${__data.fields.project:raw}/-/jobs/${__value.numeric}"
1182+
"url": "https://${GITLAB_HOST}/${__data.fields.source_project:raw}/-/jobs/${__value.numeric}"
11831183
}
11841184
]
11851185
},
@@ -1330,7 +1330,7 @@
13301330
"pluginVersion": "7.3.1",
13311331
"targets": [
13321332
{
1333-
"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",
1333+
"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",
13341334
"format": "table",
13351335
"hide": false,
13361336
"instant": true,
@@ -1340,7 +1340,7 @@
13401340
"refId": "A"
13411341
},
13421342
{
1343-
"expr": "-max(time() - gitlab_ci_environment_deployment_timestamp{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (project, environment)",
1343+
"expr": "-max(time() - gitlab_ci_environment_deployment_timestamp{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (source_project, environment)",
13441344
"format": "table",
13451345
"hide": false,
13461346
"instant": true,
@@ -1350,7 +1350,7 @@
13501350
"refId": "B"
13511351
},
13521352
{
1353-
"expr": "max(gitlab_ci_environment_deployment_duration_seconds{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (project, environment)",
1353+
"expr": "max(gitlab_ci_environment_deployment_duration_seconds{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (source_project, environment)",
13541354
"format": "table",
13551355
"hide": false,
13561356
"instant": true,
@@ -1360,31 +1360,31 @@
13601360
"refId": "C"
13611361
},
13621362
{
1363-
"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)",
1363+
"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)",
13641364
"format": "table",
13651365
"instant": true,
13661366
"interval": "",
13671367
"legendFormat": "",
13681368
"refId": "D"
13691369
},
13701370
{
1371-
"expr": "max(gitlab_ci_environment_behind_commits_count{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (project, environment)",
1371+
"expr": "max(gitlab_ci_environment_behind_commits_count{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (source_project, environment)",
13721372
"format": "table",
13731373
"instant": true,
13741374
"interval": "",
13751375
"legendFormat": "",
13761376
"refId": "E"
13771377
},
13781378
{
1379-
"expr": "max(gitlab_ci_environment_behind_duration_seconds{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (project, environment)",
1379+
"expr": "max(gitlab_ci_environment_behind_duration_seconds{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (source_project, environment)",
13801380
"format": "table",
13811381
"instant": true,
13821382
"interval": "",
13831383
"legendFormat": "",
13841384
"refId": "F"
13851385
},
13861386
{
1387-
"expr": "max(gitlab_ci_environment_deployment_job_id{project=~\"($OWNER).*\",project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (project, environment)",
1387+
"expr": "max(gitlab_ci_environment_deployment_job_id{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\", environment=~\"$ENVIRONMENT\"}) by (source_project, environment)",
13881388
"format": "table",
13891389
"instant": true,
13901390
"interval": "",
@@ -1423,7 +1423,7 @@
14231423
"environment": 2,
14241424
"environment_id": 1,
14251425
"latest_commit_short_id": 11,
1426-
"project": 3,
1426+
"source_project": 3,
14271427
"ref": 6,
14281428
"status": 14
14291429
},
@@ -1442,7 +1442,7 @@
14421442
"job_name": "Job",
14431443
"kind": "Ref Kind",
14441444
"latest_commit_short_id": "Latest commit",
1445-
"project": "Project",
1445+
"source_project": "Project",
14461446
"ref": "Ref Name",
14471447
"status": "Status"
14481448
}
@@ -1491,15 +1491,15 @@
14911491
]
14921492
},
14931493
"datasource": "prometheus",
1494-
"definition": "label_values(gitlab_ci_environment_information, project)",
1494+
"definition": "label_values(gitlab_ci_environment_information, source_project)",
14951495
"error": null,
14961496
"hide": 0,
14971497
"includeAll": true,
14981498
"label": "owner",
14991499
"multi": true,
15001500
"name": "OWNER",
15011501
"options": [],
1502-
"query": "label_values(gitlab_ci_environment_information, project)",
1502+
"query": "label_values(gitlab_ci_environment_information, source_project)",
15031503
"refresh": 2,
15041504
"regex": "/(.*)\\/.*$/",
15051505
"skipUrlSync": false,
@@ -1522,15 +1522,15 @@
15221522
]
15231523
},
15241524
"datasource": "prometheus",
1525-
"definition": "label_values(gitlab_ci_environment_information{project=~\"($OWNER).*\"}, project)",
1525+
"definition": "label_values(gitlab_ci_environment_information{source_project=~\"($OWNER).*\"}, source_project)",
15261526
"error": null,
15271527
"hide": 0,
15281528
"includeAll": true,
1529-
"label": "project",
1529+
"label": "source_project",
15301530
"multi": true,
15311531
"name": "PROJECT",
15321532
"options": [],
1533-
"query": "label_values(gitlab_ci_environment_information{project=~\"($OWNER).*\"}, project)",
1533+
"query": "label_values(gitlab_ci_environment_information{source_project=~\"($OWNER).*\"}, source_project)",
15341534
"refresh": 2,
15351535
"regex": "",
15361536
"skipUrlSync": false,
@@ -1553,15 +1553,15 @@
15531553
]
15541554
},
15551555
"datasource": "prometheus",
1556-
"definition": "label_values(gitlab_ci_environment_information{project=~\"($OWNER).*\",project=~\"$PROJECT\"}, environment)",
1556+
"definition": "label_values(gitlab_ci_environment_information{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\"}, environment)",
15571557
"error": null,
15581558
"hide": 0,
15591559
"includeAll": true,
15601560
"label": "environment",
15611561
"multi": true,
15621562
"name": "ENVIRONMENT",
15631563
"options": [],
1564-
"query": "label_values(gitlab_ci_environment_information{project=~\"($OWNER).*\",project=~\"$PROJECT\"}, environment)",
1564+
"query": "label_values(gitlab_ci_environment_information{source_project=~\"($OWNER).*\",source_project=~\"$PROJECT\"}, environment)",
15651565
"refresh": 2,
15661566
"regex": "",
15671567
"skipUrlSync": false,

0 commit comments

Comments
 (0)