Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

3099 FIX mk_mysql: worked around problems where running instances can' t be discovered

by Sebastian Herbord

Module: check_mk Branch: master Commit: 779c67dd1eeea6f129659f072532bab066d28c92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=779c67dd1eeea6… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Mar 15 11:15:49 2016 +0100 3099 FIX mk_mysql: worked around problems where running instances can't be discovered --- .werks/3099 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/mk_mysql | 6 +++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/3099 b/.werks/3099 new file mode 100644 index 0000000..581c269 --- /dev/null +++ b/.werks/3099 @@ -0,0 +1,10 @@ +Title: mk_mysql: worked around problems where running instances can't be discovered +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458036668 + + diff --git a/ChangeLog b/ChangeLog index 1d19bbb..998860d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,7 @@ * 3261 FIX: cisco_temperature: fixed wrong datatype handling * 3007 FIX: Interface groups: fixed exception when port type or interface items were not set in the WATO rule... * 3098 FIX: isc_dhcpd: fixed handling of leases that never expire + * 3099 FIX: mk_mysql: worked around problems where running instances can't be discovered Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/plugins/mk_mysql b/agents/plugins/mk_mysql index cb8812e..d278d12 100755 --- a/agents/plugins/mk_mysql +++ b/agents/plugins/mk_mysql @@ -66,7 +66,11 @@ then mysql_sockets="--"$(fgrep socket $MK_CONFDIR/mysql.cfg) if [ $mysql_sockets = "--" ] ; then mysql_sockets=$(ps -ef | grep mysqld | grep "[s]ocket" | sed -ne 's/.*socket=$[^ ]*$.*/\1/p') - for socket in $mysql_sockets ; do do_query "--socket="$socket ; done + if [ -z $mysql_sockets ] ; then + do_query "" + else + for socket in $mysql_sockets ; do do_query "--socket="$socket ; done + fi else do_query "" fi

8 years, 6 months

3290 FIX Fixed broken event quick delete icon when used in dashlets

by Lars Michelsen

