[debian-lan-devel] [debian-lan] 01/04: Updates and fixes for icinga.

[Andreas B. Mundt]

This is an automated email from the git hooks/post-receive script.

andi pushed a commit to branch master
in repository debian-lan.

commit baf5a9593853b2a42bddfa22fad35b6ff61b32a5
Author: Andreas B. Mundt <andi at debian.org>
Date:   Mon Jan 23 10:37:52 2017 +0100

    Updates and fixes for icinga.
---
 .../files/etc/icinga/objects/commands.cfg/LOG_SERVER   |  2 +-
 .../etc/icinga/objects/services_icinga.cfg/LOG_SERVER  | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fai/config/files/etc/icinga/objects/commands.cfg/LOG_SERVER b/fai/config/files/etc/icinga/objects/commands.cfg/LOG_SERVER
index da3a28b..60402a5 100644
--- a/fai/config/files/etc/icinga/objects/commands.cfg/LOG_SERVER
+++ b/fai/config/files/etc/icinga/objects/commands.cfg/LOG_SERVER
@@ -15,7 +15,7 @@ define command{
 
 define command{
         command_name    debian-lan_check_nfs
-        command_line    /usr/lib/nagios/plugins/check_rpc -H '$HOSTADDRESS$' -C nfs -c2,3,4
+        command_line    /usr/lib/nagios/plugins/check_rpc -H '$HOSTADDRESS$' -C nfs -c 2,3,4 -t
 }
 
 define command{
diff --git a/fai/config/files/etc/icinga/objects/services_icinga.cfg/LOG_SERVER b/fai/config/files/etc/icinga/objects/services_icinga.cfg/LOG_SERVER
index 14f19bb..235e003 100644
--- a/fai/config/files/etc/icinga/objects/services_icinga.cfg/LOG_SERVER
+++ b/fai/config/files/etc/icinga/objects/services_icinga.cfg/LOG_SERVER
@@ -160,62 +160,62 @@ define service {
 define service{
         hostgroup_name         workstation,diskless
         service_description    APT
-        check_command          check_nrpe_1arg!check_apt
+        check_command          check_nrpe!check_apt
         use                    client-service
 }
 
 define service{
         hostgroup_name         workstation,diskless
         service_description    Current Load
-        check_command          check_nrpe_1arg!debian-lan_check_load
+        check_command          check_nrpe!debian-lan_check_load
         use                    client-service
 }
 
 define service{
         hostgroup_name         workstation,diskless
         service_description    Current Users
-        check_command          check_nrpe_1arg!debian-lan_check_users
+        check_command          check_nrpe!debian-lan_check_users
         use                    client-service
 }
 
 define service{
         hostgroup_name         workstation
         service_description    Disk Space
-        check_command          check_nrpe_1arg!debian-lan_check_all_disks
+        check_command          check_nrpe!debian-lan_check_all_disks
         use                    client-service
 }
 
 define service{
         hostgroup_name         workstation
         service_description    Kerberos Key
-        check_command          check_nrpe_1arg!debian-lan_check_file_age
+        check_command          check_nrpe!debian-lan_check_file_age
         use                    client-service
 }
 
 define service{
         hostgroup_name         workstation,diskless
         service_description    Swap
-        check_command          check_nrpe_1arg!debian-lan_check_swap
+        check_command          check_nrpe!debian-lan_check_swap
         use                    client-service
 }
 
 define service{
         hostgroup_name         workstation,diskless
         service_description    Time
-        check_command          check_nrpe_1arg!debian-lan_check_ntp_time
+        check_command          check_nrpe!debian-lan_check_ntp_time
         use                    client-service
 }
 
 define service{
         hostgroup_name         workstation,diskless
         service_description    Total Procs
-        check_command          check_nrpe_1arg!debian-lan_check_procs
+        check_command          check_nrpe!debian-lan_check_procs
         use                    client-service
 }
 
 define service{
         hostgroup_name         workstation,diskless
         service_description    Zombie Procs
-        check_command          check_nrpe_1arg!debian-lan_check_procs_zombie
+        check_command          check_nrpe!debian-lan_check_procs_zombie
         use                    client-service
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git