New upstream version 1.9.0+dfsgupstream/1.9.0+dfsg

1 files changed, 67 insertions, 17 deletions

diff --git a/python.d/mysql.chart.py b/python.d/mysql.chart.py
index 6118f79f2..4c7058b26 100644
--- a/python.d/mysql.chart.py
+++ b/python.d/mysql.chart.py
@@ -2,11 +2,11 @@
 # Description: MySQL netdata python.d module
 # Author: Pawel Krupa (paulfantom)
 
-from base import MySQLService
+from bases.FrameworkServices.MySQLService import MySQLService
 
 # default module values (can be overridden per job in `config`)
 # update_every = 3
-priority = 90000
+priority = 60000
 retries = 60
 
 # query executed on MySQL server
@@ -114,7 +114,16 @@ GLOBAL_STATS = [
  'Connection_errors_max_connections',
  'Connection_errors_peer_address',
  'Connection_errors_select',
- 'Connection_errors_tcpwrap']
+ 'Connection_errors_tcpwrap',
+ 'wsrep_local_recv_queue',
+ 'wsrep_local_send_queue',
+ 'wsrep_received',
+ 'wsrep_replicated',
+ 'wsrep_received_bytes',
+ 'wsrep_replicated_bytes',
+ 'wsrep_local_bf_aborts',
+ 'wsrep_local_cert_failures',
+ 'wsrep_flow_control_paused_ns']
 
 def slave_seconds(value):
     try:
@@ -122,6 +131,7 @@ def slave_seconds(value):
     except (TypeError, ValueError):
         return -1
 
+
 def slave_running(value):
     return 1 if value == 'Yes' else -1
 
