Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

Pylint no-else-return refactoring: eighth set of files

by Kenneth Okoh

5 years, 8 months

Pylint no-else-return refactoring: nineth set of files

by Kenneth Okoh

5 years, 8 months

Pylint no-else-return refactoring: tenth (and so far last) set of files

by Kenneth Okoh

5 years, 8 months

6790 esx_vsphere_objects: Rule for VMs to run on different hosts

by Moritz Kiemer

Module: check_mk Branch: master Commit: 73e105853bd1e6f4ea1c9f44dba7301d1a954d83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73e105853bd1e6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Oct 1 07:58:24 2018 +0200 6790 esx_vsphere_objects: Rule for VMs to run on different hosts You can now create a rule to check that a given list of VMs run on at least N different ESX hosts. Change-Id: Ieb939c0fd5e8bd4c013a71df4ebc007a430ba19a --- .werks/6790 | 11 ++ checks/esx_vsphere_objects | 139 ++++++++++-------- cmk/gui/plugins/wato/check_parameters.py | 36 +++++ .../datasets/esx_vsphere_objects_1_feature.py | 32 +++++ .../datasets/esx_vsphere_objects_1_regression.py | 158 +++++++++++++++++++++ 5 files changed, 316 insertions(+), 60 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=73e105853b…

5 years, 8 months

Fix help & id missing places

by Óscar Nájera

