[checkmk-commits] Check_MK Git: check_mk: Removed "do not connect" option from site socket editor

Module: check_mk Branch: master Commit: 03a0f5e9170aae522cfaa87109835f3c68e06ca1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03a0f5e9170aae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 11 11:05:31 2013 +0200 Removed "do not connect" option from site socket editor --- ChangeLog | 2 ++ web/htdocs/wato.py | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9b77a1..63b7269 100644 --- a/ChangeLog +++ b/ChangeLog @@ -167,6 +167,8 @@ and folders hierarchy. Those settings override the rule base config. * Require unique alias names in between the following elements: Host/Service/Contact Groups, Timeperiods and Roles + * Removed "do not connect" option from site socket editor. Use the + checkbox "Disable" to disable the site for multisite. * FIX: do validation of check items in rule editor * FIX: More consistent handling of folderpath select in rule editor * FIX: Now correctly handling depends_on_tags on page rendering for diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4c37207..a7e58a6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6858,7 +6858,6 @@ def mode_edit_site(phase): label = _("Path:"), size = 40, allow_empty = False)), - ( "disabled", _("Do not connect")), ] if config.liveproxyd_enabled: conn_choices[2:2] = [ @@ -7189,12 +7188,20 @@ def load_sites(): vars = { "sites" : {} } execfile(sites_mk, vars, vars) + + # Be compatible to old "disabled" value in socket attribute. + # Can be removed one day. + for site in vars['sites'].values(): + if site.get('socket') == 'disabled': + site['disabled'] = True + del site['socket'] + return vars["sites"] except Exception, e: if config.debug: raise MKGeneralException(_("Cannot read configuration file %s: %s" % - (filename, e))) + (sites_mk, e))) return {}