Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

Sorting events in event views by time (needed for discovered EC)

by Lars Michelsen

Module: check_mk Branch: master Commit: a2ae0064a55a46d5e4edb9229ecb84b8cc7b1032 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2ae0064a55a46… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 07:49:46 2017 +0100 Sorting events in event views by time (needed for discovered EC) Change-Id: Icedf2805e0ea7348c4762ceadd7b2ac5d294cb7f --- web/plugins/views/mkeventd.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index bf8b8ed..3a03926 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -724,6 +724,9 @@ if mkeventd_enabled: ( 'event_phase_counting', "" ), ( 'event_phase_delayed', "" ), ], + 'sorters': [ + ('event_last', False) + ], }) multisite_builtin_views['ec_events_of_monhost'] = mkeventd_view({ @@ -764,6 +767,9 @@ if mkeventd_enabled: 'siteopt', 'host', ], + 'sorters': [ + ('event_last', False) + ], }) multisite_builtin_views['ec_events_of_host'] = mkeventd_view({ 'title': _('Events of Host'), @@ -803,6 +809,9 @@ if mkeventd_enabled: 'siteopt', 'event_host', ], + 'sorters': [ + ('event_last', False) + ], }) multisite_builtin_views['ec_event'] = mkeventd_view({ @@ -1144,7 +1153,9 @@ if mkeventd_enabled: ('event_last', None, None)], 'public': True, 'single_infos': [], - 'sorters': [], + 'sorters': [ + ('event_last', False) + ], 'title': u'Events', 'topic': u'Event Console', 'user_sortable': True}

7 years, 5 months

Event console: simulating events now supports distributed EC

by Lars Michelsen