Module: check_mk Branch: master Commit: 98c72c4ca2a7e5b0f3cac738294637281d733805 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98c72c4ca2a7e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 15 11:13:16 2016 +0100 3290 FIX Fixed broken event quick delete icon when used in dashlets --- .werks/3290 | 10 ++++++++++ ChangeLog | 1 + mkeventd/web/plugins/views/mkeventd.py | 29 ++++++++++++++++++++++++++--- web/htdocs/dashboard.py | 21 ++++++++++++--------- web/htdocs/views.py | 6 ++++++ 5 files changed, 55 insertions(+), 12 deletions(-) diff --git a/.werks/3290 b/.werks/3290 new file mode 100644 index 0000000..6a25fa0 --- /dev/null +++ b/.werks/3290 @@ -0,0 +1,10 @@ +Title: Fixed broken event quick delete icon when used in dashlets +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458036774 + + diff --git a/ChangeLog b/ChangeLog index b0a6b2c..1d19bbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,7 @@ * 3279 FIX: LDAP: Fixed default values of attribute selections... * 3285 FIX: Fixed exception when editing large bookmark lists * 3287 FIX: Fixed broken crash reporting (Submission of crashes did not work) + * 3290 FIX: Fixed broken event quick delete icon when used in dashlets WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index 10b1c44..42e95ae 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -510,9 +510,32 @@ if mkeventd_enabled: def render_delete_event_icons(row): if config.may("mkeventd.delete"): + urlvars = [] + # Found no cleaner way to get the view. Sorry. - view = get_view_by_name(html.var("view_name")) - urlvars = [ + # TODO: This needs to be cleaned up with the new view implementation. + if html.has_var("name") and html.has_var("id"): + ident = int(html.var("id")) + + import dashboard + dashboard.load_dashboards() + view = dashboard.get_dashlet(html.var("name"), ident) + + # These actions are not performed within the dashlet. Assume the title url still + # links to the source view where the action can be performed. + title_url = view.get("title_url") + if title_url: + from urlparse import urlparse, parse_qsl + url = urlparse(title_url) + filename = url.path + urlvars += parse_qsl(url.query) + else: + # Regular view + view = get_view_by_name(html.var("view_name")) + target = None + filename = None + + urlvars += [ ("filled_in", "actions"), ("actions", "yes"), ("_do_actions", "yes"), @@ -520,7 +543,7 @@ if mkeventd_enabled: ("_delete_event", _("Archive Event")), ("_show_result", "0"), ] - url = html.makeactionuri(urlvars) + url = html.makeactionuri(urlvars, filename=filename) return html.render_icon_button(url, _("Archive this event"), "delete") else: return '' diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 7ae5125..8388315 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -610,6 +610,17 @@ def get_dashlet_type(dashlet): return dashlet_types[dashlet["type"]] +def get_dashlet(board, ident): + if board not in available_dashboards: + raise MKGeneralException(_('The requested dashboard does not exist.')) + dashboard = available_dashboards[board] + + try: + return dashboard['dashlets'][ident] + except IndexError: + raise MKGeneralException(_('The dashlet does not exist.')) + + # Use the URL returned by urlfunc as dashlet URL # # We need to support function pointers to be compatible to old dashboard plugin @@ -1187,15 +1198,7 @@ def check_ajax_update(): ident = int(html.var('id')) load_dashboards(lock=True) - - if board not in available_dashboards: - raise MKGeneralException(_('The requested dashboard does not exist.')) - dashboard = available_dashboards[board] - - try: - dashlet = dashboard['dashlets'][ident] - except IndexError: - raise MKGeneralException(_('The dashlet does not exist.')) + dashlet = get_dashlet(board, ident) return dashlet, dashboard diff --git a/web/htdocs/views.py b/web/htdocs/views.py index fe9b553..fc23571 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1238,6 +1238,12 @@ def render_view(view, rows, datasource, group_painters, painters, # web service e.g. for NagStaMon) elif row_count > 0 and config.may("general.act") \ and html.do_actions() and html.transaction_valid(): + + # There are one shot actions which only want to affect one row, filter the rows + # by this id during actions + if html.has_var("_row_id") and html.do_actions(): + rows = filter_by_row_id(view, rows) + try: do_actions(view, datasource["infos"][0], rows, '') except:

8 years, 6 months

3098 FIX isc_dhcpd: fixed handling of leases that never expire

by Sebastian Herbord

Module: check_mk Branch: master Commit: 8d1ec51c36150547ca9a70448d1d2289f00d98fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d1ec51c361505… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Mar 15 10:41:16 2016 +0100 3098 FIX isc_dhcpd: fixed handling of leases that never expire --- .werks/3098 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/isc_dhcpd | 9 +++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/3098 b/.werks/3098 new file mode 100644 index 0000000..f003ada --- /dev/null +++ b/.werks/3098 @@ -0,0 +1,10 @@ +Title: isc_dhcpd: fixed handling of leases that never expire +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458034851 + + diff --git a/ChangeLog b/ChangeLog index e3de1cd..b0a6b2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * 3006 FIX: agent_vsphere: fixed exception when providing the wrong login credentials * 3261 FIX: cisco_temperature: fixed wrong datatype handling * 3007 FIX: Interface groups: fixed exception when port type or interface items were not set in the WATO rule... + * 3098 FIX: isc_dhcpd: fixed handling of leases that never expire Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/plugins/isc_dhcpd b/agents/plugins/isc_dhcpd index ef6b6f0..7334858 100755 --- a/agents/plugins/isc_dhcpd +++ b/agents/plugins/isc_dhcpd @@ -66,10 +66,11 @@ for line in file(leases_file): if parts[0] == "lease": ip_address = parts[1] elif parts[0] == "ends": - ends_date_string = parts[2] + " " + parts[3] - ends_date = calendar.timegm(time.strptime(ends_date_string, "%Y/%m/%d %H:%M:%S")) - if ends_date < now: - ip_address = None # skip this address, this lease is outdated + if parts[1] != "never": + ends_date_string = parts[2] + " " + parts[3] + ends_date = calendar.timegm(time.strptime(ends_date_string, "%Y/%m/%d %H:%M:%S")) + if ends_date < now: + ip_address = None # skip this address, this lease is outdated elif parts[0] == "binding" and parts[1] == "state": binding_state = parts[2]

