sensu-plugins-mysql 2.6.0 → 3.2.0

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
 #
@@ -86,15 +88,12 @@ class MysqlQueryCountMetric < Sensu::Plugin::Metric::CLI::Graphite
 
     output config[:name], length
     ok
-
   rescue Mysql::Error => e
     errstr = "Error code: #{e.errno} Error message: #{e.error}"
     critical "#{errstr} SQLSTATE: #{e.sqlstate}" if e.respond_to?('sqlstate')
-
-  rescue => e
+  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,111 +162,111 @@ 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_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
@@ -299,7 +301,7 @@ class MetricsMySQLRaw < Sensu::Plugin::Metric::CLI::Graphite
         output "#{config[:scheme]}.#{mysql_shorthostname}.general.#{metrics['general'][key]}", value
       end
     end
-  rescue => e
+  rescue StandardError => e
     puts "Error querying slave status: #{e}" if config[:verbose]
   end
 
@@ -332,14 +334,15 @@ class MetricsMySQLRaw < Sensu::Plugin::Metric::CLI::Graphite
         end
       end
     end
-  rescue => e
+  rescue StandardError => e
     puts e.message
   end
 
   # Fetch MySQL metrics
   def fetcher(db_user, db_pass, db_socket)
     metrics = metrics_hash
-    if config[:check] == 'metric'
+    # FIXME: this needs refactoring
+    if config[:check] == 'metric' # rubocop:disable Style/GuardClause
       mysql_shorthostname = config[:hostname].tr('.', '_')
       begin
         table = []
@@ -362,7 +365,7 @@ class MetricsMySQLRaw < Sensu::Plugin::Metric::CLI::Graphite
         table.each do |row|
           metrics.each do |category, var_mapping|
             row_var_name = row['Variable_name'].to_s
-            var_mapping.keys.each do |vmkey|
+            var_mapping.each_key do |vmkey|
               if row_var_name.to_s == vmkey.to_s
                 prefix = "#{config[:scheme]}.#{mysql_shorthostname}.#{category}.#{vmkey[row_var_name]}"
                 output prefix, row['Value'] unless mysql_shorthostname.to_s.chomp.empty?
@@ -373,7 +376,7 @@ class MetricsMySQLRaw < Sensu::Plugin::Metric::CLI::Graphite
         # Slave and configuration metrics here
         slave_metrics(metrics)
         configuration_metrics(metrics, db_user, db_pass, db_socket)
-      rescue => e
+      rescue StandardError => e
         critical "Error message: status: #{status} | Exception: #{e.backtrace}"
       ensure
         ok ''

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

@@ -0,0 +1,101 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: false
+
+#
+# MySQL Select Count Metric
+#
+# Creates a graphite-formatted metric for the first value of a result set from a MySQL query.
+#
+# Copyright 2017 Andrew Thal <athal7@me.com>
+# Copyright 2018 Tibor Nagy <nagyt@hu.inter.net>
+#
+# Released under the same terms as Sensu (the MIT license); see LICENSE
+# for details.
+
+require 'sensu-plugin/metric/cli'
+require 'mysql'
+require 'inifile'
+
+class MysqlQueryCountMetric < Sensu::Plugin::Metric::CLI::Graphite
+  option :host,
+         short: '-h HOST',
+         long: '--host HOST',
+         description: 'MySQL Host to connect to',
+         required: true
+
+  option :port,
+         short: '-P PORT',
+         long: '--port PORT',
+         description: 'MySQL Port to connect to',
+         proc: proc(&:to_i),
+         default: 3306
+
+  option :username,
+         short: '-u USERNAME',
+         long: '--user USERNAME',
+         description: 'MySQL Username'
+
+  option :password,
+         short: '-p PASSWORD',
+         long: '--pass PASSWORD',
+         description: 'MySQL password'
+
+  option :database,
+         short: '-d DATABASE',
+         long: '--database DATABASE',
+         description: 'MySQL database',
+         default: ''
+
+  option :ini,
+         short: '-i',
+         long: '--ini VALUE',
+         description: 'My.cnf ini file'
+
+  option :ini_section,
+         description: 'Section in my.cnf ini file',
+         long: '--ini-section VALUE',
+         default: 'client'
+
+  option :socket,
+         short: '-S SOCKET',
+         long: '--socket SOCKET',
+         description: 'MySQL Unix socket to connect to'
+
+  option :name,
+         short: '-n NAME',
+         long: '--name NAME',
+         description: 'Metric name for a configured handler',
+         default: 'mysql.query_count'
+
+  option :query,
+         short: '-q SELECT_COUNT_QUERY',
+         long: '--query SELECT_COUNT_QUERY',
+         description: 'Query to execute',
+         required: true
+
+  def run
+    if config[:ini]
+      ini = IniFile.load(config[:ini])
+      section = ini[config[:ini_section]]
+      db_user = section['user']
+      db_pass = section['password']
+    else
+      db_user = config[:username]
+      db_pass = config[:password]
+    end
+    raise "invalid query : #{config[:query]}" unless config[:query] =~ /^select\s+count\(\s*\*\s*\)/i
+
+    db = Mysql.real_connect(config[:host], db_user, db_pass, config[:database], config[:port], config[:socket])
+    count = db.query(config[:query]).fetch_row[0].to_i
+
+    output config[:name], count
+    ok
+  rescue Mysql::Error => e
+    errstr = "Error code: #{e.errno} Error message: #{e.error}"
+    critical "#{errstr} SQLSTATE: #{e.sqlstate}" if e.respond_to?('sqlstate')
+  rescue StandardError => e
+    critical "unhandled exception: #{e}"
+  ensure
+    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,7 +1,9 @@
+# frozen_string_literal: true
+
 module SensuPluginsMySql
   module Version
-    MAJOR = 2
-    MINOR = 6
+    MAJOR = 3
+    MINOR = 2
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-mysql
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-17 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -44,56 +44,56 @@ 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: codeclimate-test-reporter
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        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.40.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -186,21 +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
 - check-mysql-query-result-count.rb
-- check-mysql-threads.rb
-- check-mysql-alive.rb
-- metrics-mysql-graphite.rb
+- check-mysql-disk.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -218,9 +220,11 @@ files:
 - bin/check-mysql-status.rb
 - bin/check-mysql-threads.rb
 - bin/metrics-mysql-graphite.rb
+- bin/metrics-mysql-multiple-select-count.rb
 - bin/metrics-mysql-processes.rb
 - bin/metrics-mysql-query-result-count.rb
 - bin/metrics-mysql-raw.rb
+- bin/metrics-mysql-select-count.rb
 - bin/metrics-mysql.rb
 - bin/mysql-metrics.sql
 - lib/sensu-plugins-mysql.rb
@@ -243,15 +247,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for MySql