Update workqueue metric names for flyte 1.11.0

Tom-Newton · Mar 15, 2024 · f62ec6f · f62ec6f
1 parent 90bc70d
commit f62ec6f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/deployment/stats/prometheus/flytepropeller-dashboard.json b/deployment/stats/prometheus/flytepropeller-dashboard.json
@@ -1518,15 +1518,15 @@
           "targets": [
             {
               "datasource": null,
-              "expr": "sum(rate(workqueue_adds_total{name=~\"flyte:propeller.*\"}[5m])) by (name)",
+              "expr": "rate(flyte:propeller:all:main_adds[5m])",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 2,
               "legendFormat": "",
               "metric": "",
-              "query": "sum(rate(workqueue_adds_total{name=~\"flyte:propeller.*\"}[5m])) by (name)",
+              "query": "rate(flyte:propeller:all:main_adds[5m])",
               "refId": "A",
               "step": 10,
               "target": ""
@@ -1645,15 +1645,15 @@
           "targets": [
             {
               "datasource": null,
-              "expr": "sum(workqueue_depth{name=~\"flyte:propeller.*\"}) by (name)",
+              "expr": "flyte:propeller:all:main_depth",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 2,
               "legendFormat": "",
               "metric": "",
-              "query": "sum(workqueue_depth{name=~\"flyte:propeller.*\"}) by (name)",
+              "query": "flyte:propeller:all:main_depth",
               "refId": "A",
               "step": 10,
               "target": ""
@@ -1772,15 +1772,15 @@
           "targets": [
             {
               "datasource": null,
-              "expr": "sum(rate(workqueue_retries_total{name=~\"flyte:propeller.*\"}[5m])) by (name)",
+              "expr": "rate(flyte:propeller:all:main_retries[5m])",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 2,
               "legendFormat": "",
               "metric": "",
-              "query": "sum(rate(workqueue_retries_total{name=~\"flyte:propeller.*\"}[5m])) by (name)",
+              "query": "rate(flyte:propeller:all:main_retries[5m])",
               "refId": "A",
               "step": 10,
               "target": ""
@@ -1899,15 +1899,15 @@
           "targets": [
             {
               "datasource": null,
-              "expr": "sum(workqueue_unfinished_work_seconds{name=~\"flyte:propeller.*\"}) by (name)",
+              "expr": "flyte:propeller:all:main_unfinished_work_s",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 2,
               "legendFormat": "",
               "metric": "",
-              "query": "sum(workqueue_unfinished_work_seconds{name=~\"flyte:propeller.*\"}) by (name)",
+              "query": "flyte:propeller:all:main_unfinished_work_s",
               "refId": "A",
               "step": 10,
               "target": ""

diff --git a/stats/flytepropeller.dashboard.py b/stats/flytepropeller.dashboard.py
@@ -680,7 +680,7 @@ def queue_metrics(collapse: bool) -> Row:
                     dataSource=DATASOURCE,
                     targets=[
                         Target(
-                            expr='sum(rate(workqueue_adds_total{name=~"flyte:propeller.*"}[5m])) by (name)',
+                            expr='rate(flyte:propeller:all:main_adds[5m])',
                             refId="A",
                         ),
                     ],
@@ -691,7 +691,7 @@ def queue_metrics(collapse: bool) -> Row:
                     dataSource=DATASOURCE,
                     targets=[
                         Target(
-                            expr='sum(workqueue_depth{name=~"flyte:propeller.*"}) by (name)',
+                            expr='flyte:propeller:all:main_depth',
                             refId="A",
                         ),
                     ],
@@ -702,7 +702,7 @@ def queue_metrics(collapse: bool) -> Row:
                     dataSource=DATASOURCE,
                     targets=[
                         Target(
-                            expr='sum(rate(workqueue_retries_total{name=~"flyte:propeller.*"}[5m])) by (name)',
+                            expr='rate(flyte:propeller:all:main_retries[5m])',
                             refId="A",
                         ),
                     ],
@@ -713,7 +713,7 @@ def queue_metrics(collapse: bool) -> Row:
                     dataSource=DATASOURCE,
                     targets=[
                         Target(
-                            expr='sum(workqueue_unfinished_work_seconds{name=~"flyte:propeller.*"}) by (name)',
+                            expr='flyte:propeller:all:main_unfinished_work_s',
                             refId="A",
                         ),
                     ],