@@ -146,7 +156,8 @@ ORDER = ['net',
          'innodb_buffer_pool_read_ahead', 'innodb_buffer_pool_reqs', 'innodb_buffer_pool_ops',
          'qcache_ops', 'qcache', 'qcache_freemem', 'qcache_memblocks',
          'key_blocks', 'key_requests', 'key_disk_ops',
-         'files', 'files_rate', 'slave_behind', 'slave_status']
+         'files', 'files_rate', 'slave_behind', 'slave_status',
+         'galera_writesets', 'galera_bytes', 'galera_queue', 'galera_conflicts', 'galera_flow_control']
 
 CHARTS = {
     'net': {
@@ -248,7 +259,8 @@ CHARTS = {
             ['Innodb_data_fsyncs', 'fsyncs', 'incremental']
         ]},
     'innodb_io_pending_ops': {
-        'options': [None, 'mysql InnoDB Pending I/O Operations', 'operations', 'innodb', 'mysql.innodb_io_pending_ops', 'line'],
+        'options': [None, 'mysql InnoDB Pending I/O Operations', 'operations', 'innodb',
+                    'mysql.innodb_io_pending_ops', 'line'],
         'lines': [
             ['Innodb_data_pending_reads', 'reads', 'absolute'],
             ['Innodb_data_pending_writes', 'writes', 'absolute', -1, 1],
@@ -274,7 +286,8 @@ CHARTS = {
             ['Innodb_os_log_written', 'write', 'incremental', -1, 1024],
         ]},
     'innodb_cur_row_lock': {
-        'options': [None, 'mysql InnoDB Current Row Locks', 'operations', 'innodb', 'mysql.innodb_cur_row_lock', 'area'],
+        'options': [None, 'mysql InnoDB Current Row Locks', 'operations', 'innodb',
+                    'mysql.innodb_cur_row_lock', 'area'],
         'lines': [
             ['Innodb_row_lock_current_waits', 'current_waits', 'absolute']
         ]},
@@ -287,7 +300,8 @@ CHARTS = {
             ['Innodb_rows_deleted', 'deleted', 'incremental', -1, 1],
         ]},
     'innodb_buffer_pool_pages': {
-        'options': [None, 'mysql InnoDB Buffer Pool Pages', 'pages', 'innodb', 'mysql.innodb_buffer_pool_pages', 'line'],
+        'options': [None, 'mysql InnoDB Buffer Pool Pages', 'pages', 'innodb',
+                    'mysql.innodb_buffer_pool_pages', 'line'],
         'lines': [
             ['Innodb_buffer_pool_pages_data', 'data', 'absolute'],
             ['Innodb_buffer_pool_pages_dirty', 'dirty', 'absolute', -1, 1],
@@ -303,20 +317,23 @@ CHARTS = {
             ['Innodb_buffer_pool_bytes_dirty', 'dirty', 'absolute', -1, 1024 * 1024]
         ]},
     'innodb_buffer_pool_read_ahead': {
-        'options': [None, 'mysql InnoDB Buffer Pool Read Ahead', 'operations/s', 'innodb', 'mysql.innodb_buffer_pool_read_ahead', 'area'],
+        'options': [None, 'mysql InnoDB Buffer Pool Read Ahead', 'operations/s', 'innodb',
+                    'mysql.innodb_buffer_pool_read_ahead', 'area'],
         'lines': [
             ['Innodb_buffer_pool_read_ahead', 'all', 'incremental'],
             ['Innodb_buffer_pool_read_ahead_evicted', 'evicted', 'incremental', -1, 1],
             ['Innodb_buffer_pool_read_ahead_rnd', 'random', 'incremental']
         ]},
     'innodb_buffer_pool_reqs': {
-        'options': [None, 'mysql InnoDB Buffer Pool Requests', 'requests/s', 'innodb', 'mysql.innodb_buffer_pool_reqs', 'area'],
+        'options': [None, 'mysql InnoDB Buffer Pool Requests', 'requests/s', 'innodb',
+                    'mysql.innodb_buffer_pool_reqs', 'area'],
         'lines': [
             ['Innodb_buffer_pool_read_requests', 'reads', 'incremental'],
             ['Innodb_buffer_pool_write_requests', 'writes', 'incremental', -1, 1]
         ]},
     'innodb_buffer_pool_ops': {
-        'options': [None, 'mysql InnoDB Buffer Pool Operations', 'operations/s', 'innodb', 'mysql.innodb_buffer_pool_ops', 'area'],
+        'options': [None, 'mysql InnoDB Buffer Pool Operations', 'operations/s', 'innodb',
+                    'mysql.innodb_buffer_pool_ops', 'area'],
         'lines': [
             ['Innodb_buffer_pool_reads', 'disk reads', 'incremental'],
             ['Innodb_buffer_pool_wait_free', 'wait free', 'incremental', -1, 1]
@@ -359,7 +376,8 @@ CHARTS = {
             ['Key_write_requests', 'writes', 'incremental', -1, 1]
         ]},
     'key_disk_ops': {
-        'options': [None, 'mysql MyISAM Key Cache Disk Operations', 'operations/s', 'myisam', 'mysql.key_disk_ops', 'area'],
+        'options': [None, 'mysql MyISAM Key Cache Disk Operations', 'operations/s',
+                    'myisam', 'mysql.key_disk_ops', 'area'],
         'lines': [
             ['Key_reads', 'reads', 'incremental'],
             ['Key_writes', 'writes', 'incremental', -1, 1]
@@ -375,13 +393,15 @@ CHARTS = {
             ['Opened_files', 'files', 'incremental']
         ]},
     'binlog_stmt_cache': {
-        'options': [None, 'mysql Binlog Statement Cache', 'statements/s', 'binlog', 'mysql.binlog_stmt_cache', 'line'],
+        'options': [None, 'mysql Binlog Statement Cache', 'statements/s', 'binlog',
+                    'mysql.binlog_stmt_cache', 'line'],
         'lines': [
             ['Binlog_stmt_cache_disk_use', 'disk', 'incremental'],
             ['Binlog_stmt_cache_use', 'all', 'incremental']
         ]},
     'connection_errors': {
-        'options': [None, 'mysql Connection Errors', 'connections/s', 'connections', 'mysql.connection_errors', 'line'],
+        'options': [None, 'mysql Connection Errors', 'connections/s', 'connections',
+                    'mysql.connection_errors', 'line'],
         'lines': [
             ['Connection_errors_accept', 'accept', 'incremental'],
             ['Connection_errors_internal', 'internal', 'incremental'],
@@ -400,6 +420,35 @@ CHARTS = {
         'lines': [
             ['Slave_SQL_Running', 'sql_running', 'absolute'],
             ['Slave_IO_Running', 'io_running', 'absolute']
+        ]},
+    'galera_writesets': {
+        'options': [None, 'Replicated writesets', 'writesets/s', 'galera', 'mysql.galera_writesets', 'line'],
+        'lines': [
+            ['wsrep_received', 'rx', 'incremental'],
+            ['wsrep_replicated', 'tx', 'incremental', -1, 1],
+        ]},
+    'galera_bytes': {
+        'options': [None, 'Replicated bytes', 'KB/s', 'galera', 'mysql.galera_bytes', 'area'],
+        'lines': [
+            ['wsrep_received_bytes', 'rx', 'incremental', 1, 1024],
+            ['wsrep_replicated_bytes', 'tx', 'incremental', -1, 1024],
+        ]},
+    'galera_queue': {
+        'options': [None, 'Galera queue', 'writesets', 'galera', 'mysql.galera_queue', 'line'],
+        'lines': [
+            ['wsrep_local_recv_queue', 'rx', 'absolute'],
+            ['wsrep_local_send_queue', 'tx', 'absolute', -1, 1],
+        ]},
+    'galera_conflicts': {
+        'options': [None, 'Replication conflicts', 'transactions', 'galera', 'mysql.galera_conflicts', 'area'],
+        'lines': [
+            ['wsrep_local_bf_aborts', 'bf_aborts', 'incremental'],
+            ['wsrep_local_cert_failures', 'cert_fails', 'incremental', -1, 1],
+        ]},
+    'galera_flow_control': {
+        'options': [None, 'Flow control', 'millisec', 'galera', 'mysql.galera_flow_control', 'area'],
+        'lines': [
+            ['wsrep_flow_control_paused_ns', 'paused', 'incremental', 1, 1000000],
         ]}
 }
 
@@ -416,7 +465,7 @@ class Service(MySQLService):
         raw_data = self._get_raw_data(description=True)
 
         if not raw_data:
-           return None
+            return None
 
         to_netdata = dict()
 
@@ -426,14 +475,15 @@ class Service(MySQLService):
                 if key in global_status:
                     to_netdata[key] = global_status[key]
             if 'Threads_created' in to_netdata and 'Connections' in to_netdata:
-                to_netdata['Thread_cache_misses'] = round(int(to_netdata['Threads_created']) / float(to_netdata['Connections']) * 10000)
+                to_netdata['Thread_cache_misses'] = round(int(to_netdata['Threads_created'])
+                                                          / float(to_netdata['Connections']) * 10000)
 
         if 'slave_status' in raw_data:
             if raw_data['slave_status'][0]:
                 slave_raw_data = dict(zip([e[0] for e in raw_data['slave_status'][1]], raw_data['slave_status'][0][0]))
-                for key, function in SLAVE_STATS:
+                for key, func in SLAVE_STATS:
                     if key in slave_raw_data:
-                       to_netdata[key] = function(slave_raw_data[key])
+                        to_netdata[key] = func(slave_raw_data[key])
             else:
                 self.queries.pop('slave_status')