Module: check_mk Branch: master Commit: a9c7323cc37731e222ae080dd48a3a5774f8e909 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9c7323cc37731… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Oct 4 11:43:49 2018 +0200 Fix help & id missing places Change-Id: Iff9a73476a316d1671907d179252bebd80b8f4fd --- cmk/gui/bi.py | 2 +- cmk/gui/htmllib.py | 6 +++--- cmk/gui/plugins/views/availability.py | 4 ++-- cmk/gui/sidebar.py | 4 ++-- cmk/gui/table.py | 4 ++-- cmk/gui/views.py | 2 +- cmk/gui/wato/__init__.py | 12 ++++++------ cmk/gui/watolib.py | 2 +- omd/packages/cma/webconf_snapin.py | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cmk/gui/bi.py b/cmk/gui/bi.py index b6dc77b..4938185 100644 --- a/cmk/gui/bi.py +++ b/cmk/gui/bi.py @@ -3133,7 +3133,7 @@ class FoldableTreeRendererTree(FoldableTreeRenderer): icon_title = _("This element is currently not in its service period.") if icon_name and icon_title: - html.icon(icon=icon_name, help=icon_title, class_=["icon", "bi"]) + html.icon(icon=icon_name, title=icon_title, class_=["icon", "bi"]) yield diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 0997566..a56030a 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -2144,7 +2144,7 @@ class html(HTMLGenerator): # TODO: Refactor the arguments. It is only used in views/wato - def toggle_button(self, id_, isopen, icon, help_txt, hidden=False, disabled=False, onclick=None, is_context_button=True): + def toggle_button(self, id_, isopen, icon, title, hidden=False, disabled=False, onclick=None, is_context_button=True): if is_context_button: self.begin_context_buttons() # TODO: Check all calls. If done before, remove this! @@ -2154,7 +2154,7 @@ class html(HTMLGenerator): if disabled: state = "off" if disabled else "on" cssclass = "" - help_txt = "" + title = "" else: state = "on" if isopen: @@ -2165,7 +2165,7 @@ class html(HTMLGenerator): self.open_div( id_="%s_%s" % (id_, state), class_=["togglebutton", state, icon, cssclass], - title=help_txt, + title=title, style='display:none' if hidden else None, ) self.open_a("javascript:void(0)", onclick=onclick) diff --git a/cmk/gui/plugins/views/availability.py b/cmk/gui/plugins/views/availability.py index de34c52..82a9dcb 100644 --- a/cmk/gui/plugins/views/availability.py +++ b/cmk/gui/plugins/views/availability.py @@ -431,7 +431,7 @@ def render_availability_table(group_title, availability_table, what, avoptions): # Columns with the actual availability data for (title, help_txt), (text, css) in zip(av_table["cell_titles"], row["cells"]): - table.cell(title, text, css=css, help=help_txt) + table.cell(title, text, css=css, help_txt=help_txt) if "summary" in av_table: table.row(css="summary", fixed=True) @@ -444,7 +444,7 @@ def render_availability_table(group_title, availability_table, what, avoptions): table.cell("", "") for (title, help_txt), (text, css) in zip(av_table["cell_titles"], av_table["summary"]): - table.cell(title, text, css="heading " + css, help=help_txt) + table.cell(title, text, css="heading " + css, help_txt=help_txt) return table.end() # returns Table data if fetch == True diff --git a/cmk/gui/sidebar.py b/cmk/gui/sidebar.py index 7c58192..9c86c44 100644 --- a/cmk/gui/sidebar.py +++ b/cmk/gui/sidebar.py @@ -444,14 +444,14 @@ class SidebarRenderer(object): if config.user.may("general.configure_sidebar"): # Icon for mini/maximizing html.open_div(class_="minisnapin") - html.icon_button(url=None, help=_("Toggle this snapin"), icon="%ssnapin" % minimaxi, + html.icon_button(url=None, title=_("Toggle this snapin"), icon="%ssnapin" % minimaxi, onclick="toggle_sidebar_snapin(this, '%s')" % toggle_url) html.close_div() # Button for closing (removing) a snapin html.open_div(class_="closesnapin") close_url = "sidebar_openclose.py?name=%s&state=off" % name - html.icon_button(url=None, help=_("Remove this snapin"), icon="closesnapin", + html.icon_button(url=None, title=_("Remove this snapin"), icon="closesnapin", onclick="remove_sidebar_snapin(this, '%s')" % close_url) html.close_div() diff --git a/cmk/gui/table.py b/cmk/gui/table.py index d86f7e5..3ad91ff 100644 --- a/cmk/gui/table.py +++ b/cmk/gui/table.py @@ -189,7 +189,7 @@ class Table(object): self.options["collect_headers"] = False - def add_cell(self, title="", text="", css=None, help_=None, colspan=None, sortable=True, escape_text=False): + def add_cell(self, title="", text="", css=None, help_txt=None, colspan=None, sortable=True, escape_text=False): if escape_text: text = html.permissive_attrencode(text) else: @@ -205,7 +205,7 @@ class Table(object): # buttons are never sortable if css and 'buttons' in css and sortable: sortable = False - self.headers.append((title, css, help_, sortable)) + self.headers.append((title, css, help_txt, sortable)) self.rows[-1][0].append((htmlcode, css, colspan)) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index b8426f6..5ee54ca 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -1470,7 +1470,7 @@ def show_context_links(thisview, datasource, show_filters, html.toggle_button( id_="checkbox", icon="checkbox", - help_txt=_("Enable/Disable checkboxes for selecting rows for commands"), + title=_("Enable/Disable checkboxes for selecting rows for commands"), onclick="location.href='%s';" % html.makeuri([('show_checkboxes', show_checkboxes and '0' or '1')]), isopen=show_checkboxes, hidden=True, diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 9273668..3e94e6a 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -784,7 +784,7 @@ class ModeFolder(WatoMode): subfolder.edit_url(subfolder.parent()), _("Edit the properties of this folder"), "edit", - id = 'edit_' + subfolder.name(), + id_ = 'edit_' + subfolder.name(), cssclass = 'edit', style = 'display:none', ) @@ -795,7 +795,7 @@ class ModeFolder(WatoMode): make_action_link([("mode", "folder"), ("_delete_folder", subfolder.name())]), _("Delete this folder"), "delete", - id = 'delete_' + subfolder.name(), + id_ = 'delete_' + subfolder.name(), cssclass = 'delete', style = 'display:none', ) @@ -839,7 +839,7 @@ class ModeFolder(WatoMode): style = "display:none" html.popup_trigger( - html.render_icon("move", help=_("Move this %s to another folder") % what_title, + html.render_icon("move", title=_("Move this %s to another folder") % what_title, cssclass="iconbutton"), ident="move_"+obj.name(), what="move_to_folder", @@ -878,7 +878,7 @@ class ModeFolder(WatoMode): checkbox_title = _('Hide Checkboxes and bulk actions') html.toggle_button("checkbox_on", show_checkboxes, "checkbox", - help=checkbox_title, + title=checkbox_title, onclick="location.href=\'%s\'" % onclick_uri, is_context_button=False) @@ -11300,8 +11300,8 @@ class ModeEditRuleset(WatoMode): return make_action_link(vars_) - def _rule_button(self, action, help_=None, folder=None, rulenr=0): - html.icon_button(self._action_url(action, folder, rulenr), help_, action) + def _rule_button(self, action, title=None, folder=None, rulenr=0): + html.icon_button(self._action_url(action, folder, rulenr), title, action) # TODO: Refactor this whole method diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index 3906b1d..e1b531a 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -8715,7 +8715,7 @@ class RuleComment(TextAreaUnicode): html.nbsp() html.icon_button(None, - help=_("Prefix date and your name to the comment"), + title=_("Prefix date and your name to the comment"), icon="insertdate", onclick="vs_rule_comment_prefix_date_and_user(this, '%s');" % date_and_user ) diff --git a/omd/packages/cma/webconf_snapin.py b/omd/packages/cma/webconf_snapin.py index e9ff2ac..bd19658 100644 --- a/omd/packages/cma/webconf_snapin.py +++ b/omd/packages/cma/webconf_snapin.py @@ -28,7 +28,7 @@ def render_webconf(): # Our version of iconlink -> the images are located elsewhere def iconlink(text, url, icon): html.open_a(class_=["iconlink", "link"], target="main", href=url) - html.icon(icon="/webconf/images/icon_%s.png" % icon, help=None, cssclass="inline") + html.icon(icon="/webconf/images/icon_%s.png" % icon, title=None, cssclass="inline") html.write(text) html.close_a() html.br()

