Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

refactored some BI code before introducing a new aggregation option

by Andreas Boesl

Module: check_mk Branch: master Commit: 4592633f14377f18af97c0fecd16d1b61f82f2ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4592633f14377f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 12 14:40:51 2016 +0200 refactored some BI code before introducing a new aggregation option --- web/htdocs/bi.py | 71 ++++++++++++++++++++++++++++-------------------- web/plugins/wato/bi.py | 56 ++++++++++++++++++++++---------------- 2 files changed, 75 insertions(+), 52 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 0f85da5..612abc0 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -179,17 +179,14 @@ def aggregation_groups(): migrate_bi_configuration() # convert bi_packs into legacy variables # on demand: show all configured groups group_names = set([]) - for entry in config.aggregations + config.host_aggregations: - if entry[0] == config.DISABLED: + for aggr_def in config.aggregations + config.host_aggregations: + if aggr_def[0].get("disabled"): continue - if entry[0] == config.HARD_STATES: - entry = entry[1:] - - if type(entry[0]) == list: - group_names.update(entry[0]) + if type(aggr_def[1]) == list: + group_names.update(aggr_def[1]) else: - group_names.add(entry[0]) + group_names.add(aggr_def[1]) group_names = list(group_names) @@ -314,30 +311,23 @@ def compile_forest(user, only_hosts = None, only_groups = None): single_affected_hosts = [] for aggr_type, aggregations in aggr_list: - for entry in aggregations: - if entry[0] == config.DISABLED: - continue + for aggr_def in aggregations: + options = aggr_def[0] - if entry[0] == config.DT_AGGR_WARN: - downtime_aggr_warn = True - entry = entry[1:] - else: - downtime_aggr_warn = False + if options.get("disabled"): + continue - if entry[0] == config.HARD_STATES: - use_hard_states = True - entry = entry[1:] - else: - use_hard_states = False + downtime_aggr_warn = options.get("downtime_aggr_warn", False) + use_hard_states = options.get("use_hard_states", False) - if len(entry) < 3: + if len(aggr_def) < 3: raise MKConfigError(_("<h1>Invalid aggregation <tt>%s</tt></h1>" - "Must have at least 3 entries (has %d)") % (entry, len(entry))) + "Must have at least 3 entries (has %d)") % (aggr_def, len(aggr_def))) - if type(entry[0]) == list: - groups = entry[0] + if type(aggr_def[1]) == list: + groups = aggr_def[1] else: - groups = [ entry[0] ] + groups = [ aggr_def[1] ] groups_set = set(groups) if only_groups and not groups_set.intersection(only_groups): @@ -348,7 +338,7 @@ def compile_forest(user, only_hosts = None, only_groups = None): log('Skip aggr (All groups have already been compiled') continue # skip if all groups have already been compiled - new_entries = compile_rule_node(aggr_type, entry[1:], 0) + new_entries = compile_rule_node(aggr_type, aggr_def[2:], 0) for this_entry in new_entries: remove_empty_nodes(this_entry) @@ -2117,9 +2107,32 @@ def get_state_name(node): def migrate_bi_configuration(): + def convert_aggregation(aggr_tuple): + if type(aggr_tuple[0]) == dict: + return aggr_tuple # already converted + + options = {} + map_class_to_key = { + config.DISABLED: "disabled", + config.HARD_STATES: "hard_states", + config.DT_AGGR_WARN: "downtime_aggr_warn", + } + for idx, token in enumerate(list(aggr_tuple)): + if token in map_class_to_key: + options[map_class_to_key[token]] = True + else: + aggr_tuple = aggr_tuple[idx:] + break + return (options,) + aggr_tuple + if config.bi_packs: for pack in config.bi_packs.values(): - config.aggregations += pack["aggregations"] - config.host_aggregations += pack["host_aggregations"] + config.aggregations += map(convert_aggregation, pack["aggregations"]) + config.host_aggregations += map(convert_aggregation, pack["host_aggregations"]) config.aggregation_rules.update(pack["rules"]) config.bi_packs = {} + else: + if config.host_aggregations and type(config.host_aggregations[0]) != dict: + config.host_aggregations = map(convert_aggregation, config.host_aggregation) + if config.aggregations and type(config.aggregations[0]) != dict: + config.aggregations = map(convert_aggregation, config.aggregation) diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 7dcbf70..2d98aa6 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -205,12 +205,15 @@ class ModeBI(WatoMode): conv = (aggr["groups"],) node = self._convert_node_to_bi(aggr["node"]) convaggr = conv + node - if aggr["hard_states"]: - convaggr = (self._bi_constants["HARD_STATES"],) + convaggr - if aggr["downtime_aggr_warn"]: - convaggr = (self._bi_constants["DT_AGGR_WARN"],) + convaggr - if aggr["disabled"]: - convaggr = (self._bi_constants["DISABLED"],) + convaggr + + # Create dict with all aggregation options + options = {} + for option in ["hard_states", + "downtime_aggr_warn", + "disabled"]: + options[option] = aggr.get(option, False) + + convaggr = (options,) + convaggr return convaggr @@ -252,37 +255,44 @@ class ModeBI(WatoMode): def _convert_aggregation_from_bi(self, aggr, single_host): - if aggr[0] == self._bi_constants["DISABLED"]: - disabled = True + if type(aggr[0]) == dict: + options = aggr[0] aggr = aggr[1:] else: - disabled = False + # Legacy configuration + options = {} + if aggr[0] == self._bi_constants["DISABLED"]: + options["disabled"] = True + aggr = aggr[1:] + else: + options["disabled"] = False - if aggr[0] == self._bi_constants["DT_AGGR_WARN"]: - downtime_aggr_warn = True - aggr = aggr[1:] - else: - downtime_aggr_warn = False + if aggr[0] == self._bi_constants["DT_AGGR_WARN"]: + options["downtime_aggr_warn"] = True + aggr = aggr[1:] + else: + options["downtime_aggr_warn"] = False + + if aggr[0] == self._bi_constants["HARD_STATES"]: + options["hard_states"] = True + aggr = aggr[1:] + else: + options["hard_states"] = False - if aggr[0] == self._bi_constants["HARD_STATES"]: - hard_states = True - aggr = aggr[1:] - else: - hard_states = False if type(aggr[0]) != list: groups = [aggr[0]] else: groups = aggr[0] + node = self._convert_node_from_bi(aggr[1:]) - return { - "disabled" : disabled, - "hard_states" : hard_states, - "downtime_aggr_warn" : downtime_aggr_warn, + aggr_dict = { "groups" : groups, "node" : node, "single_host" : single_host, } + aggr_dict.update(options) + return aggr_dict # Make some conversions so that the format of the # valuespecs is matched

