Mysql charts fix (#5250)
* remove `mysql ` prefix from chart titles * split charts which contains dims with different algorithm
Ilya Mashchenko committed
Jan 23, 2019 at 13:05 UTC
31e42b1dfa63b0c8d599d5b3cc9bb3e3f22ee15c
1 file changed
+63
-44
collectors/python.d.plugin/mysql/mysql.chart.py
+63
-44
@@ -168,16 +168,19 @@ ORDER = [
168
'binlog_cache',
169
'binlog_stmt_cache',
170
'threads',
171
+ 'threads_creation_rate',
172
'thread_cache_misses',
173
'innodb_io',
174
'innodb_io_ops',
175
'innodb_io_pending_ops',
176
'innodb_log',
177
'innodb_os_log',
178
+ 'innodb_os_log_fsync_writes',
179
'innodb_os_log_io',
180
'innodb_cur_row_lock',
181
'innodb_rows',
182
'innodb_buffer_pool_pages',
183
+ 'innodb_buffer_pool_flush_pages_requests',
184
'innodb_buffer_pool_bytes',
185
'innodb_buffer_pool_read_ahead',
186
'innodb_buffer_pool_reqs',
@@ -202,14 +205,14 @@ ORDER = [
205
206
CHARTS = {
207
'net': {
205
- 'options': [None, 'mysql Bandwidth', 'kilobits/s', 'bandwidth', 'mysql.net', 'area'],
208
+ 'options': [None, 'Bandwidth', 'kilobits/s', 'bandwidth', 'mysql.net', 'area'],
209
'lines': [
210
['Bytes_received', 'in', 'incremental', 8, 1000],
211
['Bytes_sent', 'out', 'incremental', -8, 1000]
212
]
213
},
214
'queries': {
212
- 'options': [None, 'mysql Queries', 'queries/s', 'queries', 'mysql.queries', 'line'],
215
+ 'options': [None, 'Queries', 'queries/s', 'queries', 'mysql.queries', 'line'],
216
'lines': [
217
['Queries', 'queries', 'incremental'],
218
['Questions', 'questions', 'incremental'],
@@ -217,7 +220,7 @@ CHARTS = {
220
]
221
},
222
'queries_type': {
220
- 'options': [None, 'mysql Query type', 'queries/s', 'query_types', 'mysql.queries_type', 'stacked'],
223
+ 'options': [None, 'Query Type', 'queries/s', 'query_types', 'mysql.queries_type', 'stacked'],
224
'lines': [
225
['Com_select', 'select', 'incremental'],
226
['Com_delete', 'delete', 'incremental'],
@@ -228,7 +231,7 @@ CHARTS = {
231
]
232
},
233
'handlers': {
231
- 'options': [None, 'mysql Handlers', 'handlers/s', 'handlers', 'mysql.handlers', 'line'],
234
+ 'options': [None, 'Handlers', 'handlers/s', 'handlers', 'mysql.handlers', 'line'],
235
'lines': [
236
['Handler_commit', 'commit', 'incremental'],
237
['Handler_delete', 'delete', 'incremental'],
@@ -247,14 +250,14 @@ CHARTS = {
250
]
251
},
252
'table_locks': {
250
- 'options': [None, 'mysql Tables Locks', 'locks/s', 'locks', 'mysql.table_locks', 'line'],
253
+ 'options': [None, 'Tables Locks', 'locks/s', 'locks', 'mysql.table_locks', 'line'],
254
'lines': [
255
['Table_locks_immediate', 'immediate', 'incremental'],
256
['Table_locks_waited', 'waited', 'incremental', -1, 1]
257
]
258
},
259
'join_issues': {
257
- 'options': [None, 'mysql Select Join Issues', 'joins/s', 'issues', 'mysql.join_issues', 'line'],
260
+ 'options': [None, 'Select Join Issues', 'joins/s', 'issues', 'mysql.join_issues', 'line'],
261
'lines': [
262
['Select_full_join', 'full_join', 'incremental'],
263
['Select_full_range_join', 'full_range_join', 'incremental'],
@@ -264,7 +267,7 @@ CHARTS = {
267
]
268
},
269
'sort_issues': {
267
- 'options': [None, 'mysql Sort Issues', 'issues/s', 'issues', 'mysql.sort_issues', 'line'],
270
+ 'options': [None, 'Sort Issues', 'issues/s', 'issues', 'mysql.sort_issues', 'line'],
271
'lines': [
272
['Sort_merge_passes', 'merge_passes', 'incremental'],
273
['Sort_range', 'range', 'incremental'],
@@ -272,7 +275,7 @@ CHARTS = {
275
]
276
},
277
'tmp': {
275
- 'options': [None, 'mysql Tmp Operations', 'counter', 'temporaries', 'mysql.tmp', 'line'],
278
+ 'options': [None, 'Tmp Operations', 'counter', 'temporaries', 'mysql.tmp', 'line'],
279
'lines': [
280
['Created_tmp_disk_tables', 'disk_tables', 'incremental'],
281
['Created_tmp_files', 'files', 'incremental'],
@@ -280,14 +283,14 @@ CHARTS = {
283
]
284
},
285
'connections': {
283
- 'options': [None, 'mysql Connections', 'connections/s', 'connections', 'mysql.connections', 'line'],
286
+ 'options': [None, 'Connections', 'connections/s', 'connections', 'mysql.connections', 'line'],
287
'lines': [
288
['Connections', 'all', 'incremental'],
289
['Aborted_connects', 'aborted', 'incremental']
290
]
291
},
292
'connections_active': {
290
- 'options': [None, 'mysql Connections Active', 'connections', 'connections', 'mysql.connections_active', 'line'],
293
+ 'options': [None, 'Connections Active', 'connections', 'connections', 'mysql.connections_active', 'line'],
294
'lines': [
295
['Threads_connected', 'active', 'absolute'],
296
['max_connections', 'limit', 'absolute'],
@@ -295,21 +298,26 @@ CHARTS = {
298
]
299
},
300
'binlog_cache': {
298
- 'options': [None, 'mysql Binlog Cache', 'transactions/s', 'binlog', 'mysql.binlog_cache', 'line'],
301
+ 'options': [None, 'Binlog Cache', 'transactions/s', 'binlog', 'mysql.binlog_cache', 'line'],
302
'lines': [
303
['Binlog_cache_disk_use', 'disk', 'incremental'],
304
['Binlog_cache_use', 'all', 'incremental']
305
]
306
},
307
'threads': {
305
- 'options': [None, 'mysql Threads', 'threads', 'threads', 'mysql.threads', 'line'],
308
+ 'options': [None, 'Threads', 'threads', 'threads', 'mysql.threads', 'line'],
309
'lines': [
310
['Threads_connected', 'connected', 'absolute'],
308
- ['Threads_created', 'created', 'incremental'],
311
['Threads_cached', 'cached', 'absolute', -1, 1],
312
['Threads_running', 'running', 'absolute'],
313
]
314
},
315
+ 'threads_creation_rate': {
316
+ 'options': [None, 'Threads Creation Rate', 'threads', 'threads/s', 'mysql.threads', 'line'],
317
+ 'lines': [
318
+ ['Threads_created', 'created', 'incremental'],
319
+ ]
320
+ },
321
'thread_cache_misses': {
322
'options': [None, 'mysql Threads Cache Misses', 'misses', 'threads', 'mysql.thread_cache_misses', 'area'],
323
'lines': [
@@ -317,14 +325,14 @@ CHARTS = {
325
]
326
},
327
'innodb_io': {
320
- 'options': [None, 'mysql InnoDB I/O Bandwidth', 'KiB/s', 'innodb', 'mysql.innodb_io', 'area'],
328
+ 'options': [None, 'InnoDB I/O Bandwidth', 'KiB/s', 'innodb', 'mysql.innodb_io', 'area'],
329
'lines': [
330
['Innodb_data_read', 'read', 'incremental', 1, 1024],
331
['Innodb_data_written', 'write', 'incremental', -1, 1024]
332
]
333
},
334
'innodb_io_ops': {
327
- 'options': [None, 'mysql InnoDB I/O Operations', 'operations/s', 'innodb', 'mysql.innodb_io_ops', 'line'],
335
+ 'options': [None, 'InnoDB I/O Operations', 'operations/s', 'innodb', 'mysql.innodb_io_ops', 'line'],
336
'lines': [
337
['Innodb_data_reads', 'reads', 'incremental'],
338
['Innodb_data_writes', 'writes', 'incremental', -1, 1],
@@ -332,7 +340,7 @@ CHARTS = {
340
]
341
},
342
'innodb_io_pending_ops': {
335
- 'options': [None, 'mysql InnoDB Pending I/O Operations', 'operations', 'innodb',
343
+ 'options': [None, 'InnoDB Pending I/O Operations', 'operations', 'innodb',
344
'mysql.innodb_io_pending_ops', 'line'],
345
'lines': [
346
['Innodb_data_pending_reads', 'reads', 'absolute'],
@@ -341,7 +349,7 @@ CHARTS = {
349
]
350
},
351
'innodb_log': {
344
- 'options': [None, 'mysql InnoDB Log Operations', 'operations/s', 'innodb', 'mysql.innodb_log', 'line'],
352
+ 'options': [None, 'InnoDB Log Operations', 'operations/s', 'innodb', 'mysql.innodb_log', 'line'],
353
'lines': [
354
['Innodb_log_waits', 'waits', 'incremental'],
355
['Innodb_log_write_requests', 'write_requests', 'incremental', -1, 1],
@@ -349,28 +357,33 @@ CHARTS = {
357
]
358
},
359
'innodb_os_log': {
352
- 'options': [None, 'mysql InnoDB OS Log Operations', 'operations', 'innodb', 'mysql.innodb_os_log', 'line'],
360
+ 'options': [None, 'InnoDB OS Log Pending Operations', 'operations', 'innodb', 'mysql.innodb_os_log', 'line'],
361
+ 'lines': [
362
+ ['Innodb_os_log_pending_fsyncs', 'fsyncs', 'absolute'],
363
+ ['Innodb_os_log_pending_writes', 'writes', 'absolute', -1, 1],
364
+ ]
365
+ },
366
+ 'innodb_os_log_fsync_writes': {
367
+ 'options': [None, 'InnoDB OS Log Operations', 'operations/s', 'innodb', 'mysql.innodb_os_log', 'line'],
368
'lines': [
369
['Innodb_os_log_fsyncs', 'fsyncs', 'incremental'],
355
- ['Innodb_os_log_pending_fsyncs', 'pending_fsyncs', 'absolute'],
356
- ['Innodb_os_log_pending_writes', 'pending_writes', 'absolute', -1, 1],
370
]
371
},
372
'innodb_os_log_io': {
360
- 'options': [None, 'mysql InnoDB OS Log Bandwidth', 'KiB/s', 'innodb', 'mysql.innodb_os_log_io', 'area'],
373
+ 'options': [None, 'InnoDB OS Log Bandwidth', 'KiB/s', 'innodb', 'mysql.innodb_os_log_io', 'area'],
374
'lines': [
375
['Innodb_os_log_written', 'write', 'incremental', -1, 1024],
376
]
377
},
378
'innodb_cur_row_lock': {
366
- 'options': [None, 'mysql InnoDB Current Row Locks', 'operations', 'innodb',
379
+ 'options': [None, 'InnoDB Current Row Locks', 'operations', 'innodb',
380
'mysql.innodb_cur_row_lock', 'area'],
381
'lines': [
382
['Innodb_row_lock_current_waits', 'current_waits', 'absolute']
383
]
384
},
385
'innodb_rows': {
373
- 'options': [None, 'mysql InnoDB Row Operations', 'operations/s', 'innodb', 'mysql.innodb_rows', 'area'],
386
+ 'options': [None, 'InnoDB Row Operations', 'operations/s', 'innodb', 'mysql.innodb_rows', 'area'],
387
'lines': [
388
['Innodb_rows_inserted', 'inserted', 'incremental'],
389
['Innodb_rows_read', 'read', 'incremental', 1, 1],
@@ -379,19 +392,25 @@ CHARTS = {
392
]
393
},
394
'innodb_buffer_pool_pages': {
382
- 'options': [None, 'mysql InnoDB Buffer Pool Pages', 'pages', 'innodb',
395
+ 'options': [None, 'InnoDB Buffer Pool Pages', 'pages', 'innodb',
396
'mysql.innodb_buffer_pool_pages', 'line'],
397
'lines': [
398
['Innodb_buffer_pool_pages_data', 'data', 'absolute'],
399
['Innodb_buffer_pool_pages_dirty', 'dirty', 'absolute', -1, 1],
400
['Innodb_buffer_pool_pages_free', 'free', 'absolute'],
388
- ['Innodb_buffer_pool_pages_flushed', 'flushed', 'incremental', -1, 1],
401
['Innodb_buffer_pool_pages_misc', 'misc', 'absolute', -1, 1],
402
['Innodb_buffer_pool_pages_total', 'total', 'absolute']
403
]
404
},
405
+ 'innodb_buffer_pool_flush_pages_requests': {
406
+ 'options': [None, 'InnoDB Buffer Pool Flush Pages Requests', 'requests/s', 'innodb',
407
+ 'mysql.innodb_buffer_pool_pages', 'line'],
408
+ 'lines': [
409
+ ['Innodb_buffer_pool_pages_flushed', 'flush pages', 'incremental'],
410
+ ]
411
+ },
412
'innodb_buffer_pool_bytes': {
394
- 'options': [None, 'mysql InnoDB Buffer Pool Bytes', 'MiB', 'innodb', 'mysql.innodb_buffer_pool_bytes', 'area'],
413
+ 'options': [None, 'InnoDB Buffer Pool Bytes', 'MiB', 'innodb', 'mysql.innodb_buffer_pool_bytes', 'area'],
414
'lines': [
415
['Innodb_buffer_pool_bytes_data', 'data', 'absolute', 1, 1024 * 1024],
416
['Innodb_buffer_pool_bytes_dirty', 'dirty', 'absolute', -1, 1024 * 1024]
@@ -407,7 +426,7 @@ CHARTS = {
426
]
427
},
428
'innodb_buffer_pool_reqs': {
410
- 'options': [None, 'mysql InnoDB Buffer Pool Requests', 'requests/s', 'innodb',
429
+ 'options': [None, 'InnoDB Buffer Pool Requests', 'requests/s', 'innodb',
430
'mysql.innodb_buffer_pool_reqs', 'area'],
431
'lines': [
432
['Innodb_buffer_pool_read_requests', 'reads', 'incremental'],
@@ -415,7 +434,7 @@ CHARTS = {
434
]
435
},
436
'innodb_buffer_pool_ops': {
418
- 'options': [None, 'mysql InnoDB Buffer Pool Operations', 'operations/s', 'innodb',
437
+ 'options': [None, 'InnoDB Buffer Pool Operations', 'operations/s', 'innodb',
438
'mysql.innodb_buffer_pool_ops', 'area'],
439
'lines': [
440
['Innodb_buffer_pool_reads', 'disk reads', 'incremental'],
@@ -423,7 +442,7 @@ CHARTS = {
442
]
443
},
444
'qcache_ops': {
426
- 'options': [None, 'mysql QCache Operations', 'queries/s', 'qcache', 'mysql.qcache_ops', 'line'],
445
+ 'options': [None, 'QCache Operations', 'queries/s', 'qcache', 'mysql.qcache_ops', 'line'],
446
'lines': [
447
['Qcache_hits', 'hits', 'incremental'],
448
['Qcache_lowmem_prunes', 'lowmem prunes', 'incremental', -1, 1],
@@ -432,26 +451,26 @@ CHARTS = {
451
]
452
},
453
'qcache': {
435
- 'options': [None, 'mysql QCache Queries in Cache', 'queries', 'qcache', 'mysql.qcache', 'line'],
454
+ 'options': [None, 'QCache Queries in Cache', 'queries', 'qcache', 'mysql.qcache', 'line'],
455
'lines': [
456
['Qcache_queries_in_cache', 'queries', 'absolute']
457
]
458
},
459
'qcache_freemem': {
441
- 'options': [None, 'mysql QCache Free Memory', 'MiB', 'qcache', 'mysql.qcache_freemem', 'area'],
460
+ 'options': [None, 'QCache Free Memory', 'MiB', 'qcache', 'mysql.qcache_freemem', 'area'],
461
'lines': [
462
['Qcache_free_memory', 'free', 'absolute', 1, 1024 * 1024]
463
]
464
},
465
'qcache_memblocks': {
447
- 'options': [None, 'mysql QCache Memory Blocks', 'blocks', 'qcache', 'mysql.qcache_memblocks', 'line'],
466
+ 'options': [None, 'QCache Memory Blocks', 'blocks', 'qcache', 'mysql.qcache_memblocks', 'line'],
467
'lines': [
468
['Qcache_free_blocks', 'free', 'absolute'],
469
['Qcache_total_blocks', 'total', 'absolute']
470
]
471
},
472
'key_blocks': {
454
- 'options': [None, 'mysql MyISAM Key Cache Blocks', 'blocks', 'myisam', 'mysql.key_blocks', 'line'],
473
+ 'options': [None, 'MyISAM Key Cache Blocks', 'blocks', 'myisam', 'mysql.key_blocks', 'line'],
474
'lines': [
475
['Key_blocks_unused', 'unused', 'absolute'],
476
['Key_blocks_used', 'used', 'absolute', -1, 1],
@@ -459,14 +478,14 @@ CHARTS = {
478
]
479
},
480
'key_requests': {
462
- 'options': [None, 'mysql MyISAM Key Cache Requests', 'requests/s', 'myisam', 'mysql.key_requests', 'area'],
481
+ 'options': [None, 'MyISAM Key Cache Requests', 'requests/s', 'myisam', 'mysql.key_requests', 'area'],
482
'lines': [
483
['Key_read_requests', 'reads', 'incremental'],
484
['Key_write_requests', 'writes', 'incremental', -1, 1]
485
]
486
},
487
'key_disk_ops': {
469
- 'options': [None, 'mysql MyISAM Key Cache Disk Operations', 'operations/s',
488
+ 'options': [None, 'MyISAM Key Cache Disk Operations', 'operations/s',
489
'myisam', 'mysql.key_disk_ops', 'area'],
490
'lines': [
491
['Key_reads', 'reads', 'incremental'],
@@ -474,19 +493,19 @@ CHARTS = {
493
]
494
},
495
'files': {
477
- 'options': [None, 'mysql Open Files', 'files', 'files', 'mysql.files', 'line'],
496
+ 'options': [None, 'Open Files', 'files', 'files', 'mysql.files', 'line'],
497
'lines': [
498
['Open_files', 'files', 'absolute']
499
]
500
},
501
'files_rate': {
483
- 'options': [None, 'mysql Opened Files Rate', 'files/s', 'files', 'mysql.files_rate', 'line'],
502
+ 'options': [None, 'Opened Files Rate', 'files/s', 'files', 'mysql.files_rate', 'line'],
503
'lines': [
504
['Opened_files', 'files', 'incremental']
505
]
506
},
507
'binlog_stmt_cache': {
489
- 'options': [None, 'mysql Binlog Statement Cache', 'statements/s', 'binlog',
508
+ 'options': [None, 'Binlog Statement Cache', 'statements/s', 'binlog',
509
'mysql.binlog_stmt_cache', 'line'],
510
'lines': [
511
['Binlog_stmt_cache_disk_use', 'disk', 'incremental'],
@@ -494,7 +513,7 @@ CHARTS = {
513
]
514
},
515
'connection_errors': {
497
- 'options': [None, 'mysql Connection Errors', 'connections/s', 'connections',
516
+ 'options': [None, 'Connection Errors', 'connections/s', 'connections',
517
'mysql.connection_errors', 'line'],
518
'lines': [
519
['Connection_errors_accept', 'accept', 'incremental'],
@@ -519,35 +538,35 @@ CHARTS = {
538
]
539
},
540
'galera_writesets': {
522
- 'options': [None, 'Replicated writesets', 'writesets/s', 'galera', 'mysql.galera_writesets', 'line'],
541
+ 'options': [None, 'Replicated Writesets', 'writesets/s', 'galera', 'mysql.galera_writesets', 'line'],
542
'lines': [
543
['wsrep_received', 'rx', 'incremental'],
544
['wsrep_replicated', 'tx', 'incremental', -1, 1],
545
]
546
},
547
'galera_bytes': {
529
- 'options': [None, 'Replicated bytes', 'KiB/s', 'galera', 'mysql.galera_bytes', 'area'],
548
+ 'options': [None, 'Replicated Bytes', 'KiB/s', 'galera', 'mysql.galera_bytes', 'area'],
549
'lines': [
550
['wsrep_received_bytes', 'rx', 'incremental', 1, 1024],
551
['wsrep_replicated_bytes', 'tx', 'incremental', -1, 1024],
552
]
553
},
554
'galera_queue': {
536
- 'options': [None, 'Galera queue', 'writesets', 'galera', 'mysql.galera_queue', 'line'],
555
+ 'options': [None, 'Galera Queue', 'writesets', 'galera', 'mysql.galera_queue', 'line'],
556
'lines': [
557
['wsrep_local_recv_queue', 'rx', 'absolute'],
558
['wsrep_local_send_queue', 'tx', 'absolute', -1, 1],
559
]
560
},
561
'galera_conflicts': {
543
- 'options': [None, 'Replication conflicts', 'transactions', 'galera', 'mysql.galera_conflicts', 'area'],
562
+ 'options': [None, 'Replication Conflicts', 'transactions', 'galera', 'mysql.galera_conflicts', 'area'],
563
'lines': [
564
['wsrep_local_bf_aborts', 'bf_aborts', 'incremental'],
565
['wsrep_local_cert_failures', 'cert_fails', 'incremental', -1, 1],
566
]
567
},
568
'galera_flow_control': {
550
- 'options': [None, 'Flow control', 'millisec', 'galera', 'mysql.galera_flow_control', 'area'],
569
+ 'options': [None, 'Flow Control', 'millisec', 'galera', 'mysql.galera_flow_control', 'area'],
570
'lines': [
571
['wsrep_flow_control_paused_ns', 'paused', 'incremental', 1, 1000000],
572
]