Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 6e09a6e907d84365bbd0d956b838cb5da4674dfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e09a6e907d843… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 6 07:54:12 2017 +0100 updated werk 4481 Change-Id: Ifb4ef5e77d443ecea806b7fe197d22dad3af5876 --- checks/websphere_mq_channels | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/checks/websphere_mq_channels b/checks/websphere_mq_channels index a050f52..1408143 100644 --- a/checks/websphere_mq_channels +++ b/checks/websphere_mq_channels @@ -76,8 +76,9 @@ def inventory_websphere_mq_channels(parsed): def check_websphere_mq_channels(item, params, parsed): if isinstance(params, tuple): - params = {'message_count': params, - 'status': websphere_mq_channels_default_levels['status']} + params = { 'message_count' : params, + 'status' : { 'RUNNING': 0, + 'STOPPED': 1, }} if item in parsed: data = parsed[item]

7 years, 6 months

4482 FIX websphere_mq_instance: fixed missing installation info handling

by Simon Betz

Module: check_mk Branch: master Commit: 693252fc23a00b38944983523204dc7da1b3ed1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=693252fc23a00b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 6 07:47:05 2017 +0100 4482 FIX websphere_mq_instance: fixed missing installation info handling Change-Id: I08fef270ef3948ed920709826650ae0be88d2d7d --- .werks/4482 | 11 +++++++++++ checks/websphere_mq_instance | 15 ++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.werks/4482 b/.werks/4482 new file mode 100644 index 0000000..3ea7909 --- /dev/null +++ b/.werks/4482 @@ -0,0 +1,11 @@ +Title: websphere_mq_instance: fixed missing installation info handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1488782802 + + diff --git a/checks/websphere_mq_instance b/checks/websphere_mq_instance index 83f3aa9..3b33f05 100644 --- a/checks/websphere_mq_instance +++ b/checks/websphere_mq_instance @@ -178,9 +178,9 @@ def check_websphere_mq_manager(item, params, parsed): status = data["STATUS"] default = data["DEFAULT"] standby = data["STANDBY"] - installation_name = data["INSTNAME"] - installation_path = data["INSTPATH"] - installation_server = data["INSTVER"] + installation_name = data.get("INSTNAME") + installation_path = data.get("INSTPATH") + installation_version = data.get("INSTVER") instances_modes = [] for instance, instance_info in parsed["instances"].items(): @@ -211,8 +211,13 @@ def check_websphere_mq_manager(item, params, parsed): if "map_instance_states" in params: state = get_websphere_mq_status("standby", standby, params) - yield state, "Status: %s%s, Default: %s, Installation name: %s, Path: %s, Version: %s" % \ - (standby.lower(), extra_info, default, installation_name, installation_path, installation_server) + yield state, "Status: %s%s, Default: %s" % (standby.lower(), extra_info, default) + + for what, title in [ (installation_name, "Name"), + (installation_path, "Path"), + (installation_version, "Version") ]: + if what: + yield 0, "%s: %s" % (title, what) check_info['websphere_mq_instance.manager'] = {

7 years, 6 months

4481 FIX websphere_mq_channels: fixed incomplete info handling, ie. ValueError: need more than 2 values to unpack

by Simon Betz

Module: check_mk Branch: master Commit: 9cca2bc36f46592775d3030e3dd23d6f81f6f034 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cca2bc36f4659… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 6 07:33:50 2017 +0100 4481 FIX websphere_mq_channels: fixed incomplete info handling, ie. ValueError: need more than 2 values to unpack Change-Id: Ic922abb439e5f2d4476c3d5eed4995dfb1dbe99f --- .werks/4481 | 11 +++++ checks/websphere_mq_channels | 104 ++++++++++++++++++++++++++----------------- 2 files changed, 74 insertions(+), 41 deletions(-) diff --git a/.werks/4481 b/.werks/4481 new file mode 100644 index 0000000..1043326 --- /dev/null +++ b/.werks/4481 @@ -0,0 +1,11 @@ +Title: websphere_mq_channels: fixed incomplete info handling, id. ValueError: need more than 2 values to unpack +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.4.0b4 +Date: 1488781558 + + diff --git a/checks/websphere_mq_channels b/checks/websphere_mq_channels index 92bfe9e..a050f52 100644 --- a/checks/websphere_mq_channels +++ b/checks/websphere_mq_channels @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +# Anzahl_Message Channelname MaxMessages_Moeglich Status" # <<<websphere_mq_channels>>> # 0 CHANNEL(C000052.C000051) 5000 Unknown # 0 CHANNEL(C000052.CATSOS.03) 5000 RUNNING @@ -35,7 +37,7 @@ # 0 CHANNEL(C000052.SV2098742.T1) 5000 Unknown -websphere_mq_channels_default_levels = { +factory_settings["websphere_mq_channels_default_levels"] = { 'message_count': ( 900, 1000 ), 'status': { 'RUNNING': 0, @@ -44,50 +46,70 @@ websphere_mq_channels_default_levels = { } -def inventory_websphere_mq_channels(info): - return [ ( x[1], 'websphere_mq_channels_default_levels' ) for x in info ] +def parse_websphere_mq_channels(info): + parsed = {} + for line in info: + if len(line) == 2: + messages, max_messages = 0, 0 + channel_name = line[0] + channel_status = line[1] + elif len(line) == 4: + messages = int(line[0]) + channel_name = line[1] + max_messages = int(line[2]) + channel_status = line[3] + else: + continue + + parsed.setdefault(channel_name, { + "messages" : messages, + "max_messages" : max_messages, + "channel_status" : channel_status, + }) + return parsed + + +def inventory_websphere_mq_channels(parsed): + for channel_name in parsed: + yield channel_name, {} -def check_websphere_mq_channels(item, params, info): +def check_websphere_mq_channels(item, params, parsed): if isinstance(params, tuple): - params = { - 'message_count' : params, - 'status' : websphere_mq_channels_default_levels['status'], - } - - item_found = False - for messages, channel, max_messages, status in info: - if channel == item: - item_found = True - messages = saveint(messages) - max_messages = saveint(max_messages) - infotext = "%d/%d messages" % (messages, max_messages) - state = 0 - - if params['message_count']: - warn, crit = params['message_count'] - if messages >= crit: - state = 2 - elif messages >= warn: - state = 1 - if state: - infotext += " (warn crit at %d/%d messages)" % (warn, crit) - else: - warn, crit = (None, None) - - yield state, infotext, [('messages', messages, warn, crit, 0, max_messages)] - - state = params['status'].get(status, params['status'].get('other', 2)) - yield state, "Channel status: %s" % status, [] - - if not item_found: - raise MKCounterWrapped("Login into database failed") + params = {'message_count': params, + 'status': websphere_mq_channels_default_levels['status']} + + if item in parsed: + data = parsed[item] + messages = data["messages"] + max_messages = data["max_messages"] + channel_status = data["channel_status"] + + state = params['status'].get(channel_status, params['status'].get('other', 2)) + yield state, "Channel status: %s" % channel_status, [] + + infotext = "%d/%d messages" % (messages, max_messages) + state = 0 + if params['message_count']: + warn, crit = params['message_count'] + if messages >= crit: + state = 2 + elif messages >= warn: + state = 1 + if state > 0: + infotext += " (warn crit at %d/%d messages)" % (warn, crit) + else: + warn, crit = None, None + yield state, infotext, [('messages', messages, warn, crit, 0, max_messages)] check_info["websphere_mq_channels"] = { - "inventory_function" : inventory_websphere_mq_channels, - "check_function" : check_websphere_mq_channels, - "service_description" : "MQ Channel %s", - "has_perfdata" : True, - "group" : "websphere_mq", + "parse_function" : parse_websphere_mq_channels, + "check_function" : check_websphere_mq_channels, + "inventory_function" : inventory_websphere_mq_channels, + "service_description" : "MQ Channel %s", + "has_perfdata" : True, + "default_levels_variable" : "websphere_mq_channels_default_levels", + "group" : "websphere_mq", } +

7 years, 6 months

Updated werk 8285

by Sven Rueß

Module: check_mk Branch: master Commit: e66677ff210662031a5da2bd73656ba68344ec1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e66677ff210662… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Mar 3 16:16:34 2017 +0100 Updated werk 8285 Change-Id: I6902211b1d6e6683f936b462e7596c29b60551ab --- .werks/8285 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.werks/8285 b/.werks/8285 index c2dfc50..197d309 100644 --- a/.werks/8285 +++ b/.werks/8285 @@ -31,6 +31,9 @@ then you have to follow three steps: <ul> <li>Rename existing RRDs to new service description: + RRDs im Check_MK-Format: ~/var/check_mk/rrd + RRDs im alten Format (PNP): ~/var/pnp4nagios/perfdata + Example: mv Apache___1_80_Status.rrd Apache_[__1]_80_Status.rrd mv Apache_2001_cdba__3257_9652_443_Status.rrd Apache_[2001_cdba__3257_9652]_443_Status.rrd

7 years, 6 months

Updated werk 8285

by Sven Rueß

Module: check_mk Branch: master Commit: e3b8e5a316f722d746c7be679b5aba022cf6316c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3b8e5a316f722… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Mar 3 16:09:32 2017 +0100 Updated werk 8285 Change-Id: Iecbdbe5a619ff791d01e8d94a4545a208289e106 --- .werks/8285 | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.werks/8285 b/.werks/8285 index 555462b..c2dfc50 100644 --- a/.werks/8285 +++ b/.werks/8285 @@ -15,20 +15,24 @@ Service description for IPv6 Apache status information services will change, because the general CIDR notation will be used as new service description. In version 1.2.8 and 1.4.0: -Apache ::1:80 Status -Apache 2001:cdba::3257:9652:443 Status +<ul> + <li>Apache ::1:80 Status</li> + <li>Apache 2001:cdba::3257:9652:443 Status</li> +</ul> Since version 1.5.0: -Apache [::1]:80 Status -Apache [2001:cdba::3257:9652]:443 Status +<ul> + <li>Apache [::1]:80 Status</li> + <li>Apache [2001:cdba::3257:9652]:443 Status</li> +</ul> If historic information should not be lost and graphs should be continued, then you have to follow three steps: <ul> - <li>Rename existing RRDs to new service description: - Example: - mv Apache___1_80_Status.rrd Apache_[__1]_80_Status.rrd + <li>Rename existing RRDs to new service description: + Example: + mv Apache___1_80_Status.rrd Apache_[__1]_80_Status.rrd mv Apache_2001_cdba__3257_9652_443_Status.rrd Apache_[2001_cdba__3257_9652]_443_Status.rrd </li> <li>Update apache_status plugin on monitored hosts</li>

7 years, 6 months

8285 FIX apache_status: Fixed wrong IPv6 URLs to query the information

by Sven Rueß

Module: check_mk Branch: master Commit: 64c6e23f074ba9ce45702cfa7cd57688f1ceef57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64c6e23f074ba9… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Mar 3 15:42:10 2017 +0100 8285 FIX apache_status: Fixed wrong IPv6 URLs to query the information If the information from Apache is queried by IPv6, the request was denied, because we created a bad request. Now IPv6 addresses are surrounded by square bracket. Service description for IPv6 Apache status information services will change, because the general CIDR notation will be used as new service description. In version 1.2.8 and 1.4.0: Apache ::1:80 Status Apache 2001:cdba::3257:9652:443 Status Since version 1.5.0: Apache [::1]:80 Status Apache [2001:cdba::3257:9652]:443 Status If historic information should not be lost and graphs should be continued, then you have to follow three steps: <ul> <li>Rename existing RRDs to new service description: Example: mv Apache___1_80_Status.rrd Apache_[__1]_80_Status.rrd mv Apache_2001_cdba__3257_9652_443_Status.rrd Apache_[2001_cdba__3257_9652]_443_Status.rrd </li> <li>Update apache_status plugin on monitored hosts</li> <li>Make a service discovery of the affected hosts</li> </ul> Change-Id: I59ba71ed27a445dc4606cc986bb3e34a1901edc6 --- .werks/8285 | 36 ++++++++++++++++++++++++++++++++++++ agents/plugins/apache_status | 16 ++++++++++++---- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/.werks/8285 b/.werks/8285 new file mode 100644 index 0000000..555462b --- /dev/null +++ b/.werks/8285 @@ -0,0 +1,36 @@ +Title: apache_status: Fixed wrong IPv6 URLs to query the information +Level: 1 +Component: checks +Compatible: incomp +Edition: cee +Version: 1.5.0i1 +Date: 1488549674 +Class: fix + +If the information from Apache is queried by IPv6, the request was denied, +because we created a bad request. Now IPv6 addresses are surrounded by +square bracket. + +Service description for IPv6 Apache status information services will change, +because the general CIDR notation will be used as new service description. + +In version 1.2.8 and 1.4.0: +Apache ::1:80 Status +Apache 2001:cdba::3257:9652:443 Status + +Since version 1.5.0: +Apache [::1]:80 Status +Apache [2001:cdba::3257:9652]:443 Status + +If historic information should not be lost and graphs should be continued, +then you have to follow three steps: + +<ul> + <li>Rename existing RRDs to new service description: + Example: + mv Apache___1_80_Status.rrd Apache_[__1]_80_Status.rrd + mv Apache_2001_cdba__3257_9652_443_Status.rrd Apache_[2001_cdba__3257_9652]_443_Status.rrd + </li> + <li>Update apache_status plugin on monitored hosts</li> + <li>Make a service discovery of the affected hosts</li> +</ul> diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index 2c986f9..d92f15d 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -63,9 +63,11 @@ ssl_ports = [ 443, ] if os.path.exists(config_file): execfile(config_file) + def try_detect_servers(): pids = [] results = [] + for line in os.popen('netstat -tlnp 2>/dev/null').readlines(): parts = line.split() # Skip lines with wrong format @@ -91,7 +93,6 @@ def try_detect_servers(): continue pids.append(pid) - proto = 'http' address, port = parts[3].rsplit(':', 1) port = int(port) @@ -99,17 +100,22 @@ def try_detect_servers(): if address == '0.0.0.0': address = '127.0.0.1' elif address == '::': - address = '::1' + address = '[::1]' + elif ':' in address: + address = '[%s]' % address # Switch protocol if port is SSL port. In case you use SSL on another # port you would have to change/extend the ssl_port list if port in ssl_ports: proto = 'https' + else: + proto = 'http' results.append((proto, address, port)) return results + if servers is None: servers = try_detect_servers() @@ -117,6 +123,7 @@ if servers is None: if not servers: sys.exit(0) + sys.stdout.write('<<<apache_status>>>\n') for server in servers: if isinstance(server, tuple): @@ -147,7 +154,7 @@ for server in servers: except Exception, e: if 'doesn\'t match' in str(e): # HACK: workaround if SSL port is found and localhost is using - # SSL connections but certifiacte is mismatched + # SSL connections but certificate does not match portspec = ':80' url = 'http://%s%s/server-status?auto' % (address, portspec) fd = urllib2.urlopen(url) @@ -158,8 +165,9 @@ for server in servers: if not line.strip(): continue if line.lstrip()[0] == '<': - # seems to be html output. Skip this server. + # Seems to be html output. Skip this server. break + sys.stdout.write("%s %s %s\n" % (address, port, line)) except urllib2.HTTPError, e: sys.stderr.write('HTTP-Error (%s%s): %s %s\n' % (address, portspec, e.code, e))

7 years, 6 months

fixed systemtime if get_agent_data_time() returns None

by Simon Betz

Module: check_mk Branch: master Commit: 045a7b4e3c0ac8091af6c1388dd8c73ca0050289 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=045a7b4e3c0ac8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 3 14:05:27 2017 +0100 fixed systemtime if get_agent_data_time() returns None Change-Id: I20c4e94046f55b95a8c59ed4795792290e7a5b04 --- checks/systemtime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/systemtime b/checks/systemtime index 363d505..bb7c901 100644 --- a/checks/systemtime +++ b/checks/systemtime @@ -40,7 +40,7 @@ def check_systemtime(item, params, info): systemtime = int(info[0][0]) try: systemtime += get_agent_data_time() - except NameError: + except (NameError, TypeError): pass ourtime = int(time.time())

7 years, 6 months

4480 FIX cisco_redundancy: fixed UnboundLocalError: local variable ' infotext' referenced before assignment

by Simon Betz

Module: check_mk Branch: master Commit: f7d60b20180a7011a81500626cffece3efd4ddd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7d60b20180a70… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 3 13:31:41 2017 +0100 4480 FIX cisco_redundancy: fixed UnboundLocalError: local variable 'infotext' referenced before assignment Change-Id: I7eb2844a1e5f0fe0511ed2803463cf525c19439d --- .werks/4480 | 11 +++++++++++ checks/cisco_redundancy | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4480 b/.werks/4480 new file mode 100644 index 0000000..955d68f --- /dev/null +++ b/.werks/4480 @@ -0,0 +1,11 @@ +Title: cisco_redundancy: fixed UnboundLocalError: local variable 'infotext' referenced before assignment +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1488544232 + + diff --git a/checks/cisco_redundancy b/checks/cisco_redundancy index d9cccac..c72ce13 100644 --- a/checks/cisco_redundancy +++ b/checks/cisco_redundancy @@ -72,6 +72,7 @@ def check_cisco_redundancy(_no_item, params, info): "7" : "active unit removed", }, } + infotexts = {} for what, states in [("now", info[0][:5]), ("init", params["init_states"])]: unit_id, unit_state, peer_id, peer_state, duplex_mode = states @@ -93,7 +94,7 @@ def check_cisco_redundancy(_no_item, params, info): state = 2 infotext = "Switchover - Old status: %s, New status: %s" % \ - (infotext["init"], infotext["now"]) + (infotexts["init"], infotexts["now"]) if peer_state == "1": state = 2