8 years, 4 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: a6dee26c58d9db89c5031c8ba2804f939ace214b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6dee26c58d9db… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 12 13:40:07 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/AndingFilter.cc | 10 ++++++++++ livestatus/src/AndingFilter.h | 2 ++ livestatus/src/ContactgroupsColumn.cc | 2 -- livestatus/src/ContactgroupsMemberColumn.cc | 2 -- livestatus/src/DownCommColumn.cc | 4 ---- livestatus/src/Filter.cc | 10 ++++++---- livestatus/src/Filter.h | 3 ++- livestatus/src/HostContactsColumn.cc | 2 -- livestatus/src/HostgroupsColumn.cc | 2 -- livestatus/src/ListColumn.cc | 2 +- livestatus/src/ListColumn.h | 2 -- livestatus/src/ListFilter.cc | 8 ++++---- livestatus/src/ListFilter.h | 5 ++++- livestatus/src/Query.cc | 4 ++-- livestatus/src/Query.h | 2 +- livestatus/src/ServiceContactsColumn.cc | 2 -- livestatus/src/ServicegroupsColumn.cc | 2 -- livestatus/src/StringFilter.cc | 6 ++---- livestatus/src/StringFilter.h | 3 ++- livestatus/src/TableEventConsole.h | 3 +-- livestatus/src/TableHosts.cc | 5 ++--- livestatus/src/TableServices.cc | 17 +++++++---------- livestatus/src/VariadicFilter.cc | 10 ---------- livestatus/src/VariadicFilter.h | 1 - 24 files changed, 46 insertions(+), 63 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a6dee26c58…

8 years, 4 months

add some comments

by Simon Betz

Module: check_mk Branch: master Commit: 580de24e9015754958240f5186e2b16d6d77cb80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=580de24e901575… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 12 13:04:10 2016 +0200 add some comments --- .werks/3610 | 2 +- ChangeLog | 2 +- agents/plugins/mk_oracle | 1 + agents/plugins/mk_oracle.solaris | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.werks/3610 b/.werks/3610 index c0dcfb4..f12eafa 100644 --- a/.werks/3610 +++ b/.werks/3610 @@ -6,4 +6,4 @@ Version: 1.4.0i1 Date: 1464171502 Class: feature - + The related mk_oracle.solaris plugin is deprecated. diff --git a/ChangeLog b/ChangeLog index ce5c12b..62a2ea6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,7 +89,7 @@ * 3609 apc_rackpdu_power: now upper levels for electrical current are confiugurable * 3136 windows agent: improved crash reporting... * 3137 linux and solaris agent: mrpe checks now support option to append the cache age to cached results... - * 3610 mk_oracle: linux plugin now available for solaris + * 3610 mk_oracle: linux plugin now available for solaris... * 3611 websphere_mq_queues: now age of messages not processed is configurable... * 3612 nfsmounts: new rule for en/disabling performance data * 3615 if: Convert bandwidth from octets into bits for graph display... diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index cfcee92..67e62b2 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -27,6 +27,7 @@ # This plugin is a result of the common work of Thorsten Bruhns # and Mathias Kettner. Thorsten is responsible for the ORACLE # stuff, Mathias for the shell hacking... +# This plugin is available for linux AND solaris. # Example for mk_oracle.cfg # DBUSER=<DBUSER>:<PASSWORD>:<SYSDBA>:<HOSTNAME>:<Port> diff --git a/agents/plugins/mk_oracle.solaris b/agents/plugins/mk_oracle.solaris index bf80eff..8915a63 100755 --- a/agents/plugins/mk_oracle.solaris +++ b/agents/plugins/mk_oracle.solaris @@ -27,6 +27,7 @@ # This plugin is a port of the linux agent plugin. It has been # tested with solaris 10. +# This plugin is deprecated. Please use the mk_oracle plugin instead. # Get list of all running databases SIDS=$(UNIX95=true ps -ef -o args | sed -n '/^ora_pmon_/p;/^xe_pmon_/p' | sed -n '/^[a-z]*_pmon_$[^ ]*$/s//\1/p')

