sensu-plugins-mysql-boutetnico 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 146f44e13b444f45ee61db8098eb3b3062dbef74
-  data.tar.gz: 8516156a74fc97731a1ad5c2d04c1663f9d75c64
+  metadata.gz: 88083d7375aae12be494d3310c685d57a4eca02a
+  data.tar.gz: 537c91b7469ff45310daf460474250a0f8788d5f
 SHA512:
-  metadata.gz: 15df20ea87d2e4dc6ac85f2a93ef8de7eebf00d4c733684f8c5a10bf0b3950ee7f7ea195dca3485edf4db81170187f2d5b2f2c9e01f89887ac42c0c5ee63b0a7
-  data.tar.gz: 1b63f91ac45984154d8a4c6873ff7d4b0d2e5409a9547daf9fbe6a85d0b7b5998fc74dce1af1613b813bcf803a54cc0d38fb18636583b97990db44a81f208c80
+  metadata.gz: 15254f89788f46d9e3bed61b3875f88f2c30a9ef3fa114c32afef080ed6f13b4e55d8d43501675c07f9cffe3a3dc106539aaf23e4bc28fdeef9112a81820a0a5
+  data.tar.gz: 8c7696536a30026176bf86b19e245a36d29cb2c9fa42b664382fb56e099401d9ef002487b0d803e04aa7851808f2481ce15f9418abc2e67ee41ef3357c9d7a69

data/CHANGELOG.md

