sensu-plugins-mysql 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f4e28c5fe85bbb08ea031b00e2f59ab2aa87659ab13d8956815cb30a327a659
-  data.tar.gz: c597db8661b11a7cc1a4d57afcca1295d89e152bfdf53440ee13d503ec20c36f
+  metadata.gz: f050ecf7e999bf8ff96e3e089c875532184987ad802cfb1c3d41de64a2b65954
+  data.tar.gz: f6d603d1a7b63efedb0e936d9aa0a55d4e598cfc02fbffede44619552af44fbf
 SHA512:
-  metadata.gz: d2724a9e0af371a833139e5fb60356612a9e2e9a9626459dfb3cf6afc3c0b3bd3bf70a5cf0cee0eff42494763ac033e5dda17f194acc3ab182a96f4ad64a8361
-  data.tar.gz: 7c04bd29f0a1e41782dd90cea6744dd674951d42cb398e482af97975229c4bf37ffa5e9b109f8dabf2212e1b9a33e2c971b0721cac851204f1d8dba70c4305c9
+  metadata.gz: 84049e67a1c9181c8ad6f2e6df7fe9ac8cc4c947fae1b2c779dd6eae409155ea3bfec5a1565185b142dd5c548cf15de44d077f7c7f5897ff53ece963aca0daf0
+  data.tar.gz: 45f695cfe8b6400f12b21dcfe6709f9838db5c1dd71b2996e90021b8198a8ea95b23917cbad277aa2ed18b9583cc373d749c9a21c6806e1f6024adcf6b24243e

data/CHANGELOG.md

@@ -5,6 +5,14 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [3.2.0] - 2020-08-26
+### Changed
+- Bump sensu-plugin dependency from ~> 1.2 to ~> 4.0
+- Updated bundler dependancy to '~> 2.1'
+- Updated rubocop dependency to '~> 0.81.0'
+- Remediated rubocop issues
+- Updated rake dependency to '~> 13.0'
+
 ## [3.1.1] - 2019-03-04
 ### Fixed
 - check-mysql-disk.rb: update defaults for float and integer values as a string as the defaults apparently do not execute the proc which would have properly converted it to the appropriate type (@majormoses)
@@ -160,7 +168,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/3.1.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/3.2.0...HEAD
+[3.2.0]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/3.1.1...3.2.0
 [3.1.1]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/3.1.0...3.1.1
 [3.1.0]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/3.0.0...3.1.0
 [3.0.0]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.7.0...3.0.0

data/bin/check-mysql-alive.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # MySQL Alive Plugin
 # ===
@@ -96,7 +98,7 @@ class CheckMySQL < Sensu::Plugin::Check::CLI
     rescue Mysql::Error => e
       critical "Error message: #{e.error}"
     ensure
-      db.close if db
+      db&.close
     end
   end
 end

data/bin/check-mysql-connections.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # MySQL Health Plugin
 # ===
@@ -105,6 +107,6 @@ class CheckMySQLHealth < Sensu::Plugin::Check::CLI
   rescue Mysql::Error => e
     critical "MySQL check failed: #{e.error}"
   ensure
-    db.close if db
+    db&.close
   end
 end

data/bin/check-mysql-disk.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # MySQL Disk Usage Check
 # ===
@@ -108,11 +110,9 @@ class CheckMysqlDisk < Sensu::Plugin::Check::CLI
         FROM information_schema.TABLES group by table_schema
       SQL
 
-      unless results.nil?
-        results.each_hash do |row|
-          # #YELLOW
-          total_size = total_size + row['total_size'].to_f # rubocop:disable Style/SelfAssignment
-        end
+      results&.each_hash do |row|
+        # #YELLOW
+        total_size = total_size + row['total_size'].to_f # rubocop:disable Style/SelfAssignment
       end
 
       disk_use_percentage = total_size / disk_size * 100
@@ -131,7 +131,7 @@ class CheckMysqlDisk < Sensu::Plugin::Check::CLI
     rescue StandardError => e
       critical e
     ensure
-      db.close if db
+      db&.close
     end
   end
 end

data/bin/check-mysql-innodb-lock.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # MySQL InnoDB Lock Check Plugin
 # ===