8 years, 4 months

New helper function user_script_title

by Mathias Kettner

Module: check_mk Branch: master Commit: e67ca24b2fa3baed0a3bcc8063a2da9d0e5a1cb7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e67ca24b2fa3ba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 12 11:22:22 2016 +0200 New helper function user_script_title --- web/htdocs/wato.py | 3 +-- web/htdocs/watolib.py | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2d91672..02d53f8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8283,8 +8283,7 @@ def notification_script_choices_with_parameters(): def notification_script_title(name): - return dict(notification_script_choices()).get(name, name) - + return user_script_title("notifications", name) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 4217ab8..810a0fb 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4554,6 +4554,8 @@ def user_script_choices(what): return choices +def user_script_title(what, name): + return dict(user_script_choices(what)).get(name, name) #. # .--MIXED STUFF---------------------------------------------------------.

8 years, 4 months

Fixed werk text

by Lars Michelsen

Module: check_mk Branch: master Commit: 10733baead87f67298282db01bc2b3045fd53712 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10733baead87f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 12 11:08:43 2016 +0200 Fixed werk text --- .werks/3585 | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.werks/3585 b/.werks/3585 index 29e0cac..94ea88e 100644 --- a/.werks/3585 +++ b/.werks/3585 @@ -10,7 +10,11 @@ Date: 1464704941 The HW/SW inventory data can now be exported using a webservice. This webservice outputs the raw structured inventory data of a host. -The URL to this webservice is <tt>http://[MONITORING-SERVER]/[SITE]/check_mk/host_inv_api.py?host=[HOST]&outp…</tt>. +The URL to this webservice is: + +C+: +http://[MONITORING-SERVER]/[SITE]/check_mk/host_inv_api.py?host=[HOST]&output_format=json +C-: You choose one of these output formats: <tt>json</tt>, <tt>xml</tt>, <tt>python</tt>. @@ -46,7 +50,9 @@ C-: You can also request data of multiple hosts at once. In this case, you need to specify your request like this: -<tt>http://[MONITORING-SERVER]/[SITE]/check_mk/host_inv_api.py?request={"hosts": ["host1", "host2"]}&output_format=json</tt> +C+: +http://[MONITORING-SERVER]/[SITE]/check_mk/host_inv_api.py?request={"hosts": ["host1", "host2"]}&output_format=json +C-: You will then get an answer that is similar to the answer above. With the difference that the top level dictionary uses the host names as keys and the values are the inventory tree of this host. @@ -93,7 +99,9 @@ used to filter the tree. Only hosts that have those paths will show the trees. For example, if you only want to see the total and swap memory information of a single host, you can use the following URL: -<tt>http://[MONITORING-SERVER]/[SITE]/check_mk/host_inv_api.py?host=[HOST]&requ…"paths": [".hardware.memory.total_ram_usable", ".hardware.memory.total_swap"]}&output_format=json</tt> +C+: +http://[MONITORING-SERVER]/[SITE]/check_mk/host_inv_api.py?host=[HOST]&request={"paths": [".hardware.memory.total_ram_usable", ".hardware.memory.total_swap"]}&output_format=json +C-: You will get back only the requested data:

8 years, 4 months

Create generic code for loading notification/alert_handlers

by Mathias Kettner

