From cea14d0870c1f6bbd31bf6d50df522945015c0ab Mon Sep 17 00:00:00 2001
From: hadaq <hadaq>
Date: Wed, 15 Feb 2012 10:15:40 +0000
Subject: [PATCH] JAM: fixed icinga configuration not to filte out " from
 macros this is required for restart handler argument passing

---
 icinga/icinga.cfg                   | 5 +++--
 icinga/objects/commands.cfg         | 6 +++---
 icinga/objects/hosts_eb_servers.cfg | 7 ++++---
 icinga/objects/templates.cfg        | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/icinga/icinga.cfg b/icinga/icinga.cfg
index e4b7e27..398dc8f 100644
--- a/icinga/icinga.cfg
+++ b/icinga/icinga.cfg
@@ -1305,8 +1305,9 @@ illegal_object_name_chars=`~!$%^&*|'"<>?,()=
 #	$SERVICEACKAUTHOR$
 #	$SERVICEACKCOMMENT$
 
-illegal_macro_output_chars=`~$&|'"<>
-
+#illegal_macro_output_chars=`~$&|'"<>
+#removed the " here to pass multiple args for restart handler JAM
+illegal_macro_output_chars=`~$&|'<>
 
 
 # REGULAR EXPRESSION MATCHING
diff --git a/icinga/objects/commands.cfg b/icinga/objects/commands.cfg
index aed4be6..d7f708d 100644
--- a/icinga/objects/commands.cfg
+++ b/icinga/objects/commands.cfg
@@ -311,19 +311,19 @@ define command {
 # restart any process by name if state is critical after 3 attempts
 define command {
    command_name restart_process
-   command_line $USER1$/my_restart_handler.pl -r -m $ARG1$@$HOSTADDRESS$ -s $ARG2$ -a $ARG3$ -x $SERVICESTATE$ -y $SERVICESTATETYPE$ -z $SERVICEATTEMPT$    
+   command_line $USER1$/my_restart_handler.pl -r -m $ARG1$@$HOSTADDRESS$ -s $ARG2$  -x $SERVICESTATE$ -y $SERVICESTATETYPE$ -z $SERVICEATTEMPT$ -a $ARG3$   
 }
 
 # restart eventbuilder epics if state is critical after 3 attempts
 define command {
    command_name restart_eb_epics
-   command_line $USER1$/my_restart_handler.pl -m hadaq@lxhadesdaq -s /home/hadaq/trbsoft/daq/evtbuild/start_eb_iocs.sh -a '> /dev/null 2>&1' -x $SERVICESTATE$ -y $SERVICESTATETYPE$ -z $SERVICEATTEMPT$    
+   command_line $USER1$/my_restart_handler.pl -m hadaq@lxhadesdaq -s /home/hadaq/trbsoft/daq/evtbuild/start_eb_iocs.sh  -x $SERVICESTATE$ -y $SERVICESTATETYPE$ -z $SERVICEATTEMPT$    
 }
 
 # restart oracle export processes if state is critical after 3 attempts
 define command {
    command_name restart_run2oracle
-   command_line $USER1$/my_restart_handler.pl -m hadaq@lxhadesdaq -s /home/hadaq/trbsoft/daq/oracle/runinfo2orastart_parallel.sh -a '> /dev/null 2>&1' -x $SERVICESTATE$ -y $SERVICESTATETYPE$ -z $SERVICEATTEMPT$    
+   command_line $USER1$/my_restart_handler.pl -m hadaq@lxhadesdaq -s /home/hadaq/trbsoft/daq/oracle/runinfo2orastart_parallel.sh  -x $SERVICESTATE$ -y $SERVICESTATETYPE$ -z $SERVICEATTEMPT$    
 }
 
 
diff --git a/icinga/objects/hosts_eb_servers.cfg b/icinga/objects/hosts_eb_servers.cfg
index fc410b7..76d680f 100644
--- a/icinga/objects/hosts_eb_servers.cfg
+++ b/icinga/objects/hosts_eb_servers.cfg
@@ -120,8 +120,9 @@ define service{
        notification_interval           30
        notification_options            c,r
        check_command                   check_proc_status!50998!daq2ora!
-       event_handler                   restart_process!hadaq!/home/hadaq/trbsoft/daq/oracle/daq2ora_client.pl!'-d -o'!
+       event_handler                   restart_process!hadaq!/home/hadaq/trbsoft/daq/oracle/daq2ora_client.pl!"-d -o"!
        }
+# -d -o
 
 # runinfo2ora in one process:
 # define service{
@@ -238,7 +239,7 @@ define service{
        notification_interval           30
        notification_options            c,u,r
        check_command                   check_proc_by_ssh!hadaq!daq_disks!
-       event_handler                   restart_process!hadaq!/home/hadaq/bin/daq_disks!'-a -s 10 > /dev/null 2>&1'!
+       event_handler                   restart_process!hadaq!/home/hadaq/bin/daq_disks!"-a -s 10"!
        }
 
 define service{
@@ -250,7 +251,7 @@ define service{
        notification_interval           30
        notification_options            c,u,r
        check_command                   check_proc_status!50501!cleanup!
-       event_handler                   restart_process!hadaq!/home/hadaq/bin/cleanup.pl!'-d > /dev/null 2>&1'!
+       event_handler                   restart_process!hadaq!/home/hadaq/bin/cleanup.pl!" "!
        }
 
 
diff --git a/icinga/objects/templates.cfg b/icinga/objects/templates.cfg
index e4d0763..da97473 100644
--- a/icinga/objects/templates.cfg
+++ b/icinga/objects/templates.cfg
@@ -197,7 +197,7 @@ define service{
 define service{
         name                            remote-service        
         use                             generic-service       
-        max_check_attempts              3                     
+        max_check_attempts              4                     
         normal_check_interval           5                     
         retry_check_interval            1  
 	notification_options		c,u,r                   
-- 
2.43.0