Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

4342 FIX hp_proliant: fixed empty status handling

by Simon Betz

Module: check_mk Branch: master Commit: 7835227c08bf3e4029fb22d84e34d1924b084f29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7835227c08bf3e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 8 14:54:24 2017 +0100 4342 FIX hp_proliant: fixed empty status handling Change-Id: I27cb6ed02b7458f3367187f73198e1599713ed93 --- .werks/4342 | 10 ++++++++++ ChangeLog | 1 + checks/hp_proliant | 47 +++++++++++++++++++++++++++++------------------ 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/.werks/4342 b/.werks/4342 new file mode 100644 index 0000000..c70976e --- /dev/null +++ b/.werks/4342 @@ -0,0 +1,10 @@ +Title: hp_proliant: fixed empty status handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1486562039 + + diff --git a/ChangeLog b/ChangeLog index 84aabe1..8499bcd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ * 4340 FIX: blade_bays: cleanup and some improvements... * 4341 FIX: cisco_wlc: fixed invalid parameters during service discovery * 4024 FIX: netapp_api_volumes: fixed incorrect computation of read/write latency + * 4342 FIX: hp_proliant: fixed empty status handling Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/hp_proliant b/checks/hp_proliant index 1b03c68..70a3fc9 100644 --- a/checks/hp_proliant +++ b/checks/hp_proliant @@ -24,32 +24,43 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# General Status: -# '.1.3.6.1.4.1.232.2.2.2.1.0' => Serial Number of Server -# '.1.3.6.1.4.1.232.11.2.14.1.1.5.0' => cpqHoFwVerVersion -# '.1.3.6.1.4.1.232.11.1.3.0' => cpqHoMibCondition -hp_proliant_general_status_map = { 1: 'Unknown', 2: 'Ok', 3: 'Degraded', 4: 'Failed' } -hp_proliant_general_status2nagios_map = { 'Unknown': 3, 'Ok': 0, 'Degraded': 1, 'Failed': 2, } +# .1.3.6.1.4.1.232.11.1.3.0 1 +# .1.3.6.1.4.1.232.11.2.14.1.1.5.0 "2009.05.18" +# .1.3.6.1.4.1.232.2.2.2.1.0 "GB8851CPPH + def inventory_proliant_general(info): if len(info) > 0 and len(info[0]) > 1 and info[0][0]: return [ (None, None) ] + def check_proliant_general(item, no_params, info): if not info: - return 3, "status not found in snmp data" - snmp_state = hp_proliant_general_status_map[int(info[0][0])] - status = hp_proliant_general_status2nagios_map[snmp_state] - return (status, "General Status is %s (Firmware: %s, S/N: %s)" % - (snmp_state, info[0][1], info[0][2])) + return 3, "Status not found in snmp data" + + map_states = { + "1" : (3, "unknown"), + "2" : (0, "OK"), + "3" : (1, "degraded"), + "4" : (2, "failed"), } + + status, firmware, serial_number = info[0] + state, state_readable = map_states.get(status, (3, "unhandled[%s]" % status)) + return state, "Status: %s, Firmware: %s, S/N: %s" % \ + (state_readable, firmware, serial_number) + check_info["hp_proliant"] = { - 'check_function': check_proliant_general, - 'inventory_function': inventory_proliant_general, - 'service_description': 'General Status', - 'snmp_info': ('.1.3.6.1.4.1.232', ['11.1.3.0', '11.2.14.1.1.5.0', '2.2.2.1.0']), - 'snmp_scan_function': \ - lambda oid: "8072.3.2.10" in oid(".1.3.6.1.2.1.1.2.0") or \ - (".1.3.6.1.4.1.311.1.1.3.1.2" in oid(".1.3.6.1.2.1.1.2.0") and oid(".1.3.6.1.4.1.232.11.1.3.0")), + 'inventory_function' : inventory_proliant_general, + 'check_function' : check_proliant_general, + 'service_description' : 'General Status', + 'snmp_info' : ('.1.3.6.1.4.1.232', [ + '11.1.3.0', # CPQHOST-MIB::cpqHoMibCondition + '11.2.14.1.1.5.0', # cpqHoFwVerVersion + '2.2.2.1.0', # CPQSINFO-MIB::cpqSiSysSerialNum + ]), + 'snmp_scan_function' : lambda oid: "8072.3.2.10" in oid(".1.3.6.1.2.1.1.2.0") or \ + (".1.3.6.1.4.1.311.1.1.3.1.2" in oid(".1.3.6.1.2.1.1.2.0") and \ + oid(".1.3.6.1.4.1.232.11.1.3.0")), }