Module: check_mk Branch: master Commit: f5b62dd90547c953839bf23fc4539df69169284e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5b62dd90547c9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 12 11:08:22 2016 +0200 Create generic code for loading notification/alert_handlers --- web/htdocs/wato.py | 131 +++++++++++++------------------------------------ web/htdocs/watolib.py | 90 +++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 96 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 073c7b6..2d91672 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8250,6 +8250,41 @@ def mode_notification_rule(phase, profilemode): html.end_form() +def load_notification_scripts(): + return load_user_scripts("notifications") + + +def notification_script_choices(): + return user_script_choices("notifications") + [(None, _("ASCII Email (legacy)")) ] + + +def notification_script_choices_with_parameters(): + choices = [] + for script_name, title in notification_script_choices(): + if script_name in g_notification_parameters: + vs = g_notification_parameters[script_name] + else: + vs = ListOfStrings( + title = _("Call with the following parameters:"), + valuespec = TextUnicode(size = 24), + orientation = "horizontal", + ) + choices.append((script_name, title, + Alternative( + style = "dropdown", + elements = [ + vs, + FixedValue(None, totext = _("previous notifications of this type are cancelled"), + title = _("Cancel previous notifications")), + ] + ) + )) + return choices + + +def notification_script_title(name): + return dict(notification_script_choices()).get(name, name) + @@ -9753,102 +9788,6 @@ def service_levels(): except: return [(0, "(no service level)")] -# Example header of a notification script: -#!/usr/bin/python -# HTML Emails with included graphs -# Bulk: yes -# Argument 1: Full system path to the pnp4nagios index.php for fetching the graphs. Usually auto configured in OMD. -# Argument 2: HTTP-URL-Prefix to open Multisite. When provided, several links are added to the mail. -# -# This script creates a nifty HTML email in multipart format with -# attached graphs and such neat stuff. Sweet! - -def load_notification_scripts_from(adir): - scripts = {} - if os.path.exists(adir): - for entry in os.listdir(adir): - path = adir + "/" + entry - if os.path.isfile(path) and os.access(path, os.X_OK): - info = { "title" : entry, "bulk" : False } - try: - lines = file(path) - lines.next() - line = lines.next().strip() - if line.startswith("#") and "encoding:" in line: - line = lines.next().strip() - if line.startswith("#"): - info["title"] = line.lstrip("#").strip().split("#", 1)[0] - while True: - line = lines.next().strip() - if not line.startswith("#") or ":" not in line: - break - key, value = line[1:].strip().split(":", 1) - value = value.strip() - if key.lower() == "bulk": - info["bulk"] = (value == "yes") - - except: - pass - scripts[entry] = info - return scripts - - -def load_notification_scripts(): - scripts = {} - try: - not_dir = defaults.notifications_dir - except: - not_dir = defaults.share_dir + "/notifications" # for those with not up-to-date defaults - - scripts = load_notification_scripts_from(not_dir) - try: - local_dir = defaults.omd_root + "/local/share/check_mk/notifications" - scripts.update(load_notification_scripts_from(local_dir)) - except: - pass - - return scripts - -def notification_script_choices(): - scripts = load_notification_scripts() - - choices = [ (name, info["title"].decode('utf-8')) for (name, info) in scripts.items() ] - choices.append((None, _("ASCII Email (legacy)"))) - choices.sort(cmp = lambda a,b: cmp(a[1], b[1])) - # Make choices localizable - choices = [ (k, _(v)) for k, v in choices ] - return choices - - -def notification_script_choices_with_parameters(): - choices = [] - for script_name, title in notification_script_choices(): - if script_name in g_notification_parameters: - vs = g_notification_parameters[script_name] - else: - vs = ListOfStrings( - title = _("Call with the following parameters:"), - valuespec = TextUnicode(size = 24), - orientation = "horizontal", - ) - choices.append((script_name, title, - Alternative( - style = "dropdown", - elements = [ - vs, - FixedValue(None, totext = _("previous notifications of this type are cancelled"), - title = _("Cancel previous notifications")), - ] - ) - )) - return choices - - - -def notification_script_title(name): - return dict(notification_script_choices()).get(name, name) - - def load_notification_table(): # Make sure, that list is not trivially false def validate_only_services(value, varprefix): diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 730d1ce..4217ab8 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4464,6 +4464,96 @@ def get_tag_conditions(varprefix=""): return tag_list +#. +# .--Handler scripts-----------------------------------------------------. +# | _ _ _ _ | +# | | | | | __ _ _ __ __| | | ___ _ __ | +# | | |_| |/ _` | '_ \ / _` | |/ _ \ '__| | +# | | _ | (_| | | | | (_| | | __/ | | +# | |_| |_|\__,_|_| |_|\__,_|_|\___|_| | +# | | +# | _ _ | +# | ___ ___ _ __(_)_ __ | |_ ___ | +# | / __|/ __| '__| | '_ \| __/ __| | +# | \__ \ (__| | | | |_) | |_\__ \ | +# | |___/\___|_| |_| .__/ \__|___/ | +# | |_| | +# +----------------------------------------------------------------------+ +# | Common code for reading and offering notification scripts and alert | +# | handlers. | +# '----------------------------------------------------------------------' + + +# Example header of a notification script: +#!/usr/bin/python +# HTML Emails with included graphs +# Bulk: yes +# Argument 1: Full system path to the pnp4nagios index.php for fetching the graphs. Usually auto configured in OMD. +# Argument 2: HTTP-URL-Prefix to open Multisite. When provided, several links are added to the mail. +# +# This script creates a nifty HTML email in multipart format with +# attached graphs and such neat stuff. Sweet! + +def load_user_scripts_from(adir): + scripts = {} + if os.path.exists(adir): + for entry in os.listdir(adir): + entry = entry.decode("utf-8") + path = adir + "/" + entry + if os.path.isfile(path) and os.access(path, os.X_OK): + info = { "title" : entry, "bulk" : False } + try: + lines = file(path) + lines.next() + line = lines.next().strip().decode("utf-8") + if line.startswith("#") and "encoding:" in line: + line = lines.next().strip() + if line.startswith("#"): + info["title"] = line.lstrip("#").strip().split("#", 1)[0] + while True: + line = lines.next().strip() + if not line.startswith("#") or ":" not in line: + break + key, value = line[1:].strip().split(":", 1) + value = value.strip() + if key.lower() == "bulk": + info["bulk"] = (value == "yes") + + except: + pass + scripts[entry] = info + return scripts + + +def load_user_scripts(what): + scripts = {} + not_dir = defaults.share_dir + "/" + what + try: + if what == "notifications": + # Support for setup.sh + not_dir = defaults.notifications_dir + except: + pass + + scripts = load_user_scripts_from(not_dir) + try: + local_dir = defaults.omd_root + "/local/share/check_mk/" + what + scripts.update(load_user_scripts_from(local_dir)) + except: + pass + + return scripts + + +def user_script_choices(what): + scripts = load_user_scripts(what) + choices = [ (name, info["title"]) for (name, info) in scripts.items() ] + choices.sort(cmp = lambda a,b: cmp(a[1], b[1])) + # Make choices localizable + choices = [ (k, _(v)) for k, v in choices ] + return choices + + #. # .--MIXED STUFF---------------------------------------------------------.