Module: check_mk Branch: master Commit: 60907946d4777f83bbd8848279d978eb337d2caa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60907946d4777f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 18:07:06 2017 +0100 Event console: simulating events now supports distributed EC Change-Id: I6fa77cf4e204c2f4694080111c11da0427d9b2a7 --- bin/mkeventd | 21 +++++++++++++++++++-- web/htdocs/mkeventd.py | 44 +++++++++++++++----------------------------- web/htdocs/watolib.py | 33 +++++++++++++++++++-------------- web/plugins/wato/mkeventd.py | 4 ++++ 4 files changed, 57 insertions(+), 45 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index be4acda..9c05f79 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3048,7 +3048,7 @@ class StatusServer: "(allowed are python, json and plain)" % output_format) - # locked with lock_eventstatus + # All commands are already locked with lock_eventstatus def handle_command_request(self, commandline): log("Executing command: %s" % commandline) parts = commandline.split(";") @@ -3072,6 +3072,8 @@ class StatusServer: self.handle_command_resetcounters(arguments) elif command == "UPDATE": self.handle_command_update(arguments) + elif command == "CREATE": + self.handle_command_create(arguments) elif command == "CHANGESTATE": self.handle_command_changestate(arguments) elif command == "ACTION": @@ -3081,13 +3083,14 @@ class StatusServer: else: raise MKClientError("Unknown command %s" % command) - # locked with lock_eventstatus + def handle_command_delete(self, arguments): if len(arguments) != 2: raise MKClientError("Wrong number of arguments for DELETE") event_id, user = arguments g_event_status.delete_event(int(event_id), user) + def handle_command_update(self, arguments): event_id, user, acknowledged, comment, contact = arguments event = g_event_status.event(int(event_id)) @@ -3102,6 +3105,17 @@ class StatusServer: event["phase"] = int(acknowledged) and "ack" or "open" log_event_history(event, "UPDATE", user) + + def handle_command_create(self, arguments): + # Would rather use g_event_server.process_raw_line(), but we are already + # holding lock_eventstatus and it's sub functions are setting + # lock_eventstatus too. The lock can not be allocated twice. + # TODO: Change the lock type in future? + # process_raw_lines("%s" % ";".join(arguments)) + with file(g_pipe_path, "w") as pipe: + pipe.write("%s\n" % ";".join(arguments)) + + def handle_command_changestate(self, arguments): event_id, user, newstate = arguments event = g_event_status.event(int(event_id)) @@ -3110,6 +3124,7 @@ class StatusServer: event["state"] = int(newstate) log_event_history(event, "CHANGESTATE", user) + def handle_command_reload(self): with lock_configuration: load_configuration() @@ -3118,11 +3133,13 @@ class StatusServer: g_status_server.reload_configuration() log("Reloaded configuration.") + def handle_command_reopenlog(self): log("Closing this logfile") open_logfile() log("Opened new logfile") + # Erase our current state and history! def handle_command_flush(self): flush_event_history() diff --git a/web/htdocs/mkeventd.py b/web/htdocs/mkeventd.py index e1cdebe..9d3b9d7 100644 --- a/web/htdocs/mkeventd.py +++ b/web/htdocs/mkeventd.py @@ -36,25 +36,13 @@ import cmk.paths # Please sync these paths with htdocs/mkeventd.py mib_dirs = [ ('/usr/share/snmp/mibs', _('System MIBs')) ] -try: - socket_path = cmk.paths.omd_root + "/tmp/run/mkeventd/status" - pipe_path = cmk.paths.omd_root + "/tmp/run/mkeventd/events" +socket_path = cmk.paths.omd_root + "/tmp/run/mkeventd/status" +compiled_mibs_dir = cmk.paths.omd_root + "/local/share/check_mk/compiled_mibs" - compiled_mibs_dir = cmk.paths.omd_root + "/local/share/check_mk/compiled_mibs" - - # Please sync these paths with htdocs/mkeventd.py - mib_upload_dir = cmk.paths.omd_root + "/local/share/snmp/mibs" - mib_dirs.insert(0, (cmk.paths.omd_root + "/share/snmp/mibs", _('MIBs shipped with Check_MK'))) - mib_dirs.insert(0, (mib_upload_dir, _('Custom MIBs'))) -except: - run_dir = cmk.paths.livestatus_unix_socket.rsplit("/",1)[0] - socket_path = run_dir + "/mkeventd/status" - pipe_path = run_dir + "/mkeventd/events" - - # Please sync these paths with htdocs/mkeventd.py - mib_upload_dir = cmk.paths.var_dir + "/mkeventd/mibs" - compiled_mibs_dir = "/var/lib/mkeventd/compiled_mibs" - mib_dirs.insert(0, (mib_upload_dir, _('Custom MIBs'))) +# Please sync these paths with htdocs/mkeventd.py +mib_upload_dir = cmk.paths.omd_root + "/local/share/snmp/mibs" +mib_dirs.insert(0, (cmk.paths.omd_root + "/share/snmp/mibs", _('MIBs shipped with Check_MK'))) +mib_dirs.insert(0, (mib_upload_dir, _('Custom MIBs'))) syslog_priorities = [ @@ -171,16 +159,16 @@ def daemon_running(): def send_event(event): # "<%PRI%>@%TIMESTAMP%;%SL% %HOSTNAME% %syslogtag% %msg%\n" prio = (event["facility"] << 3) + event["priority"] - rfc = "<%d>@%s;%d %s|%s %s: %s\n" % ( - prio, int(time.time()), event["sl"], event["host"], - event["ipaddress"], event["application"], event["text"]) - if type(rfc) == unicode: - rfc = rfc.encode("utf-8") - pipe = file(pipe_path, "w") - pipe.write(rfc + "\n") - pipe.close() - return rfc + rfc = [ + "<%d>@%d" % (prio, int(time.time())), + "%d %s|%s %s: %s\n" % (event["sl"], event["host"], + event["ipaddress"], event["application"], event["text"]), + ] + + execute_command("CREATE", map(make_utf8, rfc), site=event["site"]) + + return ";".join(rfc) def get_local_ec_status(): @@ -237,8 +225,6 @@ def execute_command(name, args=None, site=None): sites.live().command(query, site) - - def get_total_stats(): stats_keys = [ "status_average_message_rate", diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 4425107..d7a1d7c 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3545,12 +3545,26 @@ def get_login_sites(): # Returns a list of site ids which gets the Event Console configuration replicated def get_event_console_sync_sites(): - sites = [] + return [ s[0] for s in get_event_console_site_choices() ] + + +def get_event_console_site_choices(): + return site_choices(filter_func=lambda site_id, site: config.site_is_local(site_id) or site.get("replicate_ec")) + + +def site_choices(filter_func=None): + choices = [] for site_id, site in config.sites.items(): - if config.site_is_local(site_id) or site.get("replicate_ec"): - sites.append(site_id) - return sites + if filter_func and not filter_func(site_id, site): + continue + + title = site_id + if site.get("alias"): + title += " - " + site["alias"] + + choices.append((site_id, title)) + return sorted(choices, key=lambda s: s[1]) @@ -3563,20 +3577,11 @@ class SiteAttribute(ValueSpecAttribute): def __init__(self): # Default is is the local one, if one exists or # no one if there is no local site - choices = [] - for id, site in config.sites.items(): - title = id - if site.get("alias"): - title += " - " + site["alias"] - choices.append((id, title)) - - choices.sort(cmp=lambda a,b: cmp(a[1], b[1])) - ValueSpecAttribute.__init__(self, "site", DropdownChoice( title=_("Monitored on site"), help=_("Specify the site that should monitor this host."), default_value = default_site(), - choices = choices, + choices = site_choices, invalid_choice = "complain", invalid_choice_title = _("Unknown site (%s)"), invalid_choice_error = _("The configured site is not known to this site. In case you " diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index e3e7f30..02b8b96 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -886,6 +886,10 @@ vs_mkeventd_event = Dictionary( choices = mkeventd.service_levels, prefix_values = True, )), + ("site", DropdownChoice( + title = _("Simulate for site"), + choices = get_event_console_site_choices, + )), ])

