Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mr pipelines from fork #728

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
+542 −249
Draft

Mr pipelines from fork #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
704a3b5
pipelines: store the project that owns the pipeline
mathstuf Oct 6, 2023
71487c3
refs: store the source project as well
mathstuf Oct 6, 2023
2873df2
merge_requests: support in-fork pipelines as well
mathstuf Oct 6, 2023
f1a90e8
examples/quickstart: update grafana dashboards to consider source pro…
mathstuf Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ and this project adheres to [0ver](https://0ver.org) (more or less).
- new configuration parameter: `gitlab.burstable_requests_per_second`, introducing a burstable amount of API RPS
- new configuration parameter: `gitlab.maximum_jobs_queue_size`, controlling the queue buffer size
- new label for pipelines and jobs: `source` to indicate the reason the pipeline started
- new label for pipelines and jobs: `source_project` to indicate pipelines for merge requests on forks
- pipelines in forks hosting merge request pipelines may now be selected using the `include_source_pipelines` option

### Changed

Expand Down
4 changes: 4 additions & 0 deletions docs/configuration_syntax.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,10 @@ project_defaults:
# (optional, default: false)
enabled: false

# Monitor merge request pipelines on source projects as well
# (optional, default: false)
include_source_pipelines: false

# Only keep most 'n' recently updated merge requests
# (optional, default: 0 -- disabled/keep every merge request)
most_recent: 0
Expand Down
79 changes: 43 additions & 36 deletions docs/metrics.md
View file
Open in desktop

Large diffs are not rendered by default.

58 changes: 29 additions & 29 deletions examples/quickstart/grafana/dashboards/dashboard_environments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
],
Expand Down Expand Up @@ -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": "",
Expand Down Expand Up @@ -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": "",
Expand Down Expand Up @@ -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": "",
Expand Down Expand Up @@ -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": "",
Expand Down Expand Up @@ -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": "",
Expand Down Expand Up @@ -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"
}
],
Expand Down Expand Up @@ -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": "",
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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}"
}
]
},
Expand Down Expand Up @@ -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}"
}
]
},
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -1360,31 +1360,31 @@
"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": "",
"legendFormat": "",
"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": "",
"legendFormat": "",
"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": "",
"legendFormat": "",
"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": "",
Expand Down Expand Up @@ -1423,7 +1423,7 @@
"environment": 2,
"environment_id": 1,
"latest_commit_short_id": 11,
"project": 3,
"source_project": 3,
"ref": 6,
"status": 14
},
Expand All @@ -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"
}
Expand Down Expand Up @@ -1491,15 +1491,15 @@
]
},
"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,
"label": "owner",
"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,
Expand All @@ -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,
Expand All @@ -1553,15 +1553,15 @@
]
},
"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,
"label": "environment",
"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,
Expand Down
Loading