Move nagios-conf/* and checkcommands.cfg into static/
authorPeter Palfrader <peter@palfrader.org>
Tue, 31 Mar 2009 17:30:01 +0000 (19:30 +0200)
committerPeter Palfrader <peter@palfrader.org>
Tue, 31 Mar 2009 17:30:01 +0000 (19:30 +0200)
config/checkcommands.cfg [deleted file]
config/nagios-conf/contacs.cfg [deleted file]
config/nagios-conf/generic-host.cfg [deleted file]
config/nagios-conf/generic-service.cfg [deleted file]
config/nagios-conf/timeperiods.cfg [deleted file]
config/static/checkcommands.cfg [new file with mode: 0644]
config/static/nagios-contacs.cfg [new file with mode: 0644]
config/static/nagios-generic-host.cfg [new file with mode: 0644]
config/static/nagios-generic-service.cfg [new file with mode: 0644]
config/static/nagios-timeperiods.cfg [new file with mode: 0644]

diff --git a/config/checkcommands.cfg b/config/checkcommands.cfg
deleted file mode 100644 (file)
index 9811089..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# if you read this in /etc/nagios-plugins/config/local-dsa-checkcommands.cfg
-# please note: this file is maintained in bzr and overwritten in the
-# make install target
-#
-# edit the copy in bzr instead, see /etc/nagios3/README-DSA
-#
-define command {
-       command_name    dsa_check_nrpe
-       command_line    /usr/lib/nagios/plugins/check_nrpe --no-ssl -H $HOSTADDRESS$ -t 50 -c $ARG1$
-}
-define command {
-       command_name    dsa_check_nrpe_host
-       command_line    /usr/lib/nagios/plugins/check_nrpe --no-ssl -H $ARG1$ -c $ARG2$
-}
-define command{
-       command_name    dsa_check_cert
-       command_line    /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -p $ARG1$ -S -C 14
-}
-define command{
-       command_name    dsa_check_http_port
-       command_line    /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -I $HOSTADDRESS$ -p $ARG1$
-}
-define command{
-       command_name    dsa_check_smtp
-       command_line    /usr/lib/nagios/plugins/check_smtp -t 40 -H $HOSTADDRESS$
-}
-define command{
-       command_name    dsa_check_smtp_port
-       command_line    /usr/lib/nagios/plugins/check_smtp -t 40 -H $HOSTADDRESS$ -p $ARG1$
-}
-define command{
-       command_name    dsa_check_ssh
-       command_line    /usr/lib/nagios/plugins/check_ssh -t 40 -H $HOSTADDRESS$
-}
-define command{
-       command_name    dsa_check_ssh_port
-       command_line    /usr/lib/nagios/plugins/check_ssh -t 40 -H $HOSTADDRESS$ -p $ARG1$
-}
-define command{
-       command_name    dsa_check_ssh_port_version
-       command_line    /usr/lib/nagios/plugins/check_ssh -t 40 -H $HOSTADDRESS$ -p $ARG1$ -r "$ARG2$"
-}
-define command{
-       command_name    dsa_check_time
-       command_line    /usr/lib/nagios/plugins/check_time -w 5 -c 60 -H $HOSTADDRESS$
-}
-define command{
-       command_name    dsa_check_mirrorsync
-       command_line    /usr/lib/nagios/plugins/dsa-check-mirrorsync --host "$ARG1$" --path "$ARG2$"
-}
-define command{
-       command_name    dsa_check_soas
-       command_line    /usr/lib/nagios/plugins/dsa-check-soas "$ARG1$"
-}
-define command{
-       command_name    dsa_check_soas_add
-       command_line    /usr/lib/nagios/plugins/dsa-check-soas -a "$ARG1$" "$ARG2$"
-}
-define command{
-       command_name    dsa_check_always_ok
-       command_line    /bin/true
-}
diff --git a/config/nagios-conf/contacs.cfg b/config/nagios-conf/contacs.cfg
deleted file mode 100644 (file)
index 6c36d24..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-define contact{
-       contact_name                    weasel
-       alias                           Peter Palfrader
-       service_notification_period     24x7
-       host_notification_period        24x7
-       service_notification_options    w,u,c,r
-       host_notification_options       d,r
-       service_notification_commands   notify-service-by-email
-       host_notification_commands      notify-host-by-email
-       email                           debian-nagios@palfrader.org
-       }
-
-define contact{
-       contact_name                    joerg
-       alias                           Joerg Jaspert
-       service_notification_period     24x7
-       host_notification_period        24x7
-       service_notification_options    w,u,c,r
-       host_notification_options       d,r
-       service_notification_commands   notify-service-by-email
-       host_notification_commands      notify-host-by-email
-       email                           debiannagios@ganneff.de
-       }
-
-define contact{
-       contact_name                    tjrc1
-       alias                           Tim Cutts
-       service_notification_period     24x7
-       host_notification_period        24x7
-       service_notification_options    w,u,c,r
-       host_notification_options       d,r
-       service_notification_commands   notify-service-by-email
-       host_notification_commands      notify-host-by-email
-       email                           tjrc@sanger.ac.uk
-       }
-
-define contact{
-       contact_name                    holger
-       alias                           Holger Levsen
-       service_notification_period     24x7
-       host_notification_period        24x7
-       service_notification_options    w,u,c,r
-       host_notification_options       d,r
-       service_notification_commands   notify-service-by-email
-       host_notification_commands      notify-host-by-email
-       email                           holger@layer-acht.org
-       }
-
-define contact{
-       contact_name                    dannf
-       alias                           Dann Frazier
-       service_notification_period     24x7
-       host_notification_period        24x7
-       service_notification_options    w,u,c,r
-       host_notification_options       d,r
-       service_notification_commands   notify-service-by-email
-       host_notification_commands      notify-host-by-email
-       email                           dannf@hp.com
-       }
-
-define contact{
-       contact_name                    bzed
-       alias                           Bernd Zeimetz
-       service_notification_period     24x7
-       host_notification_period        24x7
-       service_notification_options    w,u,c,r
-       host_notification_options       d,r
-       service_notification_commands   notify-service-by-email
-       host_notification_commands      notify-host-by-email
-       email                           bernd+debnagios@bzed.de
-       }
-
-define contact{
-       contact_name                    luk
-       alias                           Luk Claes
-       service_notification_period     24x7
-       host_notification_period        24x7
-       service_notification_options    w,u,c,r
-       host_notification_options       d,r
-       service_notification_commands   notify-service-by-email
-       host_notification_commands      notify-host-by-email
-       email                           luk.claes@ugent.be
-       }
-
-define contact{
-       contact_name                    sfrost
-       alias                           Stephen Frost
-       service_notification_period     24x7
-       host_notification_period        24x7
-       service_notification_options    w,u,c,r
-       host_notification_options       d,r
-       service_notification_commands   notify-service-by-email
-       host_notification_commands      notify-host-by-email
-       email                           sfrost@snowman.net
-       }
-
-define contact{
-       contact_name                    lfilipoz
-       alias                           Luca Filipozzi
-       service_notification_period     24x7
-       host_notification_period        24x7
-       service_notification_options    w,u,c,r
-       host_notification_options       d,r
-       service_notification_commands   notify-service-by-email
-       host_notification_commands      notify-host-by-email
-       email                           lucaf+dsa@ece.ubc.ca
-       }
-
-define contact{
-       contact_name                    zobel
-       alias                           Martin Zobel-Helas
-       service_notification_period     24x7
-       host_notification_period        24x7
-       service_notification_options    w,u,c,r
-       host_notification_options       d,r
-       service_notification_commands   notify-service-by-email
-       host_notification_commands      notify-host-by-email
-       email                           zobel+debian-nagios@ftbfs.de
-       }
-
-###############################################################################
-###############################################################################
-#
-# CONTACT GROUPS
-#
-###############################################################################
-###############################################################################
-
-# We only have one contact in this simple configuration file, so there is
-# no need to create more than one contact group.
-
-define contactgroup{
-        contactgroup_name       dsa
-        alias                   Debian System Administrators
-        members                 weasel, zobel
-        }
diff --git a/config/nagios-conf/generic-host.cfg b/config/nagios-conf/generic-host.cfg
deleted file mode 100644 (file)
index 02d157e..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generic host definition template - This is NOT a real host, just a template!
-
-define host{
-       name                            generic-host    ; The name of this host template
-       notifications_enabled           1       ; Host notifications are enabled
-       event_handler_enabled           1       ; Host event handler is enabled
-       flap_detection_enabled          1       ; Flap detection is enabled
-       failure_prediction_enabled      1       ; Failure prediction is enabled
-       process_perf_data               1       ; Process performance data
-       retain_status_information       1       ; Retain status information across program restarts
-       retain_nonstatus_information    1       ; Retain non-status information across program restarts
-       check_command                   check-host-alive
-       max_check_attempts              10
-       notification_interval           1440
-       notification_period             24x7
-       notification_options            d,u,r
-       contact_groups                  dsa
-       register                        0       ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL HOST, JUST A TEMPLATE!
-       }
diff --git a/config/nagios-conf/generic-service.cfg b/config/nagios-conf/generic-service.cfg
deleted file mode 100644 (file)
index 17ccbe2..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# generic service template definition
-define service{
-       name                            generic-service ; The 'name' of this service template
-       active_checks_enabled           1       ; Active service checks are enabled
-       passive_checks_enabled          1       ; Passive service checks are enabled/accepted
-       parallelize_check               1       ; Active service checks should be parallelized (disabling this can lead to major performance problems)
-       obsess_over_service             1       ; We should obsess over this service (if necessary)
-       check_freshness                 0       ; Default is to NOT check service 'freshness'
-       notifications_enabled           1       ; Service notifications are enabled
-       event_handler_enabled           1       ; Service event handler is enabled
-       flap_detection_enabled          1       ; Flap detection is enabled
-       failure_prediction_enabled      1       ; Failure prediction is enabled
-       process_perf_data               1       ; Process performance data
-       retain_status_information       1       ; Retain status information across program restarts
-       retain_nonstatus_information    1       ; Retain non-status information across program restarts
-       notification_interval           0       ; Only send notifications on status change by default.
-       is_volatile                     0
-       check_period                    24x7
-       normal_check_interval           15
-       retry_check_interval            2
-       max_check_attempts              6
-       notification_period             24x7
-       notification_options            w,u,c,r
-       contact_groups                  dsa
-       register                        0       ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL SERVICE, JUST A TEMPLATE!
-       }
diff --git a/config/nagios-conf/timeperiods.cfg b/config/nagios-conf/timeperiods.cfg
deleted file mode 100644 (file)
index 084c2f4..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# timeperiods.cfg
-###############################################################################
-
-# This defines a timeperiod where all times are valid for checks, 
-# notifications, etc.  The classic "24x7" support nightmare. :-)
-
-define timeperiod{
-       timeperiod_name 24x7
-       alias           24 Hours A Day, 7 Days A Week
-       sunday          00:00-24:00
-       monday          00:00-24:00
-       tuesday         00:00-24:00
-       wednesday       00:00-24:00
-       thursday        00:00-24:00
-       friday          00:00-24:00
-       saturday        00:00-24:00
-       }
-
-# This one is a favorite: never :)
-define timeperiod{
-       timeperiod_name never
-       alias           Never
-       }
diff --git a/config/static/checkcommands.cfg b/config/static/checkcommands.cfg
new file mode 100644 (file)
index 0000000..9811089
--- /dev/null
@@ -0,0 +1,62 @@
+# if you read this in /etc/nagios-plugins/config/local-dsa-checkcommands.cfg
+# please note: this file is maintained in bzr and overwritten in the
+# make install target
+#
+# edit the copy in bzr instead, see /etc/nagios3/README-DSA
+#
+define command {
+       command_name    dsa_check_nrpe
+       command_line    /usr/lib/nagios/plugins/check_nrpe --no-ssl -H $HOSTADDRESS$ -t 50 -c $ARG1$
+}
+define command {
+       command_name    dsa_check_nrpe_host
+       command_line    /usr/lib/nagios/plugins/check_nrpe --no-ssl -H $ARG1$ -c $ARG2$
+}
+define command{
+       command_name    dsa_check_cert
+       command_line    /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -p $ARG1$ -S -C 14
+}
+define command{
+       command_name    dsa_check_http_port
+       command_line    /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -I $HOSTADDRESS$ -p $ARG1$
+}
+define command{
+       command_name    dsa_check_smtp
+       command_line    /usr/lib/nagios/plugins/check_smtp -t 40 -H $HOSTADDRESS$
+}
+define command{
+       command_name    dsa_check_smtp_port
+       command_line    /usr/lib/nagios/plugins/check_smtp -t 40 -H $HOSTADDRESS$ -p $ARG1$
+}
+define command{
+       command_name    dsa_check_ssh
+       command_line    /usr/lib/nagios/plugins/check_ssh -t 40 -H $HOSTADDRESS$
+}
+define command{
+       command_name    dsa_check_ssh_port
+       command_line    /usr/lib/nagios/plugins/check_ssh -t 40 -H $HOSTADDRESS$ -p $ARG1$
+}
+define command{
+       command_name    dsa_check_ssh_port_version
+       command_line    /usr/lib/nagios/plugins/check_ssh -t 40 -H $HOSTADDRESS$ -p $ARG1$ -r "$ARG2$"
+}
+define command{
+       command_name    dsa_check_time
+       command_line    /usr/lib/nagios/plugins/check_time -w 5 -c 60 -H $HOSTADDRESS$
+}
+define command{
+       command_name    dsa_check_mirrorsync
+       command_line    /usr/lib/nagios/plugins/dsa-check-mirrorsync --host "$ARG1$" --path "$ARG2$"
+}
+define command{
+       command_name    dsa_check_soas
+       command_line    /usr/lib/nagios/plugins/dsa-check-soas "$ARG1$"
+}
+define command{
+       command_name    dsa_check_soas_add
+       command_line    /usr/lib/nagios/plugins/dsa-check-soas -a "$ARG1$" "$ARG2$"
+}
+define command{
+       command_name    dsa_check_always_ok
+       command_line    /bin/true
+}
diff --git a/config/static/nagios-contacs.cfg b/config/static/nagios-contacs.cfg
new file mode 100644 (file)
index 0000000..6c36d24
--- /dev/null
@@ -0,0 +1,136 @@
+define contact{
+       contact_name                    weasel
+       alias                           Peter Palfrader
+       service_notification_period     24x7
+       host_notification_period        24x7
+       service_notification_options    w,u,c,r
+       host_notification_options       d,r
+       service_notification_commands   notify-service-by-email
+       host_notification_commands      notify-host-by-email
+       email                           debian-nagios@palfrader.org
+       }
+
+define contact{
+       contact_name                    joerg
+       alias                           Joerg Jaspert
+       service_notification_period     24x7
+       host_notification_period        24x7
+       service_notification_options    w,u,c,r
+       host_notification_options       d,r
+       service_notification_commands   notify-service-by-email
+       host_notification_commands      notify-host-by-email
+       email                           debiannagios@ganneff.de
+       }
+
+define contact{
+       contact_name                    tjrc1
+       alias                           Tim Cutts
+       service_notification_period     24x7
+       host_notification_period        24x7
+       service_notification_options    w,u,c,r
+       host_notification_options       d,r
+       service_notification_commands   notify-service-by-email
+       host_notification_commands      notify-host-by-email
+       email                           tjrc@sanger.ac.uk
+       }
+
+define contact{
+       contact_name                    holger
+       alias                           Holger Levsen
+       service_notification_period     24x7
+       host_notification_period        24x7
+       service_notification_options    w,u,c,r
+       host_notification_options       d,r
+       service_notification_commands   notify-service-by-email
+       host_notification_commands      notify-host-by-email
+       email                           holger@layer-acht.org
+       }
+
+define contact{
+       contact_name                    dannf
+       alias                           Dann Frazier
+       service_notification_period     24x7
+       host_notification_period        24x7
+       service_notification_options    w,u,c,r
+       host_notification_options       d,r
+       service_notification_commands   notify-service-by-email
+       host_notification_commands      notify-host-by-email
+       email                           dannf@hp.com
+       }
+
+define contact{
+       contact_name                    bzed
+       alias                           Bernd Zeimetz
+       service_notification_period     24x7
+       host_notification_period        24x7
+       service_notification_options    w,u,c,r
+       host_notification_options       d,r
+       service_notification_commands   notify-service-by-email
+       host_notification_commands      notify-host-by-email
+       email                           bernd+debnagios@bzed.de
+       }
+
+define contact{
+       contact_name                    luk
+       alias                           Luk Claes
+       service_notification_period     24x7
+       host_notification_period        24x7
+       service_notification_options    w,u,c,r
+       host_notification_options       d,r
+       service_notification_commands   notify-service-by-email
+       host_notification_commands      notify-host-by-email
+       email                           luk.claes@ugent.be
+       }
+
+define contact{
+       contact_name                    sfrost
+       alias                           Stephen Frost
+       service_notification_period     24x7
+       host_notification_period        24x7
+       service_notification_options    w,u,c,r
+       host_notification_options       d,r
+       service_notification_commands   notify-service-by-email
+       host_notification_commands      notify-host-by-email
+       email                           sfrost@snowman.net
+       }
+
+define contact{
+       contact_name                    lfilipoz
+       alias                           Luca Filipozzi
+       service_notification_period     24x7
+       host_notification_period        24x7
+       service_notification_options    w,u,c,r
+       host_notification_options       d,r
+       service_notification_commands   notify-service-by-email
+       host_notification_commands      notify-host-by-email
+       email                           lucaf+dsa@ece.ubc.ca
+       }
+
+define contact{
+       contact_name                    zobel
+       alias                           Martin Zobel-Helas
+       service_notification_period     24x7
+       host_notification_period        24x7
+       service_notification_options    w,u,c,r
+       host_notification_options       d,r
+       service_notification_commands   notify-service-by-email
+       host_notification_commands      notify-host-by-email
+       email                           zobel+debian-nagios@ftbfs.de
+       }
+
+###############################################################################
+###############################################################################
+#
+# CONTACT GROUPS
+#
+###############################################################################
+###############################################################################
+
+# We only have one contact in this simple configuration file, so there is
+# no need to create more than one contact group.
+
+define contactgroup{
+        contactgroup_name       dsa
+        alias                   Debian System Administrators
+        members                 weasel, zobel
+        }
diff --git a/config/static/nagios-generic-host.cfg b/config/static/nagios-generic-host.cfg
new file mode 100644 (file)
index 0000000..02d157e
--- /dev/null
@@ -0,0 +1,19 @@
+# Generic host definition template - This is NOT a real host, just a template!
+
+define host{
+       name                            generic-host    ; The name of this host template
+       notifications_enabled           1       ; Host notifications are enabled
+       event_handler_enabled           1       ; Host event handler is enabled
+       flap_detection_enabled          1       ; Flap detection is enabled
+       failure_prediction_enabled      1       ; Failure prediction is enabled
+       process_perf_data               1       ; Process performance data
+       retain_status_information       1       ; Retain status information across program restarts
+       retain_nonstatus_information    1       ; Retain non-status information across program restarts
+       check_command                   check-host-alive
+       max_check_attempts              10
+       notification_interval           1440
+       notification_period             24x7
+       notification_options            d,u,r
+       contact_groups                  dsa
+       register                        0       ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL HOST, JUST A TEMPLATE!
+       }
diff --git a/config/static/nagios-generic-service.cfg b/config/static/nagios-generic-service.cfg
new file mode 100644 (file)
index 0000000..17ccbe2
--- /dev/null
@@ -0,0 +1,26 @@
+# generic service template definition
+define service{
+       name                            generic-service ; The 'name' of this service template
+       active_checks_enabled           1       ; Active service checks are enabled
+       passive_checks_enabled          1       ; Passive service checks are enabled/accepted
+       parallelize_check               1       ; Active service checks should be parallelized (disabling this can lead to major performance problems)
+       obsess_over_service             1       ; We should obsess over this service (if necessary)
+       check_freshness                 0       ; Default is to NOT check service 'freshness'
+       notifications_enabled           1       ; Service notifications are enabled
+       event_handler_enabled           1       ; Service event handler is enabled
+       flap_detection_enabled          1       ; Flap detection is enabled
+       failure_prediction_enabled      1       ; Failure prediction is enabled
+       process_perf_data               1       ; Process performance data
+       retain_status_information       1       ; Retain status information across program restarts
+       retain_nonstatus_information    1       ; Retain non-status information across program restarts
+       notification_interval           0       ; Only send notifications on status change by default.
+       is_volatile                     0
+       check_period                    24x7
+       normal_check_interval           15
+       retry_check_interval            2
+       max_check_attempts              6
+       notification_period             24x7
+       notification_options            w,u,c,r
+       contact_groups                  dsa
+       register                        0       ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL SERVICE, JUST A TEMPLATE!
+       }
diff --git a/config/static/nagios-timeperiods.cfg b/config/static/nagios-timeperiods.cfg
new file mode 100644 (file)
index 0000000..084c2f4
--- /dev/null
@@ -0,0 +1,24 @@
+###############################################################################
+# timeperiods.cfg
+###############################################################################
+
+# This defines a timeperiod where all times are valid for checks, 
+# notifications, etc.  The classic "24x7" support nightmare. :-)
+
+define timeperiod{
+       timeperiod_name 24x7
+       alias           24 Hours A Day, 7 Days A Week
+       sunday          00:00-24:00
+       monday          00:00-24:00
+       tuesday         00:00-24:00
+       wednesday       00:00-24:00
+       thursday        00:00-24:00
+       friday          00:00-24:00
+       saturday        00:00-24:00
+       }
+
+# This one is a favorite: never :)
+define timeperiod{
+       timeperiod_name never
+       alias           Never
+       }