[checkmk-commits] Check_MK Git: check_mk: WATO: new setting wato_hide_varnames

Module: check_mk Branch: master Commit: 157a8aa5043f280cc0aaed4e36f4c2edac7da48b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=157a8aa5043f28… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon Apr 9 14:15:44 2012 +0200 WATO: new setting wato_hide_varnames --- ChangeLog | 3 +++ web/htdocs/config.py | 1 + web/htdocs/wato.py | 21 +++++++++++++-------- web/plugins/wato/check_mk_configuration.py | 9 +++++++++ 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43e8cda..e38edc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,9 @@ have the mail addresses and other notification options persisted * FIX: deletion of automation accounts now works * FIX: Disabling notifications for users does work now + * New main overview for rule editor + * New multisite.mk option wato_hide_varnames for hiding Check_MK + configuration variable names from the user Multisite * Added config option default_ts_format to configure default timestamp diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 9ed4fad..4d161cb 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -615,6 +615,7 @@ wato_host_tags = [] wato_aux_tags = [] wato_hide_filenames = True wato_hide_hosttags = False +wato_hide_varnames = False wato_max_snapshots = 50 wato_num_hostspecs = 12 wato_num_itemspecs = 15 diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 33fc553..4876b55 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4684,9 +4684,10 @@ def mode_globalvars(phase): for groupname in groupnames: html.begin_foldable_container("globalvars", groupname, False, groupname, indent=False) html.write('<table class="data globalvars">') - html.write("<tr><th>" + _("Configuration variable") + - "</th><th>" +_("Check_MK variable") + "</th><th>" + - _("Default") + "</th><th>" + _("Your setting") + "</th><th></th></tr>\n") + html.write("<tr><th>" + _("Configuration variable") + "</th>") + if not config.wato_hide_varnames: + html.write("<th>" +_("Check_MK variable") + "</th>") + html.write("<th>" + _("Default") + "</th><th>" + _("Your setting") + "</th><th></th></tr>\n") odd = "even" for domain, varname, valuespec in g_configvar_groups[groupname]: @@ -4704,7 +4705,8 @@ def mode_globalvars(phase): edit_url = make_link([("mode", "edit_configvar"), ("varname", varname)]) html.write('<td class=title><a href="%s">%s</a></td>' % (edit_url, valuespec.title())) - html.write('<td class=varname><tt>%s</tt></td>' % varname) + if not config.wato_hide_varnames: + html.write('<td class=varname><tt>%s</tt></td>' % varname) if varname in current_settings: html.write('<td class=inherited>%s</td>' % valuespec.value_to_text(defaultvalue)) html.write('<td><b>%s</b></td>' % valuespec.value_to_text(current_settings[varname])) @@ -8552,7 +8554,7 @@ def mode_rulesets(phase): return if not only_host: - render_folder_path(keepvarnames = ["mode", "local"]) + render_folder_path(keepvarnames = ["mode", "local", "group"]) if help: html.write("<div class=info>%s</div>" % help) @@ -8629,8 +8631,10 @@ def mode_rulesets(phase): if do_folding: html.begin_foldable_container("rulesets", groupname, False, subgroupname, indent=False) html.write('<table class="data rulesets">') - html.write("<tr><th>" + _("Rule set") + "</th>" - "<th>" + _("Check_MK Variable") + "</th><th>" + _("Rules") + "</th></tr>\n") + html.write("<tr><th>" + _("Rule set") + "</th>") + if not config.wato_hide_varnames: + html.write("<th>" + _("Check_MK Variable") + "</th>") + html.write("<th>" + _("Rules") + "</th></tr>\n") odd = "even" title_shown = True @@ -8645,7 +8649,8 @@ def mode_rulesets(phase): html.write('<td class=title><a href="%s">%s</a></td>' % (view_url, rulespec["title"])) display_varname = ':' in varname and '%s["%s"]' % tuple(varname.split(":")) or varname - html.write('<td class=varname><tt>%s</tt></td>' % display_varname) + if not config.wato_hide_varnames: + html.write('<td class=varname><tt>%s</tt></td>' % display_varname) html.write('<td class=number>') if num_local_rules: if only_host: diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 3e2eb7f..98e16b0 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -173,6 +173,15 @@ register_configvar(group, domain = "multisite") register_configvar(group, + "wato_hide_varnames", + Checkbox(title = _("Hide names of configuration variables"), + label = _("hide variable names"), + help = _("When enabled, internal configuration variable names of Check_MK are hidded " + "from the user (for example in the rule editor)"), + default_value = False), + domain = "multisite") + +register_configvar(group, "wato_max_snapshots", Integer(title = _("Number of configuration snapshots to keep"), help = _("Whenever you successfully activate changes a snapshot of the configuration "