Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 723dacee2d8dd87606a473b602ec4c14d9fcec78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=723dacee2d8dd8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 13 06:56:02 2016 +0200 fixed typo in werk --- .werks/3872 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/3872 b/.werks/3872 index 155b6a9..f4434eb 100644 --- a/.werks/3872 +++ b/.werks/3872 @@ -1,4 +1,4 @@ -Title: mcafee_webgateway, mcafee_webgateway_misc: new checks which monitor some statistics of McAfee web gatway devices +Title: mcafee_webgateway, mcafee_webgateway_misc: new checks which monitor some statistics of McAfee web gateway devices Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index cf5874f..db6419c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -159,7 +159,7 @@ NOTE: Please refer to the migration notes! * 3744 synology_info: Now also displays OS version * 3799 agent_netapp: No longer requires the files NaServer/NaElements. Reduced CPU usage by 2/3... - * 3872 mcafee_webgateway, mcafee_webgateway_misc: new checks which monitor some statistics of McAfee web gatway devices + * 3872 mcafee_webgateway, mcafee_webgateway_misc: new checks which monitor some statistics of McAfee web gateway devices * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters

8 years

3854 FIX juniper_bgp_state: Fixed service descriptions in some cases

by Lars Michelsen

Module: check_mk Branch: master Commit: a92facfba87796afe3467417f5a4b97388f3d6d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a92facfba87796… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 12 17:25:18 2016 +0200 3854 FIX juniper_bgp_state: Fixed service descriptions in some cases At least for some devices Juniper M120 router, Juniper SRX240H-DC and Juniper MX80-48T the service descriptions were computed wrong (containing more numbers than the IP address of the peer). --- .werks/3854 | 11 +++++++++++ ChangeLog | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/3854 b/.werks/3854 new file mode 100644 index 0000000..bd72270 --- /dev/null +++ b/.werks/3854 @@ -0,0 +1,11 @@ +Title: juniper_bgp_state: Fixed service descriptions in some cases +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1473693897 +Class: fix + +At least for some devices Juniper M120 router, Juniper SRX240H-DC +and Juniper MX80-48T the service descriptions were computed wrong +(containing more numbers than the IP address of the peer). diff --git a/ChangeLog b/ChangeLog index 4653504..cf5874f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -384,6 +384,7 @@ * 3849 FIX: check_cpu_peaks: Fixed broken active check * 3870 FIX: elphase.include: more robust against none type params * 3801 FIX: Fixed race condition with persisted data... + * 3854 FIX: juniper_bgp_state: Fixed service descriptions in some cases... Multisite: * 3187 notification view: new filter for log command via regex

8 years

Unmonitored services: Display not yet added but discovered services by default

by Lars Michelsen