@@ -143,6 +145,6 @@ class CheckMySQLInnoDBLock < Sensu::Plugin::Check::CLI
   rescue Mysql::Error => e
     critical "MySQL check failed: #{e.error}"
   ensure
-    db.close if db
+    db&.close
   end
 end

data/bin/check-mysql-msr-replication-status.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # MySQL Multi-source Replication Status
 # ===
@@ -151,7 +153,7 @@ class CheckMysqlMSRReplicationStatus < Sensu::Plugin::Check::CLI
     rescue StandardError => e
       critical "unhandled exception: #{e}"
     ensure
-      db.close if db
+      db&.close
     end
   end
 end

data/bin/check-mysql-query-result-count.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # MySQL Query Result Count Check
 #
@@ -105,6 +107,6 @@ class MysqlQueryCountCheck < Sensu::Plugin::Check::CLI
   rescue StandardError => e
     critical e
   ensure
-    db.close if db
+    db&.close
   end
 end

data/bin/check-mysql-replication-status.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # MySQL Replication Status (modded from disk)
 # ===
@@ -45,7 +47,7 @@ class CheckMysqlReplicationStatus < Sensu::Plugin::Check::CLI
          description: 'Database port',
          default: 3306,
          # #YELLOW
-         proc: lambda { |s| s.to_i } # rubocop:disable Lambda
+         proc: lambda { |s| s.to_i } # rubocop:disable Style/Lambda
 
   option :socket,
          short: '-s SOCKET',
@@ -83,7 +85,7 @@ class CheckMysqlReplicationStatus < Sensu::Plugin::Check::CLI
          description: 'Warning threshold for replication lag',
          default: 900,
          # #YELLOW
-         proc: lambda { |s| s.to_i } # rubocop:disable Lambda
+         proc: lambda { |s| s.to_i } # rubocop:disable Style/Lambda
 
   option :crit,
          short: '-c',
@@ -91,7 +93,7 @@ class CheckMysqlReplicationStatus < Sensu::Plugin::Check::CLI
          description: 'Critical threshold for replication lag',
          default: 1800,
          # #YELLOW