7 years, 6 months

4423 FIX Availability of service filtered views was showing services multiple times

by Lars Michelsen

Module: check_mk Branch: master Commit: 53dcc0828bf2caa1062881bd47982fb5f8c259d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53dcc0828bf2ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 3 13:10:42 2017 +0100 4423 FIX Availability of service filtered views was showing services multiple times When a service is in multiple service groups and a view is filtered by a single service group and the availability view is grouped by service groups, a single service was shown multiple times. Once for each service group membership. The service is now shown only for the filtered service group memberships. Change-Id: I9ad374abe29d6f7cf1dca24201281ddb99be3e87 --- .werks/4423 | 15 +++++++++++ web/htdocs/availability.py | 56 ++++++++++++++++++++++++++++++++++++++- web/htdocs/views.py | 6 ++++- web/plugins/views/availability.py | 4 +-- 4 files changed, 77 insertions(+), 4 deletions(-) diff --git a/.werks/4423 b/.werks/4423 new file mode 100644 index 0000000..22d2bf6 --- /dev/null +++ b/.werks/4423 @@ -0,0 +1,15 @@ +Title: Availability of service filtered views was showing services multiple times +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1488542925 + +When a service is in multiple service groups and a view is filtered by a single service +group and the availability view is grouped by service groups, a single service was +shown multiple times. Once for each service group membership. + +The service is now shown only for the filtered service group memberships. diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 6b4dba0..54dbbdc 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -640,7 +640,7 @@ def get_outage_statistic_options(avoptions): # of spans. Each span is a dictionary that describes one span of time where # a specific host or service has one specific state. # what is either "host" or "service" or "bi". -def get_availability_rawdata(what, filterheaders, only_sites, av_object, include_output, avoptions): +def get_availability_rawdata(what, context, filterheaders, only_sites, av_object, include_output, avoptions): if what == "bi": return get_bi_availability_rawdata(filterheaders, only_sites, av_object, include_output, avoptions) @@ -692,6 +692,10 @@ def get_availability_rawdata(what, filterheaders, only_sites, av_object, include columns = ["site"] + columns spans = [ dict(zip(columns, span)) for span in data ] + # When a group filter is set, only care about these groups in the group fields + if avoptions["grouping"] not in [ None, "host" ]: + filter_groups_of_entries(context, avoptions, spans) + # Now we find out if the log row limit was exceeded or # if the log's length is the limit by accident. # If this limit was exceeded then we cut off the last element @@ -702,6 +706,56 @@ def get_availability_rawdata(what, filterheaders, only_sites, av_object, include return spans_by_object(spans, logrow_limit_reached_entry) + +def filter_groups_of_entries(context, avoptions, spans): + group_by = avoptions["grouping"] + + only_groups = set() + # TODO: This is a dirty hack. The logic of the filters needs to be moved to the filters. + # They need to be able to filter the list of all groups. + # TODO: Negated filters are not handled here. :( + if group_by == "service_groups": + # Extract from context: + # 'servicegroups': {'servicegroups': 'cpu|disk', 'neg_servicegroups': 'off'}, + # 'optservicegroup': {'optservice_group': '', 'neg_optservice_group': 'off'}, + negated = context.get("servicegroups", {}).get("neg_servicegroups") == "on" + if negated: + return + + only_groups.update([ e for e in context.get("servicegroups", {}).get("servicegroups", "").split("|") if e ]) + + negated = context.get("optservicegroup", {}).get("neg_optservice_group") == "on" + if negated: + return + + group_name = context.get("optservicegroup", {}).get("optservice_group") + if group_name and not negated: + only_groups.add(group_name) + + elif group_by == "host_groups": + html.log(repr(context)) + negated = context.get("hostgroups", {}).get("neg_hostgroups") == "on" + if negated: + return + + only_groups.update([ e for e in context.get("hostgroups", {}).get("hostgroups", "").split("|") if e ]) + + negated = context.get("opthostgroup", {}).get("neg_opthost_group") == "on" + if negated: + return + + group_name = context.get("opthostgroup", {}).get("opthost_group") + if group_name and not negated: + only_groups.add(group_name) + + else: + raise NotImplementedError() + + for span in spans: + filtered_groups = list(set(span[group_by]).intersection(only_groups)) + span[group_by] = filtered_groups + + # Sort the raw spans into a tree of dicts, so that we # have easy access to the timeline of each object def spans_by_object(spans, logrow_limit_reached_entry): diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7d1de2d..384f3a7 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1544,7 +1544,11 @@ def show_view(view, show_heading = False, show_buttons = True, # hosts and service table, but "statehist". This is *not* true for BI availability, though (see later) if html.var("mode") == "availability" and ( "aggr" not in datasource["infos"] or html.var("timeline_aggr")): - return render_availability_page(view, datasource, filterheaders, only_sites, limit) + + context = visuals.get_context_from_uri_vars(datasource['infos']) + context.update(visuals.get_singlecontext_html_vars(view)) + + return render_availability_page(view, datasource, context, filterheaders, only_sites, limit) query = filterheaders + view.get("add_headers", "") diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 4b7e974..4447439 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -138,7 +138,7 @@ def render_availability_options(what): # Render the page showing availability table or timelines. It # is (currently) called by views.py, when showing a view but # availability mode is activated. -def render_availability_page(view, datasource, filterheaders, only_sites, limit): +def render_availability_page(view, datasource, context, filterheaders, only_sites, limit): if handle_edit_annotations(): return @@ -191,7 +191,7 @@ def render_availability_page(view, datasource, filterheaders, only_sites, limit) # Now compute all data, we need this also for CSV export if not html.has_user_errors(): av_rawdata, has_reached_logrow_limit = \ - availability.get_availability_rawdata(what, filterheaders, only_sites, + availability.get_availability_rawdata(what, context, filterheaders, only_sites, av_object, av_mode == "timeline", avoptions) av_data = availability.compute_availability(what, av_rawdata, avoptions)