7 years, 7 months

Fixed typo in WATO lock message

by Mathias Kettner

Module: check_mk Branch: master Commit: b7180f42640b85d9888737a655db48087601ddfe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7180f42640b85… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 8 14:45:06 2017 +0100 Fixed typo in WATO lock message Change-Id: Idcc22b94b12b044f5b0eac1c09ffc1f01a10b61e --- web/htdocs/watolib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index be8d91b..9ee642b 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1889,7 +1889,7 @@ class Folder(BaseFolder): # Locked hosts if self._locked_hosts == True: - lock_messages.append(_("Hosts attributes are locked " + lock_messages.append(_("Host attributes are locked " "(You cannot create, edit or delete hosts in this folder)")) elif self._locked_hosts: lock_messages.append(self._locked_hosts)

7 years, 7 months

4341 FIX cisco_wlc: fixed invalid parameters during service discovery

by Simon Betz

Module: check_mk Branch: master Commit: c21be21db129c4f8f8107f16bf935d2496cc2887 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c21be21db129c4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 8 14:17:05 2017 +0100 4341 FIX cisco_wlc: fixed invalid parameters during service discovery Change-Id: Ib81a17334b6b1333a05db882c584403ab38bf0c9 --- .werks/4341 | 10 ++++++++++ ChangeLog | 1 + checks/cisco_wlc | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4341 b/.werks/4341 new file mode 100644 index 0000000..9106756 --- /dev/null +++ b/.werks/4341 @@ -0,0 +1,10 @@ +Title: cisco_wlc: fixed invalid parameters during service discovery +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1486559783 + + diff --git a/ChangeLog b/ChangeLog index 011a333..a9052a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ * 4339 FIX: fixed AtrributeError in oracle sessions ruleset * 4191 FIX: esx_vsphere_hostsystem.cpu_usage: Fixed wrong total GHz... * 4340 FIX: blade_bays: cleanup and some improvements... + * 4341 FIX: cisco_wlc: fixed invalid parameters during service discovery Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/cisco_wlc b/checks/cisco_wlc index 0242693..0f382e1 100644 --- a/checks/cisco_wlc +++ b/checks/cisco_wlc @@ -39,7 +39,7 @@ def cisco_wlc_convert(info): def inventory_cisco_wlc(info): data = cisco_wlc_convert(info) - return [ (x[0], None) for x in data ] + return [ (x[0], {}) for x in data ] def check_cisco_wlc(item, params, info): data = cisco_wlc_convert(info)

7 years, 7 months

Revert "Test commit for cppcheck."

by Sven Panne

Module: check_mk Branch: master Commit: 044cd7e663b2bee4ef3c6f794b13e6dc788968ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=044cd7e663b2be… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 8 14:17:17 2017 +0100 Revert "Test commit for cppcheck." This reverts commit 31ac461bb61d2c9e5b866c186e3b1c44a8e7ae1a. --- livestatus/src/Query.cc | 7 ------- 1 file changed, 7 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index d33bcb0..ee8114f 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -44,13 +44,6 @@ #include "strutil.h" #include "waittriggers.h" -int blah() -{ - char a[10]; - a[10] = 0; - return 0; -} - extern unsigned long g_max_response_size; using std::chrono::duration_cast;

7 years, 7 months

4024 FIX netapp_api_volumes: fixed incorrect computation of read/ write latency

by Andreas Boesl

