sensu-plugins-mysql 2.6.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba2c83d93364ab17b2ff50509b773fd06cf27874b154c812cfd205e24e01fe4a
-  data.tar.gz: 9354135db5e40d55d8e9ff44c095a6d7bd6287b5d8b5989937deaffa59c62b65
+  metadata.gz: f050ecf7e999bf8ff96e3e089c875532184987ad802cfb1c3d41de64a2b65954
+  data.tar.gz: f6d603d1a7b63efedb0e936d9aa0a55d4e598cfc02fbffede44619552af44fbf
 SHA512:
-  metadata.gz: 15b9d19c2f41c2ff0c7397ff950c7addcacae961e0579a60db86f0238f3608885f0a55b2f3678b7dee94a6094ad5a809a4de286134c5efb90e0f33f3fea9c81c
-  data.tar.gz: 866bf72082604e8743b58c8eba700ee66be98fba9dc36098b68103b018763b7779c0a44ff30e24968e9d655e1d755fbf06f900959cd37df58a07220bf8d7208c
+  metadata.gz: 84049e67a1c9181c8ad6f2e6df7fe9ac8cc4c947fae1b2c779dd6eae409155ea3bfec5a1565185b142dd5c548cf15de44d077f7c7f5897ff53ece963aca0daf0
+  data.tar.gz: 45f695cfe8b6400f12b21dcfe6709f9838db5c1dd71b2996e90021b8198a8ea95b23917cbad277aa2ed18b9583cc373d749c9a21c6806e1f6024adcf6b24243e

data/CHANGELOG.md

@@ -5,6 +5,37 @@ 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)
+
+## [3.1.0] - 2018-12-15
+### Added
+- metrics-mysql-multiple-select-countcript (@nagyt234)
+
+
+## [3.0.0] - 2018-12-04
+### Security
+- updated rubocop dependency to `~> 0.51.0` per: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-8418. (@majormoses)
+
+### Breaking Changes
+- removed < ruby 2.3 support as they are EOL (@majormoses)
+
+### Changed
+- appeased the cops (@majormoses)
+
+## [2.7.0] - 2018-11-25
+### Added
+- metrics-mysql-select-count.rb script (@nagyt234)
+
 ## [2.6.0] - 2018-11-17
 ### Added
 - check-mysql-select-count.rb: fleshed out config hash to read from ini file if specified (@fuzzy-logic-zach)
@@ -137,7 +168,12 @@ 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/2.6.0...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
+[2.7.0]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.6.0...2.7.0
 [2.6.0]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.5.1...2.6.0
 [2.5.1]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.5.0...2.5.1
 [2.5.0]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.4.0...2.5.0

data/README.md

@@ -20,10 +20,12 @@
  * bin/check-mysql-select-count.rb
  * bin/check-mysql-msr-replication-status.rb
  * bin/metrics-mysql-graphite.rb
+ * bin/metrics-mysql-multiple-select-count.rb
  * bin/metrics-mysql-processes.rb
  * bin/metrics-mysql-raw.rb
  * bin/metrics-mysql.rb
  * bin/metrics-mysql-query-result-count.rb
+ * bin/metrics-mysql-select-count.rb
  * bin/mysql-metrics.sql
 
 ## Usage
