sensu-plugins-mysql 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7a3f47930f8ac4e6169ecd568784a515973f794e
-  data.tar.gz: b5a697219c0ed255ccc8f91534b464bf7a2b606c
+SHA256:
+  metadata.gz: 00f0faaf8dfab6860c08be60b8afa307d1a3cd0d3d726064ec3a595ab9291317
+  data.tar.gz: 69e069e01e98de450846d64e6d4bb324ea227c89ccdd23d4877d21a916d9742d
 SHA512:
-  metadata.gz: a19f0dcac1046df6e83661fd8bdc209f61393afa30552d0c919252500d289f7167ec894a1cbab37bed91d81bba1fdd8f1aff7a1d87a5f175ec13c9e21883457e
-  data.tar.gz: e361955c2b457d4fdd0eefd7cc0db2245a16ec6b9e4ecf388260228c2f7f84fe73e7209b31445da3a64202e12518c52eaad1f88b1f92db8f2c055d3831d2df39
+  metadata.gz: de0a27cf35313a4a2e330d175bbf8695524e1a13a7ecdf68bcd76ec0003e6c16375f4c0d7c76a11fd25a52f60a716125acf5137767ace63a2ca94d3208013b5b
+  data.tar.gz: c2627626aa929925a9697b1ef1d13da422806460e526149590f6256fbb0a19e160c0afa9acc8115911281f9e995450c4bda7c7425f6da777a1d85d3143c268cf

data/CHANGELOG.md

@@ -1,10 +1,30 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
+This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md)
 
 ## [Unreleased]
 
+## [2.2.0] - 2017-11-19
+### Changed
+- check-mysql-alive.rb: Add support for custom section in inifile. (@oba11)
+- check-mysql-connections.rb: Add support for custom section in inifile. (@oba11)
+- check-mysql-disk.rb: Add support for custom section in inifile. (@oba11)
+- check-mysql-innodb-lock.rb: Add support for custom section in inifile. (@oba11)
+- check-mysql-query-result-count.rb: Add support for custom section in inifile. (@oba11)
+- check-mysql-replication-status.rb: Add support for custom section in inifile. (@oba11)
+- check-mysql-status.rb: Add support for custom section in inifile. (@oba11)
+- check-mysql-threads.rb: Add support for custom section in inifile. (@oba11)
+- metrics-mysql-graphite.rb: Add support for custom section in inifile. (@oba11)
+- metrics-mysql-processes.rb: Add support for custom section in inifile. (@oba11)
+- metrics-mysql-query-result-count.rb: Add support for custom section in inifile. (@oba11)
+- metrics-mysql-raw.rb: Add support for custom section in inifile. (@oba11)
+- README.md: update useage to have an example using the custom ini section (@majormoses)
+- update changelog guidelines location (@majormoses)
+
+### Fixed
+- misc spelling and whitespace (@majormoses)
+
 ## [2.1.2] - 2017-10-04
 ### Changed
 - In `README` clarify why they should not use privileged users for monitoring with sensu. (@majormoses)
@@ -90,7 +110,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.1.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.2.0...HEAD
+[2.2.0]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.1.1...2.2.0
 [2.1.2]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.1.1...2.1.2
 [2.1.1]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.1.0...2.1.1
 [2.1.0]: https://github.com/sensu-plugins/sensu-plugins-mysql/compare/2.0.0...2.1.0

data/README.md

@@ -53,7 +53,7 @@ $ /opt/sensu/embedded/bin/check-mysql-connections.rb --host=<DBHOST> --ini=/etc/
 
 **check-mysql-alive** example
 ```bash
-$ /opt/sensu/embedded/bin/check-mysql-alive.rb --host=<DBHOST> --ini=/etc/sensu/my.ini
+$ /opt/sensu/embedded/bin/check-mysql-alive.rb --host=<DBHOST> --ini=/etc/sensu/my.ini --ini-section=customsection
 ```
 
 **check-mysql-disk** example (note: you must supply max disk size)

data/bin/check-mysql-alive.rb

@@ -19,12 +19,17 @@
 #
 #   EXAMPLE
 #     mysql-alive.rb -h db01 --ini '/etc/sensu/my.cnf'
+#     mysql-alive.rb -h db01 --ini '/etc/sensu/my.cnf' --ini-section customsection
 #
 #   MY.CNF INI FORMAT
 #   [client]
 #   user=sensu
 #   password="abcd1234"
 #
+#   [customsection]
+#   user=user
+#   password="password"
+#
 
 require 'sensu-plugin/check/cli'
 require 'mysql'
@@ -46,6 +51,11 @@ class CheckMySQL < Sensu::Plugin::Check::CLI
          short: '-i',
          long: '--ini VALUE'
 
+  option :ini_section,
+         description: 'Section in my.cnf ini file',
+         long: '--ini-section VALUE',
+         default: 'client'
+
   option :hostname,
          description: 'Hostname to login to',
          short: '-h HOST',
@@ -71,7 +81,7 @@ class CheckMySQL < Sensu::Plugin::Check::CLI
   def run
     if config[:ini]
       ini = IniFile.load(config[:ini])