Module: check_mk Branch: master Commit: 5c97b94b3ee367536c23faf325409403e42984b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c97b94b3ee367… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 8 14:37:04 2017 +0100 4024 FIX netapp_api_volumes: fixed incorrect computation of read/write latency Change-Id: Ic8badad9f5675ba161b05d306f34eaad4cdce917 --- .werks/4024 | 9 +++++++++ ChangeLog | 1 + agents/special/agent_netapp | 4 ++-- checks/netapp_api_volumes | 17 ++++++++++++++--- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.werks/4024 b/.werks/4024 new file mode 100644 index 0000000..fbaa9f5 --- /dev/null +++ b/.werks/4024 @@ -0,0 +1,9 @@ +Title: netapp_api_volumes: fixed incorrect computation of read/write latency +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1486560986 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a9052a9..84aabe1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,7 @@ * 4191 FIX: esx_vsphere_hostsystem.cpu_usage: Fixed wrong total GHz... * 4340 FIX: blade_bays: cleanup and some improvements... * 4341 FIX: cisco_wlc: fixed invalid parameters during service discovery + * 4024 FIX: netapp_api_volumes: fixed incorrect computation of read/write latency Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 9c27c4b..6948d37 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -1043,7 +1043,7 @@ try: "volume-inode-attributes.files-used" : "files-used" }, extra_info = create_dict(volume_counters, custom_key = [ "instance_uuid" ]), extra_info_report = sum(map(lambda x: ["%s" % x, "nfs_%s" % x, "cifs_%s" % x, "san_%s" % x, "fcp_%s" % x, "iscsi_%s" % x], - sum(map(lambda x: ["read_%s" % x, "write_%s" % x], ["data", "latency"]), [])), []) + [ "instance_name" ], + sum(map(lambda x: ["read_%s" % x, "write_%s" % x], ["data", "latency", "ops"]), [])), []) + [ "instance_name" ], skip_missing_config_key = True ) @@ -1209,7 +1209,7 @@ try: "volumes", "files-total", "files-used", "state"], extra_info = create_dict(volume_counters), extra_info_report = sum(map(lambda x: ["%s" % x, "nfs_%s" % x, "cifs_%s" % x, "san_%s" % x, "fcp_%s" % x, "iscsi_%s" % x], - sum(map(lambda x: ["read_%s" % x, "write_%s" % x], ["data", "latency"]), [])), []) + [ "instance_name" ]) + sum(map(lambda x: ["read_%s" % x, "write_%s" % x], ["data", "latency", "ops"]), [])), []) + [ "instance_name" ]) # Aggregation diff --git a/checks/netapp_api_volumes b/checks/netapp_api_volumes index c56a13d..f2f4f46 100644 --- a/checks/netapp_api_volumes +++ b/checks/netapp_api_volumes @@ -71,14 +71,17 @@ def check_netapp_api_volumes(item, params, parsed): counter_wrapped = False counters = [] - now = time.time() + now = time.time() + base = {} perf_protocols = params.get("perfdata", []) for protocol in ["", "nfs_", "cifs_", "san_", "fcp_", "iscsi_"]: if protocol[:-1] not in perf_protocols: continue for mode in ["read_", "write_", "other_"]: - for field, factor, format_text in [ ("data", None, None), ("latency", 10000.0, "%s: %.2f ms")]: + for field, factor, format_text in [ ("data", None, None), + ("ops", None, "%s: %.2f 1/s"), + ("latency", 10000.0, "%s: %.2f ms")]: key = protocol + mode + field value = volume.get(key) if value != None: @@ -87,9 +90,17 @@ def check_netapp_api_volumes(item, params, parsed): delta = get_rate("netapp_api_volumes.%s.%s" % (item, key), now, value, onwrap=RAISE) perf.append( (key, delta) ) + # Quite hacky.. this base information is used later on by the "latency" field + if field == "ops": + if delta==0.0: + base[key] = 1.0 + else: + base[key] = float(delta) + + if protocol == "" and mode in ["read_", "write_"]: if factor: - delta = delta / factor + delta = delta / (factor * base[protocol + mode + "ops"]) if format_text: counters.append(format_text % (key, delta)) else:

7 years, 7 months

Test commit for cppcheck.

by Sven Panne

Module: check_mk Branch: master Commit: 31ac461bb61d2c9e5b866c186e3b1c44a8e7ae1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31ac461bb61d2c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 8 14:11:02 2017 +0100 Test commit for cppcheck. Change-Id: I944747fd958ea435b054967de515ebbdff4a9bba --- livestatus/src/Query.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index ee8114f..d33bcb0 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -44,6 +44,13 @@ #include "strutil.h" #include "waittriggers.h" +int blah() +{ + char a[10]; + a[10] = 0; + return 0; +} + extern unsigned long g_max_response_size; using std::chrono::duration_cast;