8 years, 4 months

Fixed werk text

by Lars Michelsen

Module: check_mk Branch: master Commit: 781a3af4a042988e5fa4a59d7e838f8a772d7318 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=781a3af4a04298… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 12 11:07:46 2016 +0200 Fixed werk text --- .werks/3585 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/3585 b/.werks/3585 index 9d067b4..29e0cac 100644 --- a/.werks/3585 +++ b/.werks/3585 @@ -41,7 +41,7 @@ the <tt>result_code</tt> is set to 1 and the result contains the error message: C+: {"result": "Found no inventory data for this host.", "result_code": 1} -C+: +C-: You can also request data of multiple hosts at once. In this case, you need to specify your request like this:

8 years, 4 months

host_inv_api: Can now handle multiple hosts; Can now be filtered by tree paths

by Lars Michelsen

Module: check_mk Branch: master Commit: a81bc2460034c6a2267cedad69f96cf1a32e0596 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a81bc2460034c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 12 11:07:02 2016 +0200 host_inv_api: Can now handle multiple hosts; Can now be filtered by tree paths --- .werks/3585 | 70 +++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/htmllib.py | 15 ++++++++++ web/htdocs/inventory.py | 69 ++++++++++++++++++++++++++++++++++++++++------ web/htdocs/webapi.py | 5 +--- 4 files changed, 146 insertions(+), 13 deletions(-) diff --git a/.werks/3585 b/.werks/3585 index 4e9b753..9d067b4 100644 --- a/.werks/3585 +++ b/.werks/3585 @@ -42,3 +42,73 @@ the <tt>result_code</tt> is set to 1 and the result contains the error message: C+: {"result": "Found no inventory data for this host.", "result_code": 1} C+: + + +You can also request data of multiple hosts at once. In this case, you need to specify your request like this: + +<tt>http://[MONITORING-SERVER]/[SITE]/check_mk/host_inv_api.py?request={"hosts": ["host1", "host2"]}&output_format=json</tt> + +You will then get an answer that is similar to the answer above. With the difference that the top level dictionary +uses the host names as keys and the values are the inventory tree of this host. + +C+: +{ + "result": { + "gestern": { + "hardware": { + "memory": { + "total_ram_usable": 16697307136, + "total_swap": 17049841664, + "total_vmalloc": 35184372087808 + } + }, + "networking": { + "hostname": "Klappspaten" + } + }, + "heute": { + "hardware": { + "memory": { + "total_ram_usable": 16697307136, + "total_swap": 17049841664, + "total_vmalloc": 35184372087808 + } + }, + "networking": { + "hostname": "Klappspaten" + } + }, + "slave": {} + }, + "result_code": 0 +} +C-: + +Another difference in this mode: When a host has no inventory data, the host has an empty dictionary as value +instead of providing an error result. + + +If you want to only have a subset of inventory data, you can specify a list of <i>inventory paths</i> which are then +used to filter the tree. Only hosts that have those paths will show the trees. + +For example, if you only want to see the total and swap memory information of a single host, you can use the following URL: + +<tt>http://[MONITORING-SERVER]/[SITE]/check_mk/host_inv_api.py?host=[HOST]&requ…"paths": [".hardware.memory.total_ram_usable", ".hardware.memory.total_swap"]}&output_format=json</tt> + +You will get back only the requested data: + +C+: +{ + "result": { + "": { + "hardware": { + "memory": { + "total_ram_usable": 16697307136, + "total_swap": 17049841664 + } + } + } + }, + "result_code": 0 +} +C-: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4d96a06..8826bc5 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1314,6 +1314,21 @@ class html(GUITester): def unstash_vars(self): self.vars = self.var_stash.pop() + + # Returns a dictionary containing all parameters the user handed over to this request. + # The concept is that the user can either provide the data in a single "request" variable, + # which contains the request data encoded as JSON, or provide multiple GET/POST vars which + # are then used as top level entries in the request object. + def get_request(self): + request = json.loads(self.var("request", "{}")) + + for key, val in self.all_vars().items(): + if key not in [ "request", "output_format" ]: + request[key] = val + + return request + + def render_javascript(self, code): return "<script language=\"javascript\">\n%s\n</script>\n" % code diff --git a/web/htdocs/inventory.py b/web/htdocs/inventory.py index 9b89d4b..5f9a6ba 100644 --- a/web/htdocs/inventory.py +++ b/web/htdocs/inventory.py @@ -34,7 +34,7 @@ except ImportError: import config import sites -from lib import MKException, MKGeneralException, MKAuthException, lqencode +from lib import MKException, MKGeneralException, MKAuthException, MKUserError, lqencode # Load data of a host, cache it in the current HTTP request def host(hostname): @@ -303,16 +303,27 @@ def count_items(tree): # In case of success this is a dictionary containing the host inventory. def page_host_inv_api(): try: - host_name = html.var("host") - if not may_see(host_name): - raise MKAuthException(_("Sorry, you are not allowed to access this host.")) + request = html.get_request() - host_inv = host(host_name) + # The user can either specify a single host or provide a list of host names. In case + # multiple hosts are handled, there is a top level dict added with "host > invdict" pairs + hosts = request.get("hosts") + if hosts: + result = {} + for host_name in hosts: + result[host_name] = inventory_of_host(host_name, request) - if not host_inv and not has_inventory(host_name): - raise MKGeneralException(_("Found no inventory data for this host.")) + else: + host_name = request.get("host") + if host_name == None: + raise MKUserError("host", _("You need to provide a \"host\".")) + + result = inventory_of_host(host_name, request) + + if not result and not has_inventory(host_name): + raise MKGeneralException(_("Found no inventory data for this host.")) - response = { "result_code": 0, "result": host_inv } + response = { "result_code": 0, "result": result } except MKException, e: response = { "result_code": 1, "result": "%s" % e } @@ -330,12 +341,52 @@ def page_host_inv_api(): write_python(response) -def may_see(host_name): +def inventory_of_host(host_name, request): + if not may_see(host_name, site=request.get("site")): + raise MKAuthException(_("Sorry, you are not allowed to access the host %s.") % host_name) + + host_inv = host(host_name) + + if "paths" in request: + host_inv = filter_tree_by_paths(host_inv, request["paths"]) + + return host_inv + + +def filter_tree_by_paths(tree, paths): + filtered = {} + + for path in paths: + node = get(tree, path) + + parts = path.split(".") + this_tree = filtered + while True: + key = parts.pop(0) + if parts: + this_tree = this_tree.setdefault(key, {}) + else: + this_tree[key] = node + break + + return filtered + + +def may_see(host_name, site=None): if config.may("general.see_all"): return True + query = "GET hosts\nStats: state >= 0\nFilter: name = %s\n" % lqencode(host_name) + + if site: + sites.live().set_only_sites([site]) + result = sites.live().query_summed_stats(query, "ColumnHeaders: off\n") + + if site: + sites.live().set_only_sites() + if not result: return False else: diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index 422d321..5440e90 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -81,10 +81,7 @@ def page_api(): if api_actions[action].get("dont_eval_request"): request_object = html.var("request") else: - request = html.var("request") - request_object = json.loads(request) - else: - request_object = {} + request_object = html.get_request() if api_actions[action].get("locking", True): lock_exclusive() # unlock is done automatically