@@ -98,6 +100,15 @@ $ /opt/sensu/embedded/bin/check-mysql-replication-status.rb --host=<SLAVE> --ini
 /opt/sensu/embedded/bin$ /opt/sensu/embedded/bin/ruby metrics-mysql-query-result-count.rb --host=localhost --port=3306 --user=collectd --pass=tflypass --socket=/data/mysql.sock --query 'SELECT DISTINCT(t.id) FROM table t where t.failed = true'
 ```
 
+**metrics-mysql-select-count** example
+```bash
+/opt/sensu/embedded/bin$ /opt/sensu/embedded/bin/ruby metrics-mysql-select-count.rb --host=localhost --port=3306 --user=collectd --pass=tflypass --socket=/data/mysql.sock --query 'SELECT COUNT(*) FROM table t'
+```
+
+**metrics-mysql-multiple-select-count** example
+```bash
+/opt/sensu/embedded/bin$ /opt/sensu/embedded/bin/metrics-mysql-multiple-select-count.rb --host=localhost --port=3306 --user=collectd --pass=tflypass --socket=/data/mysql.sock --query '{"t1_count":"SELECT COUNT(*) FROM table t1", "t2_count":"SELECT COUNT(*) FROM table t2"}'
+```
 ### Security
 
 In keeping with the principle of least privilege you should create a new user with the minimum required permissions. See the table below for minimum permissions for each check.
@@ -117,6 +128,8 @@ In keeping with the principle of least privilege you should create a new user wi
 | metrics-mysql-graphite.rb              | `SELECT`                                                  |
 | metrics-mysql-processes.rb             | `SELECT`                                                  |
 | metrics-mysql-query-result-count.rb    | depends on query                                          |
+| metrics-mysql-select-count.rb          | depends on query                                          |
+| metrics-mysql-multiple-select-count    | depends on query                                          |
 | metrics-mysql-raw.rb                   | `SELECT`                                                  |
 | metrics-mysql.rb                       | `INSERT` into `sensumetrics.sensu_historic_metrics`       |
 

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
 # ===
@@ -52,21 +54,21 @@ class CheckMysqlDisk < Sensu::Plugin::Check::CLI
          long: '--warning=VALUE',
          description: 'Warning threshold',
          proc: proc(&:to_f),
-         default: '85'
+         default: 85
 
   option :crit,
          short: '-c',
          long: '--critical=VALUE',
          description: 'Critical threshold',
          proc: proc(&:to_f),
-         default: '95'
+         default: 95
 
   option :port,
          description: 'Port to connect to',
          short: '-P PORT',
          long: '--port PORT',
          proc: proc(&:to_i),
-         default: '3306'
+         default: 3306
 
   option :socket,
          description: 'Socket to use',
@@ -97,7 +99,7 @@ class CheckMysqlDisk < Sensu::Plugin::Check::CLI
       total_size = 0.0
       db = Mysql.real_connect(config[:host], db_user, db_pass, nil, config[:port], config[:socket])
 
-      results = db.query <<-EOSQL
+      results = db.query <<-SQL
         SELECT table_schema,
         count(*) TABLES,
         concat(round(sum(table_rows)/1000000,2),'M') rows,
@@ -106,13 +108,11 @@ class CheckMysqlDisk < Sensu::Plugin::Check::CLI
         round(sum(data_length+index_length)/(1024*1024*1024),2) total_size,
         round(sum(index_length)/sum(data_length),2) idxfrac
         FROM information_schema.TABLES group by table_schema
-      EOSQL
+      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
@@ -125,16 +125,13 @@ class CheckMysqlDisk < Sensu::Plugin::Check::CLI
       else
         ok diskstr
       end
-
     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
 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
 # ===
@@ -140,10 +142,9 @@ class CheckMySQLInnoDBLock < Sensu::Plugin::Check::CLI
     else
       critical "Detected Locks #{lock_info}"
     end
-
   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
 # ===
@@ -74,6 +76,16 @@ class CheckMysqlMSRReplicationStatus < Sensu::Plugin::Check::CLI
          default: 1800,
          proc: proc(&:to_i)
 
+  def set_status(io_thread_status, sql_thread_status, seconds_behind_master)
+    if io_thread_status == 'No' || sql_thread_status == 'No' || seconds_behind_master > config[:crit]
+      2
+    elsif seconds_behind_master > config[:warn] && seconds_behind_master <= config[:crit]
+      1
+    else
+      0
+    end
+  end
+
   def run
     if config[:ini]
       ini = IniFile.load(config[:ini])
@@ -106,19 +118,13 @@ class CheckMysqlMSRReplicationStatus < Sensu::Plugin::Check::CLI
           io_thread_status = row['Slave_IO_Running']
           sql_thread_status = row['Slave_SQL_Running']
           seconds_behind_master = row['Seconds_Behind_Master'].to_i
-          status = 0
-          if io_thread_status == 'No' || sql_thread_status == 'No' || seconds_behind_master > config[:crit]
-            status = 2
-          end
-          if seconds_behind_master > config[:warn] && seconds_behind_master <= config[:crit]
-            status = 1
-          end
+          status = set_status
           message = "#{channel['channel_name']} STATES:"
           message += " Slave_IO_Running=#{io_thread_status}"
           message += ", Slave_SQL_Running=#{sql_thread_status}"
           message += ", Seconds_Behind_Master=#{seconds_behind_master}"
 
-          if status.zero?
+          if status == 0
             ok_statuses << message
           elsif status == 1
             warn_statuses << message
@@ -147,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
 #
@@ -99,15 +101,12 @@ class MysqlQueryCountCheck < Sensu::Plugin::Check::CLI
     else
       ok 'Result count length is below thresholds'
     end
-
   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/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,25 @@ 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[
+      Slave_IO_State
+      Slave_IO_Running
+      Slave_SQL_Running
+      Last_IO_Error
+      Last_SQL_Error
+      Seconds_Behind_Master
+    ].all? { |key| row.key? key }
+  end
+
+  def slave_running?(row)
+    %w[
+      Slave_IO_Running
+      Slave_SQL_Running
+    ].all? { |key| row[key] =~ /Yes/ }
+  end
 
   def run
     if config[:ini]
@@ -121,14 +141,9 @@ class CheckMysqlReplicationStatus < Sensu::Plugin::Check::CLI
 
       unless results.nil?
         results.each_hash do |row|
-          warn "couldn't detect replication status" unless
-            %w(Slave_IO_State Slave_IO_Running Slave_SQL_Running Last_IO_Error Last_SQL_Error Seconds_Behind_Master).all? do |key|
-              row.key? key
-            end
+          warn "couldn't detect replication status" unless detect_replication_status?(row)
 
-          slave_running = %w(Slave_IO_Running Slave_SQL_Running).all? do |key|
-            row[key] =~ /Yes/
-          end
+          slave_running = slave_running?(row)
 
           output = if db_conn.nil?
                      'Slave not running!'
@@ -160,16 +175,13 @@ class CheckMysqlReplicationStatus < Sensu::Plugin::Check::CLI
         end
         ok 'show slave status was nil. This server is not a slave.'
       end
-
     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
 end

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

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 # MySQL Select Count Check
 #
@@ -102,15 +104,12 @@ class MysqlSelectCountCheck < Sensu::Plugin::Check::CLI
     else
       ok "Count is below thresholds : #{count} count"
     end
-
   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 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]
@@ -139,7 +143,7 @@ class CheckMySQLStatus < Sensu::Plugin::Check::CLI
       else
         critical "Error message: status: #{status}"
       end
-    rescue => e
+    rescue StandardError => e
       critical "Error message: status: #{status} | Exception: #{e}"
     ensure
       puts ''
@@ -162,14 +166,14 @@ class CheckMySQLStatus < Sensu::Plugin::Check::CLI
       end
       dict = []
       table.keys.to_a.each do |k|
-        %w(Slave_IO_State Slave_IO_Running Slave_SQL_Running Last_IO_Error Last_SQL_Error Seconds_Behind_Master).each do |key|
+        %w[Slave_IO_State Slave_IO_Running Slave_SQL_Running Last_IO_Error Last_SQL_Error Seconds_Behind_Master].each do |key|
           dict.push(k.strip.to_s) if key.strip == k.strip
         end
       end
       table.each do |attribute, value|
         puts "#{attribute} : #{value}" if config[:debug]
         warn "couldn't detect replication status :#{dict.size}" unless dict.size == 6
-        slave_running = %w(Slave_IO_Running Slave_SQL_Running).all? do |key|
+        slave_running = %w[Slave_IO_Running Slave_SQL_Running].all? do |key|
           table[key].to_s =~ /Yes/
         end
         output = 'Slave not running!'
@@ -189,7 +193,7 @@ class CheckMySQLStatus < Sensu::Plugin::Check::CLI
         end
       end
       ok 'show slave status was nil. This server is not a slave.'
-    rescue => e
+    rescue StandardError => e
       critical "Error message: status: #{status} | Exception: #{e}"
     end
   end