7 years, 7 months

4340 FIX blade_bays: cleanup and some improvements

by Simon Betz

Module: check_mk Branch: master Commit: c4638bd3e606cefd07b35e7071dea1b48d3c570f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4638bd3e606ce… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 8 11:54:43 2017 +0100 4340 FIX blade_bays: cleanup and some improvements Some devices send duplicate bay names. The check plugin now detects all bays. Change-Id: I984e2a67e5eb7d80f48852712e59aecbe2d547da --- .werks/4340 | 11 +++++ ChangeLog | 1 + checks/blade_bays | 117 ++++++++++++++++++++++++++++++------------------------ 3 files changed, 77 insertions(+), 52 deletions(-) diff --git a/.werks/4340 b/.werks/4340 new file mode 100644 index 0000000..3089822 --- /dev/null +++ b/.werks/4340 @@ -0,0 +1,11 @@ +Title: blade_bays: cleanup and some improvements +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1486550914 + +Some devices send duplicate bay names. +The check plugin now detects all bays. diff --git a/ChangeLog b/ChangeLog index 9ba84c1..011a333 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ * 4325 FIX: check_cpu_peaks: Make the check working with current Check_MK APi * 4339 FIX: fixed AtrributeError in oracle sessions ruleset * 4191 FIX: esx_vsphere_hostsystem.cpu_usage: Fixed wrong total GHz... + * 4340 FIX: blade_bays: cleanup and some improvements... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/blade_bays b/checks/blade_bays index 981c104..f5f8fdc 100644 --- a/checks/blade_bays +++ b/checks/blade_bays @@ -24,61 +24,74 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -blade_bays_module_state = { - 0: 'standby', - 1: 'on', - 2: 'notPresent', - 255: 'notApplicable', -} -def blade_bays_make_item(line): - # "3.IO Module 5" - pd, name = line[0].split(".", 1) - if pd == '2': - power_domain = 1 - else: - power_domain = 2 - return "PD%d %s" % (power_domain, name) +def parse_blade_bays(info): + map_states = { + "0" : (0, 'standby'), + "1" : (0, 'on'), + "2" : (1, 'not present'), + "3" : (1, 'switched off'), + "255" : (2, 'not applicable'), } + + parsed = {} + for pd_oidend, name, state, ty, identifier, \ + power_str, power_max_str in info: + pd, oid = pd_oidend.split(".", 1) + if pd == '2': + power_domain = 1 + else: + power_domain = 2 + + itemname = "PD%d %s" % (power_domain, name) + if itemname in parsed: + itemname = "%s %s" % (itemname, oid) + + try: + power = int(power_str.rstrip("W")) + power_max = int(power_max_str.rstrip("W")) + except ValueError: + power = 0 + + parsed.setdefault(itemname, { + "_type_" : ty.split("(")[0], + "_id_" : identifier, + "_power_max_" : power_max, + "device_state" : map_states.get(state, (3, "unhandled[%s]" % state)), + "power" : power, + }) + return parsed + + +def inventory_blade_bays(parsed): + for entry, attrs in parsed.items(): + if attrs["device_state"][1] in [ "standby", "on" ]: + yield entry, {} + + +def check_blade_bays(item, params, parsed): + if item not in parsed: + yield 3, "No data for '%s' in SNMP info" % item + return + + for res in check_elphase(item, params, parsed): + yield res -def inventory_blade_bays(info): - # find only modules that are present and switched on or standby - inventory = [] - for line in info: - if line[1] in [ '0', '1' ]: - item = blade_bays_make_item(line) - inventory.append((item, None)) - return inventory + data = parsed[item] + yield 0, "Max. power: %s W, Type: %s, ID: %s" % \ + (data["_power_max_"], data["_type_"], data["_id_"]) -def check_blade_bays(item, _no_params, info): - for line in info: - if item == blade_bays_make_item(line): - state = saveint(line[1]) - type = line[2].split('(')[0] - power_current, power_max = map(lambda x: saveint(x.rstrip('W')), line[4:6]) - perfdata = [('power', '%dW' % power_current, None, None, 0, power_max)] - if state == 1: - return (0, "State %s (Type: %s, ID: %s), Power %dW (%dW max)" % - (blade_bays_module_state.get(state, 'Unhandled'), type, line[3], power_current, power_max), perfdata) - elif state == 2: - return (1, "Not present") - elif state == 3: - return (1, "Device is switched off", perfdata) - elif state == 0: - return (1, "Device is in standby", perfdata) - else: - return (2, "invalid state %d" % state) - return (3, "no data for '%s' in SNMP info" % item) check_info["blade_bays"] = { - 'check_function': check_blade_bays, - 'inventory_function': inventory_blade_bays, - 'service_description': 'BAY %s', - 'has_perfdata': True, - 'snmp_info': ( - ".1.3.6.1.4.1.2.3.51.2.2.10", [ - "2", # powerDomain1 - "3", # powerDomain2 - ], [ "1.1.5", "1.1.6", "1.1.2", "1.1.1", "1.1.7", "1.1.8" ] ), # BLADE-MIB - 'snmp_scan_function': \ - lambda oid: re.match('(BladeCenter|BladeCenter Advanced|IBM Flex Chassis) Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, + 'parse_function' : parse_blade_bays, + 'inventory_function' : inventory_blade_bays, + 'check_function' : check_blade_bays, + 'service_description' : 'BAY %s', + 'has_perfdata' : True, + 'snmp_info' : ( ".1.3.6.1.4.1.2.3.51.2.2.10", [ + "2", # powerDomain1 + "3", # powerDomain2 + ], [ OID_END, "1.1.5", "1.1.6", "1.1.2", "1.1.1", "1.1.7", "1.1.8" ] ), # BLADE-MIB + 'snmp_scan_function' : lambda oid: \ + re.match('(BladeCenter|BladeCenter Advanced|IBM Flex Chassis) Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, + 'includes' : [ 'elphase.include' ], }