8 years, 4 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 1b6d32106df853c51954621482fed2ce9fb1f84f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b6d32106df853… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 12 09:57:45 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/ContactgroupsColumn.cc | 53 ++++++++++++++++++--------- livestatus/src/ContactgroupsColumn.h | 5 +-- livestatus/src/ContactgroupsMemberColumn.cc | 42 +++++++++++++++++---- livestatus/src/ContactgroupsMemberColumn.h | 5 ++- livestatus/src/ContactsColumn.cc | 17 +++------ livestatus/src/ContactsColumn.h | 6 ++- livestatus/src/DownCommColumn.cc | 43 +++++++++++++++------- livestatus/src/DownCommColumn.h | 4 +- livestatus/src/HostContactsColumn.cc | 34 +++++++++++++++-- livestatus/src/HostContactsColumn.h | 5 ++- livestatus/src/HostgroupsColumn.cc | 52 +++++++++++++++++--------- livestatus/src/HostgroupsColumn.h | 4 +- livestatus/src/ListColumn.cc | 5 ++- livestatus/src/ListColumn.h | 13 ++++++- livestatus/src/ListFilter.cc | 19 ++++++---- livestatus/src/ListFilter.h | 6 ++- livestatus/src/ServiceContactsColumn.cc | 34 +++++++++++++++-- livestatus/src/ServiceContactsColumn.h | 5 ++- livestatus/src/ServicegroupsColumn.cc | 45 ++++++++++++++++------- livestatus/src/ServicegroupsColumn.h | 5 +-- livestatus/src/TableEventConsole.h | 14 +++++-- 21 files changed, 299 insertions(+), 117 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1b6d32106d…