5 years, 8 months

docker_node_info: Handle old docker versions

by Moritz Kiemer

Module: check_mk Branch: master Commit: c2c32ef420a2c99b88c07a3a0ded61a9d11103a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2c32ef420a2c9… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Oct 4 10:56:44 2018 +0200 docker_node_info: Handle old docker versions CMK-1031 Change-Id: I246b21cdbff61dea03404c38d55740b9c998ece4 --- agents/check_mk_agent.linux | 4 +- checks/docker_node_info | 31 +++++- .../datasets/docker_node_info_old_verison.py | 80 +++++++++++++ .../datasets/docker_node_info_regression.py | 124 +++++++++++++++++++++ 4 files changed, 234 insertions(+), 5 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 93407d0..16c1ffb 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -1028,8 +1028,8 @@ fi # Iterate all running containers and report piggyback data for them if type docker > /dev/null 2>&1 && [ -z "$MK_IS_PIGGYBACKED" ]; then - echo "<<<docker_node_info>>>" - docker info --format "{{json .}}" 2>&1 + echo "<<<docker_node_info:sep(58)>>>" + docker info --format "{{json .}}" || docker info echo "<<<docker_node_disk_usage:sep(44)>>>" docker system df --format "{{json .}}" diff --git a/checks/docker_node_info b/checks/docker_node_info index 7a2cd36..8c368bc 100644 --- a/checks/docker_node_info +++ b/checks/docker_node_info @@ -25,12 +25,37 @@ # Boston, MA 02110-1301 USA. +import json + + +def parse_docker_node_info_nojson(info): + parsed = {} + prefix = "" + for row in info: + if not row: + continue + # ignore misssing keys / pad lines that are not of "key: value" type + if len(row) == 1: + row.append('') + key = row[0].strip() + value = ':'.join(row[1:]).strip() + # indented keys are prefixed by the last not indented key + # this does the right thing in the cases used below. + indent = len(row[0]) - len(key) + if indent == 0: + parsed[key] = value + prefix = key + else: + parsed[prefix + key] = value + + return parsed + + def parse_docker_node_info(info): try: - import json - return json.loads("".join(info[0])) + return json.loads(":".join(info[0])) except ValueError: - return " ".join(info[0]) + return parse_docker_node_info_nojson(info) def inventory_docker_node_info(parsed): diff --git a/tests/unit/checks/generictests/datasets/docker_node_info_old_verison.py b/tests/unit/checks/generictests/datasets/docker_node_info_old_verison.py new file mode 100644 index 0000000..edad095 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/docker_node_info_old_verison.py @@ -0,0 +1,80 @@ + + +checkname = 'docker_node_info' + + +info = [['Containers', ' 0'], + [' Running', ' 0'], + [' Paused', ' 0'], + [' Stopped', ' 0'], + ['Images', ' 0'], + ['Server Version', ' 18.06.1-ce'], + ['Storage Driver', ' overlay2'], + [' Backing Filesystem', ' extfs'], + [' Supports d_type', ' true'], + [' Native Overlay Diff', ' true'], + ['Logging Driver', ' json-file'], + ['Cgroup Driver', ' cgroupfs'], + ['Plugins', ''], + [' Volume', ' local'], + [' Network', ' bridge host macvlan null overlay'], + [' Log', + ' awslogs fluentd gcplogs gelf journald json-file logentries splunk syslog'], + ['Swarm', ' inactive'], + ['Runtimes', ' runc'], + ['Default Runtime', ' runc'], + ['Init Binary', ' docker-init'], + ['containerd version', ' 468a545b9edcd5932818eb9de8e72413e616e86e'], + ['runc version', ' 69663f0bd4b60df09991c08812a60108003fa340'], + ['init version', ' fec3683'], + ['Security Options', ''], + [' apparmor', ''], + [' seccomp', ''], + [' Profile', ' default'], + ['Kernel Version', ' 4.15.0-36-generic'], + ['Operating System', ' Ubuntu 18.04.1 LTS'], + ['OSType', ' linux'], + ['Architecture', ' x86_64'], + ['CPUs', ' 8'], + ['Total Memory', ' 15.54GiB'], + ['Name', ' klappson'], + ['ID', + ' VAW5', + 'RDCA', + 'ATG7', + '24TV', + 'Q7IJ', + 'L33R', + 'U5MX', + 'XKXN', + 'Z77K', + 'AR22', + 'QUE6', + '3JGL'], + ['Docker Root Dir', ' /var/lib/docker'], + ['Debug Mode (client)', ' false'], + ['Debug Mode (server)', ' false'], + ['Registry', ' https', '//index.docker.io/v1/'], + ['Labels', ''], + ['Experimental', ' false'], + ['Insecure Registries', ''], + [' 127.0.0.0/8', ''], + ['Live Restore Enabled', ' false']] + + +discovery = {'': [(None, {})], 'containers': [(None, {})]} + + +checks = {'': [(None, 'default', [(0, u'Daemon running on host klappson', [])])], + 'containers': [(None, + 'default', + [(0, + 'containers: 0', + [('containers', 0, None, None, None, None)]), + (0, + 'running: 0', + [('running', 0, None, None, None, None)]), + (0, 'paused: 0', [('paused', 0, None, None, None, None)]), + (0, + 'stopped: 0', + [('stopped', 0, None, None, None, None)])])]} diff --git a/tests/unit/checks/generictests/datasets/docker_node_info_regression.py b/tests/unit/checks/generictests/datasets/docker_node_info_regression.py new file mode 100644 index 0000000..3ed9f7d --- /dev/null +++ b/tests/unit/checks/generictests/datasets/docker_node_info_regression.py @@ -0,0 +1,124 @@ + + +checkname = 'docker_node_info' + + +info = [['{"ID"', + '"VAW5', + 'RDCA', + 'ATG7', + '24TV', + 'Q7IJ', + 'L33R', + 'U5MX', + 'XKXN', + 'Z77K', + 'AR22', + 'QUE6', + '3JGL","Containers"', + '0,"ContainersRunning"', + '0,"ContainersPaused"', + '0,"ContainersStopped"', + '0,"Images"', + '0,"Driver"', + '"overlay2","DriverStatus"', + '[["Backing Filesystem","extfs"],["Supports d_type","true"],["Native Overlay Diff","true"]],"SystemStatus"', + 'null,"Plugins"', + '{"Volume"', + '["local"],"Network"', + '["bridge","host","macvlan","null","overlay"],"Authorization"', + 'null,"Log"', + '["awslogs","fluentd","gcplogs","gelf","journald","json-file","logentries","splunk","syslog"]},"MemoryLimit"', + 'true,"SwapLimit"', + 'false,"KernelMemory"', + 'true,"CpuCfsPeriod"', + 'true,"CpuCfsQuota"', + 'true,"CPUShares"', + 'true,"CPUSet"', + 'true,"IPv4Forwarding"', + 'true,"BridgeNfIptables"', + 'true,"BridgeNfIp6tables"', + 'true,"Debug"', + 'false,"NFd"', + '22,"OomKillDisable"', + 'true,"NGoroutines"', + '43,"SystemTime"', + '"2018-10-04T08', + '47', + '40.954398342+02', + '00","LoggingDriver"', + '"json-file","CgroupDriver"', + '"cgroupfs","NEventsListener"', + '0,"KernelVersion"', + '"4.15.0-36-generic","OperatingSystem"', + '"Ubuntu 18.04.1 LTS","OSType"', + '"linux","Architecture"', + '"x86_64","IndexServerAddress"', + '"https', + '//index.docker.io/v1/","RegistryConfig"', + '{"AllowNondistributableArtifactsCIDRs"', + '[],"AllowNondistributableArtifactsHostnames"', + '[],"InsecureRegistryCIDRs"', + '["127.0.0.0/8"],"IndexConfigs"', + '{"docker.io"', + '{"Name"', + '"docker.io","Mirrors"', + '[],"Secure"', + 'true,"Official"', + 'true}},"Mirrors"', + '[]},"NCPU"', + '8,"MemTotal"', + '16690192384,"GenericResources"', + 'null,"DockerRootDir"', + '"/var/lib/docker","HttpProxy"', + '"","HttpsProxy"', + '"","NoProxy"', + '"","Name"', + '"klappson","Labels"', + '[],"ExperimentalBuild"', + 'false,"ServerVersion"', + '"18.06.1-ce","ClusterStore"', + '"","ClusterAdvertise"', + '"","Runtimes"', + '{"runc"', + '{"path"', + '"docker-runc"}},"DefaultRuntime"', + '"runc","Swarm"', + '{"NodeID"', + '"","NodeAddr"', + '"","LocalNodeState"', + '"inactive","ControlAvailable"', + 'false,"Error"', + '"","RemoteManagers"', + 'null},"LiveRestoreEnabled"', + 'false,"Isolation"', + '"","InitBinary"', + '"docker-init","ContainerdCommit"', + '{"ID"', + '"468a545b9edcd5932818eb9de8e72413e616e86e","Expected"', + '"468a545b9edcd5932818eb9de8e72413e616e86e"},"RuncCommit"', + '{"ID"', + '"69663f0bd4b60df09991c08812a60108003fa340","Expected"', + '"69663f0bd4b60df09991c08812a60108003fa340"},"InitCommit"', + '{"ID"', + '"fec3683","Expected"', + '"fec3683"},"SecurityOptions"', + '["name=apparmor","name=seccomp,profile=default"]}']] + + +discovery = {'': [(None, {})], 'containers': [(None, {})]} + + +checks = {'': [(None, 'default', [(0, u'Daemon running on host klappson', [])])], + 'containers': [(None, + 'default', + [(0, + 'containers: 0', + [('containers', 0, None, None, None, None)]), + (0, + 'running: 0', + [('running', 0, None, None, None, None)]), + (0, 'paused: 0', [('paused', 0, None, None, None, None)]), + (0, + 'stopped: 0', + [('stopped', 0, None, None, None, None)])])]} \ No newline at end of file

