adds more metrics to statsdb and statsbgwriter

Author: phumpal

CHANGELOG.md

@@ -4,6 +4,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md).
 
 ## [Unreleased]
+### Added
+- metric-postgres-statsbgwriter.rb: additional metrics
+- metric-postgres-statsdb.rb additional metrics
 
 ## [2.1.0] - 2018-10-16
 ### Added

bin/metric-postgres-statsbgwriter.rb

@@ -84,19 +84,23 @@ def run
                          connect_timeout: config[:timeout])
     request = [
       'select checkpoints_timed, checkpoints_req,',
+      'checkpoint_write_time, checkpoint_sync_time,',
       'buffers_checkpoint, buffers_clean,',
-      'maxwritten_clean, buffers_backend,',
+      'maxwritten_clean, buffers_backend, buffers_backend_fsync',
       'buffers_alloc',
       'from pg_stat_bgwriter'
     ]
     con.exec(request.join(' ')) do |result|
       result.each do |row|
         output "#{config[:scheme]}.bgwriter.checkpoints_timed", row['checkpoints_timed'], timestamp
         output "#{config[:scheme]}.bgwriter.checkpoints_req", row['checkpoints_req'], timestamp
+        output "#{config[:scheme]}.bgwriter.checkpoints_write_time", row['checkpoint_write_time'], timestamp
+        output "#{config[:scheme]}.bgwriter.checkpoints_sync_time", row['checkpoint_sync_time'], timestamp
         output "#{config[:scheme]}.bgwriter.buffers_checkpoint", row['buffers_checkpoint'], timestamp
         output "#{config[:scheme]}.bgwriter.buffers_clean", row['buffers_clean'], timestamp
         output "#{config[:scheme]}.bgwriter.maxwritten_clean", row['maxwritten_clean'], timestamp
         output "#{config[:scheme]}.bgwriter.buffers_backend", row['buffers_backend'], timestamp
+        output "#{config[:scheme]}.bgwriter.buffers_backend_fsync", row['buffers_backend_fsync'], timestamp
         output "#{config[:scheme]}.bgwriter.buffers_alloc", row['buffers_alloc'], timestamp
       end
     end

bin/metric-postgres-statsdb.rb

@@ -29,6 +29,7 @@
 #   for details.
 #
 
+require 'active_support/core_ext/hash'
 require 'sensu-plugins-postgres/pgpass'
 require 'sensu-plugin/metric/cli'
 require 'pg'
@@ -89,23 +90,14 @@ def run
                          port: config[:port],
                          connect_timeout: config[:timeout])
     request = [
-      'select numbackends, xact_commit, xact_rollback,',
-      'blks_read, blks_hit,',
-      'tup_returned, tup_fetched, tup_inserted, tup_updated, tup_deleted',
+      'select *',
       "from pg_stat_database where datname='#{config[:database]}'"
     ]
     con.exec(request.join(' ')) do |result|
       result.each do |row|
-        output "#{config[:scheme]}.statsdb.#{config[:database]}.numbackends", row['numbackends'], timestamp
-        output "#{config[:scheme]}.statsdb.#{config[:database]}.xact_commit", row['xact_commit'], timestamp
-        output "#{config[:scheme]}.statsdb.#{config[:database]}.xact_rollback", row['xact_rollback'], timestamp
-        output "#{config[:scheme]}.statsdb.#{config[:database]}.blks_read", row['blks_read'], timestamp
-        output "#{config[:scheme]}.statsdb.#{config[:database]}.blks_hit", row['blks_hit'], timestamp
-        output "#{config[:scheme]}.statsdb.#{config[:database]}.tup_returned", row['tup_returned'], timestamp
-        output "#{config[:scheme]}.statsdb.#{config[:database]}.tup_fetched", row['tup_fetched'], timestamp
-        output "#{config[:scheme]}.statsdb.#{config[:database]}.tup_inserted", row['tup_inserted'], timestamp
-        output "#{config[:scheme]}.statsdb.#{config[:database]}.tup_updated", row['tup_updated'], timestamp
-        output "#{config[:scheme]}.statsdb.#{config[:database]}.tup_deleted", row['tup_deleted'], timestamp
+        row.except('datid', 'stats_reset').each do |key, value|
+          output "#{config[:scheme]}.statsdb.#{config[:database]}.#{key}", value.to_s, timestamp
+        end
       end
     end