sensu-plugins-mysql 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fc129aec007bdfaffa716935047b1e7d26c6ca5
-  data.tar.gz: cc1f3bc4826df392a45733f03684ac40bf94f424
+  metadata.gz: b4771377cb28536973ce544b4e55ee253750b268
+  data.tar.gz: 0781a896efb30553b88c61b4b4d2670c9843bcec
 SHA512:
-  metadata.gz: 592b3556770a10083ff8d0d455702ab862a332e19fa63ffbddae0d2d8819f2da673a3441ecb67d0a569932fd63339bd1889d8883ae47e24549182a04230eefda
-  data.tar.gz: b1076197ce8353cd35570be284f47662a9c4309014c35b81a6f305826b1ee70c30eeb3b41c23df966e971b7212ca84a790646870a6aec439f428e2477b691836
+  metadata.gz: 8751c800dc87b5bb2883ac8587eb4a238f43e6555b03d8e65d4c8767ca369e124d60cc7fad9149f49526efce968269448f5f23bdba7146e8138ee366c399ee4d
+  data.tar.gz: 277002253e87872b4239a5579dc8b7721c39331fe4eddbdefdcd42902f94421700ae87f3d502faf2128731c1fc8f9060e427822a445b91edb547482cf3cad6e1

data/CHANGELOG.md

@@ -5,10 +5,12 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased][unreleased]
 
-## 0.0.1 - 2015-05-29
+## [0.0.3] - 2015-07-14
+### Changed
+- updated sensu-plugin gem to 1.2.0
 
 ### Added
-- initial release
+- ability to read configuration data from an ini file
 
 ## [0.0.2] - 2015-06-03
 
@@ -16,4 +18,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - added binstubs
 
 ### Changed
-- removed cruft from /lib
+- removed cruft from /lib
+
+## 0.0.1 - 2015-05-29
+
+### Added
+- initial release
+

data/README.md

@@ -1,6 +1,6 @@
 ## Sensu-Plugins-mysql
 
-[![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-mysql.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-mysql)
+[ ![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-mysql.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-mysql)
 [![Gem Version](https://badge.fury.io/rb/sensu-plugins-mysql.svg)](http://badge.fury.io/rb/sensu-plugins-mysql)
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-mysql/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-mysql)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-mysql/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-mysql)

data/bin/check-mysql-connections.rb

@@ -12,6 +12,7 @@
 
 require 'sensu-plugin/check/cli'
 require 'mysql'
+require 'inifile'
 
 class CheckMySQLHealth < Sensu::Plugin::Check::CLI
   option :user,
@@ -23,8 +24,12 @@ class CheckMySQLHealth < Sensu::Plugin::Check::CLI
   option :password,
          description: 'MySQL Password',
          short: '-p PASS',
-         long: '--password PASS',
-         required: true
+         long: '--password PASS'
+
+  option :ini,
+         description: 'My.cnf ini file',
+         short: '-i',
+         long: '--ini VALUE'
 
   option :hostname,
          description: 'Hostname to login to',
@@ -62,7 +67,16 @@ class CheckMySQLHealth < Sensu::Plugin::Check::CLI
          default: false
 
   def run
-    db = Mysql.real_connect(config[:hostname], config[:user], config[:password], config[:database], config[:port].to_i, config[:socket])
+    if config[:ini]
+      ini = IniFile.load(config[:ini])
+      section = ini['client']
+      db_user = section['user']
+      db_pass = section['password']
+    else
+      db_user = config[:user]
+      db_pass = config[:password]
+    end
+    db = Mysql.real_connect(config[:hostname], db_user, db_pass, config[:database], config[:port].to_i, config[:socket])
     max_con = db
               .query("SHOW VARIABLES LIKE 'max_connections'")
               .fetch_hash

data/bin/check-mysql-disk.rb

@@ -12,6 +12,7 @@
 
 require 'sensu-plugin/check/cli'
 require 'mysql'
+require 'inifile'
 
 class CheckMysqlDisk < Sensu::Plugin::Check::CLI
   option :host,
@@ -29,6 +30,11 @@ class CheckMysqlDisk < Sensu::Plugin::Check::CLI
          long: '--password=VALUE',
          description: 'Database password'
 
+  option :ini,
+         description: 'My.cnf ini file',
+         short: '-i',
+         long: '--ini VALUE'
+
   option :size,
          short: '-s',
          long: '--size=VALUE',
@@ -56,9 +62,16 @@ class CheckMysqlDisk < Sensu::Plugin::Check::CLI
          exit: 0
 
   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[:user]
+      db_pass = config[:pass]
+    end
     db_host = config[:host]
-    db_user = config[:user]
-    db_pass = config[:pass]
     disk_size = config[:size].to_f
     critical_usage = config[:crit].to_f
     warning_usage = config[:warn].to_f

data/bin/check-mysql-innodb-lock.rb

@@ -12,6 +12,7 @@
 
 require 'sensu-plugin/check/cli'
 require 'mysql'
+require 'inifile'
 
 class CheckMySQLInnoDBLock < Sensu::Plugin::Check::CLI
   option :user,
@@ -23,8 +24,12 @@ class CheckMySQLInnoDBLock < Sensu::Plugin::Check::CLI
   option :password,
          description: 'MySQL Password',
          short: '-p PASS',
-         long: '--password PASS',
-         required: true
+         long: '--password PASS'
+
+  option :ini,
+         description: 'My.cnf ini file',
+         short: '-i',
+         long: '--ini VALUE'
 
   option :hostname,
          description: 'Hostname to login to',
@@ -56,7 +61,16 @@ class CheckMySQLInnoDBLock < Sensu::Plugin::Check::CLI
          default: 10
 
   def run
-    db = Mysql.new(config[:hostname], config[:user], config[:password], config[:database], config[:port].to_i, config[:socket])
+    if config[:ini]
+      ini = IniFile.load(config[:ini])
+      section = ini['client']
+      db_user = section['user']
+      db_pass = section['password']
+    else
+      db_user = config[:user]
+      db_pass = config[:password]
+    end
+    db = Mysql.new(config[:hostname], db_user, db_pass, config[:database], config[:port].to_i, config[:socket])
 
     warn = config[:warn].to_i
     crit = config[:crit].to_i

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

@@ -2,7 +2,7 @@ module SensuPluginsMySql
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 2
+    PATCH = 3
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-mysql
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -38,14 +38,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +120,14 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '0.30'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '0.30'
 - !ruby/object:Gem::Dependency