Merge pull request #1658 from aek/feature-chart-tooltip-custom-values

Feature chart tooltip custom values - show user count
locustio · Dec 15, 2020 · 7718a56 · 7718a56
2 parents 033fdb1 + 2d83081
commit 7718a56
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/locust/static/chart.js b/locust/static/chart.js
@@ -45,8 +45,9 @@
                             var str = params[0].name;
                             for (var i=0; i<params.length; i++) {
                                 var param = params[i];
-                                str += '<br><span style="color:' + param.color + ';">' + param.seriesName + ': ' + param.data + '</span>';
+                                str += '<br><span style="color:' + param.color + ';">' + param.seriesName + ': ' + param.data.value + '</span>';
                             }
+                            str += '<br><span style="color:#b3c3bc;">Users: ' + param.data.users + '</span>';
                             return str;
                         } else {
                             return "No data";
@@ -100,12 +101,12 @@
             })
         }
 
-        addValue(values) {
+        addValue(values, user_count=0) {
             this.dates.push(new Date().toLocaleTimeString());
             var seriesData = [];
             for (var i=0; i<values.length; i++) {
                 var value = Math.round(values[i] * 100) / 100;
-                this.data[i].push(value);
+                this.data[i].push({"value": value, "users": user_count});
                 seriesData.push({data: this.data[i]});
             }
             this.chart.setOption({

diff --git a/locust/static/locust.js b/locust/static/locust.js
@@ -191,8 +191,8 @@ function updateStats() {
             // get total stats row
             var total = report.stats[report.stats.length-1];
             // update charts
-            rpsChart.addValue([total.current_rps, total.current_fail_per_sec]);
-            responseTimeChart.addValue([report.current_response_time_percentile_50, report.current_response_time_percentile_95]);
+            rpsChart.addValue([total.current_rps, total.current_fail_per_sec], report.user_count);
+            responseTimeChart.addValue([report.current_response_time_percentile_50, report.current_response_time_percentile_95], report.user_count);
             usersChart.addValue([report.user_count]);
         } else {
             appearStopped();