diff options
author | Micah Anderson <micah@riseup.net> | 2012-09-25 16:27:37 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2012-09-25 16:27:37 -0400 |
commit | 16e77b3a8b257dafcf059bfcebc095178995fda5 (patch) | |
tree | 2673fa226de03b0be14ceef4df64140372643ea6 /files/nrpe/nrpe_commands.cfg | |
parent | ad1f714b06faf229ec1b0f310e81c425a6906581 (diff) | |
parent | eafb4c73ee82915bf83eac01bb26265c531a68e2 (diff) |
Merge branch 'merge_immerda'
Conflicts:
manifests/apache.pp
this conflict was just a indentation difference.
Diffstat (limited to 'files/nrpe/nrpe_commands.cfg')
-rw-r--r-- | files/nrpe/nrpe_commands.cfg | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/files/nrpe/nrpe_commands.cfg b/files/nrpe/nrpe_commands.cfg index 1a26cc3..b725a36 100644 --- a/files/nrpe/nrpe_commands.cfg +++ b/files/nrpe/nrpe_commands.cfg @@ -1,6 +1,5 @@ # default plugins command[check_users]=/usr/lib/nagios/plugins/check_users $ARG1$ -command[check_load]=/usr/lib/nagios/plugins/check_load $ARG1$ command[check_disk]=/usr/lib/nagios/plugins/check_disk $ARG1$ -x "/dev" -x "/dev/shm" -x "/lib/init/rw" command[check_apt]=sudo /usr/lib/nagios/plugins/check_apt -u $ARG1$ command[check_swap]=/usr/lib/nagios/plugins/check_swap $ARG1$ |