Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

genua_carp: Do not fetch unused OIDs anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: fb1f9c8337a0896ccd997bddf31f313a53fd1031 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb1f9c8337a089… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 14:55:40 2018 +0200 genua_carp: Do not fetch unused OIDs anymore Change-Id: If753f0fba0a327ec4981185e0a99363bb2a07eba --- checks/genua_carp | 12 ++---------- .../checks/generictests/datasets/genua_carp_1.py | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/checks/genua_carp b/checks/genua_carp index d193afa..35fd1d8 100644 --- a/checks/genua_carp +++ b/checks/genua_carp @@ -27,12 +27,8 @@ # Example Agent Output: # GENUA-MIB: -#.1.3.6.1.4.1.3137.2.1.2.1.1.9 = INTEGER: 9 -#.1.3.6.1.4.1.3137.2.1.2.1.1.10 = INTEGER: 10 #.1.3.6.1.4.1.3137.2.1.2.1.2.9 = STRING: "carp0" #.1.3.6.1.4.1.3137.2.1.2.1.2.10 = STRING: "carp1" -#.1.3.6.1.4.1.3137.2.1.2.1.3.9 = INTEGER: 5 -#.1.3.6.1.4.1.3137.2.1.2.1.3.10 = INTEGER: 5 #.1.3.6.1.4.1.3137.2.1.2.1.4.9 = INTEGER: 2 #.1.3.6.1.4.1.3137.2.1.2.1.4.10 = INTEGER: 2 #.1.3.6.1.4.1.3137.2.1.2.1.7.9 = INTEGER: 2 @@ -46,7 +42,7 @@ def inventory_genua_carp(info): info = filter(None, info) if info[0]: - for _ifIndex, ifName, _ifType, _ifLinkState, ifCarpState in info[0]: + for ifName, _ifLinkState, ifCarpState in info[0]: if ifCarpState in [ "0", "1", "2" ]: inventory.append( (ifName, None) ) return inventory @@ -90,7 +86,7 @@ def check_genua_carp(item, _no_params, info): # Loop over all nodes, just one line if not a cluster for line in info: # Loop over interfaces on node - for _ifIndex, ifName, _ifType, ifLinkState, ifCarpState in line: + for ifName, ifLinkState, ifCarpState in line: ifLinkStateStr = genua_linkstate(str(ifLinkState)) ifCarpStateStr = genua_carpstate(str(ifCarpState)) # is inventorized interface in state carp master ? @@ -138,16 +134,12 @@ check_info['genua_carp'] = { "check_function" : check_genua_carp, "service_description": "Carp Interface %s", "snmp_info" : [( ".1.3.6.1.4.1.3137.2.1.2",[ - "1.1", # "ifIndex" "1.2", # "ifName" - "1.3", # "ifType" "1.4", # "ifLinkState" "1.7", # "ifCarpState" ]), ( ".1.3.6.1.4.1.3717.2.1.2",[ - "1.1", # "ifIndex" "1.2", # "ifName" - "1.3", # "ifType" "1.4", # "ifLinkState" "1.7", # "ifCarpState" ]), diff --git a/tests/unit/checks/generictests/datasets/genua_carp_1.py b/tests/unit/checks/generictests/datasets/genua_carp_1.py new file mode 100644 index 0000000..58ec93c --- /dev/null +++ b/tests/unit/checks/generictests/datasets/genua_carp_1.py @@ -0,0 +1,20 @@ + + +checkname = 'genua_carp' + + +info = [[[u'carp0', u'2', u'2'], [u'carp1', u'2', u'2'], [u'carp2', u'1', u'0']], []] + + +discovery = {'': [(u'carp0', None), (u'carp1', None), (u'carp2', None)]} + + +checks = {'': [(u'carp0', + 'default', + [(0, 'Node test: node in carp state master with IfLinkState up', [])]), + (u'carp1', + 'default', + [(0, 'Node test: node in carp state master with IfLinkState up', [])]), + (u'carp2', + 'default', + [(1, 'Node test: node in carp state init with IfLinkState down', [])])]} \ No newline at end of file