7 years, 5 months

Fixed error in EC views when event is from unknown host

by Lars Michelsen

Module: check_mk Branch: master Commit: 18d983174bdaab332df029017c66b0901f817d78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18d983174bdaab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 07:53:12 2017 +0100 Fixed error in EC views when event is from unknown host Change-Id: I06c499dea034f55b0b00c932cc8b73fbd9ba0b18 --- web/htdocs/inventory.py | 5 +++++ web/plugins/views/inventory.py | 3 +++ 2 files changed, 8 insertions(+) diff --git a/web/htdocs/inventory.py b/web/htdocs/inventory.py index 451bdda..47ca3a1 100644 --- a/web/htdocs/inventory.py +++ b/web/htdocs/inventory.py @@ -41,6 +41,9 @@ from lib import MKException, MKGeneralException, MKAuthException, MKUserError, l # Load data of a host, cache it in the current HTTP request def host(hostname): + if not hostname: + return {} + invcache = html.get_cached("inventory") if not invcache: invcache = {} @@ -54,6 +57,8 @@ def host(hostname): return invdata def has_inventory(hostname): + if not hostname: + return False path = cmk.paths.var_dir + "/inventory/" + hostname return os.path.exists(path) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 04eb056..295fdb6 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -1114,6 +1114,9 @@ def _create_view_enabled_check_func(invpath): if "host" not in context: return True # No host data? Keep old behaviour + if context["host"] == "": + return False + tree = inventory.host(context["host"]) if not tree: return False # Don't show when no inventory data available

7 years, 5 months

Refactoring: Using store methods for saving files instead of create_user_file()

by Lars Michelsen

Module: check_mk Branch: master Commit: 6c47b84cf8bda90b0d456c4d359cb6eff6ea6f66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c47b84cf8bda9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 16:17:19 2017 +0100 Refactoring: Using store methods for saving files instead of create_user_file() Change-Id: I1f73f96c76fee4e414d4041e484faf3ebf7349de --- web/htdocs/backup.py | 2 +- web/htdocs/key_mgmt.py | 1 + web/htdocs/lib.py | 19 +----------- web/htdocs/userdb.py | 12 ++++---- web/htdocs/wato.py | 66 ++++++++++++++++-------------------------- web/htdocs/watolib.py | 42 +++++++++++++++------------ web/plugins/userdb/htpasswd.py | 15 +++------- web/plugins/wato/bi.py | 11 +++---- web/plugins/wato/mkeventd.py | 25 ++++++++-------- 9 files changed, 81 insertions(+), 112 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6c47b84cf8…

7 years, 5 months

4278 FIX check_mail_loop: Added missing Date header to sent mails

by Lars Michelsen

