[Pkg-nagios-changes] [pkg-nagios] r542 - in nagios2/trunk/debian: .
conf.d
Marc Haber
zugschlus at costa.debian.org
Sun Jan 22 22:23:56 UTC 2006
Author: zugschlus
Date: 2006-01-22 22:23:55 +0000 (Sun, 22 Jan 2006)
New Revision: 542
Added:
nagios2/trunk/debian/conf.d/
nagios2/trunk/debian/conf.d/100_nagios2-common_timeperiods.cfg
nagios2/trunk/debian/conf.d/200_nagios2-common_contacts.cfg
nagios2/trunk/debian/conf.d/300_nagios2-common_generic-host.cfg
nagios2/trunk/debian/conf.d/400_nagios2-common_generic-service.cfg
nagios2/trunk/debian/conf.d/500_nagios2-common_localhost.cfg
Removed:
nagios2/trunk/debian/cfg-100_nagios2-common_timeperiods.cfg
nagios2/trunk/debian/cfg-200_nagios2-common_contacts.cfg
nagios2/trunk/debian/cfg-300_nagios2-common_generic-host.cfg
nagios2/trunk/debian/cfg-400_nagios2-common_generic-service.cfg
nagios2/trunk/debian/cfg-500_nagios2-common_localhost.cfg
Modified:
nagios2/trunk/debian/changelog
nagios2/trunk/debian/nagios2-common.install
nagios2/trunk/debian/rules
Log:
rip out stupid code to move config files from debian/ to
debian-configs/ verbatim, ship these files in debian/conf.d in the
first place. duh.
Deleted: nagios2/trunk/debian/cfg-100_nagios2-common_timeperiods.cfg
===================================================================
--- nagios2/trunk/debian/cfg-100_nagios2-common_timeperiods.cfg 2006-01-22 22:18:24 UTC (rev 541)
+++ nagios2/trunk/debian/cfg-100_nagios2-common_timeperiods.cfg 2006-01-22 22:23:55 UTC (rev 542)
@@ -1,20 +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
- }
-
-# end of file
Deleted: nagios2/trunk/debian/cfg-200_nagios2-common_contacts.cfg
===================================================================
--- nagios2/trunk/debian/cfg-200_nagios2-common_contacts.cfg 2006-01-22 22:18:24 UTC (rev 541)
+++ nagios2/trunk/debian/cfg-200_nagios2-common_contacts.cfg 2006-01-22 22:23:55 UTC (rev 542)
@@ -1,46 +0,0 @@
-###############################################################################
-# contacts.cfg
-###############################################################################
-
-
-
-###############################################################################
-###############################################################################
-#
-# CONTACTS
-#
-###############################################################################
-###############################################################################
-
-# In this simple config file, a single contact will receive all alerts.
-
-define contact{
- contact_name root
- alias Root
- service_notification_period 24x7
- host_notification_period 24x7
- service_notification_options w,u,c,r
- host_notification_options d,r
- service_notification_commands notify-by-email
- host_notification_commands host-notify-by-email
- email root at localhost
- }
-
-
-
-###############################################################################
-###############################################################################
-#
-# 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 admins
- alias Nagios Administrators
- members root
- }
Deleted: nagios2/trunk/debian/cfg-300_nagios2-common_generic-host.cfg
===================================================================
--- nagios2/trunk/debian/cfg-300_nagios2-common_generic-host.cfg 2006-01-22 22:18:24 UTC (rev 541)
+++ nagios2/trunk/debian/cfg-300_nagios2-common_generic-host.cfg 2006-01-22 22:23:55 UTC (rev 542)
@@ -1,13 +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
- register 0 ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL HOST, JUST A TEMPLATE!
- }
Deleted: nagios2/trunk/debian/cfg-400_nagios2-common_generic-service.cfg
===================================================================
--- nagios2/trunk/debian/cfg-400_nagios2-common_generic-service.cfg 2006-01-22 22:18:24 UTC (rev 541)
+++ nagios2/trunk/debian/cfg-400_nagios2-common_generic-service.cfg 2006-01-22 22:23:55 UTC (rev 542)
@@ -1,16 +0,0 @@
-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
- register 0 ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL SERVICE, JUST A TEMPLATE!
- }
Deleted: nagios2/trunk/debian/cfg-500_nagios2-common_localhost.cfg
===================================================================
--- nagios2/trunk/debian/cfg-500_nagios2-common_localhost.cfg 2006-01-22 22:18:24 UTC (rev 541)
+++ nagios2/trunk/debian/cfg-500_nagios2-common_localhost.cfg 2006-01-22 22:23:55 UTC (rev 542)
@@ -1,123 +0,0 @@
-# Since this is a simple configuration file, we only monitor one host - the
-# local host (this machine).
-
-define host{
- use generic-host ; Name of host template to use
- host_name localhost
- alias localhost
- address 127.0.0.1
- check_command check-host-alive
- max_check_attempts 10
- notification_interval 120
- notification_period 24x7
- notification_options d,r
- contact_groups admins
- }
-
-define hostgroup{
- hostgroup_name localhost
- alias The local host
- members localhost
- }
-
-# Define a service to "ping" the local machine
-
-define service{
- use generic-service ; Name of service template to use
- host_name localhost
- service_description PING
- is_volatile 0
- check_period 24x7
- max_check_attempts 4
- normal_check_interval 5
- retry_check_interval 1
- contact_groups admins
- notification_options w,u,c,r
- notification_interval 960
- notification_period 24x7
- check_command check_ping!100.0,20%!500.0,60%
- }
-
-
-# Define a service to check the disk space of the root partition
-# on the local machine. Warning if < 20% free, critical if
-# < 10% free space on partition.
-
-define service{
- use generic-service ; Name of service template to use
- host_name localhost
- service_description Root Partition
- is_volatile 0
- check_period 24x7
- max_check_attempts 4
- normal_check_interval 5
- retry_check_interval 1
- contact_groups admins
- notification_options w,u,c,r
- notification_interval 960
- notification_period 24x7
- check_command check_local_disk!20%!10%!/
- }
-
-
-
-# Define a service to check the number of currently logged in
-# users on the local machine. Warning if > 20 users, critical
-# if > 50 users.
-
-define service{
- use generic-service ; Name of service template to use
- host_name localhost
- service_description Current Users
- is_volatile 0
- check_period 24x7
- max_check_attempts 4
- normal_check_interval 5
- retry_check_interval 1
- contact_groups admins
- notification_options w,u,c,r
- notification_interval 960
- notification_period 24x7
- check_command check_local_users!20!50
- }
-
-
-# Define a service to check the number of currently running procs
-# on the local machine. Warning if > 250 processes, critical if
-# > 400 users.
-
-define service{
- use generic-service ; Name of service template to use
- host_name localhost
- service_description Total Processes
- is_volatile 0
- check_period 24x7
- max_check_attempts 4
- normal_check_interval 5
- retry_check_interval 1
- contact_groups admins
- notification_options w,u,c,r
- notification_interval 960
- notification_period 24x7
- check_command check_local_procs!250!400
- }
-
-
-
-# Define a service to check the load on the local machine.
-
-define service{
- use generic-service ; Name of service template to use
- host_name localhost
- service_description Current Load
- is_volatile 0
- check_period 24x7
- max_check_attempts 4
- normal_check_interval 5
- retry_check_interval 1
- contact_groups admins
- notification_options w,u,c,r
- notification_interval 960
- notification_period 24x7
- check_command check_local_load!5.0,4.0,3.0!10.0,6.0,4.0
- }
Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog 2006-01-22 22:18:24 UTC (rev 541)
+++ nagios2/trunk/debian/changelog 2006-01-22 22:23:55 UTC (rev 542)
@@ -1,15 +1,13 @@
nagios2 (0rc2-2.0-2) UNRELEASED; urgency=low
* NOT RELEASED YET
- * re-work default configuration:
- * split local.cfg into distinct files in /etc/nagios2/conf.d
- * re-work debian/rules to handle new files that are not patched
- from upstream examples as plain files
+ * re-work default configuration: split local.cfg into distinct files
+ in /etc/nagios2/conf.d from debian/conf.d
* add lintian override for resource.cfg permissions != 644
* add linda override for outdated config.(guess|sub), we update at
build time, keeping the new files outside of Debian .diff
- -- Marc Haber <mh+debian-packages at zugschlus.de> Sun, 22 Jan 2006 22:15:33 +0000
+ -- Marc Haber <mh+debian-packages at zugschlus.de> Sun, 22 Jan 2006 22:22:35 +0000
nagios2 (0rc2-2.0-1) experimental; urgency=low
Copied: nagios2/trunk/debian/conf.d/100_nagios2-common_timeperiods.cfg (from rev 539, nagios2/trunk/debian/cfg-100_nagios2-common_timeperiods.cfg)
Copied: nagios2/trunk/debian/conf.d/200_nagios2-common_contacts.cfg (from rev 539, nagios2/trunk/debian/cfg-200_nagios2-common_contacts.cfg)
Copied: nagios2/trunk/debian/conf.d/300_nagios2-common_generic-host.cfg (from rev 539, nagios2/trunk/debian/cfg-300_nagios2-common_generic-host.cfg)
Copied: nagios2/trunk/debian/conf.d/400_nagios2-common_generic-service.cfg (from rev 539, nagios2/trunk/debian/cfg-400_nagios2-common_generic-service.cfg)
Copied: nagios2/trunk/debian/conf.d/500_nagios2-common_localhost.cfg (from rev 539, nagios2/trunk/debian/cfg-500_nagios2-common_localhost.cfg)
Modified: nagios2/trunk/debian/nagios2-common.install
===================================================================
--- nagios2/trunk/debian/nagios2-common.install 2006-01-22 22:18:24 UTC (rev 541)
+++ nagios2/trunk/debian/nagios2-common.install 2006-01-22 22:23:55 UTC (rev 542)
@@ -1,5 +1,5 @@
-debian-configs/[a-zA-Z]* /etc/nagios2
-debian-configs/[0-9]* /etc/nagios2/conf.d
+debian-configs/* /etc/nagios2
+debian/conf.d/* /etc/nagios2/conf.d
sample-config/README /usr/share/doc/nagios2-common/examples
sample-config/*.cfg /usr/share/doc/nagios2-common/examples
sample-config/template-object/README /usr/share/doc/nagios2-common/examples/template-object
Modified: nagios2/trunk/debian/rules
===================================================================
--- nagios2/trunk/debian/rules 2006-01-22 22:18:24 UTC (rev 541)
+++ nagios2/trunk/debian/rules 2006-01-22 22:23:55 UTC (rev 542)
@@ -63,11 +63,6 @@
echo "diffs to config file didn't match. Stop."; \
exit 1; \
fi
- for cfg in $$(ls debian/cfg-*.cfg); do \
- TARGETNAME=$$(basename $$cfg | sed 's/^cfg-//'); \
- echo cp $$cfg debian-configs/$$TARGETNAME; \
- cp $$cfg debian-configs/$$TARGETNAME; \
- done
touch unpack-configs-stamp
pack-configs: patch
@@ -77,13 +72,8 @@
if ! [ -e "$$DISTNAME" ]; then \
DISTNAME="sample-config/template-object/$$TARGETNAME"; \
fi; \
- if ! [ -e "$$DISTNAME" ]; then \
- echo cp $$cfg debian/cfg-$${TARGETNAME}; \
- cp $$cfg debian/cfg-$${TARGETNAME}; \
- else \
- echo diff -u $$DISTNAME $$cfg; \
- diff -u $$DISTNAME $$cfg > debian/cfg-$${TARGETNAME}.diff || true; \
- fi; \
+ echo diff -u $$DISTNAME $$cfg; \
+ diff -uN $$DISTNAME $$cfg > debian/cfg-$${TARGETNAME}.diff || true; \
done
rm -f unpack-configs-stamp
More information about the Pkg-nagios-changes
mailing list