6 years

genua_fan: Do not fetch unused OIDs anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: ece27fbb532bafc92653cd22393136e487009903 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ece27fbb532baf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 14:56:51 2018 +0200 genua_fan: Do not fetch unused OIDs anymore Change-Id: Ib06ad6921ca29bb1f11241fffa61e0d321b86b6b --- checks/genua_fan | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/checks/genua_fan b/checks/genua_fan index f70cf00..963333e 100644 --- a/checks/genua_fan +++ b/checks/genua_fan @@ -39,7 +39,7 @@ def inventory_genua_fan(info): return inventory = [] - for _fanNo, fanName, _fanRPM, _fanState in info[0]: + for fanName, _fanRPM, _fanState in info[0]: inventory.append( (fanName, {}) ) return inventory @@ -57,7 +57,7 @@ def check_genua_fan(item, params, info): "6" : (2, "unknown"), } for line in info[0]: - _fanNo, fanName, fanRPM, fanState = line + fanName, fanRPM, fanState = line if fanName != item: continue @@ -74,13 +74,11 @@ check_info['genua_fan'] = { "service_description" : "FAN %s", "has_perfdata" : True, "snmp_info" : [( ".1.3.6.1.4.1.3717.2.1.1.1.1",[ - "1", # "fanNo" "2", # "fanName" "3", # "fanRPM" "4" # "fanState" ]), ( ".1.3.6.1.4.1.3137.2.1.1.1.1",[ - "1", # "fanNo" "2", # "fanName" "3", # "fanRPM" "4" # "fanState"

6 years

6726 FIX Fixed duplicate view names in "link to" dropdown in view editor

by Lars Michelsen

Module: check_mk Branch: master Commit: 1dd9b283dbd43ee85217ac2b35ee125c54b02a58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dd9b283dbd43e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 13:51:47 2018 +0200 6726 FIX Fixed duplicate view names in "link to" dropdown in view editor When editing the view a painter should link to, the list contained some duplicate names. The user often had to trial and error to select the correct view. The titles now contain a category prefix and also include the internal view ID which is used to identify the views. Change-Id: I7db892e46eda415e4d3a9c1632533b1430c91909 --- .werks/6726 | 14 ++++++++++++++ cmk/gui/views.py | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/.werks/6726 b/.werks/6726 new file mode 100644 index 0000000..35d0ed9 --- /dev/null +++ b/.werks/6726 @@ -0,0 +1,14 @@ +Title: Fixed duplicate view names in "link to" dropdown in view editor +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1538048999 + +When editing the view a painter should link to, the list contained some +duplicate names. The user often had to trial and error to select the +correct view. The titles now contain a category prefix and also include +the internal view ID which is used to identify the views. diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 6067a10..5de3ca9 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -163,7 +163,7 @@ def load_plugins(force): config.declare_permission_section("view", _("Multisite Views"), do_sort = True) for name, view in multisite_builtin_views.items(): config.declare_permission("view.%s" % name, - format_view_title(view), + format_view_title(name, view), "%s - %s" % (name, _u(view["description"])), config.builtin_role_ids) @@ -383,15 +383,39 @@ def view_choices(only_with_hidden = False): choices = [("", "")] for name, view in available_views.items(): if not only_with_hidden or view['single_infos']: - title = format_view_title(view) + title = format_view_title(name, view) choices.append(("%s" % name, title)) return choices -def format_view_title(view): +def format_view_title(name, view): + title_parts = [] + if view.get('mobile', False): - return _('Mobile: ') + _u(view["title"]) - else: - return _u(view["title"]) + title_parts.append(_('Mobile')) + + # Don't use the data source title because it does not really look good here + datasource = multisite_datasources[view["datasource"]] + infos = datasource["infos"] + if "event" in infos: + title_parts.append(_("Event Console")) + elif view["datasource"].startswith("inv"): + title_parts.append(_("HW/SW inventory")) + elif "aggr" in infos: + title_parts.append(_("BI")) + elif "log" in infos: + title_parts.append(_("Log")) + elif "service" in infos: + title_parts.append(_("Services")) + elif "host" in infos: + title_parts.append(_("Hosts")) + elif "hostgroup" in infos: + title_parts.append(_("Hostgroups")) + elif "servicegroup" in infos: + title_parts.append(_("Servicegroups")) + + title_parts.append("%s (%s)" % (_u(view["title"]), name)) + + return " - ".join(title_parts) def view_editor_options(): return [

6 years

6727 FIX Increased size of BI editor parameter input fields

by Lars Michelsen

Module: check_mk Branch: master Commit: 4739e74eb7f1416556a3f70898aa1bdfd75b9f8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4739e74eb7f141… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 14:12:45 2018 +0200 6727 FIX Increased size of BI editor parameter input fields Change-Id: Iea0df06bd27a4cc44b461d76dff49b21f47b0af0 --- .werks/6727 | 11 +++++++++++ cmk/gui/plugins/wato/bi.py | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/6727 b/.werks/6727 new file mode 100644 index 0000000..4528f23 --- /dev/null +++ b/.werks/6727 @@ -0,0 +1,11 @@ +Title: Increased size of BI editor parameter input fields +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1538050346 + + diff --git a/cmk/gui/plugins/wato/bi.py b/cmk/gui/plugins/wato/bi.py index bd997ab..ecec6cb 100644 --- a/cmk/gui/plugins/wato/bi.py +++ b/cmk/gui/plugins/wato/bi.py @@ -587,7 +587,7 @@ class ModeBI(WatoMode, BIManagement): ), ListOfStrings( orientation = "horizontal", - size = 24, + size = 80, title = _("Arguments:"), ), ], @@ -2018,9 +2018,9 @@ class ModeBIEditRule(ModeBI): "title of the rule as well as the host and service names, you can insert the " "actual value of the parameters by <tt>$HOST$</tt> and <tt>$INST$</tt> " "(enclosed in dollar signs)."), - orientation = "horizontal", + orientation="horizontal", valuespec = TextAscii( - size = 24, + size = 80, regex = '[A-Za-z_][A-Za-z0-9_]*', regex_error = _("Parameters must contain only A-Z, a-z, 0-9 and _ " "and must not begin with a digit."),

6 years

hp_proliant_temp hp_proliant_fans: Do not fetch unused OIDs anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 554332b68cc620b0a9440ac23623b41c1c45bfc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=554332b68cc620… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 15:06:35 2018 +0200 hp_proliant_temp hp_proliant_fans: Do not fetch unused OIDs anymore Change-Id: If0982bdf619b789321f0ccc46ec76c1e91777bd9 --- checks/hp_proliant_fans | 17 ++++++++--------- checks/hp_proliant_temp | 5 ++--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/checks/hp_proliant_fans b/checks/hp_proliant_fans index 83c47c0..d230089 100644 --- a/checks/hp_proliant_fans +++ b/checks/hp_proliant_fans @@ -49,21 +49,21 @@ hp_proliant_fans_locale = { def inventory_hp_proliant_fans(info): if len(info) > 0: items = [] - for line in [ line for line in info if line[3] == '3' ]: + for line in [ line for line in info if line[2] == '3' ]: label = 'other' - if int(line[2]) in hp_proliant_fans_locale: - label = hp_proliant_fans_locale[int(line[2])] - items.append(("%s (%s)" % (line[1], label), None)) + if int(line[1]) in hp_proliant_fans_locale: + label = hp_proliant_fans_locale[int(line[1])] + items.append(("%s (%s)" % (line[0], label), None)) return items def check_hp_proliant_fans(item, params, info): for line in info: label = 'other' - if len(line) > 2 and int(line[2]) in hp_proliant_fans_locale: - label = hp_proliant_fans_locale[int(line[2])] + if len(line) > 1 and int(line[1]) in hp_proliant_fans_locale: + label = hp_proliant_fans_locale[int(line[1])] - if "%s (%s)" % (line[1], label) == item: - _chassis, index, _name, _present, speed, status, currentSpeed = line + if "%s (%s)" % (line[0], label) == item: + index, _name, _present, speed, status, currentSpeed = line snmp_status = hp_proliant_fans_status_map[int(status)] status = hp_proliant_status2nagios_map[snmp_status] @@ -86,7 +86,6 @@ check_info["hp_proliant_fans"] = { 'has_perfdata': True, 'snmp_info': ( ".1.3.6.1.4.1.232.6.2.6.7.1", [ - "1", # cpqHeFltTolFanChassis "2", # cpqHeFltTolFanIndex "3", # cpqHeFltTolFanLocale "4", # cpqHeFltTolFanPresent diff --git a/checks/hp_proliant_temp b/checks/hp_proliant_temp index 1fc5f43..ec535e1 100644 --- a/checks/hp_proliant_temp +++ b/checks/hp_proliant_temp @@ -27,7 +27,7 @@ # Author: Lars Michelsen <lm(a)mathias-kettner.de> def format_hp_proliant_name(line): - return "%s (%s)" % (line[1], hp_proliant_locale[int(line[2])]) + return "%s (%s)" % (line[0], hp_proliant_locale[int(line[1])]) def inventory_hp_proliant_temp(info): for line in info: @@ -36,7 +36,7 @@ def inventory_hp_proliant_temp(info): def check_hp_proliant_temp(item, params, info): for line in info: if format_hp_proliant_name(line) == item: - _chassis, _index, _name, value, threshold, status = line + value, threshold, status = line[2:] # This case means no threshold available and # the devices' web interface displays "N/A" @@ -60,7 +60,6 @@ check_info["hp_proliant_temp"] = { 'service_description': 'Temperature %s', 'has_perfdata' : True, 'snmp_info' : ( ".1.3.6.1.4.1.232.6.2.6.8.1", [ - "1", # cpqHeTemperatureChassis "2", # cpqHeTemperatureIndex "3", # cpqHeTemperatureLocale "4", # cpqHeTemperatureCelsius

6 years

6734 FIX ibm_svc_enclosure: Fixed parsing data of IBM-FLASH900 devices

by Simon Betz

Module: check_mk Branch: master Commit: 1a021da89b0ea5e85c92cac8a32d354ea2f519c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a021da89b0ea5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 27 14:20:54 2018 +0200 6734 FIX ibm_svc_enclosure: Fixed parsing data of IBM-FLASH900 devices Change-Id: I0f6dea3bba70f443fa4a12ed78d28c45c6752300 --- .werks/6734 | 10 ++++++++++ checks/ibm_svc_enclosure | 19 +++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.werks/6734 b/.werks/6734 new file mode 100644 index 0000000..913309a --- /dev/null +++ b/.werks/6734 @@ -0,0 +1,10 @@ +Title: ibm_svc_enclosure: Fixed parsing data of IBM-FLASH900 devices +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1538050756 +Class: fix + + diff --git a/checks/ibm_svc_enclosure b/checks/ibm_svc_enclosure index 049f9e3..c8ce669 100644 --- a/checks/ibm_svc_enclosure +++ b/checks/ibm_svc_enclosure @@ -46,6 +46,10 @@ # The names of the columns are: # id:status:type:managed:IO_group_id:IO_group_name:product_MTM:serial_number:total_canisters:online_canisters:total_PSUs:online_PSUs:drive_slots:total_fan_modules:online_fan_modules:total_sems:online_sems +# IBM-FLASH900 +# <<<ibm_svc_enclosure:sep(58)>>> +# 1:online:control:9843-AE2:6860407:2:2:2:12 + def inventory_ibm_svc_enclosure(info): inventory = [] @@ -54,13 +58,20 @@ def inventory_ibm_svc_enclosure(info): inventory.append( (enclosure_id, None) ) return inventory + def check_ibm_svc_enclosure(item, _no_params, info): for line in info: if line[0] == item: - if len(line) < 15: # old(est) format - line = line + ["0", "0", "0", "0"] # do not modify line! - if len(line) < 17: # old format - line = line + ["0", "0"] # do not modify line! + if len(line) == 9: + line = line[:2] + [None, None, None] + line[2:6] + ["0"] + line[6:] + ["0", "0", "0", "0"] + elif len(line) == 13: + line = line + ["0", "0", "0", "0"] + elif len(line) == 15: + line = line + ["0", "0"] + elif len(line) == 17: + pass + else: + return 3, "Unknown format" enclosure_id, enclosure_status, _enclosure_type, _managed, _IO_group_id, \ _IO_group_name, _product_MTM, _serial_number, total_canisters, online_canisters, \

6 years

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: d9a3ab566c5140a53bb6b5ca78f718b0879e8620 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9a3ab566c5140… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 14:48:28 2018 +0200 Reserved 20 Werk IDS Change-Id: I95bcb8ba7f2e94cfafe3077824888102bebb10c5 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 2102728..d403938 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6769 +6789

6 years

fc_port: Fix use of portname in discovery

by Moritz Kiemer

Module: check_mk Branch: master Commit: 7d76f41ba1f4a43653352b891b8a0a6e7f7c918d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d76f41ba1f4a4… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Sep 27 10:45:04 2018 +0200 fc_port: Fix use of portname in discovery Change-Id: Ief76323027acc418988844cd2baae87cc1470de8 --- checks/fc_port | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/checks/fc_port b/checks/fc_port index 709bd48..60f78b9 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -80,10 +80,10 @@ factory_settings["fc_port_default_levels"] = { # Helper function for computing item from port number def fc_port_getitem(num_ports, index, portname): - int_len = str(len(str(num_ports))) # number of digits for index - itemname = ("%0" + int_len + "d") % (index - 1) # leading zeros + fmt = "%%0%dd" % len(str(num_ports)) # number of digits for index + itemname = fmt % (index - 1) # leading zeros if portname.strip() and fc_port_inventory_use_portname: - itemname += portname.strip() + return "%s %s" % (itemname, portname.strip()) return itemname @@ -167,11 +167,11 @@ def check_fc_port(item, params, info): warn_bytes, crit_bytes = None, None else: warn, crit = bw_thresh - if type(warn) == float: + if isinstance(warn, float): warn_bytes = wirespeed * warn / 100.0 else: # in MB warn_bytes = warn * 1048576.0 - if type(crit) == float: + if isinstance(crit, float): crit_bytes = wirespeed * crit / 100.0 else: # in MB crit_bytes = crit * 1048576.0 @@ -187,10 +187,10 @@ def check_fc_port(item, params, info): perfaverages.append( ("%s_avg" % what.lower(), value, warn_bytes, crit_bytes, 0, wirespeed)) # handle levels for in/out - if crit_bytes != None and value >= crit_bytes: + if crit_bytes is not None and value >= crit_bytes: summarystate = 2 output.append(" >= %s/s(!!)" % (get_bytes_human_readable(crit_bytes))) - elif warn_bytes != None and value >= warn_bytes: + elif warn_bytes is not None and value >= warn_bytes: summarystate = max(1, summarystate) output.append(" >= %s/s(!!)" % (get_bytes_human_readable(warn_bytes))) @@ -242,11 +242,11 @@ def check_fc_port(item, params, info): error_percentage = rate * 100.0 warn, crit = params[counter] - if crit != None and error_percentage >= crit: + if crit is not None and error_percentage >= crit: summarystate = 2 text += "(!!)" output.append(text) - elif warn != None and error_percentage >= warn: + elif warn is not None and error_percentage >= warn: summarystate = max(1, summarystate) text += "(!)" output.append(text)

6 years

6577 agent_vsphere: Add "System Time" service

by Moritz Kiemer

Module: check_mk Branch: master Commit: 2265e5f98a771f37b5b0078560f191fd58c15648 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2265e5f98a771f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Sep 27 08:55:22 2018 +0200 6577 agent_vsphere: Add "System Time" service And a minor clean up along the way. Change-Id: I0d7111313bb435a11d040fb88134d3b4001fe585 --- .werks/6577 | 9 ++++++++ agents/special/agent_vsphere | 52 ++++++++++++++++++++++++++++++++------------ 2 files changed, 47 insertions(+), 14 deletions(-) diff --git a/.werks/6577 b/.werks/6577 new file mode 100644 index 0000000..1d5b3d7 --- /dev/null +++ b/.werks/6577 @@ -0,0 +1,9 @@ +Title: agent_vsphere: Add "System Time" service +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1538031189 +Class: feature + diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index e0ef0b7..5cec8ee 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -39,6 +39,7 @@ import pprint import socket import httplib import datetime +from dateutil import tz from xml.dom import minidom # Great article how to get additional information @@ -53,6 +54,10 @@ telegram_list = { '<ns1:Login xsi:type="ns1:LoginRequestType"><ns1:_this type="SessionManager">%(sessionManager)s</ns1:_this>'\ '<ns1:userName>%(username)s</ns1:userName><ns1:password>%(password)s</ns1:password></ns1:Login>', + "systemtime": + '<ns1:CurrentTime xsi:type="ns1:CurrentTimeRequestType">'\ + '<ns1:_this type="ServiceInstance">ServiceInstance</ns1:_this></ns1:CurrentTime>', + "hostsystems": '<ns1:RetrievePropertiesEx xsi:type="ns1:RetrievePropertiesExRequestType">'\ '<ns1:_this type="PropertyCollector">%(propertyCollector)s</ns1:_this><ns1:specSet>'\ @@ -952,6 +957,16 @@ def output(line): vsphere_output.append(line) +def write_output(vsphere_output, opt_agent, host): + if opt_agent: + win_agent_output = get_agent_info_tcp(host) + sys.stdout.write(win_agent_output) + + for line in vsphere_output: + sys.stdout.write((line.encode("utf-8") if type(line) == unicode else line) + "\n") + sys.stdout.flush() + + socket.setdefaulttimeout(opt_timeout) def get_agent_info_tcp(hostname): response = "" @@ -1050,10 +1065,12 @@ if "OMD_SITE" in os.environ: host_cookie_path = "%s/cookie.%s" % (cookie_path, host_address) + def delete_server_cookie(): if host_cookie_path and os.path.exists(host_cookie_path): os.unlink(host_cookie_path) + def query_server(payload, payload_params=None): if payload_params is None: payload_params = {} @@ -1114,6 +1131,7 @@ def query_server(payload, payload_params=None): return response.status, response.reason, response.msg, "".join(response_data) + def encode_url(text): for char, replacement in [ ( "&", "&"), ( ">", ">" ), @@ -1151,6 +1169,7 @@ def connect_to_server(): error = "Cannot connect to vSphere Server. Please check the IP and SSL certificate (if applicable) "\ "and try again. This error is not related to the login credentials. Error message: %r" % e + def retrieve_systeminfo(): # Retrieve basic data, which requires no login payload = telegram_list["systeminfo"] @@ -1160,6 +1179,7 @@ def retrieve_systeminfo(): if element: systeminfo[entry] = function(element[0]) if function else element[0] + def login(): global server_cookie @@ -1200,6 +1220,21 @@ def output_aggregated_snapshots(vms, hostsystems=None): output('<<<<>>>>') +def section_systemtime(): + try: + __, __, __, response = query_server(telegram_list["systemtime"]) + elements = get_pattern('<returnval>(.*)</returnval>', response) + if elements: + naive = datetime.datetime.strptime(elements[0], "%Y-%m-%dT%H:%M:%S.%fZ") + utc = naive.replace(tzinfo=tz.tzutc()) + localtime = utc.astimezone(tz.tzlocal()) + output("<<<systemtime>>>") + output(localtime.strftime("%s")) + except: + if opt_debug: + raise + + # .--Main----------------------------------------------------------------. # | __ __ _ | # | | \/ | __ _(_)_ __ | @@ -1237,7 +1272,6 @@ if not error: for entry in systeminfo.items(): output("%s %s" % entry) - ############################# # Determine available host systems ############################# @@ -1629,11 +1663,8 @@ if not error: elif opt_snapshot_display == 'vCenter': output_aggregated_snapshots(vms) - output("<<<<>>>>") - - if not opt_direct: reply_code, reply_msg, reply_headers, response = query_server(telegram_list["datacenters"]) datacenters = get_pattern('<objects><obj type="Datacenter">(.*?)</obj>', response) @@ -1709,6 +1740,8 @@ if not error: output("\n".join(values)) output("<<<<>>>>") + section_systemtime() + # We only logout in non OMD-setups if not host_cookie_path: query_server(telegram_list["logout"]) @@ -1728,20 +1761,11 @@ if not error: error = "Error while processing received data" -def make_utf8(line): - if type(line) == unicode: - return line.encode("utf-8") - else: - return line +write_output(vsphere_output, opt_agent, host_address) if opt_agent: - win_agent_output = get_agent_info_tcp(host_address) - sys.stdout.write(win_agent_output) - sys.stdout.flush() error_exit = 0 -print "\n".join(map(make_utf8, vsphere_output)) - if tracefile: tracefile.close()

6 years

BI rule: Added a non-breaking space between icon and title

by Simon Betz

Module: check_mk Branch: master Commit: f9e1c9ff61c6cb0cc1f14bc5123d7764138d5bbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9e1c9ff61c6cb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 27 13:21:53 2018 +0200 BI rule: Added a non-breaking space between icon and title Change-Id: Ia6fa80c7ebcd713ba9745a6beeba24a497393d8e --- cmk/gui/bi.py | 3 +++ cmk/gui/plugins/wato/bi.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmk/gui/bi.py b/cmk/gui/bi.py index 3c397f5..1515fce 100644 --- a/cmk/gui/bi.py +++ b/cmk/gui/bi.py @@ -3077,10 +3077,13 @@ class FoldableTreeRendererTree(FoldableTreeRenderer): with self._show_node(tree, show_host, mousecode=mc, img_class=css_class): if tree[2].get('icon'): html.write(html.render_icon(tree[2]['icon'])) + html.write(" ") + if tree[2].get("docu_url"): html.icon_button(tree[2]["docu_url"], _("Context information about this rule"), "url", target="_blank") html.write(" ") + html.write_text(tree[2]["title"]) if not is_empty: diff --git a/cmk/gui/plugins/wato/bi.py b/cmk/gui/plugins/wato/bi.py index acd3a9f..bd997ab 100644 --- a/cmk/gui/plugins/wato/bi.py +++ b/cmk/gui/plugins/wato/bi.py @@ -1577,7 +1577,7 @@ class ModeBIRules(ModeBI): table.text_cell(_("Parameters"), " ".join(rule["params"])) if rule.get('icon'): - title = html.render_icon(rule["icon"]) + rule["title"] + title = html.render_icon(rule["icon"]) + " " + rule["title"] else: title = rule["title"] table.text_cell(_("Title"), title)

6 years

← Newer
1
2
3
4
5
6
7
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018