Module: check_mk Branch: master Commit: a29a65c4a12949a308118fa2fb7105f77a7c9e63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a29a65c4a12949… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 16:59:42 2017 +0100 4278 FIX check_mail_loop: Added missing Date header to sent mails Change-Id: I406a9b9dd31a8486391410f29efe0d82ddb9ec40 --- .werks/4278 | 10 ++++++++++ ChangeLog | 1 + active_checks/check_mail_loop | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/4278 b/.werks/4278 new file mode 100644 index 0000000..b560f97 --- /dev/null +++ b/.werks/4278 @@ -0,0 +1,10 @@ +Title: check_mail_loop: Added missing Date header to sent mails +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1484236699 + + diff --git a/ChangeLog b/ChangeLog index 5919c17..b54b158 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * 4274 FIX: eltek_outdoor_temp: Fixed non working default levels * 4275 FIX: ibm_imm_voltage: Fixed not working perfdata processing * 4010 FIX: netapp_api_qtree_quota: now only includes quotas where disk-limits are set + * 4278 FIX: check_mail_loop: Added missing Date header to sent mails Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/active_checks/check_mail_loop b/active_checks/check_mail_loop index d899d25..e2fb400 100755 --- a/active_checks/check_mail_loop +++ b/active_checks/check_mail_loop @@ -328,6 +328,7 @@ def send_mail(): mail['From'] = mail_from mail['To'] = mail_from mail['Subject'] = '%s %d %d' % (subject, now, key) + mail['Date'] = email.utils.formatdate(localtime=True) try: S = smtplib.SMTP(smtp_server, smtp_port)

7 years, 5 months

Refactoring htmllib: changed stdanard <script> tag call and rendering. mobile: continued refactoring.

by Roland Halbig

