Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

Pylint no-else-return refactoring: fixed new occurences since first commit

by Kenneth Okoh

Module: check_mk Branch: master Commit: 124451f1fb8ddb42c9df5e71ae9a664893e3f417 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=124451f1fb8ddb… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Oct 4 14:34:29 2018 +0200 Pylint no-else-return refactoring: fixed new occurences since first commit Change-Id: I38231b6c1cc1c800343411e134419bd72d3820a7 --- checks/mssql_backup | 3 +-- cmk/gui/availability.py | 32 ++++++++++++++------------------ cmk/gui/backup.py | 12 ++++-------- cmk/gui/bi.py | 3 +-- cmk/gui/dashboard.py | 3 +-- cmk/gui/http_status.py | 13 ++++++------- cmk/gui/inventory.py | 3 +-- cmk/gui/plugins/dashboard/utils.py | 13 +++++-------- cmk/gui/plugins/visuals/filters.py | 3 +-- cmk/gui/utils.py | 3 +-- 10 files changed, 35 insertions(+), 53 deletions(-) diff --git a/checks/mssql_backup b/checks/mssql_backup index 57349d2..b292302 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -210,8 +210,7 @@ check_info['mssql_backup'] = { def _mssql_backup_per_type_item(db_name, backup): if backup.type is None: return "%s UNKNOWN" % db_name - else: - return "%s %s" % (db_name, backup.type.title()) + return "%s %s" % (db_name, backup.type.title()) def inventory_mssql_backup_per_type(parsed): diff --git a/cmk/gui/availability.py b/cmk/gui/availability.py index 9b6ef3d..cfb8851 100644 --- a/cmk/gui/availability.py +++ b/cmk/gui/availability.py @@ -527,8 +527,7 @@ def render_number_function(timeformat): def render_number(n, d): if not d: return _("n/a") - else: - return ("%." + timeformat[11:] + "f%%") % ( float(n) / float(d) * 100.0) + return ("%." + timeformat[11:] + "f%%") % ( float(n) / float(d) * 100.0) elif timeformat == "seconds": def render_number(n, d): return "%d s" % n @@ -1081,8 +1080,8 @@ def compute_availability_groups(what, av_data, avoptions): def object_title(what, av_entry): if what == "host": return av_entry["host"] - else: # service and BI - return av_entry["host"] + " / " + av_entry["service"] + # service and BI + return av_entry["host"] + " / " + av_entry["service"] # Merge consecutive rows with same state @@ -1444,8 +1443,7 @@ def layout_timeline(what, timeline_rows, considered_duration, avoptions, style): def render_date(ts): if avoptions["dateformat"] == "epoch": return str(int(ts)) - else: - return time.strftime(time_format, time.localtime(ts)) + return time.strftime(time_format, time.localtime(ts)) return render_date render_date = render_date_func(time_format) @@ -1953,22 +1951,21 @@ def cell_active(sid, avoptions): return False if sid == "outof_notification_period" and avoptions["notification_period"] != "honor": return False - elif sid == "outof_service_period": # Never show this as a column + if sid == "outof_service_period": # Never show this as a column return False - elif sid == "in_downtime" and avoptions["downtimes"]["include"] != "honor": + if sid == "in_downtime" and avoptions["downtimes"]["include"] != "honor": return False - elif sid == "unmonitored" and not avoptions["consider"]["unmonitored"]: + if sid == "unmonitored" and not avoptions["consider"]["unmonitored"]: return False - elif sid == "flapping" and not avoptions["consider"]["flapping"]: + if sid == "flapping" and not avoptions["consider"]["flapping"]: return False - elif sid == "host_down" and not avoptions["consider"]["host_down"]: + if sid == "host_down" and not avoptions["consider"]["host_down"]: return False - elif sid in sg and sid not in sg.values(): + if sid in sg and sid not in sg.values(): return False - elif sid in hsg and sid not in hsg.values(): + if sid in hsg and sid not in hsg.values(): return False - else: - return True + return True # Check if the availability of some object is below the levels # that are configured in the avoptions. @@ -1980,10 +1977,9 @@ def check_av_levels(ok_seconds, av_levels, considered_duration): warn, crit = av_levels if perc < crit: return 2 - elif perc < warn: + if perc < warn: return 1 - else: - return 0 + return 0 def get_av_groups(availability_table, avoptions): diff --git a/cmk/gui/backup.py b/cmk/gui/backup.py index 0c87e50..b810d13 100644 --- a/cmk/gui/backup.py +++ b/cmk/gui/backup.py @@ -72,8 +72,7 @@ def is_site(): def mkbackup_path(): if not is_site(): return "/usr/sbin/mkbackup" - else: - return "%s/bin/mkbackup" % os.environ["OMD_ROOT"] + return "%s/bin/mkbackup" % os.environ["OMD_ROOT"] def system_config_path(): @@ -402,8 +401,7 @@ class Job(MKBackupJob, BackupEntity): def _cron_userspec(self): if os.environ.get("OMD_SITE"): return "" - else: - return "root " + return "root " def _cron_cmdline(self): @@ -1590,8 +1588,7 @@ class RestoreJob(MKBackupJob): def state_file_path(self): if not is_site(): return "/var/lib/mkbackup/restore.state" - else: - return "/tmp/restore-%s.state" % os.environ["OMD_SITE"] + return "/tmp/restore-%s.state" % os.environ["OMD_SITE"] def complete(self): @@ -1717,8 +1714,7 @@ class PageBackupRestore(object): backup_info = self._target.get_backup(backup_ident) if backup_info["config"]["encrypt"] != None: return self._start_encrypted_restore(backup_ident, backup_info) - else: - return self._start_unencrypted_restore(backup_ident) + return self._start_unencrypted_restore(backup_ident) def _complete_restore(self, backup_ident): diff --git a/cmk/gui/bi.py b/cmk/gui/bi.py index 4938185..826e64c 100644 --- a/cmk/gui/bi.py +++ b/cmk/gui/bi.py @@ -3635,8 +3635,7 @@ def get_state_name(node): if node[1]['type'] == NT_LEAF: if 'service' in node[1]: return service_state_names[node[0]['state']] - else: - return host_state_names[node[0]['state']] + return host_state_names[node[0]['state']] return service_state_names[node[0]['state']] diff --git a/cmk/gui/dashboard.py b/cmk/gui/dashboard.py index 1b5d2b1..cce3321 100644 --- a/cmk/gui/dashboard.py +++ b/cmk/gui/dashboard.py @@ -213,8 +213,7 @@ class LegacyDashlet(cmk.gui.plugins.dashboard.IFrameDashlet): title_func = self._spec.get("title_func") if title_func: return title_func(self._dashlet_spec) - else: - return self.title() + return self.title() def on_resize(self): diff --git a/cmk/gui/http_status.py b/cmk/gui/http_status.py index 2061f3c..d93206d 100644 --- a/cmk/gui/http_status.py +++ b/cmk/gui/http_status.py @@ -80,15 +80,14 @@ def status_with_reason(code): # type: (int) -> str if code == HTTP_OK: return '200 OK' - elif code == HTTP_MOVED_TEMPORARILY: + if code == HTTP_MOVED_TEMPORARILY: return '301 Moved Permanently' - elif code == HTTP_MOVED_PERMANENTLY: + if code == HTTP_MOVED_PERMANENTLY: return '302 Found' - elif code == HTTP_NOT_MODIFIED: + if code == HTTP_NOT_MODIFIED: return '304 Not Modified' - elif code == HTTP_INTERNAL_SERVER_ERROR: + if code == HTTP_INTERNAL_SERVER_ERROR: return '500 Internal Server Error' - elif code == HTTP_NOT_FOUND: + if code == HTTP_NOT_FOUND: return '404 Not Found' - else: - return str(code) + return str(code) diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index a98d1d6..0a0a409 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -389,8 +389,7 @@ def _may_see(host_name, site): if not result: return False - else: - return result[0] > 0 + return result[0] > 0 def _write_xml(response): diff --git a/cmk/gui/plugins/dashboard/utils.py b/cmk/gui/plugins/dashboard/utils.py index cd6c5b2..c8f3779 100644 --- a/cmk/gui/plugins/dashboard/utils.py +++ b/cmk/gui/plugins/dashboard/utils.py @@ -263,19 +263,17 @@ class Dashlet(object): def _add_wato_folder_to_url(self, url): if not self._wato_folder: return url - elif '/' in url: + if '/' in url: return url # do not append wato_folder to non-Check_MK-urls - elif '?' in url: + if '?' in url: return url + "&wato_folder=" + html.urlencode(self._wato_folder) - else: - return url + "?wato_folder=" + html.urlencode(self._wato_folder) + return url + "?wato_folder=" + html.urlencode(self._wato_folder) def size(self): if self.is_resizable(): return self._dashlet_spec.get("size", self.initial_size()) - else: - return self.initial_size() + return self.initial_size() def position(self): @@ -295,8 +293,7 @@ class Dashlet(object): on_refresh = self.on_refresh() if on_refresh: return 'function() {%s}' % on_refresh - else: - return '"%s"' % self._add_wato_folder_to_url(url) # url to dashboard_dashlet.py + return '"%s"' % self._add_wato_folder_to_url(url) # url to dashboard_dashlet.py except Exception: # Ignore the exceptions in non debug mode, assuming the exception also occures # while dashlet rendering, which is then shown in the dashlet itselfs. diff --git a/cmk/gui/plugins/visuals/filters.py b/cmk/gui/plugins/visuals/filters.py index 09fd9f1..65a6aef 100644 --- a/cmk/gui/plugins/visuals/filters.py +++ b/cmk/gui/plugins/visuals/filters.py @@ -229,8 +229,7 @@ class FilterAddressFamily(Filter): family = html.var("address_family", "both") if family == "both": return "" - else: - return "Filter: host_custom_variables = ADDRESS_FAMILY %s\n" % livestatus.lqencode(family) + return "Filter: host_custom_variables = ADDRESS_FAMILY %s\n" % livestatus.lqencode(family) declare_filter(103, FilterAddressFamily()) diff --git a/cmk/gui/utils.py b/cmk/gui/utils.py index fc29cc3..25e62ad 100644 --- a/cmk/gui/utils.py +++ b/cmk/gui/utils.py @@ -51,8 +51,7 @@ def drop_dotzero(v, digits=2): t = "%%.%df" % digits % v if "." in t: return t.rstrip("0").rstrip(".") - else: - return t + return t def num_split(s):

5 years, 12 months

6732 FIX agent_netapp: Skip attributes which are not available

by Simon Betz

Module: check_mk Branch: master Commit: bf3bb7bba35b919e53b4b210a6550bfe512d100d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf3bb7bba35b91… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 27 11:15:03 2018 +0200 6732 FIX agent_netapp: Skip attributes which are not available Change-Id: I349aa1d1891e53391ef93fcb31e5839654f2c135 --- .werks/6732 | 11 +++++++++++ agents/special/agent_netapp | 24 ++++++++++++++---------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/.werks/6732 b/.werks/6732 new file mode 100644 index 0000000..3dca08e --- /dev/null +++ b/.werks/6732 @@ -0,0 +1,11 @@ +Title: agent_netapp: Skip attributes which are not available +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1538039636 + + diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 0539ba0..884e083 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -658,13 +658,15 @@ def query(what, return_toplevel_node = False): while tag_string: # We need to start additinal query until all data is fetched tag_response = server.get_response([what, [["max-records", max_records],["tag", tag_string]]]) - - # Get attributes-list and add this content to the initial response - tag_string = tag_response.get_results().child_get_string("next-tag") - attr_childs = tag_response.get_results().child_get("attributes-list") + if tag_response.result_status() != "passed": + return if tag_response.get_results().child_get_string("num-records") == "0": break - results.extend_attributes_list(attr_childs) + + # Get attributes-list and add this content to the initial response + tag_string = tag_response.get_results().child_get_string("next-tag") + attr_children = tag_response.get_results().child_get("attributes-list") + results.extend_attributes_list(attr_children) if return_toplevel_node: return results @@ -720,13 +722,15 @@ def query_counters(what): # We need to start additinal query until all data is fetched tag_response = server.get_response(["perf-object-instance-list-info-iter", [["objectname", what], ["max-records", max_records], ["tag", tag_string]]]) - - # Get attributes-list and add this content to the initial response - tag_string = tag_response.get_results().child_get_string("next-tag") - attr_childs = tag_response.get_results().child_get("attributes-list") + if tag_response.result_status() != "passed": + return if tag_response.get_results().child_get_string("num-records") == "0": break - results.extend_attributes_list(attr_childs) + + # Get attributes-list and add this content to the initial response + tag_string = tag_response.get_results().child_get_string("next-tag") + attr_children = tag_response.get_results().child_get("attributes-list") + results.extend_attributes_list(attr_children) if response.results_status() != "passed": return

5 years, 12 months

Pylint no-else-return refactoring: Update .pylintrc

by Kenneth Okoh

Module: check_mk Branch: master Commit: 7fc0c5f31e5a5ef3ccc98cc17435924bd1584d43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fc0c5f31e5a5e… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Oct 4 14:09:11 2018 +0200 Pylint no-else-return refactoring: Update .pylintrc Change-Id: I8df23ef5e4f93aa2c4437fd30bf15b63bbaa1ba4 --- .pylintrc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.pylintrc b/.pylintrc index 06bf549..f217aa1 100644 --- a/.pylintrc +++ b/.pylintrc @@ -51,10 +51,6 @@ disable= # uncover bugs. Fixing this is not rocket science, just some work. inconsistent-return-statements, #--------------------------------------------------------------------------- - # Enabling this warning would be nice, it is mostly a sign of sloppy - # programming practice. In some cases, they can even hide bugs. - no-else-return, - #--------------------------------------------------------------------------- # Enabling this would enhance readability quite a bit and it might even # uncover bugs. Fixing this is not rocket science, just some work: Roughly # 400 warnings in about 60 modules, but this can be fixed step by step.

5 years, 12 months

kernel.util: New test case for unit test

by Konstantin Büttner

Module: check_mk Branch: master Commit: 426b1178f2047ed73ac1b727854834c52a9a29fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=426b1178f2047e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Oct 5 10:55:04 2018 +0200 kernel.util: New test case for unit test Change-Id: Ie92fce141114f6c778fd14e046cec8104686c10b --- tests/unit/checks/test_kernel_check.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit/checks/test_kernel_check.py b/tests/unit/checks/test_kernel_check.py index 426b3a0..4eaebd2 100644 --- a/tests/unit/checks/test_kernel_check.py +++ b/tests/unit/checks/test_kernel_check.py @@ -7,6 +7,7 @@ pytestmark = pytest.mark.checks @pytest.mark.parametrize("time_to_info,params,predicate", [ (lambda t: [["cpu", 15*t, 10*t, 5*t, 5*t, 5*t, 5*t, 5*t]], {}, lambda cr: True), +(lambda t: [["cpu", 15*t, 10*t, 5*t, 5*t, 5*t, 5*t, 5*t]], {'core_util_graph': True, 'iowait': (30.0, 50.0)}, lambda cr: True), ]) def test_kernel_util_check(check_manager, time_to_info, params, predicate): check = check_manager.get_check("kernel.util")

5 years, 12 months

docker_node_disk_usage: Handle old docker versions

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4f9232eb571f24c1442e94954bb4b2af364766f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f9232eb571f24… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Oct 4 11:42:22 2018 +0200 docker_node_disk_usage: Handle old docker versions CMK-1031 Change-Id: Ia2084323abeb832a0912b9d09bdbd78ac2ff2d27 --- agents/check_mk_agent.linux | 4 ++-- checks/docker_node_disk_usage | 39 +++++++++++++++++++++++++++------------ 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 16c1ffb..abe3aee 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -1031,8 +1031,8 @@ if type docker > /dev/null 2>&1 && [ -z "$MK_IS_PIGGYBACKED" ]; then echo "<<<docker_node_info:sep(58)>>>" docker info --format "{{json .}}" || docker info - echo "<<<docker_node_disk_usage:sep(44)>>>" - docker system df --format "{{json .}}" + echo "<<<docker_node_disk_usage>>>" + docker system df --format "{{json .}}" || docker system df echo "<<<docker_node_images>>>" echo "[[[images]]]" diff --git a/checks/docker_node_disk_usage b/checks/docker_node_disk_usage index 816ac69..eb41fb8 100644 --- a/checks/docker_node_disk_usage +++ b/checks/docker_node_disk_usage @@ -23,26 +23,41 @@ # License along with GNU Make; see the file COPYING. If not, write # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import json -def parse_docker_node_disk_usage(info): - import json +def _parse_docker_node_disk_usage_dict(data): + key = data.pop('Type').lower() - parsed = {} - for line in info: - data = json.loads(",".join(line)) + act = data.get('Active') + if act is not None: + data['Active'] = int(act) if act else 0 - type_ = data.pop('Type').lower() - parsed[type_] = data + tc = data.get('TotalCount') or data.get('Total') + if tc is not None: + data['TotalCount'] = int(tc) if tc else 0 - data['Active'] = int(data['Active']) if data['Active'] else 0 - data['TotalCount'] = int(data['TotalCount']) if data['TotalCount'] else 0 - data['Size'] = docker_size_to_bytes(data['Size']) + sz = data.get('Size') + if sz is not None: + data['Size'] = docker_size_to_bytes(sz) - reclaimable = data['Reclaimable'].split(' ')[0] # discard percentage + rc = data.get('Reclaimable') + if rc is not None: + reclaimable = rc.split(' ')[0] # discard percentage data['Reclaimable'] = docker_size_to_bytes(reclaimable) - return parsed + return key, data + + +def parse_docker_node_disk_usage(info): + try: + data_dicts = [json.loads(" ".join(line)) for line in info] + except ValueError: + header = [field.title() for field in info[0]] + data_dicts = [{k: v for k, v in zip(header, row)} + for row in info[1:]] + + return dict(map(_parse_docker_node_disk_usage_dict, data_dicts)) def inventory_docker_node_disk_usage(parsed):

5 years, 12 months

mk_oracle: Slight logging improvement

by Simon Betz

Module: check_mk Branch: master Commit: 26452010fd811a092d75186b2ba8b3de60edbc5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26452010fd811a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 5 07:22:18 2018 +0200 mk_oracle: Slight logging improvement Change-Id: Id949d2cb3171aa0521ccbe968dbc4037f25a609a --- agents/plugins/mk_oracle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index c0d0961..a87de54 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -1853,7 +1853,7 @@ mk_ora_db_connect () { fi fi - logging "[${sid}] [mk_ora_db_connect]" "DB connection: ${ORADBUSER}/***@${TNSALIAS}${assysdbaconnect}" + logging "[${sid}] [mk_ora_db_connect]" "DB connection: ${ORADBUSER}/${DBPASSWORD//?/*}@${TNSALIAS}${assysdbaconnect}" echo "${ORADBUSER}/${DBPASSWORD}@${TNSALIAS}${assysdbaconnect}" }

5 years, 12 months

Fix id and help keyword arguments #3

by Óscar Nájera

Module: check_mk Branch: master Commit: 90e9de6a77a1b9da429b9ccef3cb8203dc91738f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90e9de6a77a1b9… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Oct 4 14:03:22 2018 +0200 Fix id and help keyword arguments #3 Change-Id: I6714e3280c20ddfa8881470308bd198c2c6eb7b7 --- cmk/gui/htmllib.py | 8 ++++---- cmk/gui/metrics.py | 2 +- cmk/gui/plugins/views/mkeventd.py | 2 +- cmk/gui/plugins/views/painters.py | 2 +- cmk/gui/table.py | 2 +- cmk/gui/valuespec.py | 2 +- cmk/gui/wato/__init__.py | 22 +++++++++++----------- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 48fca7b..b645ac9 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -2111,7 +2111,7 @@ class html(HTMLGenerator): def button(self, varname, title, cssclass = None, style=None, help_=None): - self.write_html(self.render_button(varname, title, cssclass, style)) + self.write_html(self.render_button(varname, title, cssclass, style, help_=help_)) def render_button(self, varname, title, cssclass = None, style=None, help_=None): @@ -2596,7 +2596,7 @@ class html(HTMLGenerator): if icon: self.img(class_=["treeangle", "title"], src="images/icon_%s.png" % icon) else: - self.img(id_=img_id, class_=["treeangle", "nform", "open" if isopen else "closed"], + self.img(id=img_id, class_=["treeangle", "nform", "open" if isopen else "closed"], src="images/%s_closed.png" % tree_img, align="absbottom") self.write_text(title) self.close_td() @@ -2605,7 +2605,7 @@ class html(HTMLGenerator): self.open_div(class_="foldable") if not icon: - self.img(id_="treeimg.%s.%s" % (treename, id_), + self.img(id="treeimg.%s.%s" % (treename, id_), class_=["treeangle", "open" if isopen else "closed"], src="images/%s_closed.png" % tree_img, align="absbottom", onclick=onclick) if isinstance(title, HTML): # custom HTML code @@ -2833,7 +2833,7 @@ hy icon = HTML(self.render_icon(icon, cssclass="iconbutton")) return self.render_a(icon, **{'title' : title, - 'id_' : id_, + 'id' : id_, 'class' : cssclass, 'style' : style, 'target' : target if target else '', diff --git a/cmk/gui/metrics.py b/cmk/gui/metrics.py index dffe744..5641da1 100644 --- a/cmk/gui/metrics.py +++ b/cmk/gui/metrics.py @@ -1008,7 +1008,7 @@ def render_metrics_table(translated_metrics, host_name, service_description): if cmk_graphs_possible(): output += "<td>" output += html.render_popup_trigger( - html.render_icon("custom_graph", help=_("Add this metric to a custom graph"), cssclass="iconbutton"), + html.render_icon("custom_graph", title=_("Add this metric to a custom graph"), cssclass="iconbutton"), ident = "add_metric_to_graph_" + host_name + ";" + service_description, what = "add_metric_to_custom_graph", url_vars = [ diff --git a/cmk/gui/plugins/views/mkeventd.py b/cmk/gui/plugins/views/mkeventd.py index 785beae..367849f 100644 --- a/cmk/gui/plugins/views/mkeventd.py +++ b/cmk/gui/plugins/views/mkeventd.py @@ -371,7 +371,7 @@ if config.mkeventd_enabled: else: return '' - return html.render_icon(phase, help=title) + return html.render_icon(phase, title=title) def render_delete_event_icons(row): if config.user.may("mkeventd.delete"): diff --git a/cmk/gui/plugins/views/painters.py b/cmk/gui/plugins/views/painters.py index c6befe3..f990c47 100644 --- a/cmk/gui/plugins/views/painters.py +++ b/cmk/gui/plugins/views/painters.py @@ -2141,7 +2141,7 @@ def paint_log_icon(row): title = _("Stopped acknowledgement") if img: - return "icon", html.render_icon("alert_"+img, help=title) + return "icon", html.render_icon("alert_"+img, title=title) return "icon", "" multisite_painters["log_icon"] = { diff --git a/cmk/gui/table.py b/cmk/gui/table.py index 3ad91ff..5ec8a98 100644 --- a/cmk/gui/table.py +++ b/cmk/gui/table.py @@ -238,7 +238,7 @@ class Table(object): if self.options["foldable"]: html.begin_foldable_container( treename="table", - id=self.id, + id_=self.id, isopen=True, indent=False, title=html.render_h3(self.title, class_=["treeangle", "title"]) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index d933cae..7699eeb 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -4266,7 +4266,7 @@ class IconSelector(ValueSpec): if not icon_name: icon_name = self._empty_img - icon = html.render_icon(icon_name, help=title, middle=True, id_=id_) + icon = html.render_icon(icon_name, title=title, middle=True, id_=id_) if onclick: icon = html.render_a(icon, href="javascript:void(0)", onclick=onclick) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 697b095..fca9605 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -3037,13 +3037,13 @@ class ModeDiagHost(WatoMode): html.open_div() html.img("images/icon_reload.png", class_="icon", id="%s_img" % ident) html.open_a(href="") - html.img("images/icon_reload.png", class_=["icon", "retry"], id_="%s_retry" % ident, title=_('Retry this test')) + html.img("images/icon_reload.png", class_=["icon", "retry"], id="%s_retry" % ident, title=_('Retry this test')) html.close_a() html.close_div() html.close_td() html.open_td() - html.div('', class_="log", id_="%s_log" % ident) + html.div('', class_="log", id="%s_log" % ident) html.close_td() html.close_tr() @@ -3657,7 +3657,7 @@ class ModeDiscovery(WatoMode): def bulk_button(source, target, target_label, label): html.button("_bulk_%s_%s" % (source, target), target_label, - help=_("Move %s to %s services") % (label, target)) + help_=_("Move %s to %s services") % (label, target)) table.row(collect_headers=collect_headers, fixed=True) table.cell(css="bulkactions service_discovery", colspan=self._bulk_action_colspan()) @@ -3682,7 +3682,7 @@ class ModeDiscovery(WatoMode): elif table_source == self.SERVICE_VANISHED: if config.user.may("wato.service_discovery_to_removed"): html.button("_bulk_%s_removed" % table_source, _("Remove"), - help=_("Remove %s services") % label) + help_=_("Remove %s services") % label) if config.user.may("wato.service_discovery_to_ignored"): bulk_button(table_source, self.SERVICE_IGNORED, _("Disable"), label) @@ -5492,7 +5492,7 @@ class ModeActivateChanges(WatoMode, watolib.ActivateChanges): if self._may_discard_changes(): html.context_button(_("Discard Changes!"), html.makeactionuri([("_action", "discard")]), - "discard", id="discard_changes_button") + "discard", id_="discard_changes_button") if config.user.may("wato.sites"): html.context_button(_("Site Configuration"), watolib.folder_preserving_link([("mode", "sites")]), "sites") @@ -5786,17 +5786,17 @@ class ModeActivateChanges(WatoMode, watolib.ActivateChanges): # State if can_activate_all and need_sync: html.icon_button(url="javascript:void(0)", - id="activate_%s" % site_id, + id_="activate_%s" % site_id, cssclass=["activate_site"], - help=_("This site is not update and needs a replication. Start it now."), + title=_("This site is not update and needs a replication. Start it now."), icon="need_replicate", onclick="activate_changes(\"site\", \"%s\")" % site_id) if can_activate_all and need_restart: html.icon_button(url="javascript:void(0)", - id="activate_%s" % site_id, + id_="activate_%s" % site_id, cssclass=["activate_site"], - help=_("This site needs a restart for activating the changes. Start it now."), + title=_("This site needs a restart for activating the changes. Start it now."), icon="need_restart", onclick="activate_changes(\"site\", \"%s\")" % site_id) @@ -5811,7 +5811,7 @@ class ModeActivateChanges(WatoMode, watolib.ActivateChanges): # Livestatus table.cell(_("Status"), css="narrow nobr") - html.status_label(content=status, status=status, help=_("This site is %s") % status) + html.status_label(content=status, status=status, title=_("This site is %s") % status) # Livestatus-/Check_MK-Version table.cell(_("Version"), site_status.get("livestatus_version", ""), css="narrow nobr") @@ -7182,7 +7182,7 @@ class NotificationsMode(EventsMode): if num_conditions: title = _("%d conditions") % num_conditions html.begin_foldable_container(treename="rule_%d" % nr, - id="%s" % nr, + id_="%s" % nr, isopen=False, title=title, indent=False,

5 years, 12 months

Fixed two 'id' kwargs

by Simon Betz

Module: check_mk Branch: master Commit: ab130f3120275e35e74c64127947a9d3a35a7334 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab130f3120275e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 4 15:53:21 2018 +0200 Fixed two 'id' kwargs Change-Id: I39dfb29c046afbb4830b0f698920dee2334c5102 --- cmk/gui/valuespec.py | 2 +- cmk/gui/wato/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index 40b758d..d933cae 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -1250,7 +1250,7 @@ class ListOf(ValueSpec): html.hidden_field('%s_count' % varprefix, str(count), - id = '%s_count' % varprefix, + id_ = '%s_count' % varprefix, add_var = True) self._show_entries(varprefix, value) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index a38e8cb..697b095 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -5634,7 +5634,7 @@ class ModeActivateChanges(WatoMode, watolib.ActivateChanges): valuespec = self._vs_activation() html.begin_form("activate", method="POST", action="") - html.hidden_field("activate_until", self._get_last_change_id(), id="activate_until") + html.hidden_field("activate_until", self._get_last_change_id(), id_="activate_until") forms.header(valuespec.title()) valuespec.render_input("activate", self._value)

5 years, 12 months

6740 FIX statgrab_mem: Mark ruleset as deprecated

by Simon Betz

Module: check_mk Branch: master Commit: 86127be109b99572be2ec79abc92fd9b65b91345 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86127be109b995… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 4 14:28:34 2018 +0200 6740 FIX statgrab_mem: Mark ruleset as deprecated Change-Id: If21863bf0418bd633791bc45d65ca5fe244ca92c --- .werks/6740 | 12 ++++++++++++ cmk/gui/plugins/wato/check_parameters.py | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/6740 b/.werks/6740 new file mode 100644 index 0000000..0b50d8d --- /dev/null +++ b/.werks/6740 @@ -0,0 +1,12 @@ +Title: statgrab_mem: Mark ruleset as deprecated +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1538656098 +Class: fix + +The ruleset {{Statgrab Memory Usage}} was replaced by the ruleset +{{Main memory usage (UNIX / Other Devices)}} in version 1.2.7 but +not marked as {{deprecated}}. diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 524a975..8ac9113 100755 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -9106,7 +9106,8 @@ register_check_parameters( ] ), None, - "first" + "first", + deprecated=True, ) register_check_parameters(

5 years, 12 months

Fix missing help & id #2

by Óscar Nájera

Module: check_mk Branch: master Commit: d4e17e1ed708b6a09d7564e9fcfaad3eadecd465 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4e17e1ed708b6… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Oct 4 13:41:04 2018 +0200 Fix missing help & id #2 Change-Id: I8edde980ca55c1d6bcd18c3600a488dc21830a3b --- cmk/gui/htmllib.py | 8 ++++---- cmk/gui/plugins/sidebar/master_control.py | 2 +- cmk/gui/plugins/sidebar/site_status.py | 4 ++-- cmk/gui/sidebar.py | 2 +- cmk/gui/views.py | 2 +- cmk/gui/wato/__init__.py | 2 +- cmk/gui/wato/pages/global_settings.py | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index a56030a..48fca7b 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -2299,14 +2299,14 @@ class html(HTMLGenerator): # Shows a colored badge with text (used on WATO activation page for the site status) - def status_label(self, content, status, help_txt, **attrs): - self.status_label_button(content, status, help_txt, onclick=None, **attrs) + def status_label(self, content, status, title, **attrs): + self.status_label_button(content, status, title, onclick=None, **attrs) # Shows a colored button with text (used in site and customer status snapins) - def status_label_button(self, content, status, help_txt, onclick, **attrs): + def status_label_button(self, content, status, title, onclick, **attrs): button_cls = "button" if onclick else None - self.div(content, title=help_txt, class_=[ "status_label", button_cls, status ], + self.div(content, title=title, class_=[ "status_label", button_cls, status ], onclick=onclick, **attrs) diff --git a/cmk/gui/plugins/sidebar/master_control.py b/cmk/gui/plugins/sidebar/master_control.py index bc6bc35..ecbe4a7 100644 --- a/cmk/gui/plugins/sidebar/master_control.py +++ b/cmk/gui/plugins/sidebar/master_control.py @@ -117,7 +117,7 @@ class MasterControlSnapin(SidebarSnapin): html.open_td() html.toggle_switch( enabled=colvalue, - help=_("Switch '%s' to '%s'") % (title, _("off") if colvalue else _("on")), + help_txt=_("Switch '%s' to '%s'") % (title, _("off") if colvalue else _("on")), onclick=onclick, ) html.close_td() diff --git a/cmk/gui/plugins/sidebar/site_status.py b/cmk/gui/plugins/sidebar/site_status.py index 5f1a6a9..6eaa1c5 100644 --- a/cmk/gui/plugins/sidebar/site_status.py +++ b/cmk/gui/plugins/sidebar/site_status.py @@ -90,13 +90,13 @@ class SiteStatus(SidebarSnapin): html.close_td() html.open_td(class_="state") if switch == "missing": - html.status_label(content=state, status=state, help=_("Site is missing")) + html.status_label(content=state, status=state, title=_("Site is missing")) else: url = html.makeactionuri_contextless([ ("_site_switch", "%s:%s" % (sitename, switch)), ], filename="switch_site.py") html.status_label_button(content=state, status=state, - help=_("enable this site") if state == "disabled" else _("disable this site"), + title=_("enable this site") if state == "disabled" else _("disable this site"), onclick="switch_site(%s)" % (json.dumps(url))) html.close_tr() html.close_table() diff --git a/cmk/gui/sidebar.py b/cmk/gui/sidebar.py index 9c86c44..4c0850b 100644 --- a/cmk/gui/sidebar.py +++ b/cmk/gui/sidebar.py @@ -547,7 +547,7 @@ class SidebarRenderer(object): html.icon_button("logout.py", _("Log out"), "sidebar_logout", target="_top") html.icon_button("return void();", _("You have pending messages."), - "sidebar_messages", onclick = 'read_message()', id = 'msg_button', style = 'display:none') + "sidebar_messages", onclick = 'read_message()', id_ = 'msg_button', style = 'display:none') html.open_div(style="display:none;", id_="messages") self.render_messages() html.close_div() diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 5ee54ca..172cbf1 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -1505,7 +1505,7 @@ def show_context_links(thisview, datasource, show_filters, url = watolib.link_to_host_by_name(host) else: url = watolib.link_to_folder_by_path(html.var("wato_folder", "")) - html.context_button(_("WATO"), url, "wato", id="wato", + html.context_button(_("WATO"), url, "wato", id_="wato", bestof = config.context_buttons_to_show) # Button for creating an instant report (if reporting is available) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 3e94e6a..a38e8cb 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -1036,7 +1036,7 @@ class ModeFolder(WatoMode): # 1. add round the single tags to prevent wrap within tags # 2. add "zero width space" () tag_title = "|".join([ '%s' % t for t in host.tags() ]) - table.cell(_("Tags"), help=tag_title, css="tag-ellipsis") + table.cell(_("Tags"), help_txt=tag_title, css="tag-ellipsis") html.write("|".join([ '%s' % t for t in host.tags() ])) # Located in folder diff --git a/cmk/gui/wato/pages/global_settings.py b/cmk/gui/wato/pages/global_settings.py index 04f8bd7..324588d 100644 --- a/cmk/gui/wato/pages/global_settings.py +++ b/cmk/gui/wato/pages/global_settings.py @@ -184,7 +184,7 @@ class GlobalSettingsMode(WatoMode): html.open_div(class_=["toggle_switch_container", modified_cls]) html.toggle_switch( enabled=value, - help=_("Immediately toggle this setting"), + help_txt=_("Immediately toggle this setting"), href=html.makeactionuri([("_action", "toggle"), ("_varname", varname)]), class_=modified_cls, title=title,

5 years, 12 months

← Newer
1
...
24
25
26
27
28
29
30
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018