riemann-babbler 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b12b09f0206a5293f373dcfb2fc94d0451c446bd
-  data.tar.gz: 24c516afe7a4fd13b66d9b60c089e77d8d9a15f6
+  metadata.gz: 9915b5a001d3c3f81b76a15e7c50c848c94f59e6
+  data.tar.gz: 21db07879c0c11ee089a0597f7976404c45c26fe
 SHA512:
-  metadata.gz: 6eee0b673ca94e64051c5ace8088b686fc79d4762fa35a6283ec0fc0e7097f25c1af4c924028c793ea42cc870539d19307608280ab8c433f7702e9f79bdcbf85
-  data.tar.gz: 46414b6df6a30f163816ccf21134ee8fb3c12f570eac191ec0650841cd0202159e58ccd758cecf0e36be556da75ad687973dd9eabc70657ffa8f3a9fc396f7b8
+  metadata.gz: 74c7ed6b265d2a7d366b26fab1e6df92d21d4b29fc60fa5e6652451ff8ef201a09f6b8f2562624e5246073ebc6338299249b7c4147bf5bc8b6dc9f2910db4147
+  data.tar.gz: a4c58781c080e2777668b4e84f6915bc069599761c8c3b06aa60f5511efe9b66c49db027349e1fa6f3494a6235068977e2f5e1860a6ac5eaf293dcfa993a10ee

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    riemann-babbler (2.0.4)
+    riemann-babbler (2.0.5)
       configatron
       docile
       file-tail

data/lib/riemann/babbler/plugins/pgsql.rb

@@ -4,30 +4,44 @@ class Riemann::Babbler::Plugin::Pgsql < Riemann::Babbler::Plugin
     plugin.set_default(:service, 'pgsql')
     plugin.set_default(:host, '127.0.0.1')
     plugin.set_default(:user, 'postgres')
-    plugin.set_default(:chk_file, '/usr/bin/pg_config')
-
-    plugin.set_default(:rep_lag_sql, "select date_part('epoch', pg_last_xact_replay_timestamp() - now())::int")
-    plugin.set_default(:rep_lag_warn, 500)
-    plugin.set_default(:rep_lag_crit, 1000)
-
+    plugin.set_default(:psql, '/usr/bin/psql')
+    plugin.set_default(:db4monit, 'riemann_monit')
     plugin.set_default(:conn_warn, 5)
     plugin.set_default(:conn_crit, 3)
-
+    plugin.states.set_default(:warning, 120) # repl lag
+    plugin.states.set_default(:critical, 500) # repl lag
     plugin.set_default(:interval, 60)
   end
 
   def run_plugin
-    File.exists? plugin.chk_file
+    File.exists? plugin.psql
   end
 
-  def run_sql(sql)
-    shell("psql -h #{plugin.host} -U #{plugin.user} -tnc \"#{sql}\" postgres")
+  def run_sql(sql, db='postgres')
+    shell("#{plugin.psql} -h #{plugin.host} -U #{plugin.user} -tnc \"#{sql}\" #{db}")
   end
 
   def in_recovery?
     run_sql('select pg_is_in_recovery()') == 't'
   end
 
+  def db_exists?
+    run_sql("select 1 from pg_database where datname = '#{plugin.db4monit}'") == '1'
+  end
+
+  def run_master_sql
+    run_sql("create database #{plugin.db4monit}") unless db_exists?
+    run_sql(
+      "drop table if exists timestamp; \
+      create table timestamp ( id int primary key, value timestamp default now() ); \
+      insert into timestamp (id) values (1); \
+      ", plugin.db4monit)
+  end
+
+  def repl_lag
+    unixnow - run_sql("select extract(epoch from value::timestamp) from timestamp where id = 1;", plugin.db4monit).to_i
+  end
+
   # connection to pg
   def connections
     max_conn = run_sql('show max_connections').to_i
@@ -36,23 +50,17 @@ class Riemann::Babbler::Plugin::Pgsql < Riemann::Babbler::Plugin
     [cur_conn, (max_conn - res_conn - cur_conn)]
   end
 
-  def rep_lag_state
-    rep_lag = run_sql(plugin.rep_lag_sql).to_i.abs
-    if rep_lag >= plugin.rep_lag_crit
-      { :service => plugin.service + ' rep_lag', :description => 'Postgresql replication lag state', :state => 'critical', :metric => rep_lag }
-    elsif rep_lag >= plugin.rep_lag_warn
-      { :service => plugin.service + ' rep_lag', :description => 'Postgresql replication lag state', :state => 'warning', :metric => rep_lag }
-    else
-      { :service => plugin.service + ' rep_lag', :description => 'Postgresql replication lag state', :state => 'ok', :metric => rep_lag }
-    end
-  end
-
   def collect
     status = Array.new
 
     cur_conn, res_conn = connections
 
-    status << rep_lag_state if in_recovery?
+    if in_recovery?
+      status << { :service => plugin.service + ' replication lag', :description => 'Postgresql replication lag', :metric => repl_lag } 
+    else
+      run_master_sql
+    end
+
     status << { :service => plugin.service + ' connections', :description => 'Postgresql current connections', :state => 'ok', :metric => cur_conn }
 
     # check reserved pool size

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   module Babbler
-    VERSION = '2.0.4'
+    VERSION = '2.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client