Changeset c667d32

Timestamp:

05/24/11 11:20:39 (2 years ago)

Author:

Pall Sigurdsson <palli@…>

Branches:

master

Children:

2a7e6fd

Parents:

abfc979 (diff), 58fa100 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Pall Sigurdsson <palli@…> (05/24/11 11:20:39)

git-committer:

Pall Sigurdsson <palli@…> (05/24/11 11:20:39)

Message:

Merge pall.sigurdsson.is:/tmp/okconfig

Location:

nagios-okconfig/trunk/okconfig

Files:

• examples/rhcs.cfg-example (modified) (2 diffs)
• templates/groups.cfg (modified) (1 diff)
• templates/linux/commands.cfg (modified) (1 diff)
• templates/linux/services.cfg (modified) (2 diffs)
• templates/misc/hosts.cfg (modified) (1 diff)
• templates/misc/nginx/commands.cfg (added)
• templates/misc/nginx/services.cfg (added)
• templates/rhcs/services.cfg (modified) (1 diff)
• examples/host.cfg-example (modified) (1 diff)

nagios-okconfig/trunk/okconfig/examples/rhcs.cfg-example

@@ -60 +60 @@
         host_name               HOSTNAME
         service_description     RHCS cman group default
-        __GROUP                 default
+        __NAME                 default
         __LEVEL                 0
 }
@@ -70 +70 @@
         host_name               HOSTNAME
         service_description     RHCS cman group rgmanager
-        __GROUP                 rgmanager
+        __NAME                 rgmanager
         __LEVEL                 1
 }
+
+define service {
+        use                     HOSTNAME,rhcs-check_cman_group
+        host_name               HOSTNAME
+        service_description     RHCS cman group clvmd
+        __NAME                 clvmd
+        __LEVEL                 1
+        register                0
+}
+
 
 define service {

nagios-okconfig/trunk/okconfig/templates/groups.cfg

@@ -15 +15 @@
 }
 
+# Use this service for example if you want to set check_interval for a whole hostgroup
 define service {
         name                    default-default_service
         register                0
+        #check_interval         5
+        #retry_interval         2
 }
+

nagios-okconfig/trunk/okconfig/templates/linux/commands.cfg

@@ -17 +17 @@
   command_line  $USER1$/check_time.sh -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$
 }
+
+
+define command {
+  command_name  linux-check_cpu
+  command_line  $USER1$/check_nrpe -H $HOSTADDRESS$ -c check_cpu
+}
+
+
 
 

nagios-okconfig/trunk/okconfig/templates/linux/services.cfg

@@ -5 +5 @@
         name                    linux-service
         servicegroups           +linux-services
-        icon_image              redhat.png      
         register                0
 }
@@ -128 +127 @@
         use                     linux-service
         name                    linux-check_cpu
-        check_command           check_nrpe!check_cpu
+        check_command           linux-check_cpu
         service_description     CPU Utilization
         register                0

nagios-okconfig/trunk/okconfig/templates/misc/hosts.cfg

@@ -9 +9 @@
         max_check_attempts              3              
         check_command                   check-host-alive 
+        register                        0
 
 }

nagios-okconfig/trunk/okconfig/templates/rhcs/services.cfg

@@ -37 +37 @@
         name                    rhcs-check_cman_group
         service_description     RHCS cman group
-        check_command           check_nrpe!check_rhcs_cman_group -a $_SERVICE_LEVEL$ $_SERVICE_GROUP$
+        check_command           check_nrpe!check_rhcs_cman_group -a $_SERVICE_LEVEL$ $_SERVICE_NAME$
         __LEVEL                 0
+        __NAME                  default
         __GROUP                 default
         register                0

nagios-okconfig/trunk/okconfig/examples/host.cfg-example

@@ -24 +24 @@
         contact_groups                  +GROUP
         service_groups                  +GROUP
+        register                        0
 }