@@ -1 +1 @@
-Can be found at [https://github.com/boutetnico/sensu-plugins-mysql/releases](https://github.com/boutetnico/sensu-plugins-mysql/releases).
+Can be found at [https://github.com/boutetnico/sensu-plugins-mysql/releases](https://github.com/boutetnico/sensu-plugins-mysql/releases).

data/README.md

@@ -10,21 +10,22 @@ This fork is automatically tested, built and published to [RubyGems](https://rub
 ## Files
  * bin/check-cloudwatch-mysql-sensu.rb
  * bin/check-mysql-alive.rb
- * bin/check-mysql-status.rb
  * bin/check-mysql-connections.rb
  * bin/check-mysql-disk.rb
  * bin/check-mysql-innodb-lock.rb
- * bin/check-mysql-threads.rb
+ * bin/check-mysql-msr-replication-status.rb
  * bin/check-mysql-query-result-count.rb
  * bin/check-mysql-select-count.rb
- * bin/check-mysql-msr-replication-status.rb
+ * bin/check-mysql-status.rb
+ * bin/check-mysql-threads.rb
+ * bin/metrics-mysql-disk.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
  * bin/metrics-mysql-query-result-count.rb
+ * bin/metrics-mysql-raw.rb
  * bin/metrics-mysql-select-count.rb
+ * bin/metrics-mysql.rb
  * bin/mysql-metrics.sql
 
 ## Usage

data/bin/metrics-mysql-disk.rb

@@ -0,0 +1,84 @@
+#!/usr/bin/env ruby
+#
+# MySQL Disk Usage Metrics
+# ===
+
+require 'sensu-plugin/metric/cli'
+require 'mysql'
+require 'inifile'
+
+class CheckMysqlDisk < Sensu::Plugin::Metric::CLI::Graphite
+  option :host,
+         short: '-h',
+         long: '--host=VALUE',
+         description: 'Database host'
+
+  option :user,
+         short: '-u',
+         long: '--username=VALUE',
+         description: 'Database username'
+
+  option :pass,
+         short: '-p',
+         long: '--password=VALUE',
+         description: 'Database password'
+
+  option :ini,
+         description: 'My.cnf ini file',
+         short: '-i',
+         long: '--ini VALUE'
+
+  option :scheme,
+         description: 'Metric naming scheme, text to prepend to metric',
+         short: '-s SCHEME',
+         long: '--scheme SCHEME',
+         default: "#{Socket.gethostname}.mysql"
+
+  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]
+    mysql_shorthostname = db_host.split('.')[0]
+
+    if [db_host, db_user, db_pass].any?(&:nil?)
+      unknown 'Must specify host, user and password'
+    end
+
+    begin
+      db = Mysql.new(db_host, db_user, db_pass)
+
+      results = db.query <<-EOSQL
+        select table_schema,
+        count(*) as tables,
+        sum(table_rows) as rows,
+        sum(data_length) as data,
+        sum(index_length) as idx,
+        sum(data_length + index_length) as total_size
+        from information_schema.tables
+        where table_schema not in ("information_schema", "mysql", "performance_schema", "sys")
+        group by table_schema
+      EOSQL
+
+      unless results.nil?
+        results.each_hash do |row|
+          output "#{config[:scheme]}.#{mysql_shorthostname}.disk.#{row['table_schema']}.tables", row['tables']
+          output "#{config[:scheme]}.#{mysql_shorthostname}.disk.#{row['table_schema']}.rows", row['rows']
+          output "#{config[:scheme]}.#{mysql_shorthostname}.disk.#{row['table_schema']}.data", row['data']
+          output "#{config[:scheme]}.#{mysql_shorthostname}.disk.#{row['table_schema']}.idx", row['idx']
+          output "#{config[:scheme]}.#{mysql_shorthostname}.disk.#{row['table_schema']}.total_size", row['total_size']
+        end
+      end
+    ensure
+      db.close if db
+    end
+
+    ok
+  end
+end

data/bin/metrics-mysql-graphite.rb

@@ -175,25 +175,37 @@ class MysqlGraphite < Sensu::Plugin::Metric::CLI::Graphite
         'Handler_savepoint_rollback' => 'handlerSavepointRollback',
       },
       'innodb' => {
-        'Innodb_buffer_pool_pages_total' =>   'bufferTotal_pages',
-        'Innodb_buffer_pool_pages_free' =>    'bufferFree_pages',
-        'Innodb_buffer_pool_pages_dirty' =>   'bufferDirty_pages',
-        'Innodb_buffer_pool_pages_data' =>    'bufferUsed_pages',
-        'Innodb_page_size' =>                 'pageSize',
-        'Innodb_pages_created' =>             'pagesCreated',
-        'Innodb_pages_read' =>                'pagesRead',
-        'Innodb_pages_written' =>             'pagesWritten',
-        'Innodb_row_lock_current_waits' =>    'currentLockWaits',
-        'Innodb_row_lock_waits' =>            'lockWaitTimes',
-        'Innodb_row_lock_time' =>             'rowLockTime',
-        'Innodb_data_reads' =>                'fileReads',
-        'Innodb_data_writes' =>               'fileWrites',
-        'Innodb_data_fsyncs' =>               'fileFsyncs',
-        'Innodb_log_writes' =>                'logWrites',
-        'Innodb_rows_updated' =>              'rowsUpdated',
-        'Innodb_rows_read' =>                 'rowsRead',
-        'Innodb_rows_deleted' =>              'rowsDeleted',
-        'Innodb_rows_inserted' =>             'rowsInserted',
+        'Innodb_buffer_pool_pages_total' =>        'bufferTotal_pages',
+        'Innodb_buffer_pool_pages_free' =>         'bufferFree_pages',
+        'Innodb_buffer_pool_pages_dirty' =>        'bufferDirty_pages',
+        'Innodb_buffer_pool_pages_data' =>         'bufferUsed_pages',
+        'Innodb_buffer_pool_pages_flushed' =>      'bufferFlushed_pages',
+        'Innodb_buffer_pool_pages_misc' =>         'bufferMisc_pages',
+        'Innodb_buffer_pool_bytes_data' =>         'bufferUsed_bytes',
+        'Innodb_buffer_pool_bytes_dirty' =>        'bufferDirty_bytes',
+        'Innodb_buffer_pool_read_ahead_rnd' =>     'bufferReadAheadRnd',
+        'Innodb_buffer_pool_read_ahead' =>         'bufferReadAhead',
+        'Innodb_buffer_pool_read_ahead_evicted' => 'bufferReadAheadEvicted',
+        'Innodb_buffer_pool_read_requests' =>      'bufferReadRequests',
+        'Innodb_buffer_pool_reads' =>              'bufferReads',
+        'Innodb_buffer_pool_wait_free' =>          'bufferWaitFree',
+        'Innodb_buffer_pool_write_requests' =>     'bufferWriteRequests',
+        'innodb_buffer_pool_size' =>               'poolSize',
+        'Innodb_page_size' =>                      'pageSize',
+        'Innodb_pages_created' =>                  'pagesCreated',
+        'Innodb_pages_read' =>                     'pagesRead',
+        'Innodb_pages_written' =>                  'pagesWritten',
+        'Innodb_row_lock_current_waits' =>         'currentLockWaits',
+        'Innodb_row_lock_waits' =>                 'lockWaitTimes',
+        'Innodb_row_lock_time' =>                  'rowLockTime',
+        'Innodb_data_reads' =>                     'fileReads',
+        'Innodb_data_writes' =>                    'fileWrites',
+        'Innodb_data_fsyncs' =>                    'fileFsyncs',
+        'Innodb_log_writes' =>                     'logWrites',
+        'Innodb_rows_updated' =>                   'rowsUpdated',
+        'Innodb_rows_read' =>                      'rowsRead',
+        'Innodb_rows_deleted' =>                   'rowsDeleted',
+        'Innodb_rows_inserted' =>                  'rowsInserted',
       },
       'configuration' => {
         'max_connections'         =>          'MaxConnections',

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

@@ -1,7 +1,7 @@
 module SensuPluginsMySql
   module Version
     MAJOR = 1
-    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-boutetnico
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -191,6 +191,7 @@ executables:
 - check-mysql-select-count.rb
 - metrics-mysql-query-result-count.rb
 - metrics-mysql-graphite.rb
+- metrics-mysql-disk.rb
 - check-mysql-status.rb
 - metrics-mysql.rb
 - check-mysql-replication-status.rb
@@ -219,6 +220,7 @@ files:
 - bin/check-mysql-select-count.rb
 - bin/check-mysql-status.rb
 - bin/check-mysql-threads.rb
+- bin/metrics-mysql-disk.rb
 - bin/metrics-mysql-graphite.rb
 - bin/metrics-mysql-multiple-select-count.rb
 - bin/metrics-mysql-processes.rb