7 years, 6 months

4454 FIX agent_ucs_bladecenter: disabled ssl certificate validation

by Andreas Boesl

Module: check_mk Branch: master Commit: 24f5fca88c78204401fdc40c16c9ab1a292651da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24f5fca88c7820… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 3 10:37:40 2017 +0100 4454 FIX agent_ucs_bladecenter: disabled ssl certificate validation Change-Id: I0c7c608d346291ef8752e285159518f49661a745 --- .werks/4454 | 10 ++++++++++ agents/special/agent_ucs_bladecenter | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/4454 b/.werks/4454 new file mode 100644 index 0000000..cf202e8 --- /dev/null +++ b/.werks/4454 @@ -0,0 +1,10 @@ +Title: agent_ucs_bladecenter: disabled ssl certificate validation +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1488533827 +Class: fix + + diff --git a/agents/special/agent_ucs_bladecenter b/agents/special/agent_ucs_bladecenter index 833d9d5..a33e7a9 100755 --- a/agents/special/agent_ucs_bladecenter +++ b/agents/special/agent_ucs_bladecenter @@ -28,7 +28,7 @@ # about connection configuration and status. -import sys, getopt, httplib, socket, pprint, re +import sys, getopt, httplib, socket, pprint, re, ssl def usage(): sys.stderr.write("""Check_MK UCS Bladecenter Agent @@ -94,7 +94,7 @@ def get_pattern(pattern, line): class Server: def __init__(self, host_address): self.netloc = host_address - self.conn_handle = httplib.HTTPSConnection(self.netloc) + self.conn_handle = httplib.HTTPSConnection(netloc, context = ssl._create_unverified_context()) self.cookie = None if opt_debug:

7 years, 6 months

← Newer
1
...
27
28
29
30
31
32
33
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017