sensu-plugins-mysql 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9ed9307213b4bc5dd251f86367045379d88101f
-  data.tar.gz: 084a97a89f06e7caa95d2ca87718150527c6c37d
+  metadata.gz: 7b7608ea6a5cded48a747cf06209077fe26e9041
+  data.tar.gz: 9f7cdbab6faede729fe2d3784f55a9056a7e2bad
 SHA512:
-  metadata.gz: 8d33d92cde4c78d7bbdeff35e48f0a32111147593f4167e03e5955fdca93a71210a6d0176bd557e3497d07aee72cb4de2ad2f77843e94b0e113d0b322dbf5686
-  data.tar.gz: b4ceea2313dc9794199d80474ba5f3cea6745f2b599b113b874ce9d5b62d22d1927837cb62530b3f9d2c94aa220c9db5a0ea8adf88751253bbe0a4217a975386
+  metadata.gz: dbfcc07febf6c3fd280f2ac82765162037d977bf153e68dce1711f3607157cd6ef5ee2dbca82b39a1e6ddc5d76d9bfbde7f7c1f47f0f8b0d596863426f89c4e1
+  data.tar.gz: 8e794b4cce853c315b3add749195e8fc6318f6403eae8a5bdc02420cfeac31ea2083d1ad52a12790dfcd7e21fcbe86a3085c4075a89310efac503eeb80e7f756

data/CHANGELOG.md

@@ -4,6 +4,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [2.1.0] - 2017-06-10
+### Added
+- metrics-mysql-query-result-count.rb: Creates a graphite-formatted metric for the length of a result set from a MySQL query. (@athal7)
 
 ## [2.0.0] - 2017-06-05
 ### Breaking Change
@@ -68,7 +71,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.1.0...HEAD
+[2.1.0]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/1.2.1...2.0.0
 [1.2.1]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/1.2.0...1.2.1
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/1.1.0...1.2.0

data/README.md

@@ -21,6 +21,7 @@
  * bin/metrics-mysql-processes.rb
  * bin/metrics-mysql-raw.rb
  * bin/metrics-mysql.rb
+ * bin/metrics-mysql-query-result-count.rb
  * bin/mysql-metrics.sql
 
 ## Usage
@@ -51,6 +52,11 @@
 /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'
 ```
 
+**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'
+```
+
 ## Installation
 
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)

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

@@ -0,0 +1,95 @@
+#!/usr/bin/env ruby
+#
+# MySQL Query Result Count Metric
+#
+# Creates a graphite-formatted metric for the length of a result set from a MySQL query.
+#
+# Copyright 2017 Andrew Thal <athal7@me.com>
+#
+# 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',
+         default: ''
+
+  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 :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 QUERY',
+         long: '--query QUERY',
+         description: 'Query to execute',
+         required: true
+
+  def run
+    if config[:ini]
+      ini = IniFile.load(config[:ini])
+      section = ini['client']
+      db_user = section['user']
+      db_pass = section['password']
+    else
+      db_user = config[:username]
+      db_pass = config[:password]
+    end
+    db = Mysql.real_connect(config[:host], db_user, db_pass, config[:database], config[:port].to_i, config[:socket])
+    length = db.query(config[:query]).count
+
+    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
+    critical 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 = 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: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -196,6 +196,7 @@ executables:
 - check-mysql-threads.rb
 - metrics-mysql-graphite.rb
 - metrics-mysql-processes.rb
+- metrics-mysql-query-result-count.rb
 - metrics-mysql-raw.rb
 - metrics-mysql.rb
 extensions: []
@@ -214,6 +215,7 @@ files:
 - bin/check-mysql-threads.rb
 - bin/metrics-mysql-graphite.rb
 - bin/metrics-mysql-processes.rb
+- bin/metrics-mysql-query-result-count.rb
 - bin/metrics-mysql-raw.rb
 - bin/metrics-mysql.rb
 - bin/mysql-metrics.sql