[debian-lan-devel] [debian-lan] 02/06: Fix false positive CUPS warning in 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 ee27c7c745319becdd8e44679a4425c981284a59
Author: Andreas B. Mundt <andi at debian.org>
Date:   Fri Aug 8 12:13:21 2014 +0200

    Fix false positive CUPS warning in icinga.
    
    CUPS does not like to be accessed via the loop interface.
---
 fai/config/files/etc/icinga/objects/commands.cfg/LOG_SERVER   |  5 +++++
 .../files/etc/icinga/objects/hostgroups_icinga.cfg/LOG_SERVER | 10 +++++-----
 .../files/etc/icinga/objects/services_icinga.cfg/LOG_SERVER   | 11 +++++++++--
 3 files changed, 19 insertions(+), 7 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 0ed422c..da3a28b 100644
--- a/fai/config/files/etc/icinga/objects/commands.cfg/LOG_SERVER
+++ b/fai/config/files/etc/icinga/objects/commands.cfg/LOG_SERVER
@@ -1,4 +1,9 @@
 define command{
+        command_name    debian-lan_check_cups
+        command_line    /usr/lib/nagios/plugins/check_http -H print.intern -p 631
+}
+
+define command{
         command_name    debian-lan_check_swap
         command_line    /usr/lib/nagios/plugins/check_swap -w 50% -c 20%
 }
diff --git a/fai/config/files/etc/icinga/objects/hostgroups_icinga.cfg/LOG_SERVER b/fai/config/files/etc/icinga/objects/hostgroups_icinga.cfg/LOG_SERVER
index 6dc8c1b..2c91b4a 100644
--- a/fai/config/files/etc/icinga/objects/hostgroups_icinga.cfg/LOG_SERVER
+++ b/fai/config/files/etc/icinga/objects/hostgroups_icinga.cfg/LOG_SERVER
@@ -48,11 +48,11 @@ define hostgroup {
        members           mainserver
 }
 
-define hostgroup {
-       hostgroup_name    cups-servers
-       alias             CUPS servers
-       members           mainserver
-}
+#define hostgroup {
+#       hostgroup_name    cups-servers
+#       alias             CUPS servers
+#       members           mainserver
+#}
 
 define hostgroup {
        hostgroup_name    dns-servers
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 63bc04e..14f19bb 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
@@ -7,12 +7,19 @@ define service{
 }
 
 define service{
-        hostgroup_name         cups-servers
+        host                   mainserver
         service_description    CUPS
-        check_command          check_cups
+        check_command          debian-lan_check_cups
         use                    generic-service
 }
 
+#define service{
+#        hostgroup_name         cups-servers
+#        service_description    CUPS
+#        check_command          check_cups
+#        use                    generic-service
+#}
+
 define service{
         host                   mainserver
         service_description    Current Load

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