8 years, 4 months

3692 FIX f5_bigip_conns: fixed empty data handling

by Simon Betz

Module: check_mk Branch: master Commit: abd9b14a2a693b8215be47dc9b5167f0568bc04c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abd9b14a2a693b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 12 09:44:02 2016 +0200 3692 FIX f5_bigip_conns: fixed empty data handling --- .werks/3692 | 10 ++++++ ChangeLog | 1 + checks/f5_bigip_conns | 80 +++++++++++++++------------------------------- modules/check_mk_base.py | 19 +++++++---- 4 files changed, 49 insertions(+), 61 deletions(-) diff --git a/.werks/3692 b/.werks/3692 new file mode 100644 index 0000000..a740d7b --- /dev/null +++ b/.werks/3692 @@ -0,0 +1,10 @@ +Title: f5_bigip_conns: fixed empty data handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1468309337 + + diff --git a/ChangeLog b/ChangeLog index ad0a5c1..ce5c12b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -302,6 +302,7 @@ * 3555 FIX: esx_vsphere_sensors: fixed incorrect default parameter during service discovery... * 3665 FIX: hitachi_hnas_*: Fixed service discovery on some devices (e.g. HM800) * 3666 FIX: ups_*: Fixed discovery for Vision UPS devices + * 3692 FIX: f5_bigip_conns: fixed empty data handling Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/f5_bigip_conns b/checks/f5_bigip_conns index 3b617d4..e37f2f7 100644 --- a/checks/f5_bigip_conns +++ b/checks/f5_bigip_conns @@ -25,81 +25,53 @@ # Boston, MA 02110-1301 USA. -# {iso(1) identified-organization(3) dod(6) internet(1) private(4) enterprise(1) 3375 bigipTrafficMgmt(2) bigipSystem(1) sysGlobals(1) sysGlobalStats(2) sysGlobalStat(1) sysStatClientCurConns(8)} +# .1.3.6.1.4.1.3375.2.1.1.2.1.8.0 594 --> F5-BIGIP-SYSTEM-MIB::sysStatClientCurConns.0 +# .1.3.6.1.4.1.3375.2.1.1.2.9.2.0 --> F5-BIGIP-SYSTEM-MIB::sysClientsslStatCurConns.0 -# {iso(1) identified-organization(3) dod(6) internet(1) private(4) enterprise(1) 3375 bigipTrafficMgmt(2) bigipSystem(1) sysGlobals(1) sysGlobalStats(2) sysGlobalClientSslStat(9) sysClientsslStatCurConns(2)} factory_settings["f5_bigip_conns_default_levels"] = { "conns" : (25000, 30000), "ssl_conns" : (25000, 30000), } + def inventory_f5_bigip_conns(info): if info: return [ ( None, {} ) ] + def check_f5_bigip_conns(item, params, info): - type_list = { 'conns': ('Connections', 0), - 'ssl_conns': ('SSL Connections', 1), - } - perfdata = [] - infotext = "" - state = 0 + for val, what, title in [ + (info[0][0], "conns", "Connections"), + (info[0][1], "ssl_conns", "SSL connections")]: + + state = 0 + infotext = "%s:" % title + perfdata = [] + + # SSL may not be configured, eg. on test servers + if val == "": + infotext += " not configured" - separator = "" - for typ, values in type_list.iteritems(): - param = params.get(typ) - desc = values[0] - index = values[1] - conns = int(info[0][index]) - infotext += separator - separator = " - " - if type(param) == tuple: - warn, crit = param - perfdata.append( (typ, conns, warn, crit) ) - if conns >=crit: - sstate = 2 - sym = "(!!)" - elif conns >= warn: - sstate = 1 - sym = "(!)" - else: - sstate = 0 - sym = "" - infotext += "%d %s%s (%d/%d)" % (conns, desc, sym, warn, crit) else: - warn, crit = None, None - perf = ( (typ, conns, warn, crit) ) - sstate, text, extraperf = check_levels(conns, typ, param) - if sstate == 2: - sym == "(!!)" - elif sstate == 1: - sym = "(!)" - else: - sym = "" - perfdata.append(perf) - if len(extraperf) > 0: - perfdata.append(extraperf[0]) - infotext += "%d %s%s" % (conns, desc, sym) - if text: - infotext += ", " + text - if state < sstate: - state = sstate + state, extrainfo, perfdata = check_levels(int(val), what, params.get(what)) + infotext += " %s%s" % (what, extrainfo) + + yield state, infotext, perfdata - return (state, infotext, perfdata) check_info["f5_bigip_conns"] = { 'check_function' : check_f5_bigip_conns, 'inventory_function' : inventory_f5_bigip_conns, 'service_description' : 'Open Connections', + 'snmp_info' : ( '.1.3.6.1.4.1.3375.2.1.1.2', [ + '1.8', # F5-BIGIP-SYSTEM-MIB::sysStatServerCurConns + '9.2', # F5-BIGIP-SYSTEM-MIB::sysClientsslStatCurConns + ]), + 'snmp_scan_function' : lambda oid: '.1.3.6.1.4.1.3375.2' in \ + oid(".1.3.6.1.2.1.1.2.0") and "big-ip" in \ + oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower(), 'has_perfdata' : True, 'group' : 'f5_connections', 'default_levels_variable' : 'f5_bigip_conns_default_levels', - 'snmp_info' : ( '.1.3.6.1.4.1.3375.2.1.1.2', [ - '1.8', # sysStatServerCurConns - '9.2', # sysClientsslStatCurConns - ] ), - 'snmp_scan_function' : lambda oid: '.1.3.6.1.4.1.3375.2' in \ - oid(".1.3.6.1.2.1.1.2.0") and "big-ip" in \ - oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower(), } diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index a7ba470..a36570b 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -2133,6 +2133,9 @@ def check_levels(value, dsname, params, unit="", factor=1.0, scale=1.0, statemar else: return v * factor * scale + def levelsinfo_ty(ty, warn, crit, unit): + return ("warn/crit %s %.2f/%.2f %s" % (ty, warn, crit, unit)).strip() + # None or (None, None) -> do not check any levels if params == None or params == (None, None): return 0, "", [] @@ -2142,9 +2145,11 @@ def check_levels(value, dsname, params, unit="", factor=1.0, scale=1.0, statemar if len(params) == 2: # upper warn and crit warn_upper, crit_upper = scale_value(params[0]), scale_value(params[1]) warn_lower, crit_lower = None, None - else: # uppwer and lower warn and crit + + else: # upper and lower warn and crit warn_upper, crit_upper = scale_value(params[0]), scale_value(params[1]) warn_lower, crit_lower = scale_value(params[2]), scale_value(params[3]) + ref_value = None # Dictionary -> predictive levels @@ -2174,18 +2179,18 @@ def check_levels(value, dsname, params, unit="", factor=1.0, scale=1.0, statemar # Critical cases if crit_upper != None and value >= crit_upper: state = 2 - infotexts.append("critical level at %.2f%s" % (crit_upper / scale, unit)) - elif crit_lower != None and value <= crit_lower: + infotexts.append(levelsinfo_ty("at", warn_upper / scale, crit_upper / scale, unit)) + elif crit_lower != None and value < crit_lower: state = 2 - infotexts.append("too low: critical level at %.2f%s" % (crit_lower / scale, unit)) + infotexts.append(levelsinfo_ty("below", warn_lower / scale, crit_lower / scale, unit)) # Warning cases elif warn_upper != None and value >= warn_upper: state = 1 - infotexts.append("warning level at %.2f%s" % (warn_upper / scale, unit)) - elif warn_lower != None and value <= warn_lower: + infotexts.append(levelsinfo_ty("at", warn_upper / scale, crit_upper / scale, unit)) + elif warn_lower != None and value < warn_lower: state = 1 - infotexts.append("too low: warning level at %.2f%s" % (warn_lower / scale, unit)) + infotexts.append(levelsinfo_ty("below", warn_lower / scale, crit_lower / scale, unit)) # OK else:

8 years, 4 months

← Newer
1
...
14
15
16
17
18
19
20
21
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2016