diff --git a/scripts/dashboards_render_atlas.py b/scripts/dashboards_render_atlas.py index 56874cb5..61e285d5 100644 --- a/scripts/dashboards_render_atlas.py +++ b/scripts/dashboards_render_atlas.py @@ -1383,7 +1383,7 @@ def bargauge_panel( def _jenkins_weather_status_expr(base_expr, comparator): return ( - f"({base_expr}) and on(job,job_url,weather_icon) " + f"({base_expr}) and on(exported_job,job_url,weather_icon) " f"({JENKINS_BUILD_WEATHER_LAST_STATUS} {comparator})" ) @@ -1412,25 +1412,25 @@ def jenkins_weather_bargauge_panel( { "refId": "A", "expr": _jenkins_weather_status_expr(expr, "== 1"), - "legendFormat": "{{weather_icon}} {{job}}", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": True, }, { "refId": "B", "expr": _jenkins_weather_status_expr(expr, "== 0"), - "legendFormat": "{{weather_icon}} {{job}}", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": True, }, { "refId": "C", "expr": _jenkins_weather_status_expr(expr, "== 2"), - "legendFormat": "{{weather_icon}} {{job}}", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": True, }, { "refId": "D", "expr": _jenkins_weather_status_expr(expr, "< 0"), - "legendFormat": "{{weather_icon}} {{job}}", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": True, }, ], diff --git a/services/monitoring/dashboards/atlas-jobs.json b/services/monitoring/dashboards/atlas-jobs.json index ede00f38..fbddabc0 100644 --- a/services/monitoring/dashboards/atlas-jobs.json +++ b/services/monitoring/dashboards/atlas-jobs.json @@ -1551,26 +1551,26 @@ "targets": [ { "refId": "A", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "B", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "C", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "D", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true } ], @@ -1722,26 +1722,26 @@ "targets": [ { "refId": "A", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "B", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "C", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "D", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true } ], @@ -1893,26 +1893,26 @@ "targets": [ { "refId": "A", - "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "B", - "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "C", - "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "D", - "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true } ], diff --git a/services/monitoring/dashboards/atlas-overview.json b/services/monitoring/dashboards/atlas-overview.json index 4742556c..fb44bce5 100644 --- a/services/monitoring/dashboards/atlas-overview.json +++ b/services/monitoring/dashboards/atlas-overview.json @@ -2403,26 +2403,26 @@ "targets": [ { "refId": "A", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "B", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "C", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "D", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true } ], diff --git a/services/monitoring/grafana-dashboard-jobs.yaml b/services/monitoring/grafana-dashboard-jobs.yaml index bf4ec8c1..31d1139e 100644 --- a/services/monitoring/grafana-dashboard-jobs.yaml +++ b/services/monitoring/grafana-dashboard-jobs.yaml @@ -1560,26 +1560,26 @@ data: "targets": [ { "refId": "A", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "B", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "C", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "D", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true } ], @@ -1731,26 +1731,26 @@ data: "targets": [ { "refId": "A", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "B", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "C", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "D", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_success_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true } ], @@ -1902,26 +1902,26 @@ data: "targets": [ { "refId": "A", - "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "B", - "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "C", - "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "D", - "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "(ariadne_jenkins_build_weather_job_last_duration_seconds / 60) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true } ], diff --git a/services/monitoring/grafana-dashboard-overview.yaml b/services/monitoring/grafana-dashboard-overview.yaml index 0460c124..3f2ef069 100644 --- a/services/monitoring/grafana-dashboard-overview.yaml +++ b/services/monitoring/grafana-dashboard-overview.yaml @@ -2412,26 +2412,26 @@ data: "targets": [ { "refId": "A", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 1)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "B", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "C", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status == 2)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true }, { "refId": "D", - "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", - "legendFormat": "{{weather_icon}} {{job}}", + "expr": "((time() - ariadne_jenkins_build_weather_job_last_run_timestamp_seconds) / 3600) and on(exported_job,job_url,weather_icon) (ariadne_jenkins_build_weather_job_last_status < 0)", + "legendFormat": "{{weather_icon}} {{exported_job}}", "instant": true } ],