5 years, 8 months

6632 FIX aix_memory: Fix graph colouring and labelling

by Konstantin Büttner

Module: check_mk Branch: master Commit: b9846d1bff5483b2b9b8b4e6b7a8f86f1ff025da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9846d1bff5483… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 4 12:51:23 2018 +0200 6632 FIX aix_memory: Fix graph colouring and labelling The check shares logic with a number of other memory checks, but failed to map all of the old performance value names to the new metrics. This has been fixed. Change-Id: I65385607d9249e36b8461ed8d1975ac1f237c988 --- .werks/6632 | 13 +++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/6632 b/.werks/6632 new file mode 100644 index 0000000..783c0f8 --- /dev/null +++ b/.werks/6632 @@ -0,0 +1,13 @@ +Title: aix_memory: Fix graph colouring and labelling +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1538650039 + +The check shares logic with a number of other memory checks, +but failed to map all of the old performance value names to +the new metrics. This has been fixed. diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 7edcfe6..0cbb4d7 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -4628,7 +4628,8 @@ check_metrics["check_mk-jolokia_metrics.tp"] = { check_metrics["check_mk-aix_memory"] = { "ramused" : { "name" : "mem_used", "scale": MB }, - "swapused" : { "name" : "swap_used", "scale": MB } + "swapused" : { "name" : "swap_used", "scale": MB }, + "memused" : { "name" : "mem_lnx_total_used", "scale" : MB }, } check_metrics["check_mk-mem.win"] = {

5 years, 8 months

Fix redefined builtin for WATO sidebar snapin

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 673fc3adf34d363c1e4a7da819ace33a8144b415 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=673fc3adf34d36… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Oct 4 11:38:28 2018 +0200 Fix redefined builtin for WATO sidebar snapin Change-Id: I68736bb35d2ef758bf517f8b79cb05561685daff --- cmk/gui/plugins/sidebar/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/sidebar/utils.py b/cmk/gui/plugins/sidebar/utils.py index aed44c0..e434f9b 100644 --- a/cmk/gui/plugins/sidebar/utils.py +++ b/cmk/gui/plugins/sidebar/utils.py @@ -258,7 +258,7 @@ def bulletlink(text, url, target="main", onclick = None): def iconlink(text, url, icon): html.open_a(class_=["iconlink", "link"], target="main", href=url) - html.icon(icon=icon, help=None, cssclass="inline") + html.icon(icon=icon, title=None, cssclass="inline") html.write_text(text) html.close_a() html.br()

5 years, 8 months

Fixex for the redefined builtins of the all hosts view

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 3830e3e3174f58d0552210bc0d1985004ead16ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3830e3e3174f58… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Oct 4 11:27:20 2018 +0200 Fixex for the redefined builtins of the all hosts view Change-Id: I7c57f274c227084d376cb0fdc174f22eadb91243 --- cmk/gui/views.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 4ef4933..b8426f6 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -1468,9 +1468,9 @@ def show_context_links(thisview, datasource, show_filters, selection_enabled = enable_checkboxes if enable_commands else thisview.get('force_checkboxes') if not thisview.get("force_checkboxes"): html.toggle_button( - id="checkbox", + id_="checkbox", icon="checkbox", - help=_("Enable/Disable checkboxes for selecting rows for commands"), + help_txt=_("Enable/Disable checkboxes for selecting rows for commands"), onclick="location.href='%s';" % html.makeuri([('show_checkboxes', show_checkboxes and '0' or '1')]), isopen=show_checkboxes, hidden=True, @@ -1516,7 +1516,7 @@ def show_context_links(thisview, datasource, show_filters, # Buttons to other views, dashboards, etc. links = visuals.collect_context_links(thisview) for linktitle, uri, icon, buttonid in links: - html.context_button(linktitle, url=uri, icon=icon, id=buttonid, bestof=config.context_buttons_to_show) + html.context_button(linktitle, url=uri, icon=icon, id_=buttonid, bestof=config.context_buttons_to_show) # Customize/Edit view button if display_options.enabled(display_options.E) and config.user.may("general.edit_views"): @@ -1529,7 +1529,7 @@ def show_context_links(thisview, datasource, show_filters, url_vars.append(("load_user", thisview["owner"])) url = html.makeuri_contextless(url_vars, filename="edit_view.py") - html.context_button(_("Edit View"), url, "edit", id="edit", bestof=config.context_buttons_to_show) + html.context_button(_("Edit View"), url, "edit", id_="edit", bestof=config.context_buttons_to_show) if display_options.enabled(display_options.E): if show_availability and config.user.may("general.see_availability"):

5 years, 8 months

6739 FIX mssql_backup: Levels can be disabled

by Simon Betz

Module: check_mk Branch: master Commit: 414a09f68a3484c4d97f5fbf973b64a1cf930639 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=414a09f68a3484… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 4 10:45:22 2018 +0200 6739 FIX mssql_backup: Levels can be disabled Change-Id: I674fe5f0835a9c01fa0f70cb79eee9dd0a3fc263 --- .werks/6739 | 10 ++++ cmk/gui/plugins/wato/check_parameters.py | 84 +++++++++++--------------------- 2 files changed, 39 insertions(+), 55 deletions(-) diff --git a/.werks/6739 b/.werks/6739 new file mode 100644 index 0000000..0f14f4a --- /dev/null +++ b/.werks/6739 @@ -0,0 +1,10 @@ +Title: mssql_backup: Levels can be disabled +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1538642697 +Class: fix + + diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 03a0eae..bd9c7ec 100755 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -71,7 +71,6 @@ subgroup_inventory = _("Discovery - automatic service detection") # from there into their appropriate sections until "Unsorted" is empty. # Create new rules directly in the correct secions. - # .--Networking----------------------------------------------------------. # | _ _ _ _ _ | # | | \ | | ___| |___ _____ _ __| | _(_)_ __ __ _ | @@ -10735,6 +10734,26 @@ register_check_parameters( "dict" ) +def _vs_mssql_backup_age(title): + return Alternative( + title=_("%s" % title), + style="dropdown", + elements=[ + Tuple( + title=_("Set levels"), + elements=[ + Age(title=_("Warning if older than")), + Age(title=_("Critical if older than")), + ]), + Tuple( + title=_("No levels"), + elements=[ + FixedValue(None, totext=""), + FixedValue(None, totext=""), + ]), + ] + ) + register_check_parameters( subgroup_applications, "mssql_backup", @@ -10747,54 +10766,14 @@ register_check_parameters( "Backup</i>, etc.) you can use the option <i>Database Backup" "</i> to set a general limit"), elements = [ - ("database", Tuple( - title = _("Database Backup"), - elements = [ - Age(title = _("Warning if older than")), - Age(title = _("Critical if older than")), - ])), - ("database_diff", Tuple( - title = _("Database Diff Backup"), - elements = [ - Age(title = _("Warning if older than")), - Age(title = _("Critical if older than")), - ])), - ("log", Tuple( - title = _("Log Backup"), - elements = [ - Age(title = _("Warning if older than")), - Age(title = _("Critical if older than")), - ])), - ("file_or_filegroup", Tuple( - title = _("File or Filegroup Backup"), - elements = [ - Age(title = _("Warning if older than")), - Age(title = _("Critical if older than")), - ])), - ("file_diff", Tuple( - title = _("File Diff Backup"), - elements = [ - Age(title = _("Warning if older than")), - Age(title = _("Critical if older than")), - ])), - ("partial", Tuple( - title = _("Partial Backup"), - elements = [ - Age(title = _("Warning if older than")), - Age(title = _("Critical if older than")), - ])), - ("partial_diff", Tuple( - title = _("Partial Diff Backup"), - elements = [ - Age(title = _("Warning if older than")), - Age(title = _("Critical if older than")), - ])), - ("unspecific", Tuple( - title = _("Unspecific Backup"), - elements = [ - Age(title = _("Warning if older than")), - Age(title = _("Critical if older than")), - ])), + ("database", _vs_mssql_backup_age("Database backup")), + ("database_diff", _vs_mssql_backup_age("Database diff backup")), + ("log", _vs_mssql_backup_age("Log backup")), + ("file_or_filegroup", _vs_mssql_backup_age("File or filegroup backup")), + ("file_diff", _vs_mssql_backup_age("File diff backup")), + ("partial", _vs_mssql_backup_age("Partial backup")), + ("partial_diff", _vs_mssql_backup_age("Partial diff backup")), + ("unspecific", _vs_mssql_backup_age("Unspecific backup")), ("not_found", MonitoringState(title=_("State if no backup found"))), ] ), @@ -10813,12 +10792,7 @@ register_check_parameters( _("MSSQL Backup"), Dictionary( elements=[ - ("levels", Tuple( - title=_("Upper levels for the backup age"), - elements = [ - Age(title = _("Warning if older than")), - Age(title = _("Critical if older than")), - ])), + ("levels", _vs_mssql_backup_age("Upper levels for the backup age")), ] ), TextAscii(

5 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018