-      section = ini['client']
+      section = ini[config[:ini_section]]
       db_user = section['user']
       db_pass = section['password']
     else

data/bin/check-mysql-connections.rb

@@ -31,6 +31,11 @@ class CheckMySQLHealth < Sensu::Plugin::Check::CLI
          short: '-i',
          long: '--ini VALUE'
 
+  option :ini_section,
+         description: 'Section in my.cnf ini file',
+         long: '--ini-section VALUE',
+         default: 'client'
+
   option :hostname,
          description: 'Hostname to login to',
          short: '-h HOST',
@@ -69,7 +74,7 @@ class CheckMySQLHealth < Sensu::Plugin::Check::CLI
   def run
     if config[:ini]
       ini = IniFile.load(config[:ini])
-      section = ini['client']
+      section = ini[config[:ini_section]]
       db_user = section['user']
       db_pass = section['password']
     else

data/bin/check-mysql-disk.rb

@@ -35,6 +35,11 @@ class CheckMysqlDisk < Sensu::Plugin::Check::CLI
          short: '-i',
          long: '--ini VALUE'
 
+  option :ini_section,
+         description: 'Section in my.cnf ini file',
+         long: '--ini-section VALUE',
+         default: 'client'
+
   option :size,
          short: '-s',
          long: '--size=VALUE',
@@ -72,7 +77,7 @@ class CheckMysqlDisk < Sensu::Plugin::Check::CLI
   def run
     if config[:ini]
       ini = IniFile.load(config[:ini])
-      section = ini['client']
+      section = ini[config[:ini_section]]
       db_user = section['user']
       db_pass = section['password']
     else

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

@@ -31,6 +31,11 @@ class CheckMySQLInnoDBLock < Sensu::Plugin::Check::CLI
          short: '-i',
          long: '--ini VALUE'
 
+  option :ini_section,
+         description: 'Section in my.cnf ini file',
+         long: '--ini-section VALUE',
+         default: 'client'
+
   option :hostname,
          description: 'Hostname to login to',
          short: '-h HOST',
@@ -63,7 +68,7 @@ class CheckMySQLInnoDBLock < Sensu::Plugin::Check::CLI
   def run
     if config[:ini]
       ini = IniFile.load(config[:ini])
-      section = ini['client']
+      section = ini[config[:ini_section]]
       db_user = section['user']
       db_pass = section['password']
     else

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

@@ -49,6 +49,11 @@ class MysqlQueryCountCheck < Sensu::Plugin::Check::CLI
          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',
@@ -77,7 +82,7 @@ class MysqlQueryCountCheck < Sensu::Plugin::Check::CLI
   def run
     if config[:ini]
       ini = IniFile.load(config[:ini])
-      section = ini['client']
+      section = ini[config[:ini_section]]
       db_user = section['user']
       db_pass = section['password']
     else

data/bin/check-mysql-replication-status.rb

@@ -17,12 +17,17 @@
 #
 #   EXAMPLE
 #     mysql-alive.rb -h db01 --ini '/etc/sensu/my.cnf'
+#     mysql-alive.rb -h db01 --ini '/etc/sensu/my.cnf' --ini-section customsection
 #
 #   MY.CNF INI FORMAT
 #   [client]
 #   user=sensu
 #   password="abcd1234"
 #
+#   [customsection]
+#   user=user
+#   password="password"
+#
 
 require 'sensu-plugin/check/cli'
 require 'mysql'
@@ -67,6 +72,11 @@ class CheckMysqlReplicationStatus < Sensu::Plugin::Check::CLI
          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 :warn,
          short: '-w',
          long: '--warning=VALUE',
@@ -86,7 +96,7 @@ class CheckMysqlReplicationStatus < Sensu::Plugin::Check::CLI
   def run
     if config[:ini]
       ini = IniFile.load(config[:ini])
-      section = ini['client']
+      section = ini[config[:ini_section]]
       db_user = section['user']
       db_pass = section['password']
     else

data/bin/check-mysql-status.rb

@@ -51,6 +51,11 @@ class CheckMySQLStatus < Sensu::Plugin::Check::CLI
          short: '-i',
          long: '--ini VALUE'
 
+  option :ini_section,
+         description: 'Section in my.cnf ini file',
+         long: '--ini-section VALUE',
+         default: 'client'
+
   option :hostname,
          description: 'Hostname to login to',
          short: '-h HOST',
@@ -107,7 +112,7 @@ class CheckMySQLStatus < Sensu::Plugin::Check::CLI
   def credentials
     if config[:ini]
       ini = IniFile.load(config[:ini])
-      section = ini['client']
+      section = ini[config[:ini_section]]
       db_user = section['user']
       db_pass = section['password']
       db_socket = section['socket']

data/bin/check-mysql-threads.rb

@@ -51,6 +51,11 @@ class CheckMySQLHealth < Sensu::Plugin::Check::CLI
          short: '-i',
          long: '--ini VALUE'
 
+  option :ini_section,
+         description: 'Section in my.cnf ini file',
+         long: '--ini-section VALUE',
+         default: 'client'
+
   option :hostname,
          description: 'Hostname to login to',
          short: '-h HOST',
