[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, master, updated. 016db4e7560fc8ef5ccdb6357745ef691650d94a

[David GUENAULT]

The following commit has been merged in the master branch:
commit fda32c5ab610fa3203ac238ed0dd7814bb3f7225
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Wed Nov 9 20:43:17 2011 +0100

    ADD macro for configuring simple poller

diff --git a/contrib/alternative-installation/shinken-install/tools/macros/ces_add_satellite_tagged_poller.macro b/contrib/alternative-installation/shinken-install/tools/macros/ces_add_satellite_poller.macro
similarity index 51%
copy from contrib/alternative-installation/shinken-install/tools/macros/ces_add_satellite_tagged_poller.macro
copy to contrib/alternative-installation/shinken-install/tools/macros/ces_add_satellite_poller.macro
index 4e931f3..1f830f3 100644
--- a/contrib/alternative-installation/shinken-install/tools/macros/ces_add_satellite_tagged_poller.macro
+++ b/contrib/alternative-installation/shinken-install/tools/macros/ces_add_satellite_poller.macro
@@ -1,9 +1,8 @@
 # macro for adding a shinken satellite with a tagged poller also deploy config on satellites
 # Arguments are :
 # ARG1 : new poller name
-# ARG2 : new poller tag
-# ARG3 : new poller address
-# ARG4 : existing poller name that will be used as model for the new poller
+# ARG2 : new poller address
+# ARG3 : existing poller name that will be used as model for the new poller
 #
 # set configuration file
 setconfigfile /opt/shinken/etc/shinken-specific.cfg
@@ -14,13 +13,7 @@ onerror continue
 delete poller where poller_name=ARG1
 onerror stop
 # clone existing poller
-clone poller set poller_name=ARG1,address=ARG3 where poller_name=ARG4
-# add poller tag
-setparam poller_tags=ARG2 from poller where poller_name=ARG1
-# get existing module for Arbiter
-getdirective modules from arbiter where arbiter_name=Arbiter-Master
-# add HackPollerTagByMacros module to Arbiter
-setparam modules=LAST, HackPollerTagByMacros from arbiter where arbiter_name=Arbiter-Master
+clone poller set poller_name=ARG1,address=ARG2 where poller_name=ARG3
 # write config
 writeconfig
 # deploy configuration

-- 
UNNAMED PROJECT