Module: check_mk Branch: master Commit: af10dbaa91e1f0c8eeef5775e241443fb657c3bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af10dbaa91e1f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 12 13:28:02 2016 +0200 Unmonitored services: Display not yet added but discovered services by default --- web/plugins/views/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index b7f3c76..fdf7338 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -162,7 +162,7 @@ multisite_builtin_views.update({ 'context': { 'discovery_state': {'discovery_state_var0': 'on', 'discovery_state_var1': '', - 'discovery_state_var2': ''} + 'discovery_state_var2': 'on'} }, 'group_painters': [('sitealias', None), ('host_with_state', 'host')],

8 years

Cleaned up code for host unmonitored service view

by Lars Michelsen

Module: check_mk Branch: master Commit: 955eea032a8b3ab6718190f744dc227d5b78685e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=955eea032a8b3a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 12 16:47:03 2016 +0200 Cleaned up code for host unmonitored service view --- web/plugins/views/datasources.py | 70 ++++++++++++++++------------------------ web/plugins/visuals/filters.py | 57 ++++++++++++++++++++------------ web/plugins/visuals/infos.py | 12 ++----- 3 files changed, 66 insertions(+), 73 deletions(-) diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index eb03361..b08e594 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -241,59 +241,45 @@ multisite_datasources["alert_stats"] = { "time_filters" : [ "logtime" ], } +# The livestatus query constructed by the filters of the view may +# contain filters that are related to the discovery info and should only be +# handled here. We need to extract them from the query, hand over the regular +# filters to the host livestatus query and apply the others during the discovery +# service query. def query_service_discovery(columns, query, only_sites, limit, all_active_filters): - # query contains combined filters, some of which may refer to an actual livestatus - # column, others to the dynamic one generated here. fun fun fun - filters = query.split("\n") - view_filters = [filt for filt in filters if filt.startswith("ViewFilter")] + # Hard code the discovery service filter + query += "Filter: check_command = check-mk-inventory\n" - lq_filters =\ - ["Filter: check_command = check-mk-inventory"] +\ - [filt for filt in filters if not filt.startswith("ViewFilter")] - - rows = do_query_data( - "GET services\n", + service_rows = do_query_data("GET services\n", ["host_state", "host_has_been_checked", "long_plugin_output", "host_name"], [], [], - "\n".join(lq_filters), only_sites, limit, "read") - - # convert list of strings "ViewFilter: var = value" to list of tuples (var, value) - view_filters = [map(lambda s: s.strip(), filt.split(":")[1].split("=")) - for filt in view_filters] - # convert list of (var, value) tuples to dictionary {var: [val1, val2, val3] ... } - view_filters = dict([(filt[0], [inner[1] for inner in view_filters - if inner[0] == filt[0]]) - for filt in view_filters]) + query, only_sites, limit, "read") - result = [] - # one row per host - for row in rows: + rows = [] + for row in service_rows: for service_line in row["long_plugin_output"].split("\n"): - if service_line: - state, check, service = map(lambda s: s.strip(), service_line.split(":", 2)) - include = True - for var, varname in [(state, "state"), (check, "check")]: - if varname in view_filters and var not in view_filters[varname]: - include = False - if include: - result.append({ - "site" : row["site"], - "host_name" : row["host_name"], - "host_state" : row["host_state"], - "host_has_been_checked" : row["host_has_been_checked"], - "discovery_state" : state, - "discovery_check" : check, - "discovery_service" : service - }) + if not service_line: + continue + + state, check, service_description = map(lambda s: s.strip(), service_line.split(":", 2)) + + rows.append({ + "site" : row["site"], + "host_name" : row["host_name"], + "host_state" : row["host_state"], + "host_has_been_checked" : row["host_has_been_checked"], + "discovery_state" : state, + "discovery_check" : check, + "discovery_service" : service_description + }) - return result + return rows multisite_datasources["service_discovery"] = { "title" : _("Service discovery"), "table" : query_service_discovery, "add_columns" : [ "discovery_state", "discovery_check", "discovery_service" ], - "add_headers" : "Filter: check_command = check-mk-inventory", - "infos" : [ "host", "long_plugin_output" ], + "infos" : [ "host", "host_discovery" ], "keys" : [], - "idkeys" : [ 'host_name' ] + "idkeys" : [ "host_name" ] } diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 2514833..fccf0c3 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -1177,31 +1177,46 @@ class FilterStarred(FilterTristate): declare_filter(501, FilterStarred("host")) declare_filter(501, FilterStarred("service")) -class FilterViewMultiselect(Filter): - def __init__(self, name, title, options, info, varname): - Filter.__init__(self, name, title, - info, ["%s_var%d" % (name, idx) for idx, option in enumerate(options)], []) - self.__options = options - self.__varname = varname +class FilterDiscoveryState(Filter): + def __init__(self): + self.__options = [ + ("discovery_state_ignored", _("Hidden")), + ("discovery_state_vanished", _("Vanished")), + ("discovery_state_unmonitored", _("New")), + ] + Filter.__init__(self, "discovery_state", _("Discovery state"), "discovery_state", + [ o[0] for o in self.__options ], []) + self.__varname = "discovery_state" + def display(self): html.begin_checkbox_group() - for idx, option in enumerate(self.__options): - html.checkbox("%s_var%d" % (self.name, idx), True, label=option[1]) + for varname, title in self.__options: + html.checkbox(varname, True, label=title) html.end_checkbox_group() + + def value(self): + val = {} + for varname in self.htmlvars: + value = html.get_checkbox(varname) + if value == None: + value = True # Default setting for filter: all checked! + val[varname] = value + return val + + def filter(self, infoname): - filters = [] - for idx, option in enumerate(self.__options): - if html.get_checkbox("%s_var%d" % (self.name, idx)): - filters.append("ViewFilter: %s = %s" % (self.__varname, option[0])) - if filters: - return "\n".join(filters) + "\n" - else: - return "" + return "" + + + def filter_table(self, rows): + new_rows = [] + filter_options = self.value() + for row in rows: + if filter_options["discovery_state_" + row["discovery_state"]]: + new_rows.append(row) + return new_rows + -declare_filter(601, FilterViewMultiselect("discovery_state", _("Discovery state"), - [("ignored", "Hidden"), - ("vanished", "Vanished"), - ("unmonitored", "New")], "long_plugin_output", - "state")) +declare_filter(601, FilterDiscoveryState()) diff --git a/web/plugins/visuals/infos.py b/web/plugins/visuals/infos.py index c1c8fd6..3504805 100644 --- a/web/plugins/visuals/infos.py +++ b/web/plugins/visuals/infos.py @@ -132,16 +132,8 @@ infos['aggr_group'] = { ], } -# long_plugin_output can of course exist in every service, but the datasource -# is (currently) limited to return only the output of the discovery service and -# works per-host, not per-service -infos['long_plugin_output'] = { +infos['discovery'] = { 'title' : _('Discovery Output'), 'title_plural': _('Discovery Outputs'), - 'single_spec' : [ - ('long_plugin_output', TextUnicode( - title = _('Output'), - )), - ] + 'single_spec' : None, } -

8 years

3873 BI: now rules can easily be copied and deactivate temporarily

by Simon Betz

Module: check_mk Branch: master Commit: e8ee23c0b50c0a70409deaa60777ac2c437fe0df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8ee23c0b50c0a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 12 16:59:30 2016 +0200 3873 BI: now rules can easily be copied and deactivate temporarily --- .werks/3873 | 9 +++++++++ ChangeLog | 1 + web/htdocs/bi.py | 2 ++ web/plugins/wato/bi.py | 28 +++++++++++++++++++++++++--- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/.werks/3873 b/.werks/3873 new file mode 100644 index 0000000..92cd80d --- /dev/null +++ b/.werks/3873 @@ -0,0 +1,9 @@ +Title: BI: now rules can easily be copied and deactivate temporarily +Level: 1 +Component: bi +Compatible: compat +Version: 1.4.0i1 +Date: 1473692330 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 5e01fa7..4653504 100644 --- a/ChangeLog +++ b/ChangeLog @@ -625,6 +625,7 @@ * 3396 Change default setting of Precompile aggregations on demand to ON now... * 3449 The host alias can now be used in BI aggregates... * 3546 Drastically sped up response time on querying single aggregations... + * 3873 BI: now rules can easily be copied and deactivate temporarily * 3247 FIX: Do not allow multiple BI aggregates with the same title... * 3232 FIX: BI: Only querying site of host for specific host status info... * 3291 FIX: Improved error handling when searching for BI aggregations with invalid regex diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index a3e1b47..b5ea624 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -492,6 +492,8 @@ def compile_rule_node(aggr_type, calllist, lvl): "There is no rule named <tt>%s</tt>. Available are: <tt>%s</tt>") % (rulename, "</tt>, <tt>".join(config.aggregation_rules.keys()))) rule = config.aggregation_rules[rulename] + if rule.get("disabled", False): + return [] # Execute FOREACH: iterate over matching hosts/services. # Create an argument list where $1$, $2$, ... are diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 5b8dcf9..40708fe 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1154,14 +1154,26 @@ class ModeBIRules(ModeBI): if not only_unused or refs == 0: table.row() table.cell(_("Actions"), css="buttons") + edit_url = self.url_to_pack([("mode", "bi_edit_rule"), ("id", ruleid)]) html.icon_button(edit_url, _("Edit this rule"), "edit") + + clone_url = self.url_to_pack([("mode", "bi_edit_rule"), ("clone", ruleid)]) + html.icon_button(clone_url, _("Create a copy of this rule"), "clone") + if rule_refs == 0: tree_url = html.makeuri([("mode", "bi_rule_tree"), ("id", ruleid)]) html.icon_button(tree_url, _("This is a top-level rule. Show rule tree"), "bitree") if refs == 0: delete_url = html.makeactionuri_contextless([("mode", "bi_rules"), ("_del_rule", ruleid), ("pack", self._pack_id)]) html.icon_button(delete_url, _("Delete this rule"), "delete") + + table.cell("", css="narrow") + if rule.get("disabled"): + html.icon(_("This rule is currently disabled and will not be applied"), "disabled") + else: + html.empty_icon_button() + table.cell(_("Level"), level or "", css="number") table.cell(_("ID"), '<a href="%s">%s</a>' % (edit_url, ruleid)) table.cell(_("Parameters"), " ".join(rule["params"])) @@ -1375,7 +1387,11 @@ class ModeBIEditRule(ModeBI): def page(self): if self._new: - value = {} + cloneid = html.var("clone") + if cloneid: + value = self._pack["rules"][cloneid] + else: + value = {} else: value = self._pack["rules"][self._ruleid] @@ -1405,7 +1421,6 @@ class ModeBIEditRule(ModeBI): size = 64, ), ), - ( "comment", TextUnicode( title = _("Comment"), @@ -1433,6 +1448,13 @@ class ModeBIEditRule(ModeBI): ) ) ), + ( "disabled", + Checkbox( + title = _("Rule activation"), + help = _("Disabled rules are kept in the configuration but are not applied."), + label = _("do not apply this rule"), + ) + ), ( "aggregation", CascadingDropdown( title = _("Aggregation Function"), @@ -1471,7 +1493,7 @@ class ModeBIEditRule(ModeBI): render = "form", elements = elements, headers = [ - ( _("General Properties"), [ "id", "title", "comment", "params" ]), + ( _("General Properties"), [ "id", "title", "comment", "params", "disabled" ]), ( _("Child Node Generation"), [ "nodes" ] ), ( _("Aggregation Function"), [ "aggregation" ], ), ]

