sensu-plugins-mysql 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5922468dc21649e24a29345516eb02ff4f9002aee5415d1aa6248a5cd387bbd9
-  data.tar.gz: c934f6e0c33d107072e897ad3a1ae1e8e316cdfd029df64100114f6f2aae849c
+  metadata.gz: 00bad3fc713f6812222e0256b8495ec87d6cf0c64668d7caad5d64f58841a5ce
+  data.tar.gz: 69e155cf7bc0370fe2f21a425cd727fce4c444de31c9a8731d69501588a3cbb2
 SHA512:
-  metadata.gz: 20418c01d373e088978a0162297164776e1a2e4eeed071a9fa45218906ddaa2fa00980215c7fd4362b01b9f164fb24afbf29762d69e063c0d5fdce40a1da5e57
-  data.tar.gz: 7202eeb5502b433c9aced5191a8cb9ebb1287cff3fc977535276042acf97f77665fabed0a4738b9be5a077d29a67cb4f44d6e165a9e243c9c9f19cb320659247
+  metadata.gz: 1a391131fbca828fcab9759aec2a593e964cc09a486bb614fb90e9f06e2893abb24cf63df68dd14559c9cd09d277df3e9bf05433d370d5e10860f385aa1f7a03
+  data.tar.gz: b0a6e03148a3038376e501d1c11283ae1cff8f1e3bc756eb91e8439553b313f35b781dd184b1e21ecec49ad30362b27528cac1ba3c24dde6b626844ff482d03b

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [3.1.0] - 2018-12-15
+### Added
+- metrics-mysql-multiple-select-countcript (@nagyt234)
+
 
 ## [3.0.0] - 2018-12-04
 ### Security
@@ -153,6 +157,7 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 - initial release
 
 [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/3.0.0...HEAD
+[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

data/README.md

@@ -20,6 +20,7 @@
  * 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
@@ -104,6 +105,10 @@ $ /opt/sensu/embedded/bin/check-mysql-replication-status.rb --host=<SLAVE> --ini
 /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.
@@ -124,6 +129,7 @@ In keeping with the principle of least privilege you should create a new user wi
 | 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/metrics-mysql-multiple-select-count.rb

@@ -0,0 +1,110 @@
+#!/usr/bin/env ruby
+#
+# MySQL Select Count Metrics
+#
+# Creates a graphite-formatted metrics for the first values of a result set from MySQL queries
+# defined as a JSON parameter.
+#
+# 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'
+require 'json'
+
+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_QUERIES',
+         long: '--query SELECT_COUNT_QUERIES',
+         description: 'Queries to execute in JSON',
+         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
+
+    begin
+      query_hash = ::JSON.parse config[:query]
+    rescue ::JSON::ParserError => e
+      critical "JSON.parse error: #{e}"
+    end
+
+    # traverse all SQL
+    query_hash.each do |key, sql|
+      raise "invalid query : #{sql}" unless sql =~ /^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(sql).fetch_row[0].to_i
+
+      output "#{config[:name]}.#{key}", count
+    end
+
+    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}"
+  end
+end

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

@@ -1,7 +1,7 @@
 module SensuPluginsMySql
   module Version
     MAJOR = 3
-    MINOR = 0
+    MINOR = 1
     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: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2018-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -197,6 +197,7 @@ executables:
 - 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
@@ -219,6 +220,7 @@ 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