Module: check_mk Branch: master Commit: 0ce965dc35bc252744fd414760986a3eaf25ca15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ce965dc35bc25… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Jan 12 14:34:35 2017 +0100 Refactoring htmllib: changed stdanard <script> tag call and rendering. mobile: continued refactoring. Change-Id: I1875eca51d87f660d0eb18e7e773241b4fea7105 --- web/htdocs/htmllib.py | 47 +++++++++++++++++++++-------------------------- web/htdocs/mobile.py | 11 ++++------- 2 files changed, 25 insertions(+), 33 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a7e472d..b09a5ef 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -586,31 +586,31 @@ class HTMLGenerator(Escaper, OutputFunnel): def write_text(self, text): """ Write text. Highlighting tags such as h2|b|tt|i|br|pre|a|sup|p|li|ul|ol are not escaped. """ - return self.write(self._escape_text(text)) + self.write(self._escape_text(text)) def write_html(self, content): """ Write HTML code directly, without escaping. """ - return self.write(content + "\n") + self.write(content + "\n") def comment(self, comment_text): - return self.write("" % self.encode_attribute(comment_text)) + self.write("" % self.encode_attribute(comment_text)) def meta(self, httpequiv=None, **attrs): if httpequiv: attrs['http-equiv'] = httpequiv - return self.write(self._render_opening_tag('meta', close_tag=True, **attrs)) + self.write(self._render_opening_tag('meta', close_tag=True, **attrs)) def base(self, target): - return self.write(self._render_opening_tag('base', close_tag=True, target=target)) + self.write(self._render_opening_tag('base', close_tag=True, target=target)) def open_a(self, href, **attrs): attrs['href'] = href - return self.write(self._render_opening_tag('a', **attrs)) + self.write(self._render_opening_tag('a', **attrs)) def render_a(self, content, href, **attrs): @@ -619,11 +619,11 @@ class HTMLGenerator(Escaper, OutputFunnel): def a(self, content, href, **attrs): - return self.write(self.render_a(content, href, **attrs)) + self.write(self.render_a(content, href, **attrs)) def stylesheet(self, href): - return self.write(self._render_opening_tag('link', rel="stylesheet", type_="text/css", href=href, close_tag=True)) + self.write(self._render_opening_tag('link', rel="stylesheet", type_="text/css", href=href, close_tag=True)) # @@ -631,18 +631,13 @@ class HTMLGenerator(Escaper, OutputFunnel): # - # does not escape the script content - def render_javascript(self, code): - return HTML("<script language=\"javascript\">\n%s\n</script>\n" % code) - - def javascript(self, code): - return self.write(self.render_javascript(code)) + self.write("<script type=\"text/javascript\">\n%s\n</script>\n" % code) def javascript_file(self, src): """ <script type="text/javascript" src="%(name)"/>\n """ - return self.write(self._render_content_tag('script', '', type_="text/javascript", src=src)) + self.write(self._render_content_tag('script', '', type_="text/javascript", src=src)) def render_img(self, src, **attrs): @@ -651,16 +646,16 @@ class HTMLGenerator(Escaper, OutputFunnel): def img(self, src, **attrs): - return self.write(self.render_img(src, **attrs)) + self.write(self.render_img(src, **attrs)) def open_button(self, type_, **attrs): attrs['type'] = type_ - return self.write(self._render_opening_tag('button', close_tag=True, **attrs)) + self.write(self._render_opening_tag('button', close_tag=True, **attrs)) def play_sound(self, url): - return self.write(self._render_opening_tag('audio autoplay', src_=url)) + self.write(self._render_opening_tag('audio autoplay', src_=url)) # @@ -674,7 +669,7 @@ class HTMLGenerator(Escaper, OutputFunnel): def label(self, content, for_, **attrs): - return self.write(self.render_label(content, for_, **attrs)) + self.write(self.render_label(content, for_, **attrs)) def render_input(self, name, type_, **attrs): @@ -684,7 +679,7 @@ class HTMLGenerator(Escaper, OutputFunnel): def input(self, name, type_, **attrs): - return self.write(self.render_input(name, type_, **attrs)) + self.write(self.render_input(name, type_, **attrs)) # @@ -694,12 +689,12 @@ class HTMLGenerator(Escaper, OutputFunnel): def td(self, content, **attrs): """ Only for text content. You can't put HTML structure here. """ - return self.write(self._render_content_tag('td', content, **attrs)) + self.write(self._render_content_tag('td', content, **attrs)) def li(self, content, **attrs): """ Only for text content. You can't put HTML structure here. """ - return self.write(self._render_content_tag('li', content, **attrs)) + self.write(self._render_content_tag('li', content, **attrs)) # @@ -713,7 +708,7 @@ class HTMLGenerator(Escaper, OutputFunnel): def heading(self, content): - return self.write(self.render_heading(content)) + self.write(self.render_heading(content)) def render_br(self): @@ -721,7 +716,7 @@ class HTMLGenerator(Escaper, OutputFunnel): def br(self): - return self.write(self.render_br()) + self.write(self.render_br()) def render_hr(self, **attrs): @@ -729,7 +724,7 @@ class HTMLGenerator(Escaper, OutputFunnel): def hr(self, **attrs): - return self.write(self.render_hr(**attrs)) + self.write(self.render_hr(**attrs)) def rule(self): @@ -741,7 +736,7 @@ class HTMLGenerator(Escaper, OutputFunnel): def nbsp(self): - return self.write(self.render_nbsp()) + self.write(self.render_nbsp()) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index ced6d6b..54d8bba 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -65,20 +65,17 @@ def mobile_html_head(title, ready_code=""): # Never allow the mobile page to be opened in a frameset. Redirect top page to the current content page. # This will result in a full screen mobile interface page. - html.javascript('''if(top != self) { - window.top.location.href = location; -}''') + html.javascript('''if(top != self) { window.top.location.href = location; }''') - html.write("""<script type='text/javascript'> + html.javascript(""" $(document).ready(function() { %s }); $(document).ready(function() { $("a").click(function (event) { event.preventDefault(); window.location = $(this).attr("href"); }); - }); - </script> -""" % (ready_code)) + });""" % ready_code) + html.close_head() html.open_body(class_="mobile")

7 years, 5 months

Refactored watolib.

by Roland Halbig

