update grafana board

mms-gianni · Oct 18, 2021 · 74d3fb9 · 74d3fb9
1 parent e12dfee
commit 74d3fb9
Show file tree

Hide file tree

Showing 2 changed files with 156 additions and 15 deletions.
diff --git a/app/locust.js b/app/locust.js
@@ -255,8 +255,8 @@ function getMetrics() {
             for (var w in instance.stats.workers) {
                 let worker = instance.stats.workers[w];
 
-                ret_str += `locust_cpu_usage {locust_instance="${i}", worker_id="${worker.id}"} ${worker.cpu_usage}` + "\n";
-                ret_str += `locust_user_count {locust_instance="${i}", worker_id="${worker.id}"} ${worker.user_count}` + "\n";
+                ret_str += `locust_cpu_usage {locust_instance="${i}", state="${worker.state}" worker_id="${worker.id}"} ${worker.cpu_usage}` + "\n";
+                ret_str += `locust_user_count {locust_instance="${i}", state="${worker.state}" worker_id="${worker.id}"} ${worker.user_count}` + "\n";
             }
         }
         ret_str += `locust_workers {locust_instance="${i}"} ${instance.status.worker.readyReplicas}` + "\n";

diff --git a/grafana-dashboard.json b/grafana-dashboard.json
@@ -70,7 +70,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1634211598395,
+  "iteration": 1634568214152,
   "links": [],
   "panels": [
     {
@@ -1012,21 +1012,39 @@
         "overrides": [
           {
             "matcher": {
-              "id": "byName"
+              "id": "byName",
+              "options": "name"
             },
-            "properties": []
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Path"
+              }
+            ]
           },
           {
             "matcher": {
               "id": "byName",
-              "options": "Value"
+              "options": "Value #B"
             },
             "properties": [
               {
                 "id": "displayName",
                 "value": "Requests"
               }
             ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Value #A"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Failures"
+              }
+            ]
           }
         ]
       },
@@ -1038,7 +1056,7 @@
       },
       "id": 30,
       "options": {
-        "frameIndex": 4,
+        "frameIndex": 1,
         "showHeader": true,
         "sortBy": [
           {
@@ -1050,17 +1068,144 @@
       "pluginVersion": "7.1.0",
       "targets": [
         {
-          "expr": "sum by (method, name, locust_instance) (rate(locust_num_requests[10s]))",
+          "expr": "sum(locust_num_requests) by (method, name)",
           "format": "table",
+          "hide": false,
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "B"
+        },
+        {
+          "expr": "sum(locust_num_failures) by (method, name)",
+          "format": "table",
+          "hide": false,
+          "instant": true,
           "interval": "",
           "legendFormat": "",
           "refId": "A"
         }
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Logs",
-      "transformations": [],
+      "title": "Requests",
+      "transformations": [
+        {
+          "id": "filterFieldsByName",
+          "options": {
+            "include": {
+              "names": [
+                "method",
+                "name",
+                "Value #B",
+                "Value #A"
+              ]
+            }
+          }
+        },
+        {
+          "id": "merge",
+          "options": {}
+        }
+      ],
+      "type": "table"
+    },
+    {
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": null
+          },
+          "mappings": [],
+          "noValue": "0",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "name"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Path"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Value"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Errors"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 24,
+        "x": 0,
+        "y": 34
+      },
+      "id": 31,
+      "options": {
+        "frameIndex": 1,
+        "showHeader": true,
+        "sortBy": []
+      },
+      "pluginVersion": "7.1.0",
+      "targets": [
+        {
+          "expr": "sum(locust_num_errors) by (error)",
+          "format": "table",
+          "hide": false,
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "B"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Errors",
+      "transformations": [
+        {
+          "id": "filterFieldsByName",
+          "options": {
+            "include": {
+              "names": [
+                "method",
+                "name",
+                "error",
+                "Value"
+              ]
+            }
+          }
+        },
+        {
+          "id": "merge",
+          "options": {}
+        }
+      ],
       "type": "table"
     }
   ],
@@ -1094,10 +1239,6 @@
       }
     ]
   },
-  "time": {
-    "from": "2021-10-14T11:35:55.737Z",
-    "to": "2021-10-14T11:46:43.737Z"
-  },
   "timepicker": {
     "refresh_intervals": [
       "10s",
@@ -1114,5 +1255,5 @@
   "timezone": "",
   "title": "Locust Swarmadmin",
   "uid": "bAXZzjv7k",
-  "version": 56
+  "version": 67
 }