diff options
| author | mh <mh@immerda.ch> | 2012-05-05 17:00:57 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-05-05 17:00:57 +0200 |
| commit | 620a84a3753e0b9c5838ada54c0f306b955f2a24 (patch) | |
| tree | cae854f27d7f43fdbe665fa483ae789b2338e180 | |
| parent | 60ebd42e903db7f5c1f8bb2f1d447e4d952a7265 (diff) | |
| parent | acdb652ceb0613bd94a3fa115fea7044b8f87314 (diff) | |
Merge remote-tracking branch 'github/master'
| -rw-r--r-- | manifests/defaults/commands.pp | 2 | ||||
| -rw-r--r-- | manifests/defaults/plugins.pp | 4 | ||||
| -rw-r--r-- | manifests/plugin/jabber.pp | 10 | ||||
| -rw-r--r-- | manifests/service/http.pp | 5 |
4 files changed, 14 insertions, 7 deletions
diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index 3b0da37..195c8e3 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -64,7 +64,7 @@ class nagios::defaults::commands { check_http_url: command_line => '$USER1$/check_http -H $ARG1$ -u $ARG2$'; check_http_url_regex: - command_line => '$USER1$/check_http -H $ARG1$ -u $ARG2$ -e $ARG3$'; + command_line => '$USER1$/check_http -H $ARG1$ -p $ARG2$ -u $ARG3$ -e $ARG4$'; check_https_url: command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$'; check_https_url_regex: diff --git a/manifests/defaults/plugins.pp b/manifests/defaults/plugins.pp index b713354..abd8b52 100644 --- a/manifests/defaults/plugins.pp +++ b/manifests/defaults/plugins.pp @@ -6,9 +6,5 @@ class nagios::defaults::plugins { source => 'nagios/plugins/check_dns2'; 'check_dnsbl': source => 'nagios/plugins/check_dnsbl'; - 'check_jabber_login': - source => 'nagios/plugins/check_jabber_login'; } - # for check_jabber_login - require rubygems::xmpp4r } diff --git a/manifests/plugin/jabber.pp b/manifests/plugin/jabber.pp new file mode 100644 index 0000000..380a5c0 --- /dev/null +++ b/manifests/plugin/jabber.pp @@ -0,0 +1,10 @@ +class nagios::plugins::jabber { + + # for check_jabber_login + require rubygems::xmpp4r + + nagios::plugin { 'check_jabber_login': + source => 'nagios/plugins/check_jabber_login' + } +} + diff --git a/manifests/service/http.pp b/manifests/service/http.pp index 8fd5059..ef63abb 100644 --- a/manifests/service/http.pp +++ b/manifests/service/http.pp @@ -6,6 +6,7 @@ define nagios::service::http( $ensure = present, $check_domain = 'absent', + $port = '80', $check_url = '/', $check_code = 'OK', $use = 'generic-service', @@ -27,7 +28,7 @@ define nagios::service::http( nagios::service{"httprd_${name}": ensure => $ensure, use => $use, - check_command => "check_http_url_regex!${real_check_domain}!${check_url}!'301'", + check_command => "check_http_url_regex!${real_check_domain}!${port}!${check_url}!'301'", } } } @@ -38,7 +39,7 @@ define nagios::service::http( nagios::service{"http_${name}_${check_code}": ensure => $ensure, use => $use, - check_command => "check_http_url_regex!${real_check_domain}!${check_url}!'${check_code}'", + check_command => "check_http_url_regex!${real_check_domain}!${port}!${check_url}!'${check_code}'", } } } |