Module: check_mk Branch: master Commit: 11aab8d683a56354f35ec00f093cab4ed9fd53c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11aab8d683a563… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Jan 5 16:32:39 2017 +0100 Refactored watolib. Change-Id: I06e5a91d6615bf3a9090afee422b8ab870eb6716 --- web/htdocs/watolib.py | 65 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 5201592..badb0cc 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -618,10 +618,12 @@ class BaseFolder(WithPermissionsAndAttributes): html.attrencode(folder.title())) def breadcrump_element_start(end = '', z_index = 0): - html.write('<li style="z-index:%d;"><div class="left %s"></div>' % (z_index, end)) + html.open_li(style="z-index:%d;" % z_index) + html.div('', class_=["left", end]) def breadcrump_element_end(end = ''): - html.write('<div class="right %s"></div></li>' % end) + html.div('', class_=["right", end]) + html.close_li() parts = [] @@ -636,14 +638,17 @@ class BaseFolder(WithPermissionsAndAttributes): # Render the folder path - html.write("<div class=folderpath><ul>\n") + html.open_div(class_=["folderpath"]) + html.open_ul() num = 0 for part in parts: if num == 0: breadcrump_element_start('end', z_index = 100 + num) else: breadcrump_element_start(z_index = 100 + num) - html.write('<div class=content>%s</div>\n' % part) + html.open_div(class_=["content"]) + html.write(part) + html.close_div() breadcrump_element_end(num == len(parts)-1 and not (self.has_subfolders() and not link_to_folder) @@ -653,7 +658,8 @@ class BaseFolder(WithPermissionsAndAttributes): # Render the current folder when having subfolders if self.has_subfolders() and not link_to_folder: breadcrump_element_start(z_index = 100 + num) - html.write("<div class=content><form method=GET name=folderpath>") + html.open_div(class_=["content"]) + html.open_form(name="folderpath", method="GET") html.sorted_select( "folder", [ ("", "") ] + self.subfolder_choices(), onchange = "folderpath.submit();", @@ -664,10 +670,12 @@ class BaseFolder(WithPermissionsAndAttributes): else: for var in keepvarnames: html.hidden_field(var, html.var(var)) - html.write("</form></div>") + html.close_form() + html.close_div() breadcrump_element_end('end') - html.write("</ul></div>\n") + html.close_ul() + html.close_div() def name(self): @@ -2904,8 +2912,9 @@ class ContactGroupsAttribute(Attribute): items.sort(cmp = lambda a,b: cmp(a[1], b[1])) for name, group in items: html.checkbox(varprefix + self._name + "_n_" + name, name in value["groups"]) - html.write(' <a href="%s">%s</a><br>' % (folder_preserving_link([("mode", "edit_contact_group"), ("edit", name)]), group['alias'] and group['alias'] or name)) - html.write("<hr>") + html.a(group['alias'] if group['alias'] else name , href=folder_preserving_link([("mode", "edit_contact_group"), ("edit", name)])) + html.br() + html.hr() if is_host: html.checkbox(varprefix + self._name + "_use", value["use"], @@ -2914,14 +2923,14 @@ class ContactGroupsAttribute(Attribute): elif not is_search: html.checkbox(varprefix + self._name + "_recurse_perms", value["recurse_perms"], label = _("Give these groups also <b>permission on all subfolders</b>")) - html.write("<hr>") + html.hr() html.checkbox(varprefix + self._name + "_use", value["use"], label = _("Add these groups as <b>contacts</b> to all hosts in this folder")) - html.write("<br>") + html.br() html.checkbox(varprefix + self._name + "_recurse_use", value["recurse_use"], label = _("Add these groups as <b>contacts in all subfolders</b>")) - html.write("<hr>") + html.hr() html.help(_("With this option contact groups that are added to hosts are always " "being added to services, as well. This only makes a difference if you have " "assigned other contact groups to services via rules in <i>Host & Service Parameters</i>. " @@ -5604,7 +5613,7 @@ def render_condition_editor(tag_specs, varprefix=""): # Show dropdown with "is/isnot/ignore" and beginning # of div that is switched visible by is/isnot def tag_condition_dropdown(tagtype, deflt, id): - html.write("<td>") + html.open_td() html.select(varprefix + tagtype + "_" + id, [ ("ignore", _("ignore")), ("is", _("is")), @@ -5612,13 +5621,13 @@ def render_condition_editor(tag_specs, varprefix=""): onchange="valuespec_toggle_dropdownn(this, '%stag_sel_%s');" % \ (varprefix, id) ) - html.write("</td><td class=\"tag_sel\">") + html.close_td() + html.open_td(class_="tag_sel") if html.form_submitted(): div_is_open = html.var(tagtype + "_" + id, "ignore") != "ignore" else: div_is_open = deflt != "ignore" - html.write('<div id="%stag_sel_%s" style="%s">' % ( - varprefix, id, not div_is_open and "display: none;" or "")) + html.open_div(id_="%stag_sel_%s" % (varprefix, id), style="display: none;" if not div_is_open else None) auxtags = group_hosttags_by_topic(configured_aux_tags()) @@ -5633,14 +5642,17 @@ def render_condition_editor(tag_specs, varprefix=""): if make_foldable: html.begin_foldable_container("topic", varprefix + topic, True, HTML("<b>%s</b>" % (_u(topic)))) - html.write("<table class=\"hosttags\">") + html.open_table(class_=["hosttags"]) # Show main tags for t, grouped_tags in hosttags: if t == topic: for entry in grouped_tags: id, title, choices = entry[:3] - html.write("<tr><td class=title>%s:  </td>" % _u(title)) + html.open_tr() + html.open_td(class_="title") + html.write("%s:  " % _u(title)) + html.close_td() default_tag, deflt = current_tag_setting(choices) tag_condition_dropdown("tag", deflt, id) if len(choices) == 1: @@ -5648,21 +5660,26 @@ def render_condition_editor(tag_specs, varprefix=""): else: html.select(varprefix + "tagvalue_" + id, [(t[0], _u(t[1])) for t in choices if t[0] != None], deflt=default_tag) - html.write("</div>") - html.write("</td></tr>") + html.close_div() + html.close_td() + html.close_tr() # And auxiliary tags for t, grouped_tags in auxtags: if t == topic: for id, title in grouped_tags: - html.write("<tr><td class=title>%s:  </td>" % _u(title)) + html.open_tr() + html.open_td(class_="title") + html.write("%s:  " % _u(title)) + html.close_td() default_tag, deflt = current_tag_setting([(id, _u(title))]) tag_condition_dropdown("auxtag", deflt, id) html.write(" " + _("set")) - html.write("</div>") - html.write("</td></tr>") + html.close_div() + html.close_td() + html.close_tr() - html.write("</table>") + html.close_table() if make_foldable: html.end_foldable_container()

