[checkmk-commits] Check_MK Git: check_mk: #1689 Creating WATO backends for each configured site now

Module: check_mk Branch: master Commit: 9c2ed2b3a32a559ec1761f8998b872e5bde4a073 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c2ed2b3a32a55… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 8 12:24:02 2014 +0100 #1689 Creating WATO backends for each configured site now For each configured site a new backend is created within NagVis. The backend is named equal to the site ID. This only works in OMD envionments. --- .werks/1689 | 12 ++++++++++++ ChangeLog | 2 +- web/htdocs/wato.py | 25 +++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/.werks/1689 b/.werks/1689 new file mode 100644 index 0000000..02cb04e --- /dev/null +++ b/.werks/1689 @@ -0,0 +1,12 @@ +Title: Creating WATO backends for each configured site now +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1418037792 +Class: feature + +For each configured site a new backend is created within NagVis. +The backend is named equal to the site ID. + +This only works in OMD envionments. diff --git a/ChangeLog b/ChangeLog index 4bb9c37..d98610d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,6 @@ * 1624 FIX: Remove illegal characters from service descriptions of active checks... * 1628 FIX: Remove trailing backslashes from service descriptions... * 1649 FIX: Check_MK inventory service has been renamed to Check_MK Discovery... - * 1657 FIX: check_mk_agent.solaris: run_cached: remove cache file if it is older than twice the maximum cache age * 1706 FIX: Fix file permissions when installing MKPs to 0644 or 0755... Checks & Agents: @@ -198,6 +197,7 @@ * 1562 Move manual checks into a new WATO module... * 1697 Allow non-Ascii characters in topic of host tag groups * 1707 WATO rule editor: show title of tag group when rendering the conditions of a rule... + * 1689 Creating WATO backends for each configured site now... * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7bc521b..52c6a6e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10505,6 +10505,8 @@ def save_sites(sites, activate=True): if config.liveproxyd_enabled: save_liveproxyd_config(sites) + create_nagvis_backends(sites) + # Call the sites saved hook call_hook_sites_saved(sites) @@ -10527,6 +10529,29 @@ def save_liveproxyd_config(sites): except Exception, e: html.show_error(_("Warning: cannot reload Livestatus Proxy-Daemon: %s" % e)) +def create_nagvis_backends(sites): + if not defaults.omd_root: + return # skip when not in OMD environment + cfg = [ + '; MANAGED BY CHECK_MK WATO - Last Update: %s' % time.strftime('%Y-%m-%d %H:%M:%S'), + ] + for site_id, site in sites.items(): + if site == defaults.omd_site: + continue # skip local site, backend already added by omd + if 'socket' not in site: + continue # skip sites without configured sockets + + cfg += [ + '', + '[backend_%s]' % site_id, + 'backendtype="mklivestatus"', + 'socket="%s"' % site['socket'], + ] + + if 'status_host' in site: + cfg.append('statushost="%s"' % ':'.join(site['status_host'])) + + file('%s/etc/nagvis/conf.d/cmk_backends.ini.php' % defaults.omd_root, 'w').write('\n'.join(cfg)) # Makes sure, that in distributed mode we monitor only # the hosts that are directly assigned to our (the local)