From bd2def940d9bd241a71d6e5f4c5905555743781d Mon Sep 17 00:00:00 2001 From: ndarshan Date: Mon, 2 Jun 2014 14:40:14 +0530 Subject: nagios-server-addons: Fix for dummy config file issue. This patch replaces the configfile node1.cfg(gluster-host) by temp_node1.cfg which is of type linux-server having service PING. And this dummy config file is renamed to temp_node1.cfg.sample during auto-discovery as it is not needed after we configure actual hosts. Also this patch sets the config variable allow_empty_hostgroup_assignment to 1, which is needed for nagios to allow declaration of empty host-group with services. Change-Id: I03cc54975f5ff5857f8d82b66110e049e4195009 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1091236 Signed-off-by: ndarshan Reviewed-on: http://review.gluster.org/7952 Reviewed-by: Kanagaraj M Reviewed-by: Shubhendu Tripathi Reviewed-by: Sahina Bose --- plugins/discovery.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'plugins/discovery.py') diff --git a/plugins/discovery.py b/plugins/discovery.py index 18dc714..825d8d3 100755 --- a/plugins/discovery.py +++ b/plugins/discovery.py @@ -527,6 +527,19 @@ if __name__ == '__main__': args.nagiosServerIP, args.mode, args.timeout) print "Cluster configurations synced successfully from host %s" % \ (args.hostip) + # Rename the configuration file for dummy host from temp_node1.cfg + # to temp_node1.cfg.sample as this host is not needed after other + # hosts are configured through auto-discovery. + dummy_host_config_file = DEFAULT_AUTO_CONFIG_DIR \ + + '/default/temp_node1.cfg' + try: + if os.path.exists(dummy_host_config_file): + os.rename( + dummy_host_config_file, + dummy_host_config_file + '.sample' + ) + except Exception as e: + pass #If Nagios is running then try to restart. Otherwise don't do #anything. if server_utils.isNagiosRunning(): -- cgit