7 years, 5 months

Repaired table tests.

by Roland Halbig

Module: check_mk Branch: master Commit: 2a0ef3bd2e645f2fc1b96f75fc1062dc9f9f1f66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a0ef3bd2e645f… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Jan 10 16:55:28 2017 +0100 Repaired table tests. Change-Id: Ieab28bd9e1d636bde673122ac9838d1a85aa3437 --- tests/web/test_table.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/web/test_table.py b/tests/web/test_table.py index c94a34f..1f0bfb4 100644 --- a/tests/web/test_table.py +++ b/tests/web/test_table.py @@ -31,6 +31,10 @@ class TableTest(html): written_text = '' tag_counter = 0 + def __init__(self): + super(TableTest, self).__init__() + self.myfile = "testfile" + def lowlevel_write(self, text): if re.match(r'.*\.close_\w+[(][)]', '\n'.join(traceback.format_stack()), re.DOTALL): @@ -99,6 +103,7 @@ def table_test_cubical(sortable, searchable, limit, output_format): separator = ';' html.add_var('_%s_sort' % table_id, "1,0") + html.add_var('_%s_actions' % table_id, '1') rows = [ (i, i**3) for i in range(10) ] header = ["Number", "Cubical"] @@ -138,7 +143,7 @@ def table_test_cubical(sortable, searchable, limit, output_format): else: assert False, 'Not yet implemented!' - data = [ tuple(map(int, row)) for row in data ] + data = [ tuple(map(int, row)) for row in data if row and row[0]] if limit is None: limit = len(rows)

7 years, 5 months

Refactoring table.py: Moving out evaluation of user_opts.

by Roland Halbig