8 years

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 60456f1811977bf1e8ecb152ba29d990543fb72d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60456f1811977b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 12 16:58:39 2016 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index ae66aa4..0bc0e51 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3873 +3883

8 years

updated werk and cleanup in ipmi check

by Simon Betz

Module: check_mk Branch: master Commit: 8e91ee9591941d5f3f8bb6245b58fbff391ceef2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e91ee9591941d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 12 16:36:14 2016 +0200 updated werk and cleanup in ipmi check --- .werks/3869 | 12 +- ChangeLog | 3 +- checks/ipmi | 326 ++++++++++++++++------------------- web/plugins/wato/check_parameters.py | 107 ++++++++---- 4 files changed, 235 insertions(+), 213 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8e91ee9591…

8 years

3872 mcafee_webgateway, mcafee_webgateway_misc: new checks which monitor some statistics of McAfee web gatway devices

by Simon Betz

Module: check_mk Branch: master Commit: 7c8dbb9e50a997a0b4e74b1ae7f0e804e6d50721 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c8dbb9e50a997… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 12 14:53:47 2016 +0200 3872 mcafee_webgateway, mcafee_webgateway_misc: new checks which monitor some statistics of McAfee web gatway devices --- .werks/3872 | 9 ++++++ ChangeLog | 1 + checkman/mcafee_webgateway | 17 ++++++++++ checkman/mcafee_webgateway_misc | 17 ++++++++++ checks/mcafee_webgateway | 51 +++++++++++++++++++++++++++++ checks/mcafee_webgateway.include | 56 ++++++++++++++++++++++++++++++++ checks/mcafee_webgateway_misc | 51 +++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 62 ++++++++++++++++++++++++++++++++++++ 8 files changed, 264 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7c8dbb9e50…

