Merge pull request #9 from derjohn/master

Made monit's PROGRAM STATUS TESTING work, made ACTION EXEC work, made exec path accept parameters.
sbitio · Sep 3, 2015 · 2efb3e1 · 2efb3e1
2 parents ff6b3a9 + cf40f16
commit 2efb3e1
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -183,6 +183,19 @@ monit::checks :
         host: '127.0.0.1'
         port: '80'
         protocol: 'http'
+
+ custom-script:
+   type   : 'program'
+   config :
+     path   : "/path/to/custom/pingcheck.sh"
+   tests  :
+     - type      : 'status'
+       operator  : '!='
+       value     : '0'
+       tolerance :
+         cycles  : '2'
+       action    : 'exec'
+       exec      : 'sudo /sbin/reboot'
 ```
 
 ## License

diff --git a/lib/puppet/parser/functions/monit_validate_tests.rb b/lib/puppet/parser/functions/monit_validate_tests.rb
@@ -36,7 +36,7 @@ module Puppet::Parser::Functions
       ],
       'HOST'        => ['CONNECTION'],
       'PROCESS'     => RESOURCE_TESTS + ['CONNECTION',],
-      'PROGRAM'     => [],
+      'PROGRAM'     => ['STATUS'],
       'SYSTEM'      => RESOURCE_TESTS,
     }
     defined?(TEST_ACTIONS) or TEST_ACTIONS = ['ALERT', 'RESTART', 'START', 'STOP', 'EXEC', 'UNMONITOR']
@@ -108,6 +108,11 @@ module Puppet::Parser::Functions
         end
         test['condition'] = "FAILED #{test['type']} #{test['value']}"
 
+      # STATUS TESTING
+      elsif test['type'] == 'STATUS'
+        test['operator'] = test['operator'].upcase
+        test['condition'] = "#{test['type']} #{test['operator']} #{test['value']}"
+
       # CONNECTION TESTING
       elsif test['type'] == 'CONNECTION'
         unless test.key? 'port' or test.key? 'unixsocket'

diff --git a/manifests/check/program.pp b/manifests/check/program.pp
@@ -19,8 +19,6 @@
   $order      = 0,
 ) {
 
-  validate_absolute_path($path)
-
   monit::check::instance { "${name}_instance":
     ensure   => $ensure,
     name     => $name,

diff --git a/templates/check/common.erb b/templates/check/common.erb
@@ -17,6 +17,9 @@
   <%- if test.key? 'tolerance' -%>
     FOR <%= test['tolerance'] %>
   <%- end -%>
-  THEN <%= test['action'] %>
-<%- end -%>
+  THEN <%= test['action'] -%>
+  <%- if test.key? 'exec' -%>
+ "<%= test['exec'] %>"
+  <%- end -%>
+<%- end %>
 
diff --git a/templates/check/program.erb b/templates/check/program.erb
@@ -1 +1 @@
-CHECK PROGRAM <%= @name %> WITH PATH <%= @path %>
+CHECK PROGRAM <%= @name %> WITH PATH "<%= @path %>"