Module: check_mk Branch: master Commit: 6da128f5c96e3c0f86b0697e9b08efb5b0cbec09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6da128f5c96e3c… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Jan 10 16:24:20 2017 +0100 Refactoring table.py: Moving out evaluation of user_opts. Change-Id: I9805b98cb7b67c62d067581bb3ebdd3159a49ce3 --- web/htdocs/table.py | 55 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index d558a15..3a15d85 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -170,14 +170,43 @@ def end(): table = None return - table_id = table['id'] rows = table["rows"] # Controls whether or not actions are available for a table + rows, actions_enabled, actions_visible, search_term, user_opts = _evaluate_user_opts(table, rows) + + num_rows_unlimited = len(rows) + num_cols = len(table["headers"]) + + # Apply limit after search / sorting etc. + limit = table['limit'] + if limit is not None: + rows = rows[:limit] + + # Render header + _write_table(table, rows, actions_enabled, actions_visible, search_term) + + if limit is not None and num_rows_unlimited > limit: + html.message(_('This table is limited to show only %d of %d rows. ' + 'Click <a href="%s">here</a> to disable the limitation.') % + (limit, num_rows_unlimited, html.makeuri([('limit', 'none')]))) + + if actions_enabled: + config.user.save_file("tableoptions", user_opts) + table = None + + +def _evaluate_user_opts(table, rows): + + table_id = table["id"] + search_term = None - actions_visible = False actions_enabled = (table["searchable"] or table["sortable"]) - if actions_enabled: + + if not actions_enabled: + return rows, False, False, None, None + + else: user_opts = config.user.load_file("tableoptions", {}) user_opts.setdefault(table_id, {}) @@ -217,25 +246,7 @@ def end(): sort_col, sort_reverse = map(int, sort.split(',', 1)) rows = _sort_rows(rows, sort_col, sort_reverse) - num_rows_unlimited = len(rows) - num_cols = len(table["headers"]) - - # Apply limit after search / sorting etc. - limit = table['limit'] - if limit is not None: - rows = rows[:limit] - - # Render header - _write_table(table, rows, actions_enabled, actions_visible, search_term) - - if limit is not None and num_rows_unlimited > limit: - html.message(_('This table is limited to show only %d of %d rows. ' - 'Click <a href="%s">here</a> to disable the limitation.') % - (limit, num_rows_unlimited, html.makeuri([('limit', 'none')]))) - - if actions_enabled: - config.user.save_file("tableoptions", user_opts) - table = None + return rows, actions_enabled, actions_visible, search_term, user_opts def _write_table(table, rows, actions_enabled, actions_visible, search_term):

7 years, 5 months

Refactoring table.py: Moved out _write_table.

by Roland Halbig

Module: check_mk Branch: master Commit: f26d9330aa9fa368d6bbafcd948a5485d62b5907 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f26d9330aa9fa3… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Jan 10 16:01:48 2017 +0100 Refactoring table.py: Moved out _write_table. Change-Id: I47775cbf21c6cd81fd8a23904f65619b31837f23 --- web/htdocs/table.py | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index b70c25f..d558a15 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -225,6 +225,23 @@ def end(): if limit is not None: rows = rows[:limit] + # Render header + _write_table(table, rows, actions_enabled, actions_visible, search_term) + + if limit is not None and num_rows_unlimited > limit: + html.message(_('This table is limited to show only %d of %d rows. ' + 'Click <a href="%s">here</a> to disable the limitation.') % + (limit, num_rows_unlimited, html.makeuri([('limit', 'none')]))) + + if actions_enabled: + config.user.save_file("tableoptions", user_opts) + table = None + + +def _write_table(table, rows, actions_enabled, actions_visible, search_term): + + table_id = table["id"] + html.write('<table class="data oddeven') if "css" in table: html.write(" %s" % table["css"]) @@ -288,15 +305,6 @@ def end(): html.write("</table>\n") - if limit is not None and num_rows_unlimited > limit: - html.message(_('This table is limited to show only %d of %d rows. ' - 'Click <a href="%s">here</a> to disable the limitation.') % - (limit, num_rows_unlimited, html.makeuri([('limit', 'none')]))) - - if actions_enabled: - config.user.save_file("tableoptions", user_opts) - table = None - def _write_csv(table, csv_separator): @@ -322,6 +330,7 @@ def _write_csv(table, csv_separator): html.write("\n") + def _render_headers(table, actions_enabled, actions_visible): if table["omit_headers"]: return

7 years, 5 months

← Newer
1
...
13
14
15
16
17
18
19
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017