8 years, 6 months

isc_dhcpd: fixed stripping of configuration lines

by Sebastian Herbord

Module: check_mk Branch: master Commit: 13861c7cb8ae833d870387f69b5c2e2ce4b9cca3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13861c7cb8ae83… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Mar 15 10:22:22 2016 +0100 isc_dhcpd: fixed stripping of configuration lines --- agents/plugins/isc_dhcpd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/plugins/isc_dhcpd b/agents/plugins/isc_dhcpd index 3278460..ef6b6f0 100755 --- a/agents/plugins/isc_dhcpd +++ b/agents/plugins/isc_dhcpd @@ -31,11 +31,12 @@ sys.stdout.write('[pools]\n') def parse_config(filename): for line in file(filename): + line = line.strip() if line.startswith("include"): included_file = re.search('include\s+"(.*)"', line).group(1) parse_config(included_file) elif line.startswith("range"): - sys.stdout.write(line[5:].strip() + "\n") + sys.stdout.write(line[5:].strip("\t ;") + "\n") parse_config(conf_file)

8 years, 6 months

Prevent line wrapping within host name in views

by Mathias Kettner

Module: check_mk Branch: master Commit: 204a4a9a9eded84b8250c94cb9c2f72f56819f78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=204a4a9a9eded8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 15 09:38:55 2016 +0100 Prevent line wrapping within host name in views This could happen if the host name contains a dash. --- web/plugins/views/painters.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index fde0003..6fff243 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1356,9 +1356,9 @@ multisite_painters["host_pnpgraph" ] = { def paint_host_black(row): state = row["host_state"] if state != 0: - return None, "<div class=hostdown>%s</div>" % row["host_name"] + return "nobr", "<div class=hostdown>%s</div>" % row["host_name"] else: - return None, row["host_name"] + return "nobr", row["host_name"] multisite_painters["host_black"] = { "title" : _("Hostname, red background if down or unreachable"), @@ -1403,7 +1403,7 @@ def paint_host_with_state(row): if state != 0: return "state hstate hstate%s" % state, row["host_name"] else: - return "", row["host_name"] + return "nobr", row["host_name"] multisite_painters["host_with_state"] = { "title" : _("Hostname, marked red if down"), @@ -1417,7 +1417,7 @@ multisite_painters["host"] = { "title" : _("Hostname"), "short" : _("Host"), "columns" : ["host_name"], - "paint" : lambda row: ("", row["host_name"]), + "paint" : lambda row: ("nobr", row["host_name"]), "sorter" : 'site_host', }

8 years, 6 months

Fixed invalid function call in FilterInvtableAge view filter

by Lars Michelsen

Module: check_mk Branch: master Commit: d45ac96fdd6784f67fbd52227f7486954cb42c4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d45ac96fdd6784… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 14 16:56:17 2016 +0100 Fixed invalid function call in FilterInvtableAge view filter --- web/plugins/visuals/inventory.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/plugins/visuals/inventory.py b/web/plugins/visuals/inventory.py index 311f4fe..5d73945 100644 --- a/web/plugins/visuals/inventory.py +++ b/web/plugins/visuals/inventory.py @@ -36,6 +36,7 @@ def try_int(x): except: return x + class FilterInvtableText(Filter): def __init__(self, infoname, name, title): varname = infoname + "_" + name @@ -60,6 +61,8 @@ class FilterInvtableText(Filter): newrows.append(row) return newrows + + # Filter for choosing a range in which an age lies class FilterInvtableAge(Filter): def __init__(self, infoname, name, title, only_days=False): @@ -81,7 +84,7 @@ class FilterInvtableAge(Filter): return True def filter_table(self, rows): - return filter_table_with_conversion(self, rows, lambda age: age) + return self.filter_table_with_conversion(self, rows, lambda age: age) def filter_table_with_conversion(self, rows, conv): from_value = Age().from_html_vars(self.name + "_from") @@ -104,6 +107,7 @@ class FilterInvtableAge(Filter): return newrows + class FilterInvtableTimestampAsAge(FilterInvtableAge): def __init__(self, infoname, name, title, only_days=True): FilterInvtableAge.__init__(self, infoname, name, title, only_days) @@ -115,7 +119,6 @@ class FilterInvtableTimestampAsAge(FilterInvtableAge): - # Filter for choosing a range in which a certain integer lies class FilterInvtableIDRange(Filter): def __init__(self, infoname, name, title):

8 years, 6 months

filters: Added missing abstract method declaration

by Lars Michelsen

Module: check_mk Branch: master Commit: cd43f94b02e33f776be510c8e0354e04317e1047 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd43f94b02e33f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 14 16:57:50 2016 +0100 filters: Added missing abstract method declaration --- web/plugins/visuals/filters.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 8d6b34a..fad5ba5 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -555,6 +555,9 @@ class FilterTristate(Filter): else: return self.filter_code(infoname, False) + def filter_code(self, infoname, positive): + raise NotImplementedError() + class FilterStateType(FilterTristate): def __init__(self, info, column, title, deflt = -1): @@ -574,6 +577,7 @@ class FilterStateType(FilterTristate): declare_filter(116, FilterStateType("host", "host_state_type", _("Host state type"))) declare_filter(217, FilterStateType("service", "service_state_type", _("Service state type"))) + class FilterNagiosFlag(FilterTristate): def __init__(self, info, column, title, deflt = -1): FilterTristate.__init__(self, column, title, info, column, deflt) @@ -584,6 +588,7 @@ class FilterNagiosFlag(FilterTristate): else: return "Filter: %s = 0\n" % self.column + class FilterNagiosExpression(FilterTristate): def __init__(self, info, name, title, pos, neg, deflt = -1): FilterTristate.__init__(self, name, title, info, None, deflt) @@ -593,6 +598,7 @@ class FilterNagiosExpression(FilterTristate): def filter_code(self, infoname, positive): return positive and self.pos or self.neg + declare_filter(120, FilterNagiosExpression("host", "summary_host", _("Is summary host"), "Filter: host_custom_variable_names >= _REALNAME\n", "Filter: host_custom_variable_names < _REALNAME\n")) @@ -970,6 +976,10 @@ class BIServiceIsUsedFilter(FilterTristate): new_rows.append(row) return new_rows + def filter_code(self, infoname, positive): + pass + + declare_filter(300, BIServiceIsUsedFilter()) declare_filter(301, FilterText("downtime_id", _("Downtime ID"), "downtime", "downtime_id", "downtime_id", "=")) @@ -1129,5 +1139,9 @@ class FilterStarred(FilterTristate): filters += "%s: %d\n" % (oor, count) return filters + def filter_code(self, infoname, positive): + pass + + declare_filter(501, FilterStarred("host")) declare_filter(501, FilterStarred("service"))

8 years, 6 months

3097 FIX mkeventd: fixed crash with non-descriptive error message if mibs couldn't be loaded

by Sebastian Herbord

Module: check_mk Branch: master Commit: be4fe91fac572ebfd6e076b50444c5fdb5c51d47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be4fe91fac572e… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Mar 14 16:52:21 2016 +0100 3097 FIX mkeventd: fixed crash with non-descriptive error message if mibs couldn't be loaded --- .werks/3097 | 10 ++++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/3097 b/.werks/3097 new file mode 100644 index 0000000..889972f --- /dev/null +++ b/.werks/3097 @@ -0,0 +1,10 @@ +Title: mkeventd: fixed crash with non-descriptive error message if mibs couldn't be loaded +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457970667 + + diff --git a/ChangeLog b/ChangeLog index 65724fb..e3de1cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -147,6 +147,7 @@ * 2999 The contact name is now included in Event Console notifications... * 3262 Event Console: bulk delete button for custom MIBs now available * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... + * 3097 FIX: mkeventd: fixed crash with non-descriptive error message if mibs couldn't be loaded Livestatus: * 3233 FIX: Fixed shutdown of Nagios core with Livestatus module... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 28a8812..dbe74b7 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1217,6 +1217,10 @@ class EventServer: # Convert pysnmp datatypes to simply handable ones def snmptrap_translate_varbinds(self, var_bind_list): var_binds = [] + if self._mib_resolver is None: + log('Failed to translate OIDs, no modules loaded (see above)') + return [(str(oid), str(value)) for oid, value in var_bind_list] + for oid, value in var_bind_list: try: mib_var = ObjectType(ObjectIdentity(oid), value).resolveWithMib(self._mib_resolver)

8 years, 6 months

3289 FIX Fixed missing filters in HW-/ SW-Inventory views after editing the view

by Lars Michelsen

Module: check_mk Branch: master Commit: 87e607a115068b36f61e41897291104f75b70822 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87e607a115068b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 14 15:18:14 2016 +0100 3289 FIX Fixed missing filters in HW-/SW-Inventory views after editing the view When editing HW-/SW-Inventory based views like the software package search, all software related filters were gone after saving the view. Only removing the customized view helped to bring the old view back. Loosing the filters has now been fixed. You can now edit such views as expected. --- .werks/3289 | 14 ++++++++++++++ ChangeLog | 1 + web/plugins/visuals/inventory.py | 16 ++++++++-------- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.werks/3289 b/.werks/3289 new file mode 100644 index 0000000..8511a5f --- /dev/null +++ b/.werks/3289 @@ -0,0 +1,14 @@ +Title: Fixed missing filters in HW-/SW-Inventory views after editing the view +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457964984 + +When editing HW-/SW-Inventory based views like the software package search, +all software related filters were gone after saving the view. Only removing +the customized view helped to bring the old view back. + +Loosing the filters has now been fixed. You can now edit such views as expected. diff --git a/ChangeLog b/ChangeLog index c69465b..65724fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -157,6 +157,7 @@ * 3219 FIX: lnx_distro: Now detecting Oracle VM Server correctly * 3229 FIX: lnx_distro: SLES based systems have now an OS name inventorized\ * 3265 FIX: mk_inventory.solaris: fix problem on Solaris 10, do prtdiag and prtpicl only in global zone + * 3289 FIX: Fixed missing filters in HW-/SW-Inventory views after editing the view... 1.2.8b1: diff --git a/web/plugins/visuals/inventory.py b/web/plugins/visuals/inventory.py index 085875f..311f4fe 100644 --- a/web/plugins/visuals/inventory.py +++ b/web/plugins/visuals/inventory.py @@ -39,7 +39,7 @@ def try_int(x): class FilterInvtableText(Filter): def __init__(self, infoname, name, title): varname = infoname + "_" + name - Filter.__init__(self, varname, title, infoname + "s", [varname], []) + Filter.__init__(self, varname, title, infoname, [varname], []) def display(self): htmlvar = self.htmlvars[0] @@ -64,7 +64,7 @@ class FilterInvtableText(Filter): class FilterInvtableAge(Filter): def __init__(self, infoname, name, title, only_days=False): name = infoname + "_" + name - Filter.__init__(self, name, title, infoname + "s", [name + "_from", name + "_to"], []) + Filter.__init__(self, name, title, infoname, [name + "_from", name + "_to"], []) def display(self): html.write("<table><tr><td style='vertical-align: middle;'>") @@ -120,7 +120,7 @@ class FilterInvtableTimestampAsAge(FilterInvtableAge): class FilterInvtableIDRange(Filter): def __init__(self, infoname, name, title): name = infoname + "_" + name - Filter.__init__(self, name, title, infoname + "s", [name + "_from", name + "_to"], []) + Filter.__init__(self, name, title, infoname, [name + "_from", name + "_to"], []) def display(self): html.write(_("from:") + " ") @@ -152,7 +152,7 @@ class FilterInvtableOperStatus(Filter): def __init__(self, infoname, name, title): varname = infoname + "_" + name varnames = [ varname + "_" + str(x) for x in interface_oper_states ] - Filter.__init__(self, varname, title, infoname + "s", varnames, []) + Filter.__init__(self, varname, title, infoname, varnames, []) def display(self): html.begin_checkbox_group() @@ -189,7 +189,7 @@ class FilterInvtableOperStatus(Filter): class FilterInvtableAdminStatus(Filter): def __init__(self, infoname, name, title): varname = infoname + "_" + name - Filter.__init__(self, varname, title, infoname + "s", [ varname ], []) + Filter.__init__(self, varname, title, infoname, [ varname ], []) def display(self): html.begin_radio_group(horizontal = True) @@ -212,7 +212,7 @@ class FilterInvtableAdminStatus(Filter): class FilterInvtableAvailable(Filter): def __init__(self, infoname, name, title): varname = infoname + "_" + name - Filter.__init__(self, varname, title, infoname + "s", [ varname ], []) + Filter.__init__(self, varname, title, infoname, [ varname ], []) def display(self): html.begin_radio_group(horizontal = True) @@ -238,7 +238,7 @@ class FilterInvtableAvailable(Filter): class FilterInvtableInterfaceType(Filter): def __init__(self, infoname, name, title): varname = infoname + "_" + name - Filter.__init__(self, varname, title, infoname + "s", [ varname ], []) + Filter.__init__(self, varname, title, infoname, [ varname ], []) def double_height(self): return True @@ -276,7 +276,7 @@ class FilterInvtableInterfaceType(Filter): class FilterInvtableVersion(Filter): def __init__(self, infoname, name, title): varname = infoname + "_" + name - Filter.__init__(self, varname, title, infoname + "s", [varname + "_from", varname + "_to"], []) + Filter.__init__(self, varname, title, infoname, [varname + "_from", varname + "_to"], []) def display(self): htmlvar = self.htmlvars[0]

8 years, 6 months

3288 Implemented grouping of services in table views

by Lars Michelsen

Module: check_mk Branch: master Commit: 39259f81eafa28137d90c3619ee0448a476871e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39259f81eafa28… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 14 14:25:02 2016 +0100 3288 Implemented grouping of services in table views You can now configure the service table views to group the service row together to expandable groups. This can be configured using the global setting "Grouping of services in table views". For example if you have a host with several network interfaces which are all named like "Interface 1", "Interface 2" and so on, you can create a single group out of them. You can name the group "Interfaces" and configure a pattern like "Interface .*" for matching all your interface services. Once saved you can open up the service list page of the host and see all interface services hidden and grouped together. Please note that only services in OK (and not stale) state are grouped together. If one of the interfaces is in a problematic state, it will not be hidden by the grouping mechanism. --- .werks/3288 | 22 +++++ ChangeLog | 1 + web/htdocs/js/checkmk.js | 49 ++++++++++- web/htdocs/pages.css | 8 ++ web/plugins/config/builtin.py | 3 + web/plugins/views/layouts.py | 129 +++++++++++++++++++++++++--- web/plugins/wato/check_mk_configuration.py | 33 +++++++ 7 files changed, 229 insertions(+), 16 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=39259f81ea…

8 years, 6 months

← Newer
1
...
11
12
13
14
15
16
17
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016