-         proc: lambda { |s| s.to_i } # rubocop:disable Lambda
+         proc: lambda { |s| s.to_i } # rubocop:disable Style/Lambda
 
   def detect_replication_status?(row)
     %w[
@@ -179,7 +181,7 @@ class CheckMysqlReplicationStatus < Sensu::Plugin::Check::CLI
     rescue StandardError => e
       critical e
     ensure
-      db.close if db
+      db&.close
     end
   end
 end

data/bin/check-mysql-select-count.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # MySQL Select Count Check
 #
@@ -108,6 +110,6 @@ class MysqlSelectCountCheck < Sensu::Plugin::Check::CLI
   rescue StandardError => e
     critical "unhandled exception: #{e}"
   ensure
-    db.close if db
+    db&.close
   end
 end

data/bin/check-mysql-status.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # MySQL Status Plugin
 # ===
@@ -115,11 +117,13 @@ class CheckMySQLStatus < Sensu::Plugin::Check::CLI
       section = ini[config[:ini_section]]
       db_user = section['user']
       db_pass = section['password']
+      # rubocop:disable Style/RedundantCondition
       db_socket = if config[:socket]
                     config[:socket]
                   else
                     section['socket']
                   end
+      # rubocop:enable Style/RedundantCondition
     else
       db_user = config[:user]
       db_pass = config[:password]

data/bin/check-mysql-threads.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   check-mysql-threads.rb
 #
@@ -117,6 +119,6 @@ class CheckMySQLHealth < Sensu::Plugin::Check::CLI
   rescue Mysql::Error => e
     critical "MySQL check failed: #{e.error}"
   ensure
-    db.close if db
+    db&.close
   end
 end

data/bin/metrics-mysql-graphite.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # Push mysql stats into graphite
 # ===
@@ -93,112 +95,112 @@ class MysqlGraphite < Sensu::Plugin::Metric::CLI::Graphite
   def metrics_hash
     {
       'general' => {
-        'Bytes_received' =>         'rxBytes',
-        'Bytes_sent' =>             'txBytes',
-        'Key_read_requests' =>      'keyRead_requests',
-        'Key_reads' =>              'keyReads',
-        'Key_write_requests' =>     'keyWrite_requests',
-        'Key_writes' =>             'keyWrites',
-        'Binlog_cache_use' =>       'binlogCacheUse',
-        'Binlog_cache_disk_use' =>  'binlogCacheDiskUse',
-        'Max_used_connections' =>   'maxUsedConnections',
-        'Aborted_clients' =>        'abortedClients',
-        'Aborted_connects' =>       'abortedConnects',
-        'Threads_connected' =>      'threadsConnected',
-        'Open_files' =>             'openFiles',
-        'Open_tables' =>            'openTables',
-        'Opened_tables' =>          'openedTables',
-        'Prepared_stmt_count' =>    'preparedStmtCount',
-        'Seconds_Behind_Master' =>  'slaveLag',
-        'Select_full_join' =>       'fullJoins',
+        'Bytes_received' => 'rxBytes',
+        'Bytes_sent' => 'txBytes',
+        'Key_read_requests' => 'keyRead_requests',
+        'Key_reads' => 'keyReads',
+        'Key_write_requests' => 'keyWrite_requests',
+        'Key_writes' => 'keyWrites',
+        'Binlog_cache_use' => 'binlogCacheUse',
+        'Binlog_cache_disk_use' => 'binlogCacheDiskUse',
+        'Max_used_connections' => 'maxUsedConnections',
+        'Aborted_clients' => 'abortedClients',
+        'Aborted_connects' => 'abortedConnects',
+        'Threads_connected' => 'threadsConnected',
+        'Open_files' => 'openFiles',
+        'Open_tables' => 'openTables',
+        'Opened_tables' => 'openedTables',
+        'Prepared_stmt_count' => 'preparedStmtCount',
+        'Seconds_Behind_Master' => 'slaveLag',
+        'Select_full_join' => 'fullJoins',
         'Select_full_range_join' => 'fullRangeJoins',
-        'Select_range' =>           'selectRange',
-        'Select_range_check' =>     'selectRange_check',
-        'Select_scan' =>            'selectScan',
-        'Slow_queries' =>           'slowQueries',
+        'Select_range' => 'selectRange',
+        'Select_range_check' => 'selectRange_check',
+        'Select_scan' => 'selectScan',
+        'Slow_queries' => 'slowQueries'
       },
       'querycache' => {
-        'Qcache_queries_in_cache' =>  'queriesInCache',
-        'Qcache_hits' =>              'cacheHits',
-        'Qcache_inserts' =>           'inserts',
-        'Qcache_not_cached' =>        'notCached',
-        'Qcache_lowmem_prunes' =>     'lowMemPrunes',
+        'Qcache_queries_in_cache' => 'queriesInCache',
+        'Qcache_hits' => 'cacheHits',
+        'Qcache_inserts' => 'inserts',
+        'Qcache_not_cached' => 'notCached',
+        'Qcache_lowmem_prunes' => 'lowMemPrunes'
       },
       'commands' => {
         'Com_admin_commands' => 'admin_commands',
-        'Com_begin' =>          'begin',
-        'Com_change_db' =>      'change_db',
-        'Com_commit' =>         'commit',
-        'Com_create_table' =>   'create_table',
-        'Com_drop_table' =>     'drop_table',
-        'Com_show_keys' =>      'show_keys',
-        'Com_delete' =>         'delete',
-        'Com_create_db' =>      'create_db',
-        'Com_grant' =>          'grant',
+        'Com_begin' => 'begin',
+        'Com_change_db' => 'change_db',
+        'Com_commit' => 'commit',
+        'Com_create_table' => 'create_table',
+        'Com_drop_table' => 'drop_table',
+        'Com_show_keys' => 'show_keys',
+        'Com_delete' => 'delete',
+        'Com_create_db' => 'create_db',
+        'Com_grant' => 'grant',
         'Com_show_processlist' => 'show_processlist',
-        'Com_flush' =>          'flush',
-        'Com_insert' =>         'insert',
-        'Com_purge' =>          'purge',
-        'Com_replace' =>        'replace',
-        'Com_rollback' =>       'rollback',
-        'Com_select' =>         'select',
-        'Com_set_option' =>     'set_option',
-        'Com_show_binlogs' =>   'show_binlogs',
+        'Com_flush' => 'flush',
+        'Com_insert' => 'insert',
+        'Com_purge' => 'purge',
+        'Com_replace' => 'replace',
+        'Com_rollback' => 'rollback',
+        'Com_select' => 'select',
+        'Com_set_option' => 'set_option',
+        'Com_show_binlogs' => 'show_binlogs',
         'Com_show_databases' => 'show_databases',
-        'Com_show_fields' =>    'show_fields',
-        'Com_show_status' =>    'show_status',
-        'Com_show_tables' =>    'show_tables',
+        'Com_show_fields' => 'show_fields',
+        'Com_show_status' => 'show_status',
+        'Com_show_tables' => 'show_tables',
         'Com_show_variables' => 'show_variables',
-        'Com_update' =>         'update',
-        'Com_drop_db' =>        'drop_db',
-        'Com_revoke' =>         'revoke',
-        'Com_drop_user' =>      'drop_user',
-        'Com_show_grants' =>    'show_grants',
-        'Com_lock_tables' =>    'lock_tables',
+        'Com_update' => 'update',
+        'Com_drop_db' => 'drop_db',
+        'Com_revoke' => 'revoke',
+        'Com_drop_user' => 'drop_user',
+        'Com_show_grants' => 'show_grants',
+        'Com_lock_tables' => 'lock_tables',
         'Com_show_create_table' => 'show_create_table',
-        'Com_unlock_tables' =>  'unlock_tables',
-        'Com_alter_table' =>    'alter_table',
+        'Com_unlock_tables' => 'unlock_tables',
+        'Com_alter_table' => 'alter_table'
       },
       'counters' => {
-        'Handler_write' =>              'handlerWrite',
-        'Handler_update' =>             'handlerUpdate',
-        'Handler_delete' =>             'handlerDelete',
-        'Handler_read_first' =>         'handlerRead_first',
-        'Handler_read_key' =>           'handlerRead_key',
-        'Handler_read_next' =>          'handlerRead_next',
-        'Handler_read_prev' =>          'handlerRead_prev',
-        'Handler_read_rnd' =>           'handlerRead_rnd',
-        'Handler_read_rnd_next' =>      'handlerRead_rnd_next',
-        'Handler_commit' =>             'handlerCommit',
-        'Handler_rollback' =>           'handlerRollback',
-        'Handler_savepoint' =>          'handlerSavepoint',
-        'Handler_savepoint_rollback' => 'handlerSavepointRollback',
+        'Handler_write' => 'handlerWrite',
+        'Handler_update' => 'handlerUpdate',
+        'Handler_delete' => 'handlerDelete',
+        'Handler_read_first' => 'handlerRead_first',
+        'Handler_read_key' => 'handlerRead_key',
+        'Handler_read_next' => 'handlerRead_next',
+        'Handler_read_prev' => 'handlerRead_prev',
+        'Handler_read_rnd' => 'handlerRead_rnd',
+        'Handler_read_rnd_next' => 'handlerRead_rnd_next',
+        'Handler_commit' => 'handlerCommit',
+        'Handler_rollback' => 'handlerRollback',
+        'Handler_savepoint' => 'handlerSavepoint',
+        'Handler_savepoint_rollback' => 'handlerSavepointRollback'
       },
       'innodb' => {
-        'Innodb_buffer_pool_pages_total' =>   'bufferTotal_pages',
-        'Innodb_buffer_pool_pages_free' =>    'bufferFree_pages',
-        'Innodb_buffer_pool_pages_dirty' =>   'bufferDirty_pages',
-        'Innodb_buffer_pool_pages_data' =>    'bufferUsed_pages',
-        'Innodb_page_size' =>                 'pageSize',
-        'Innodb_pages_created' =>             'pagesCreated',
-        'Innodb_pages_read' =>                'pagesRead',
-        'Innodb_pages_written' =>             'pagesWritten',
-        'Innodb_row_lock_current_waits' =>    'currentLockWaits',
-        'Innodb_row_lock_waits' =>            'lockWaitTimes',
-        'Innodb_row_lock_time' =>             'rowLockTime',
-        'Innodb_data_reads' =>                'fileReads',
-        'Innodb_data_writes' =>               'fileWrites',
-        'Innodb_data_fsyncs' =>               'fileFsyncs',
-        'Innodb_log_writes' =>                'logWrites',
-        'Innodb_rows_updated' =>              'rowsUpdated',
-        'Innodb_rows_read' =>                 'rowsRead',
-        'Innodb_rows_deleted' =>              'rowsDeleted',
-        'Innodb_rows_inserted' =>             'rowsInserted',
+        'Innodb_buffer_pool_pages_total' => 'bufferTotal_pages',
+        'Innodb_buffer_pool_pages_free' => 'bufferFree_pages',
+        'Innodb_buffer_pool_pages_dirty' => 'bufferDirty_pages',
+        'Innodb_buffer_pool_pages_data' => 'bufferUsed_pages',
+        'Innodb_page_size' => 'pageSize',
+        'Innodb_pages_created' => 'pagesCreated',
+        'Innodb_pages_read' => 'pagesRead',
+        'Innodb_pages_written' => 'pagesWritten',
+        'Innodb_row_lock_current_waits' => 'currentLockWaits',
+        'Innodb_row_lock_waits' => 'lockWaitTimes',
+        'Innodb_row_lock_time' => 'rowLockTime',
+        'Innodb_data_reads' => 'fileReads',
+        'Innodb_data_writes' => 'fileWrites',
+        'Innodb_data_fsyncs' => 'fileFsyncs',
+        'Innodb_log_writes' => 'logWrites',
+        'Innodb_rows_updated' => 'rowsUpdated',
+        'Innodb_rows_read' => 'rowsRead',
+        'Innodb_rows_deleted' => 'rowsDeleted',
+        'Innodb_rows_inserted' => 'rowsInserted'
       },
       'configuration' => {
-        'max_connections'         =>          'MaxConnections',
-        'Max_prepared_stmt_count' =>          'MaxPreparedStmtCount',
-      },
+        'max_connections' => 'MaxConnections',
+        'Max_prepared_stmt_count' => 'MaxPreparedStmtCount'
+      }
     }
   end
 
