Merge branch 'add_current_computation_count' of https://github.com/po…

…wsybl/powsybl-deployment into monitoring-execution-queue
gridsuite · Dec 27, 2024 · 1afc540 · 1afc540
2 parents b9bc235 + b88acd1
commit 1afc540
Show file tree

Hide file tree

Showing 2 changed files with 106 additions and 6 deletions.
diff --git a/docker-compose/technical/grafana/dashboards/computations_metrics.json b/docker-compose/technical/grafana/dashboards/computations_metrics.json
@@ -72,7 +72,7 @@
           "refId": "A"
         }
       ],
-      "title": "Computation reports",
+      "title": "Computation stats",
       "type": "row"
     },
     {
@@ -464,7 +464,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": true,
-          "expr": "sum(app_computation_run_seconds_count{type='$COMPUTATION', error!=\"none\"}) by (provider)",
+          "expr": "sum(rate(app_computation_run_seconds_count{type='$COMPUTATION', error!=\"none\"}[$__rate_interval])) by (provider) * 60",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -475,7 +475,7 @@
           "useBackend": false
         }
       ],
-      "title": "Computation with exception count",
+      "title": "Computation rate with exception (count/min)",
       "type": "timeseries"
     },
     {
@@ -896,7 +896,7 @@
       },
       "id": 15,
       "panels": [],
-      "title": "Computation queues",
+      "title": "Computation count",
       "type": "row"
     },
     {
@@ -996,7 +996,107 @@
           "useBackend": false
         }
       ],
-      "title": "Computation run ready queue",
+      "title": "Queued computation",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
+      },
+      "description": "Messages with ready state count in rabbitmq queue.\nDisplay how many calculation are waiting to be ran.\nCalculation currently running are not counted here",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 33
+      },
+      "id": 16,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sum(app_computation_current_count{type='$COMPUTATION'}) by (provider)",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{provider}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Current computation",
       "type": "timeseries"
     }
   ],

diff --git a/docker-compose/technical/grafana/dashboards/users_metrics.json b/docker-compose/technical/grafana/dashboards/users_metrics.json
@@ -160,7 +160,7 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "count(count by (user) (app_users))",
+          "expr": "count(app_users)",
           "interval": "",
           "legendFormat": "",
           "range": true,