From 1450b69451b0c2252e6178f8a3a0188c1477790c Mon Sep 17 00:00:00 2001
From: Axel Mendoza <aekroft@gmail.com>
Date: Mon, 14 Dec 2020 14:10:41 -0500
Subject: [PATCH 1/2] Feature add custom data values for tooltip usage - show
 user_count to the others graphs

---
 locust/static/chart.js  | 10 ++++++----
 locust/static/locust.js |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/locust/static/chart.js b/locust/static/chart.js
index 90e3c21a06..9b633613e7 100644
--- a/locust/static/chart.js
+++ b/locust/static/chart.js
@@ -40,13 +40,15 @@
                 },
                 tooltip: {
                     trigger: 'axis',
-                    formatter: function (params) {
+                    formatter:
+                    function (params) {
                         if (!!params && params.length > 0 && params.some(param => !!param.value)) {
                             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";
@@ -94,12 +96,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
index 8386739165..1bffb8d076 100644
--- 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();

From 717f391af64979e493c43131dd2895402e8161d3 Mon Sep 17 00:00:00 2001
From: Axel Mendoza <aekroft@gmail.com>
Date: Mon, 14 Dec 2020 14:13:31 -0500
Subject: [PATCH 2/2] remove extra line

---
 locust/static/chart.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/locust/static/chart.js b/locust/static/chart.js
index 9b633613e7..d7d72bb4d8 100644
--- a/locust/static/chart.js
+++ b/locust/static/chart.js
@@ -40,8 +40,7 @@
                 },
                 tooltip: {
                     trigger: 'axis',
-                    formatter:
-                    function (params) {
+                    formatter: function (params) {
                         if (!!params && params.length > 0 && params.some(param => !!param.value)) {
                             var str = params[0].name;
                             for (var i=0; i<params.length; i++) {