sensu-plugins-mysql 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b5e5653712ab73a7fb12a37a97c8472ffab497df
-  data.tar.gz: 556cff86d0e9ceb1a7a2954527f858a2e5b7be1b
+SHA256:
+  metadata.gz: 0f3c4c5c8032b4d4772fa261612cdfa3e253354fc4ecf3f91df6bd5de5ae3092
+  data.tar.gz: 80cc13b7479af0f2131327e376d1bf60c9fbca0bc80b2bea85d015068fe4e1a6
 SHA512:
-  metadata.gz: 0166be616c39d39a56314c683e3f91fe09aad4cdad696a34a5115fb14fcc2f77ff389e149f5733d523e36c290719189f1ab3279f57f919bc6b900e20209e2c39
-  data.tar.gz: 900c46efc192ba7c71b9ac3d975dd924e6ffc9beec6e75f366178e0498a6e6041219de8db613a8cdfe09d2e8381fb8c237c3ae717badde9a8d5ef5414d2205b7
+  metadata.gz: f4928ac744df5cfa609f918e1f3c6ebcce3c1a67d4d4cbbc55311c384341b90801bb58a97a1da8d2dce1627df3703fa6352f22e5116c35913b8786f58633b2bc
+  data.tar.gz: 338847d6b300427fb42ca5ee97db87fa9512520743457de3746e43405050a9327d2aadc6631285516eea0fa0b98bf2298a1099c66fa86902f64855bfb775245b

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [2.4.0] - 2018-06-4
+### Added
+- Add check-mysql-select-count.rb script (@negachov)
+
 ## [2.3.0] - 2018-03-17
 ### Added
 - check-mysql-msr-replication-status.rb: new script that helps with monitoring mysql multi-source replication (@ndelic0)
@@ -121,7 +125,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/2.3.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.4.0...HEAD
+[2.4.0]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.3.0...2.4.0
 [2.3.0]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.2.1...2.3.0
 [2.2.1]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.2.0..2.2.1
 [2.2.0]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.1.1...2.2.0

data/README.md

@@ -17,6 +17,7 @@
  * bin/check-mysql-innodb-lock.rb
  * bin/check-mysql-threads.rb
  * bin/check-mysql-query-result-count.rb
+ * bin/check-mysql-select-count.rb
  * bin/check-mysql-msr-replication-status.rb
  * bin/metrics-mysql-graphite.rb
  * bin/metrics-mysql-processes.rb
@@ -87,6 +88,11 @@ $ /opt/sensu/embedded/bin/check-mysql-replication-status.rb --host=<SLAVE> --ini
 /opt/sensu/embedded/bin$ /opt/sensu/embedded/bin/ruby check-mysql-query-result-count.rb --host=localhost --port=3306 --user=collectd --pass=tflypass --socket=/data/mysql.sock --warning 1 --critical 10 --query 'SELECT DISTINCT(t.id) FROM table t where t.failed = true'
 ```
 
+**check-mysql-select-count** example
+```bash
+/opt/sensu/embedded/bin$ /opt/sensu/embedded/bin/ruby check-mysql-select-count.rb --host=localhost --port=3306 --user=collectd --pass=tflypass --socket=/data/mysql.sock --warning 30000 --critical 50000 --query 'SELECT count(*) FROM table t'
+```
+
 **metrics-mysql-query-result-count** example
 ```bash
 /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'
@@ -103,6 +109,7 @@ In keeping with the principle of least privilege you should create a new user wi
 | check-mysql-disk.rb                    | `SELECT`                                                  |
 | check-mysql-innodb-lock.rb             | `PROCESS`                                                 |
 | check-mysql-query-result-count.rb      | depends on query                                          |
+| check-mysql-select-count.rb            | `SELECT`                                                  |
 | check-mysql-replication-status.rb      | `SUPER` OR `REPLICATION_CLIENT` (the latter is preferable)|
 | check-mysql-msr-replication-status.rb  | `SELECT`                                                  |
 | check-mysql-status.rb                  | `SELECT`                                                  |

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

@@ -0,0 +1,115 @@
+#!/usr/bin/env ruby
+#
+# MySQL Select Count Check
+#
+# Checks the length of a result set from a MySQL query.
+#
+# Copyright 2017 Andrew Thal <athal7@me.com> to check-mysql-query-result-count.rb
+# Modified by Mutsutoshi Yoshimoto <negachov@gmail.com> 2018 to select count(*) version
+#
+# Released under the same terms as Sensu (the MIT license); see LICENSE
+# for details.
+
+require 'sensu-plugin/check/cli'
+require 'mysql'
+require 'inifile'
+
+class MysqlSelectCountCheck < Sensu::Plugin::Check::CLI
+  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',
+         required: true
+
+  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 :warn,
+         short: '-w COUNT',
+         long: '--warning COUNT',
+         description: 'Warning when query value exceeds threshold',
+         proc: proc(&:to_i),
+         required: true
+
+  option :crit,
+         short: '-c COUNT',
+         long: '--critical COUNT',
+         description: 'Critical when query value exceeds threshold',
+         proc: proc(&:to_i),
+         required: true
+
+  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
+    if count >= config[:crit]
+      critical "Count is above the CRITICAL limit: #{count} count / #{config[:crit]} limit"
+    elsif count >= config[:warn]
+      warning "Count is above the WARNING limit: #{count} count / #{config[:warn]} limit"
+    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
+  end
+end

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

@@ -1,7 +1,7 @@
 module SensuPluginsMySql
   module Version
     MAJOR = 2
-    MINOR = 3
+    MINOR = 4
     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.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-17 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -186,20 +186,21 @@ description: |-
                                 sending metrics to a MySQL database.
 email: "<sensu-users@googlegroups.com>"
 executables:
-- metrics-mysql-query-result-count.rb
+- check-mysql-alive.rb
+- check-mysql-connections.rb
 - check-mysql-disk.rb
-- metrics-mysql.rb
 - check-mysql-innodb-lock.rb
-- check-mysql-alive.rb
+- check-mysql-msr-replication-status.rb
 - check-mysql-query-result-count.rb
-- metrics-mysql-graphite.rb
 - check-mysql-replication-status.rb
+- check-mysql-status.rb
 - check-mysql-threads.rb
-- check-mysql-msr-replication-status.rb
+- metrics-mysql-graphite.rb
 - metrics-mysql-processes.rb
+- metrics-mysql-query-result-count.rb
 - metrics-mysql-raw.rb
-- check-mysql-connections.rb
-- check-mysql-status.rb
+- metrics-mysql.rb
+- check-mysql-select-count.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -213,6 +214,7 @@ files:
 - bin/check-mysql-msr-replication-status.rb
 - bin/check-mysql-query-result-count.rb
 - bin/check-mysql-replication-status.rb
+- bin/check-mysql-select-count.rb
 - bin/check-mysql-status.rb
 - bin/check-mysql-threads.rb
 - bin/metrics-mysql-graphite.rb
@@ -249,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for MySql