From 7a9b2f665268ef417cea0da4d5be2babf22aed24 Mon Sep 17 00:00:00 2001
From: Henk-Jan Agteresch <h.j.agteresch@avisi.nl>
Date: Tue, 20 Feb 2018 21:40:01 +0100
Subject: [PATCH] align metric naming scheme output

---
 bin/metric-postgres-graphite.rb      |  2 +-
 bin/metric-postgres-statsbgwriter.rb | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/bin/metric-postgres-graphite.rb b/bin/metric-postgres-graphite.rb
index 6016e8c..808b077 100755
--- a/bin/metric-postgres-graphite.rb
+++ b/bin/metric-postgres-graphite.rb
@@ -113,7 +113,7 @@ def lag_compute(res1, res, m_segbytes) # rubocop:disable NestedMethodDefinition
 
     # Compute lag
     lag = lag_compute(res1, res, m_segbytes)
-    output config[:scheme].to_s, lag
+    output "#{config[:scheme]}.replication.#{config[:database]}.to_s", lag
 
     ok
   end
diff --git a/bin/metric-postgres-statsbgwriter.rb b/bin/metric-postgres-statsbgwriter.rb
index d62bb95..9f1db42 100755
--- a/bin/metric-postgres-statsbgwriter.rb
+++ b/bin/metric-postgres-statsbgwriter.rb
@@ -60,6 +60,11 @@ class PostgresStatsDBMetrics < Sensu::Plugin::Metric::CLI::Graphite
          short: '-P PORT',
          long: '--port PORT'
 
+  option :database,
+         description: 'Database name',
+         short: '-d DB',
+         long: '--db DB'
+
   option :scheme,
          description: 'Metric naming scheme, text to prepend to $queue_name.$metric',
          long: '--scheme SCHEME',
@@ -91,13 +96,13 @@ def run
     ]
     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.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_alloc", row['buffers_alloc'], timestamp
+        output "#{config[:scheme]}.bgwriter.#{config[:database]}.checkpoints_timed", row['checkpoints_timed'], timestamp
+        output "#{config[:scheme]}.bgwriter.#{config[:database]}.checkpoints_req", row['checkpoints_req'], timestamp
+        output "#{config[:scheme]}.bgwriter.#{config[:database]}.buffers_checkpoint", row['buffers_checkpoint'], timestamp
+        output "#{config[:scheme]}.bgwriter.#{config[:database]}.buffers_clean", row['buffers_clean'], timestamp
+        output "#{config[:scheme]}.bgwriter.#{config[:database]}.maxwritten_clean", row['maxwritten_clean'], timestamp
+        output "#{config[:scheme]}.bgwriter.#{config[:database]}.buffers_backend", row['buffers_backend'], timestamp
+        output "#{config[:scheme]}.bgwriter.#{config[:database]}.buffers_alloc", row['buffers_alloc'], timestamp
       end
     end