7 years, 7 months

Unbreak cppcheck target

by Sven Panne

Module: check_mk Branch: master Commit: 1ff8f15b687863d8edf2b916b5f65e1009934ff2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ff8f15b687863… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 8 11:46:28 2017 +0100 Unbreak cppcheck target Change-Id: I1f59906db2d182012536a7afba53bfdc2f787360 --- .gitignore | 1 - Makefile | 20 +++++++++++++++++--- livestatus/.gitignore | 1 + 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9332ce5..adb08e1 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,6 @@ config.log config.status config.sub configure -cppcheck-result.xml depcomp install-sh missing diff --git a/Makefile b/Makefile index 9bc1878..529a33c 100644 --- a/Makefile +++ b/Makefile @@ -444,14 +444,28 @@ analyze: config.h # GCC-like output on stderr intended for human consumption. cppcheck: compile_commands.json @scripts/compiled_sources | \ + grep /livestatus/src/ |\ sed 's/^"$.*$"$$/\1/' | \ - $(CPPCHECK) --max-configs=16 -UCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I livestatus/src -I livestatus --file-list=- --quiet --template=gcc + ( cd livestatus && $(CPPCHECK) -DHAVE_CONFIG_H -UCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I src -I .. -I . --file-list=- --quiet --template=gcc ) +ifeq ($(ENTERPRISE),yes) + @scripts/compiled_sources | \ + grep /enterprise/core/ |\ + sed 's/^"$.*$"$$/\1/' | \ + ( cd enterprise/core/src && $(CPPCHECK) -DHAVE_CONFIG_H -DCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I . -I ../../.. -I livestatus -I checkhelper --file-list=- --quiet --template=gcc ) +endif # XML output into file intended for machine processing. cppcheck-xml: compile_commands.json - @./compiled_sources | \ + scripts/compiled_sources | \ + grep /livestatus/src/ |\ sed 's/^"$.*$"$$/\1/' | \ - $(CPPCHECK) --max-configs=16 -UCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I livestatus/src -I livestatus --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml + ( cd livestatus && $(CPPCHECK) -DHAVE_CONFIG_H -UCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I src -I .. -I . --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml ) +ifeq ($(ENTERPRISE),yes) + scripts/compiled_sources | \ + grep /enterprise/core/ |\ + sed 's/^"$.*$"$$/\1/' | \ + ( cd enterprise/core/src && $(CPPCHECK) -DHAVE_CONFIG_H -DCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I . -I ../../.. -I livestatus -I checkhelper --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml ) +endif # TODO: We should probably handle this rule via AM_EXTRA_RECURSIVE_TARGETS in # src/configure.ac, but this needs at least automake-1.13, which in turn is only diff --git a/livestatus/.gitignore b/livestatus/.gitignore index 0acdced..349f3b8 100644 --- a/livestatus/.gitignore +++ b/livestatus/.gitignore @@ -1,3 +1,4 @@ +cppcheck-result.xml .cproject cscope.files Debug