8 years

Fixed linter error

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d6a303334c756f12b92b3d0c16cee38b406fe5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d6a303334c756… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 12 12:30:53 2016 +0200 Fixed linter error --- modules/automation.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 4d82ce3..14a605d 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -106,10 +106,10 @@ def do_automation(cmd, args): result = automation_delete_hosts(args) elif cmd == "rename-hosts": result = automation_rename_hosts() - elif cmd == "notification-replay": - result = automation_notification_replay(args) - elif cmd == "notification-analyse": - result = automation_notification_analyse(args) + elif cmd == "notification-replay": + result = automation_notification_replay(args) + elif cmd == "notification-analyse": + result = automation_notification_analyse(args) elif cmd == "update-dns-cache": result = automation_update_dns_cache() elif cmd == "bake-agents": @@ -382,6 +382,7 @@ def automation_analyse_service(args): def automation_delete_hosts(args): for hostname in args: delete_host_files(hostname) + return None def delete_host_files(hostname):

8 years

Updated bug entries #2414

by Lars Michelsen

Module: check_mk Branch: master Commit: 0c0cd9606da95775a597c2cbb11c853d7151f477 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c0cd9606da957… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 12 10:27:09 2016 +0200 Updated bug entries #2414 --- .bugs/2414 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/2414 b/.bugs/2414 index 48bca5a..9d07550 100644 --- a/.bugs/2414 +++ b/.bugs/2414 @@ -1,9 +1,9 @@ Title: Deletion of host's state files omitted in certain situations Component: wato -State: open +Class: bug +State: done Date: 2015-12-04 15:37:30 Targetversion: future -Class: bug If you delete a host via bulk delete, then all files (autochecks, counters, many other) are being correctly deleted via the automation delete-host. When @@ -17,3 +17,5 @@ Change: - Rename the automation in "delete-hosts" - Write a function that sorts the hosts by their site_ids and call the automation once for each affected site. + +2016-09-12 10:27:06: changed state open -> done

8 years

← Newer
1
...
17
18
19
20
21
22
23
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2016