@@ -265,7 +267,7 @@ class MysqlGraphite < Sensu::Plugin::Metric::CLI::Graphite
         puts e.message
       end
 
-      mysql.close if mysql
+      mysql&.close
     end
 
     ok

data/bin/metrics-mysql-multiple-select-count.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # MySQL Select Count Metrics
 #

data/bin/metrics-mysql-processes.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # metrics-mysql-processes
 #
@@ -98,7 +100,7 @@ class MetricsMySQLProcesses < Sensu::Plugin::Metric::CLI::Graphite
     {
       'user' => {},
       'database' => {},
-      'command' => {},
+      'command' => {}
     }.each_value { |value| value.default = 0 }
   end
 

data/bin/metrics-mysql-query-result-count.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # MySQL Query Result Count Metric
 #
@@ -92,6 +94,6 @@ class MysqlQueryCountMetric < Sensu::Plugin::Metric::CLI::Graphite
   rescue StandardError => e
     critical e
   ensure
-    db.close if db
+    db&.close
   end
 end

data/bin/metrics-mysql-raw.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # MySQL metrics Plugin without mysql gem requirement
 # ===
@@ -160,112 +162,112 @@ class MetricsMySQLRaw < Sensu::Plugin::Metric::CLI::Graphite
   def metrics_hash
     metrics = {
       'general' => {
-        'Bytes_received' =>         'rxBytes',
-        'Bytes_sent' =>             'txBytes',
-        'Key_read_requests' =>      'keyRead_requests',
-        'Key_reads' =>              'keyReads',
-        'Key_write_requests' =>     'keyWrite_requests',
-        'Key_writes' =>             'keyWrites',
-        'Binlog_cache_use' =>       'binlogCacheUse',
-        'Binlog_cache_disk_use' =>  'binlogCacheDiskUse',
-        'Max_used_connections' =>   'maxUsedConnections',
-        'Aborted_clients' =>        'abortedClients',
-        'Aborted_connects' =>       'abortedConnects',
-        'Threads_connected' =>      'threadsConnected',
-        'Open_files' =>             'openFiles',
-        'Open_tables' =>            'openTables',
-        'Opened_tables' =>          'openedTables',
-        'Prepared_stmt_count' =>    'preparedStmtCount',
-        'Seconds_Behind_Master' =>  'slaveLag',
-        'Select_full_join' =>       'fullJoins',
+        'Bytes_received' => 'rxBytes',
+        'Bytes_sent' => 'txBytes',
+        'Key_read_requests' => 'keyRead_requests',
+        'Key_reads' => 'keyReads',
+        'Key_write_requests' => 'keyWrite_requests',
+        'Key_writes' => 'keyWrites',
+        'Binlog_cache_use' => 'binlogCacheUse',
+        'Binlog_cache_disk_use' => 'binlogCacheDiskUse',
+        'Max_used_connections' => 'maxUsedConnections',
+        'Aborted_clients' => 'abortedClients',
+        'Aborted_connects' => 'abortedConnects',
+        'Threads_connected' => 'threadsConnected',
+        'Open_files' => 'openFiles',
+        'Open_tables' => 'openTables',
+        'Opened_tables' => 'openedTables',
+        'Prepared_stmt_count' => 'preparedStmtCount',
+        'Seconds_Behind_Master' => 'slaveLag',
+        'Select_full_join' => 'fullJoins',
         'Select_full_range_join' => 'fullRangeJoins',
-        'Select_range' =>           'selectRange',
-        'Select_range_check' =>     'selectRange_check',
-        'Select_scan' =>            'selectScan',
-        'Slow_queries' =>           'slowQueries',
+        'Select_range' => 'selectRange',
+        'Select_range_check' => 'selectRange_check',
+        'Select_scan' => 'selectScan',
+        'Slow_queries' => 'slowQueries'
       },
       'querycache' => {
-        'Qcache_queries_in_cache' =>  'queriesInCache',
-        'Qcache_hits' =>              'cacheHits',
-        'Qcache_inserts' =>           'inserts',
-        'Qcache_not_cached' =>        'notCached',
-        'Qcache_lowmem_prunes' =>     'lowMemPrunes',
-        'Qcache_free_memory' =>       'freeMemory',
+        'Qcache_queries_in_cache' => 'queriesInCache',
+        'Qcache_hits' => 'cacheHits',
+        'Qcache_inserts' => 'inserts',
+        'Qcache_not_cached' => 'notCached',
+        'Qcache_lowmem_prunes' => 'lowMemPrunes',
+        'Qcache_free_memory' => 'freeMemory'
       },
       'commands' => {
         'Com_admin_commands' => 'admin_commands',
-        'Com_begin' =>          'begin',
-        'Com_change_db' =>      'change_db',
-        'Com_commit' =>         'commit',
-        'Com_create_table' =>   'create_table',
-        'Com_drop_table' =>     'drop_table',
-        'Com_show_keys' =>      'show_keys',
-        'Com_delete' =>         'delete',
-        'Com_create_db' =>      'create_db',
-        'Com_grant' =>          'grant',
+        'Com_begin' => 'begin',
+        'Com_change_db' => 'change_db',
+        'Com_commit' => 'commit',
+        'Com_create_table' => 'create_table',
+        'Com_drop_table' => 'drop_table',
+        'Com_show_keys' => 'show_keys',
+        'Com_delete' => 'delete',
+        'Com_create_db' => 'create_db',
+        'Com_grant' => 'grant',
         'Com_show_processlist' => 'show_processlist',
-        'Com_flush' =>          'flush',
-        'Com_insert' =>         'insert',
-        'Com_purge' =>          'purge',
-        'Com_replace' =>        'replace',
-        'Com_rollback' =>       'rollback',
-        'Com_select' =>         'select',
-        'Com_set_option' =>     'set_option',
-        'Com_show_binlogs' =>   'show_binlogs',
+        'Com_flush' => 'flush',
+        'Com_insert' => 'insert',
+        'Com_purge' => 'purge',
+        'Com_replace' => 'replace',
+        'Com_rollback' => 'rollback',
+        'Com_select' => 'select',
+        'Com_set_option' => 'set_option',
+        'Com_show_binlogs' => 'show_binlogs',
         'Com_show_databases' => 'show_databases',
-        'Com_show_fields' =>    'show_fields',
-        'Com_show_status' =>    'show_status',
-        'Com_show_tables' =>    'show_tables',
+        'Com_show_fields' => 'show_fields',
+        'Com_show_status' => 'show_status',
+        'Com_show_tables' => 'show_tables',
         'Com_show_variables' => 'show_variables',
-        'Com_update' =>         'update',
-        'Com_drop_db' =>        'drop_db',
-        'Com_revoke' =>         'revoke',
-        'Com_drop_user' =>      'drop_user',
-        'Com_show_grants' =>    'show_grants',
-        'Com_lock_tables' =>    'lock_tables',
+        'Com_update' => 'update',
+        'Com_drop_db' => 'drop_db',
+        'Com_revoke' => 'revoke',
+        'Com_drop_user' => 'drop_user',
+        'Com_show_grants' => 'show_grants',
+        'Com_lock_tables' => 'lock_tables',
         'Com_show_create_table' => 'show_create_table',
-        'Com_unlock_tables' =>  'unlock_tables',
-        'Com_alter_table' =>    'alter_table',
+        'Com_unlock_tables' => 'unlock_tables',
+        'Com_alter_table' => 'alter_table'
       },
       'counters' => {
-        'Handler_write' =>              'handlerWrite',
-        'Handler_update' =>             'handlerUpdate',
-        'Handler_delete' =>             'handlerDelete',
-        'Handler_read_first' =>         'handlerRead_first',
-        'Handler_read_key' =>           'handlerRead_key',
-        'Handler_read_next' =>          'handlerRead_next',
-        'Handler_read_prev' =>          'handlerRead_prev',
-        'Handler_read_rnd' =>           'handlerRead_rnd',
-        'Handler_read_rnd_next' =>      'handlerRead_rnd_next',
-        'Handler_commit' =>             'handlerCommit',
-        'Handler_rollback' =>           'handlerRollback',
-        'Handler_savepoint' =>          'handlerSavepoint',
-        'Handler_savepoint_rollback' => 'handlerSavepointRollback',
+        'Handler_write' => 'handlerWrite',
+        'Handler_update' => 'handlerUpdate',
+        'Handler_delete' => 'handlerDelete',
+        'Handler_read_first' => 'handlerRead_first',
+        'Handler_read_key' => 'handlerRead_key',
+        'Handler_read_next' => 'handlerRead_next',
+        'Handler_read_prev' => 'handlerRead_prev',
+        'Handler_read_rnd' => 'handlerRead_rnd',
+        'Handler_read_rnd_next' => 'handlerRead_rnd_next',
+        'Handler_commit' => 'handlerCommit',
+        'Handler_rollback' => 'handlerRollback',
+        'Handler_savepoint' => 'handlerSavepoint',
+        'Handler_savepoint_rollback' => 'handlerSavepointRollback'
       },
       'innodb' => {
-        'Innodb_buffer_pool_pages_total' =>   'bufferTotal_pages',
-        'Innodb_buffer_pool_pages_free' =>    'bufferFree_pages',
-        'Innodb_buffer_pool_pages_dirty' =>   'bufferDirty_pages',
-        'Innodb_buffer_pool_pages_data' =>    'bufferUsed_pages',
-        'Innodb_page_size' =>                 'pageSize',
-        'Innodb_pages_created' =>             'pagesCreated',
-        'Innodb_pages_read' =>                'pagesRead',
-        'Innodb_pages_written' =>             'pagesWritten',
-        'Innodb_row_lock_current_waits' =>    'currentLockWaits',
-        'Innodb_row_lock_waits' =>            'lockWaitTimes',
-        'Innodb_row_lock_time' =>             'rowLockTime',
-        'Innodb_data_reads' =>                'fileReads',
-        'Innodb_data_writes' =>               'fileWrites',
-        'Innodb_data_fsyncs' =>               'fileFsyncs',
-        'Innodb_log_writes' =>                'logWrites',
-        'Innodb_rows_updated' =>              'rowsUpdated',
-        'Innodb_rows_read' =>                 'rowsRead',
-        'Innodb_rows_deleted' =>              'rowsDeleted',
-        'Innodb_rows_inserted' =>             'rowsInserted',
+        'Innodb_buffer_pool_pages_total' => 'bufferTotal_pages',
+        'Innodb_buffer_pool_pages_free' => 'bufferFree_pages',
+        'Innodb_buffer_pool_pages_dirty' => 'bufferDirty_pages',
+        'Innodb_buffer_pool_pages_data' => 'bufferUsed_pages',
+        'Innodb_page_size' => 'pageSize',
+        'Innodb_pages_created' => 'pagesCreated',
+        'Innodb_pages_read' => 'pagesRead',
+        'Innodb_pages_written' => 'pagesWritten',
+        'Innodb_row_lock_current_waits' => 'currentLockWaits',
+        'Innodb_row_lock_waits' => 'lockWaitTimes',
+        'Innodb_row_lock_time' => 'rowLockTime',
+        'Innodb_data_reads' => 'fileReads',
+        'Innodb_data_writes' => 'fileWrites',
+        'Innodb_data_fsyncs' => 'fileFsyncs',
+        'Innodb_log_writes' => 'logWrites',
+        'Innodb_rows_updated' => 'rowsUpdated',
+        'Innodb_rows_read' => 'rowsRead',
+        'Innodb_rows_deleted' => 'rowsDeleted',
+        'Innodb_rows_inserted' => 'rowsInserted'
       },
       'configuration' => {
-        'Max_prepared_stmt_count' =>          'MaxPreparedStmtCount',
-      },
+        'Max_prepared_stmt_count' => 'MaxPreparedStmtCount'
+      }
     }
     metrics
   end

