Merging upstream version 1.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 9 deletions

diff --git a/collectors/python.d.plugin/proxysql/proxysql.chart.py b/collectors/python.d.plugin/proxysql/proxysql.chart.py
index f7e3d49f9..c97147486 100644
--- a/collectors/python.d.plugin/proxysql/proxysql.chart.py
+++ b/collectors/python.d.plugin/proxysql/proxysql.chart.py
@@ -5,11 +5,6 @@
 
 from bases.FrameworkServices.MySQLService import MySQLService
 
-# default module values (can be overridden per job in `config`)
-# update_every = 3
-priority = 60000
-retries = 60
-
 
 def query(table, *params):
     return 'SELECT {params} FROM {table}'.format(table=table, params=', '.join(params))
@@ -133,8 +128,8 @@ CHARTS = {
         'options': [None, 'ProxySQL Backend Overall Bandwidth', 'kilobits/s', 'overall_bandwidth',
                     'proxysql.pool_overall_net', 'area'],
         'lines': [
-            ['bytes_data_recv', 'in', 'incremental', 8, 1024],
-            ['bytes_data_sent', 'out', 'incremental', -8, 1024]
+            ['bytes_data_recv', 'in', 'incremental', 8, 1000],
+            ['bytes_data_sent', 'out', 'incremental', -8, 1000]
         ]
     },
     'questions': {
@@ -156,7 +151,7 @@ CHARTS = {
         ]
     },
     'pool_latency': {
-        'options': [None, 'ProxySQL Backend Latency', 'ms', 'latency', 'proxysql.latency', 'line'],
+        'options': [None, 'ProxySQL Backend Latency', 'milliseconds', 'latency', 'proxysql.latency', 'line'],
         'lines': []
     },
     'connections': {
@@ -194,7 +189,7 @@ CHARTS = {
         'lines': []
     },
     'commands_duration': {
-        'options': [None, 'ProxySQL Commands Duration', 'ms', 'commands', 'proxysql.commands_duration', 'line'],
+        'options': [None, 'ProxySQL Commands Duration', 'milliseconds', 'commands', 'proxysql.commands_duration', 'line'],
         'lines': []
     }
 }