@@ -95,7 +100,7 @@ class CheckMySQLHealth < Sensu::Plugin::Check::CLI
   def run
     if config[:ini]
       ini = IniFile.load(config[:ini])
-      section = ini['client']
+      section = ini[config[:ini_section]]
       db_user = section['user']
       db_pass = section['password']
     else

data/bin/metrics-mysql-graphite.rb

@@ -23,12 +23,17 @@
 #
 #   EXAMPLE
 #     mysql-alive.rb -h db01 --ini '/etc/sensu/my.cnf'
+#     mysql-alive.rb -h db01 --ini '/etc/sensu/my.cnf' --ini-section customsection
 #
 #   MY.CNF INI FORMAT
 #   [client]
 #   user=sensu
 #   password="abcd1234"
 #
+#   [customsection]
+#   user=user
+#   password="password"
+#
 
 require 'sensu-plugin/metric/cli'
 require 'mysql'
@@ -65,6 +70,11 @@ class MysqlGraphite < Sensu::Plugin::Metric::CLI::Graphite
          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 :scheme,
          description: 'Metric naming scheme, text to prepend to metric',
          short: '-s SCHEME',
@@ -197,7 +207,7 @@ class MysqlGraphite < Sensu::Plugin::Metric::CLI::Graphite
       mysql_shorthostname = mysql_host.split('.')[0]
       if config[:ini]
         ini = IniFile.load(config[:ini])
-        section = ini['client']
+        section = ini[config[:ini_section]]
         db_user = section['user']
         db_pass = section['password']
       else

data/bin/metrics-mysql-processes.rb

@@ -25,12 +25,17 @@
 #
 #   EXAMPLE
 #     mysql-alive.rb -h db01 --ini '/etc/sensu/my.cnf'
+#     mysql-alive.rb -h db01 --ini '/etc/sensu/my.cnf' --ini-section customsection
 #
 #   MY.CNF INI FORMAT
 #   [client]
 #   user=sensu
 #   password="abcd1234"
 #
+#   [customsection]
+#   user=user
+#   password="password"
+#
 # NOTES:
 #
 # LICENSE:
@@ -73,6 +78,11 @@ class MetricsMySQLProcesses < Sensu::Plugin::Metric::CLI::Graphite
          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 :scheme,
          description: 'Metric naming scheme, text to prepend to metric',
          short: '-s SCHEME',
@@ -89,7 +99,7 @@ class MetricsMySQLProcesses < Sensu::Plugin::Metric::CLI::Graphite
       mysql_shorthostname = mysql_host.split('.')[0]
       if config[:ini]
         ini = IniFile.load(config[:ini])
-        section = ini['client']
+        section = ini[config[:ini_section]]
         db_user = section['user']
         db_pass = section['password']
       else

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

@@ -49,6 +49,11 @@ class MysqlQueryCountMetric < Sensu::Plugin::Metric::CLI::Graphite
          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',
@@ -69,7 +74,7 @@ class MysqlQueryCountMetric < Sensu::Plugin::Metric::CLI::Graphite
   def run
     if config[:ini]
       ini = IniFile.load(config[:ini])
-      section = ini['client']
+      section = ini[config[:ini_section]]
       db_user = section['user']
       db_pass = section['password']
     else

data/bin/metrics-mysql-raw.rb

@@ -16,6 +16,7 @@
 #
 #   EXAMPLE
 #     metrics-mysql-raw.rb -h localhost --ini '/etc/sensu/my.cnf'
+#     metrics-mysql-raw.rb -h localhost --ini '/etc/sensu/my.cnf' --ini-section customsection
 #
 #   MY.CNF INI FORMAT
 #   [client]
@@ -23,6 +24,10 @@
 #   password="abcd1234"
 #   socket="/var/lib/mysql/mysql.sock"
 #
+#   [customsection]
+#   user=user
+#   password="password"
+#
 # LICENSE:
 #  Copyright 2012 Pete Shima <me@peteshima.com>
 #   Additional hacks by Joe Miller - https://github.com/joemiller
@@ -57,6 +62,7 @@ class MetricsMySQLRaw < Sensu::Plugin::Metric::CLI::Graphite
     long: '--password PASS',
     default: 'mysqlPassWord'
   )
+
   option(
     :ini,
     description: 'My.cnf ini file',
@@ -64,6 +70,13 @@ class MetricsMySQLRaw < Sensu::Plugin::Metric::CLI::Graphite
     long: '--ini VALUE'
   )
 
+  option(
+    :ini_section,
+    description: 'Section in my.cnf ini file',
+    long: '--ini-section VALUE',
+    default: 'client'
+  )
+
   option(
     :hostname,
     description: 'Hostname to login to',
@@ -260,7 +273,7 @@ class MetricsMySQLRaw < Sensu::Plugin::Metric::CLI::Graphite
   def credentials
     if config[:ini]
       ini = IniFile.load(config[:ini])
-      section = ini['client']
+      section = ini[config[:ini_section]]
       db_user = section['user']
       db_pass = section['password']
       db_socket = section['socket']

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-mysql
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for MySql