data/bin/metrics-mysql-select-count.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # MySQL Select Count Metric
 #
@@ -94,6 +96,6 @@ class MysqlQueryCountMetric < Sensu::Plugin::Metric::CLI::Graphite
   rescue StandardError => e
     critical "unhandled exception: #{e}"
   ensure
-    db.close if db
+    db&.close
   end
 end

data/bin/metrics-mysql.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # Copyright 2014 Paulo Miguel Almeida Rodenas (paulo.ubuntu@gmail.com)
 #
@@ -52,7 +54,7 @@ class MysqlMetric < Sensu::Handler
       puts e.errno
       puts e.error
     ensure
-      con.close if con
+      con&.close
     end
   end
 end

data/lib/sensu-plugins-mysql.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'sensu-plugins-mysql/version'

data/lib/sensu-plugins-mysql/version.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module SensuPluginsMySql
   module Version
     MAJOR = 3
-    MINOR = 1
-    PATCH = 1
+    MINOR = 2
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-mysql
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -186,23 +186,23 @@ description: |-
                                 sending metrics to a MySQL database.
 email: "<sensu-users@googlegroups.com>"
 executables:
+- check-mysql-replication-status.rb
 - metrics-mysql.rb
+- check-mysql-threads.rb
 - metrics-mysql-query-result-count.rb
-- check-mysql-replication-status.rb
+- check-mysql-connections.rb
 - check-mysql-innodb-lock.rb
+- metrics-mysql-select-count.rb
+- check-mysql-status.rb
+- metrics-mysql-graphite.rb
+- check-mysql-alive.rb
+- metrics-mysql-processes.rb
+- metrics-mysql-multiple-select-count.rb
 - metrics-mysql-raw.rb
-- check-mysql-connections.rb
 - check-mysql-select-count.rb
-- check-mysql-disk.rb
 - check-mysql-msr-replication-status.rb
-- metrics-mysql-processes.rb
-- check-mysql-status.rb
-- metrics-mysql-multiple-select-count.rb
 - check-mysql-query-result-count.rb
-- check-mysql-threads.rb
-- check-mysql-alive.rb
-- metrics-mysql-select-count.rb
-- metrics-mysql-graphite.rb
+- check-mysql-disk.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for MySql