From c2bf2240684dd6cfb52a9b9fa9524678727726bf Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 3 Nov 2025 10:49:49 -0800 Subject: [PATCH] Further fixes to zuul-launcher metrics The previous change did not change all of the locations where - became _. Change-Id: I16c168caa9c4ad9d771fe46477550daf5278b3fb --- grafana/zuul-launcher-icr.template | 36 ++++++++++++++-------------- grafana/zuul-launcher-ir.template | 30 +++++++++++------------ grafana/zuul-launcher-openmetal.json | 36 ++++++++++++++-------------- grafana/zuul-launcher-osuosl.json | 36 ++++++++++++++-------------- grafana/zuul-launcher-ovh.json | 36 ++++++++++++++-------------- grafana/zuul-launcher-rax.json | 30 +++++++++++------------ grafana/zuul-launcher-raxflex.json | 30 +++++++++++------------ grafana/zuul-launcher-vexxhost.json | 36 ++++++++++++++-------------- 8 files changed, 135 insertions(+), 135 deletions(-) diff --git a/grafana/zuul-launcher-icr.template b/grafana/zuul-launcher-icr.template index 8423767039..77f21f6fd0 100644 --- a/grafana/zuul-launcher-icr.template +++ b/grafana/zuul-launcher-icr.template @@ -133,7 +133,7 @@ }, "refCount": 0, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.requested)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.requested)" } ], "title": "Requested", @@ -199,7 +199,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building)" } ], "title": "Building", @@ -265,7 +265,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready)" } ], "title": "Ready", @@ -331,7 +331,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use)" } ], "title": "In Use", @@ -428,7 +428,7 @@ "hide": false, "refCount": 0, "refId": "A", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.instances, 'Instances')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.instances, 'Instances')" }, { "datasource": { @@ -438,7 +438,7 @@ "hide": false, "refCount": 0, "refId": "B", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances, 'instance limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances, 'instance limit')" }, { "datasource": { @@ -448,7 +448,7 @@ "hide": false, "refCount": 0, "refId": "C", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.cores, 'Cores')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.cores, 'Cores')" }, { "datasource": { @@ -458,7 +458,7 @@ "hide": false, "refCount": 0, "refId": "D", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.cores, 'core limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.cores, 'core limit')" }, { "datasource": { @@ -468,7 +468,7 @@ "hide": false, "refCount": 0, "refId": "E", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.ram, 'RAM')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.ram, 'RAM')" }, { "datasource": { @@ -478,7 +478,7 @@ "hide": false, "refCount": 0, "refId": "F", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.ram, 'ram limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.ram, 'ram limit')" } ], "title": "Resources - $region", @@ -658,7 +658,7 @@ }, "refCount": 0, "refId": "A", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building), 'Building')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building), 'Building')" }, { "datasource": { @@ -667,7 +667,7 @@ }, "refCount": 0, "refId": "B", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready), 'Ready')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready), 'Ready')" }, { "datasource": { @@ -676,7 +676,7 @@ }, "refCount": 0, "refId": "C", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use), 'In Use')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use), 'In Use')" }, { "datasource": { @@ -685,7 +685,7 @@ }, "refCount": 0, "refId": "D", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.used), 'Used')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.used), 'Used')" }, { "datasource": { @@ -694,7 +694,7 @@ }, "refCount": 0, "refId": "E", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.requested), 'Requested')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.requested), 'Requested')" }, { "datasource": { @@ -703,7 +703,7 @@ }, "refCount": 0, "refId": "F", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances), 'Max')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances), 'Max')" } ], "title": "Test Node History - $region", @@ -733,10 +733,10 @@ "query": { "queryType": "Default", "refId": "A", - "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-%STAT_LIST%-*-main" + "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_%STAT_LIST%-*-main" }, "refresh": 1, - "regex": "/.*?zuul-providers-(%STAT_LIST%-.*?)-main/", + "regex": "/.*?zuul-providers_(%STAT_LIST%-.*?)-main/", "type": "query" } ] diff --git a/grafana/zuul-launcher-ir.template b/grafana/zuul-launcher-ir.template index 31edcd7bef..818d331d5f 100644 --- a/grafana/zuul-launcher-ir.template +++ b/grafana/zuul-launcher-ir.template @@ -199,7 +199,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building)" } ], "title": "Building", @@ -265,7 +265,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready)" } ], "title": "Ready", @@ -331,7 +331,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use)" } ], "title": "In Use", @@ -428,7 +428,7 @@ "hide": false, "refCount": 0, "refId": "A", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.instances, 'Instances')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.instances, 'Instances')" }, { "datasource": { @@ -438,7 +438,7 @@ "hide": false, "refCount": 0, "refId": "B", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances, 'instance limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances, 'instance limit')" }, { "datasource": { @@ -448,7 +448,7 @@ "hide": false, "refCount": 0, "refId": "E", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.ram, 'RAM')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.ram, 'RAM')" }, { "datasource": { @@ -458,7 +458,7 @@ "hide": false, "refCount": 0, "refId": "F", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.ram, 'ram limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.ram, 'ram limit')" } ], "title": "Resources - $region", @@ -622,7 +622,7 @@ }, "refCount": 0, "refId": "A", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building), 'Building')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building), 'Building')" }, { "datasource": { @@ -631,7 +631,7 @@ }, "refCount": 0, "refId": "B", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready), 'Ready')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready), 'Ready')" }, { "datasource": { @@ -640,7 +640,7 @@ }, "refCount": 0, "refId": "C", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use), 'In Use')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use), 'In Use')" }, { "datasource": { @@ -649,7 +649,7 @@ }, "refCount": 0, "refId": "D", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.used), 'Used')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.used), 'Used')" }, { "datasource": { @@ -658,7 +658,7 @@ }, "refCount": 0, "refId": "E", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.requested), 'Requested')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.requested), 'Requested')" }, { "datasource": { @@ -667,7 +667,7 @@ }, "refCount": 0, "refId": "F", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances), 'Max')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances), 'Max')" } ], "title": "Test Node History - $region", @@ -697,10 +697,10 @@ "query": { "queryType": "Default", "refId": "A", - "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-%STAT_LIST%-*-main" + "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_%STAT_LIST%-*-main" }, "refresh": 1, - "regex": "/.*?zuul-providers-(%STAT_LIST%-.*?)-main/", + "regex": "/.*?zuul-providers_(%STAT_LIST%-.*?)-main/", "type": "query" } ] diff --git a/grafana/zuul-launcher-openmetal.json b/grafana/zuul-launcher-openmetal.json index d5b8c7441a..afd98432a9 100644 --- a/grafana/zuul-launcher-openmetal.json +++ b/grafana/zuul-launcher-openmetal.json @@ -133,7 +133,7 @@ }, "refCount": 0, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.requested)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.requested)" } ], "title": "Requested", @@ -199,7 +199,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building)" } ], "title": "Building", @@ -265,7 +265,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready)" } ], "title": "Ready", @@ -331,7 +331,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use)" } ], "title": "In Use", @@ -428,7 +428,7 @@ "hide": false, "refCount": 0, "refId": "A", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.instances, 'Instances')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.instances, 'Instances')" }, { "datasource": { @@ -438,7 +438,7 @@ "hide": false, "refCount": 0, "refId": "B", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances, 'instance limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances, 'instance limit')" }, { "datasource": { @@ -448,7 +448,7 @@ "hide": false, "refCount": 0, "refId": "C", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.cores, 'Cores')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.cores, 'Cores')" }, { "datasource": { @@ -458,7 +458,7 @@ "hide": false, "refCount": 0, "refId": "D", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.cores, 'core limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.cores, 'core limit')" }, { "datasource": { @@ -468,7 +468,7 @@ "hide": false, "refCount": 0, "refId": "E", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.ram, 'RAM')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.ram, 'RAM')" }, { "datasource": { @@ -478,7 +478,7 @@ "hide": false, "refCount": 0, "refId": "F", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.ram, 'ram limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.ram, 'ram limit')" } ], "title": "Resources - $region", @@ -658,7 +658,7 @@ }, "refCount": 0, "refId": "A", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building), 'Building')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building), 'Building')" }, { "datasource": { @@ -667,7 +667,7 @@ }, "refCount": 0, "refId": "B", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready), 'Ready')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready), 'Ready')" }, { "datasource": { @@ -676,7 +676,7 @@ }, "refCount": 0, "refId": "C", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use), 'In Use')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use), 'In Use')" }, { "datasource": { @@ -685,7 +685,7 @@ }, "refCount": 0, "refId": "D", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.used), 'Used')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.used), 'Used')" }, { "datasource": { @@ -694,7 +694,7 @@ }, "refCount": 0, "refId": "E", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.requested), 'Requested')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.requested), 'Requested')" }, { "datasource": { @@ -703,7 +703,7 @@ }, "refCount": 0, "refId": "F", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances), 'Max')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances), 'Max')" } ], "title": "Test Node History - $region", @@ -733,10 +733,10 @@ "query": { "queryType": "Default", "refId": "A", - "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-openmetal-*-main" + "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_openmetal-*-main" }, "refresh": 1, - "regex": "/.*?zuul-providers-(openmetal-.*?)-main/", + "regex": "/.*?zuul-providers_(openmetal-.*?)-main/", "type": "query" } ] diff --git a/grafana/zuul-launcher-osuosl.json b/grafana/zuul-launcher-osuosl.json index c6360a37fe..bb277a3b04 100644 --- a/grafana/zuul-launcher-osuosl.json +++ b/grafana/zuul-launcher-osuosl.json @@ -133,7 +133,7 @@ }, "refCount": 0, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.requested)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.requested)" } ], "title": "Requested", @@ -199,7 +199,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building)" } ], "title": "Building", @@ -265,7 +265,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready)" } ], "title": "Ready", @@ -331,7 +331,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use)" } ], "title": "In Use", @@ -428,7 +428,7 @@ "hide": false, "refCount": 0, "refId": "A", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.instances, 'Instances')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.instances, 'Instances')" }, { "datasource": { @@ -438,7 +438,7 @@ "hide": false, "refCount": 0, "refId": "B", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances, 'instance limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances, 'instance limit')" }, { "datasource": { @@ -448,7 +448,7 @@ "hide": false, "refCount": 0, "refId": "C", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.cores, 'Cores')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.cores, 'Cores')" }, { "datasource": { @@ -458,7 +458,7 @@ "hide": false, "refCount": 0, "refId": "D", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.cores, 'core limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.cores, 'core limit')" }, { "datasource": { @@ -468,7 +468,7 @@ "hide": false, "refCount": 0, "refId": "E", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.ram, 'RAM')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.ram, 'RAM')" }, { "datasource": { @@ -478,7 +478,7 @@ "hide": false, "refCount": 0, "refId": "F", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.ram, 'ram limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.ram, 'ram limit')" } ], "title": "Resources - $region", @@ -658,7 +658,7 @@ }, "refCount": 0, "refId": "A", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building), 'Building')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building), 'Building')" }, { "datasource": { @@ -667,7 +667,7 @@ }, "refCount": 0, "refId": "B", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready), 'Ready')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready), 'Ready')" }, { "datasource": { @@ -676,7 +676,7 @@ }, "refCount": 0, "refId": "C", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use), 'In Use')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use), 'In Use')" }, { "datasource": { @@ -685,7 +685,7 @@ }, "refCount": 0, "refId": "D", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.used), 'Used')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.used), 'Used')" }, { "datasource": { @@ -694,7 +694,7 @@ }, "refCount": 0, "refId": "E", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.requested), 'Requested')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.requested), 'Requested')" }, { "datasource": { @@ -703,7 +703,7 @@ }, "refCount": 0, "refId": "F", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances), 'Max')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances), 'Max')" } ], "title": "Test Node History - $region", @@ -733,10 +733,10 @@ "query": { "queryType": "Default", "refId": "A", - "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-osuosl-*-main" + "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_osuosl-*-main" }, "refresh": 1, - "regex": "/.*?zuul-providers-(osuosl-.*?)-main/", + "regex": "/.*?zuul-providers_(osuosl-.*?)-main/", "type": "query" } ] diff --git a/grafana/zuul-launcher-ovh.json b/grafana/zuul-launcher-ovh.json index 06e7c3e181..6cd8b40ae5 100644 --- a/grafana/zuul-launcher-ovh.json +++ b/grafana/zuul-launcher-ovh.json @@ -133,7 +133,7 @@ }, "refCount": 0, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.requested)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.requested)" } ], "title": "Requested", @@ -199,7 +199,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building)" } ], "title": "Building", @@ -265,7 +265,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready)" } ], "title": "Ready", @@ -331,7 +331,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use)" } ], "title": "In Use", @@ -428,7 +428,7 @@ "hide": false, "refCount": 0, "refId": "A", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.instances, 'Instances')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.instances, 'Instances')" }, { "datasource": { @@ -438,7 +438,7 @@ "hide": false, "refCount": 0, "refId": "B", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances, 'instance limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances, 'instance limit')" }, { "datasource": { @@ -448,7 +448,7 @@ "hide": false, "refCount": 0, "refId": "C", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.cores, 'Cores')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.cores, 'Cores')" }, { "datasource": { @@ -458,7 +458,7 @@ "hide": false, "refCount": 0, "refId": "D", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.cores, 'core limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.cores, 'core limit')" }, { "datasource": { @@ -468,7 +468,7 @@ "hide": false, "refCount": 0, "refId": "E", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.ram, 'RAM')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.ram, 'RAM')" }, { "datasource": { @@ -478,7 +478,7 @@ "hide": false, "refCount": 0, "refId": "F", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.ram, 'ram limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.ram, 'ram limit')" } ], "title": "Resources - $region", @@ -658,7 +658,7 @@ }, "refCount": 0, "refId": "A", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building), 'Building')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building), 'Building')" }, { "datasource": { @@ -667,7 +667,7 @@ }, "refCount": 0, "refId": "B", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready), 'Ready')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready), 'Ready')" }, { "datasource": { @@ -676,7 +676,7 @@ }, "refCount": 0, "refId": "C", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use), 'In Use')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use), 'In Use')" }, { "datasource": { @@ -685,7 +685,7 @@ }, "refCount": 0, "refId": "D", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.used), 'Used')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.used), 'Used')" }, { "datasource": { @@ -694,7 +694,7 @@ }, "refCount": 0, "refId": "E", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.requested), 'Requested')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.requested), 'Requested')" }, { "datasource": { @@ -703,7 +703,7 @@ }, "refCount": 0, "refId": "F", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances), 'Max')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances), 'Max')" } ], "title": "Test Node History - $region", @@ -733,10 +733,10 @@ "query": { "queryType": "Default", "refId": "A", - "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-ovh-*-main" + "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_ovh-*-main" }, "refresh": 1, - "regex": "/.*?zuul-providers-(ovh-.*?)-main/", + "regex": "/.*?zuul-providers_(ovh-.*?)-main/", "type": "query" } ] diff --git a/grafana/zuul-launcher-rax.json b/grafana/zuul-launcher-rax.json index 43310d1f4a..65cef7b29c 100644 --- a/grafana/zuul-launcher-rax.json +++ b/grafana/zuul-launcher-rax.json @@ -199,7 +199,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building)" } ], "title": "Building", @@ -265,7 +265,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready)" } ], "title": "Ready", @@ -331,7 +331,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use)" } ], "title": "In Use", @@ -428,7 +428,7 @@ "hide": false, "refCount": 0, "refId": "A", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.instances, 'Instances')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.instances, 'Instances')" }, { "datasource": { @@ -438,7 +438,7 @@ "hide": false, "refCount": 0, "refId": "B", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances, 'instance limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances, 'instance limit')" }, { "datasource": { @@ -448,7 +448,7 @@ "hide": false, "refCount": 0, "refId": "E", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.ram, 'RAM')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.ram, 'RAM')" }, { "datasource": { @@ -458,7 +458,7 @@ "hide": false, "refCount": 0, "refId": "F", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.ram, 'ram limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.ram, 'ram limit')" } ], "title": "Resources - $region", @@ -622,7 +622,7 @@ }, "refCount": 0, "refId": "A", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building), 'Building')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building), 'Building')" }, { "datasource": { @@ -631,7 +631,7 @@ }, "refCount": 0, "refId": "B", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready), 'Ready')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready), 'Ready')" }, { "datasource": { @@ -640,7 +640,7 @@ }, "refCount": 0, "refId": "C", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use), 'In Use')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use), 'In Use')" }, { "datasource": { @@ -649,7 +649,7 @@ }, "refCount": 0, "refId": "D", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.used), 'Used')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.used), 'Used')" }, { "datasource": { @@ -658,7 +658,7 @@ }, "refCount": 0, "refId": "E", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.requested), 'Requested')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.requested), 'Requested')" }, { "datasource": { @@ -667,7 +667,7 @@ }, "refCount": 0, "refId": "F", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances), 'Max')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances), 'Max')" } ], "title": "Test Node History - $region", @@ -697,10 +697,10 @@ "query": { "queryType": "Default", "refId": "A", - "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-rax-*-main" + "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_rax-*-main" }, "refresh": 1, - "regex": "/.*?zuul-providers-(rax-.*?)-main/", + "regex": "/.*?zuul-providers_(rax-.*?)-main/", "type": "query" } ] diff --git a/grafana/zuul-launcher-raxflex.json b/grafana/zuul-launcher-raxflex.json index a4b5c42e3d..3a7e990ca5 100644 --- a/grafana/zuul-launcher-raxflex.json +++ b/grafana/zuul-launcher-raxflex.json @@ -199,7 +199,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building)" } ], "title": "Building", @@ -265,7 +265,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready)" } ], "title": "Ready", @@ -331,7 +331,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use)" } ], "title": "In Use", @@ -428,7 +428,7 @@ "hide": false, "refCount": 0, "refId": "A", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.instances, 'Instances')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.instances, 'Instances')" }, { "datasource": { @@ -438,7 +438,7 @@ "hide": false, "refCount": 0, "refId": "B", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances, 'instance limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances, 'instance limit')" }, { "datasource": { @@ -448,7 +448,7 @@ "hide": false, "refCount": 0, "refId": "E", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.ram, 'RAM')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.ram, 'RAM')" }, { "datasource": { @@ -458,7 +458,7 @@ "hide": false, "refCount": 0, "refId": "F", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.ram, 'ram limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.ram, 'ram limit')" } ], "title": "Resources - $region", @@ -622,7 +622,7 @@ }, "refCount": 0, "refId": "A", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building), 'Building')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building), 'Building')" }, { "datasource": { @@ -631,7 +631,7 @@ }, "refCount": 0, "refId": "B", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready), 'Ready')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready), 'Ready')" }, { "datasource": { @@ -640,7 +640,7 @@ }, "refCount": 0, "refId": "C", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use), 'In Use')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use), 'In Use')" }, { "datasource": { @@ -649,7 +649,7 @@ }, "refCount": 0, "refId": "D", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.used), 'Used')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.used), 'Used')" }, { "datasource": { @@ -658,7 +658,7 @@ }, "refCount": 0, "refId": "E", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.requested), 'Requested')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.requested), 'Requested')" }, { "datasource": { @@ -667,7 +667,7 @@ }, "refCount": 0, "refId": "F", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances), 'Max')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances), 'Max')" } ], "title": "Test Node History - $region", @@ -697,10 +697,10 @@ "query": { "queryType": "Default", "refId": "A", - "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-raxflex-*-main" + "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_raxflex-*-main" }, "refresh": 1, - "regex": "/.*?zuul-providers-(raxflex-.*?)-main/", + "regex": "/.*?zuul-providers_(raxflex-.*?)-main/", "type": "query" } ] diff --git a/grafana/zuul-launcher-vexxhost.json b/grafana/zuul-launcher-vexxhost.json index c152faac57..5b75bddc7a 100644 --- a/grafana/zuul-launcher-vexxhost.json +++ b/grafana/zuul-launcher-vexxhost.json @@ -133,7 +133,7 @@ }, "refCount": 0, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.requested)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.requested)" } ], "title": "Requested", @@ -199,7 +199,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building)" } ], "title": "Building", @@ -265,7 +265,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready)" } ], "title": "Ready", @@ -331,7 +331,7 @@ "uid": "d9c17c45a8" }, "refId": "A", - "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use)" + "target": "sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use)" } ], "title": "In Use", @@ -428,7 +428,7 @@ "hide": false, "refCount": 0, "refId": "A", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.instances, 'Instances')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.instances, 'Instances')" }, { "datasource": { @@ -438,7 +438,7 @@ "hide": false, "refCount": 0, "refId": "B", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances, 'instance limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances, 'instance limit')" }, { "datasource": { @@ -448,7 +448,7 @@ "hide": false, "refCount": 0, "refId": "C", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.cores, 'Cores')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.cores, 'Cores')" }, { "datasource": { @@ -458,7 +458,7 @@ "hide": false, "refCount": 0, "refId": "D", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.cores, 'core limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.cores, 'core limit')" }, { "datasource": { @@ -468,7 +468,7 @@ "hide": false, "refCount": 0, "refId": "E", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.usage.ram, 'RAM')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.usage.ram, 'RAM')" }, { "datasource": { @@ -478,7 +478,7 @@ "hide": false, "refCount": 0, "refId": "F", - "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.ram, 'ram limit')" + "target": "alias(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.ram, 'ram limit')" } ], "title": "Resources - $region", @@ -658,7 +658,7 @@ }, "refCount": 0, "refId": "A", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.building), 'Building')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.building), 'Building')" }, { "datasource": { @@ -667,7 +667,7 @@ }, "refCount": 0, "refId": "B", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.ready), 'Ready')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.ready), 'Ready')" }, { "datasource": { @@ -676,7 +676,7 @@ }, "refCount": 0, "refId": "C", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.in-use), 'In Use')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.in-use), 'In Use')" }, { "datasource": { @@ -685,7 +685,7 @@ }, "refCount": 0, "refId": "D", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.used), 'Used')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.used), 'Used')" }, { "datasource": { @@ -694,7 +694,7 @@ }, "refCount": 0, "refId": "E", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.nodes.state.requested), 'Requested')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.nodes.state.requested), 'Requested')" }, { "datasource": { @@ -703,7 +703,7 @@ }, "refCount": 0, "refId": "F", - "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-$region-main.limit.instances), 'Max')" + "target": "alias(sumSeries(stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_$region-main.limit.instances), 'Max')" } ], "title": "Test Node History - $region", @@ -733,10 +733,10 @@ "query": { "queryType": "Default", "refId": "A", - "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers-vexxhost-*-main" + "target": "stats.gauges.zuul.provider.opendev_org2Fopendev2Fzuul-providers_vexxhost-*-main" }, "refresh": 1, - "regex": "/.*?zuul-providers-(vexxhost-.*?)-main/", + "regex": "/.*?zuul-providers_(vexxhost-.*?)-main/", "type": "query" } ]