7 years, 7 months

4191 FIX esx_vsphere_hostsystem.cpu_usage: Fixed wrong total GHz

by Marcel Arentz

Module: check_mk Branch: master Commit: 3a16ad24f6cbb9b9baeb365567c86e8f663d730c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a16ad24f6cbb9… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Feb 8 11:46:08 2017 +0100 4191 FIX esx_vsphere_hostsystem.cpu_usage: Fixed wrong total GHz Fixed calculation of total available CPU GHz. Previously it was handled like KB tk MB. Change-Id: Ib2791f9c457c11561369858f3f18965fcf4ea312 --- .werks/4191 | 9 +++++++++ ChangeLog | 1 + checks/esx_vsphere_hostsystem | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/4191 b/.werks/4191 new file mode 100644 index 0000000..1054351 --- /dev/null +++ b/.werks/4191 @@ -0,0 +1,9 @@ +Title: esx_vsphere_hostsystem.cpu_usage: Fixed wrong total GHz +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1486550603 +Class: fix + +Fixed calculation of total available CPU GHz. Previously it was handled like KB tk MB. diff --git a/ChangeLog b/ChangeLog index 41aae63..9ba84c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ * 4123 FIX: active check check_sql: changed handling of query results and fixed hostname parameter... * 4325 FIX: check_cpu_peaks: Make the check working with current Check_MK APi * 4339 FIX: fixed AtrributeError in oracle sessions ruleset + * 4191 FIX: esx_vsphere_hostsystem.cpu_usage: Fixed wrong total GHz... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index be18453..881a4e1 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -67,7 +67,7 @@ def check_esx_vsphere_hostsystem_cpu(item, params, info): num_cores = int(data['hardware.cpuInfo.numCpuCores'][0]) num_threads = int(data['hardware.cpuInfo.numCpuThreads'][0]) used_mhz = float(data['summary.quickStats.overallCpuUsage'][0]) - mhz_per_core = float(data['hardware.cpuInfo.hz'][0]) / 1024.0 / 1024.0 + mhz_per_core = float(data['hardware.cpuInfo.hz'][0]) / 1000.0 / 1000.0 total_mhz = mhz_per_core * num_cores usage = used_mhz / total_mhz * 100 @@ -79,7 +79,7 @@ def check_esx_vsphere_hostsystem_cpu(item, params, info): this_time = time.time() state, infotext, perfdata = check_cpu_util(usage, params).next() - infotext += ", %.2fGHz/%.2fGHz" % (used_mhz / 1024.0, total_mhz / 1024.0) + infotext += ", %.2fGHz/%.2fGHz" % (used_mhz / 1000.0, total_mhz / 1000.0) infotext += ", %d sockets, %d cores/socket, %d threads" % ( num_sockets, num_cores / num_sockets, num_threads)

7 years, 7 months

DualListChoice: Fixed long time broken default value for autoheight argument

by Lars Michelsen

Module: check_mk Branch: master Commit: da73ab02373e9500a8009f51564e34f6f1810f36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da73ab02373e95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 8 10:59:56 2017 +0100 DualListChoice: Fixed long time broken default value for autoheight argument Change-Id: I64707798b04ebfa1dbf481075a68db3ffa4a0237 --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 0651bc3..ce823b0 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2107,7 +2107,7 @@ class MultiSelect(ListChoice): class DualListChoice(ListChoice): def __init__(self, **kwargs): super(DualListChoice, self).__init__(**kwargs) - self._autoheight = kwargs.get("autoheight", True) + self._autoheight = kwargs.get("autoheight", False) self._custom_order = kwargs.get("custom_order", False) self._instant_add = kwargs.get("instant_add", False) self._enlarge_active = kwargs.get("enlarge_active", False)

7 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017