Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 0e415bbdfd0980cb5058092ead2073f2ba738d42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e415bbdfd0980… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 1 19:10:21 2018 +0100 add todo Change-Id: Ibbbbc7fea89a13e8d00360487049ca21f470912a --- cmk_base/modes/check_mk.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 3f61657..6a6110b 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -40,6 +40,10 @@ from cmk_base.exceptions import MKAgentError from cmk_base.modes import modes, Mode, Option, keepalive_option +# TODO: Investigate all modes and try to find out whether or not we can +# set needs_checks=False for them. This would save a lot of IO/time for +# these modes. + #. # .--General options-----------------------------------------------------. # | ____ _ _ |

6 years, 4 months

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 8aa748d2a6fadca613d474a0019373424e3659ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8aa748d2a6fadc… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 1 15:52:36 2018 +0100 Minor cleanup Change-Id: Id0d293bfaeae1a6985187a6523aea735100870ba --- checkman/adva_fsp_current | 8 +++---- checkman/huawei_osn_fan | 7 +++--- checks/adva_fsp_current | 45 +++++++++++++++++++++---------------- checks/blade_bx_blades | 56 +++++++++++++++++++++++++++++------------------ checks/watchdog_sensors | 18 ++++++--------- 5 files changed, 75 insertions(+), 59 deletions(-) diff --git a/checkman/adva_fsp_current b/checkman/adva_fsp_current index 07af411..db87f18 100644 --- a/checkman/adva_fsp_current +++ b/checkman/adva_fsp_current @@ -7,10 +7,10 @@ description: This checks monitors the current measured for power supplies of the ADVA FSP 3000 scalable optical transport solution. - No limits are set in the check, since limits are configured in the - device itself. The upper limit for the current is - read from the device. If the current value is outside the allowed - range the check is {CRIT}, otherwise it is {OK}. + No thresholds are set in the check, since thresholds are configured in the + device itself. The upper threshold for the current is + read from the device. If the current value is above the threshold + the check is {CRIT}, otherwise it is {OK}. item: The name of the power supply module diff --git a/checkman/huawei_osn_fan b/checkman/huawei_osn_fan index 133ac4f..f354013 100644 --- a/checkman/huawei_osn_fan +++ b/checkman/huawei_osn_fan @@ -1,14 +1,13 @@ -title: Huawei OSN: Fans +title: Huawei OptiX OSN: Fans agents: snmp catalog: hw/network/huawei license: GPL distribution: check_mk description: - This check monitors the state of fans. The state will change to {WARN} - if the reported value for the fan speed is "stopped" or "high". + This check monitors the state of Huawei OSN OptiX fans. item: - The fan BID is the item + The fan board slot ID. inventory: One service for each fan is created diff --git a/checks/adva_fsp_current b/checks/adva_fsp_current index aef08d7..d3544ec 100644 --- a/checks/adva_fsp_current +++ b/checks/adva_fsp_current @@ -24,32 +24,40 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +# .1.3.6.1.4.1.2544.1.11.2.4.2.2.1.1.101318912 8110 +# .1.3.6.1.4.1.2544.1.11.2.4.2.2.1.2.101318912 65600 +# .1.3.6.1.4.1.2544.1.11.2.4.2.2.1.3.101318912 9 +# .1.3.6.1.4.1.2544.2.5.5.1.1.1.101318912 "PSU/7HU-AC-800" +# .1.3.6.1.4.1.2544.2.5.5.1.1.5.101318912 "MOD-1-1" + + def inventory_adva_fsp_current(info): - inventory = [] - for line in info: + for current_str, upper_threshold_str, power_str, \ + unit_name, index_aid in info: # Ignore non-connected sensors - if len(line) == 5 and line[4] != "" and line[2] != "": - inventory.append( (line[4], None) ) - return inventory + if index_aid != "" and power_str != "": + yield index_aid, None + def check_adva_fsp_current(item, _no_params, info): - for line in info: - if len(line) == 5 and line[4] == item: - current, high, power, descr = line[0:4] - current = float(current) / 1000.0 - high = float(high) / 1000 + for current_str, upper_threshold_str, power_str, \ + unit_name, index_aid in info: + if index_aid == item: + current = float(current_str) / 1000.0 + upper_threshold = float(upper_threshold_str) / 1000 - infotext = "%.3f A (limit at %.3f A) at %s" % (current, high, descr) - perfdata = [ ("current", current, "", str(high), ) ] + infotext = "[%s] %.3f A (crit at %.3f A)" % ( + unit_name, current, upper_threshold) + perfdata = [("current", current, None, upper_threshold,)] if current <= 0: - return(3, "Invalid Sensor Data") - elif current >= high: - return (2, "%s" % infotext, perfdata) + return 3, "Invalid sensor data" + elif current >= upper_threshold: + return 2, infotext, perfdata else: - return (0, "%s" % infotext, perfdata) + return 0, infotext, perfdata - return (3, "Sensor %s not found in SNMP data" % item) check_info['adva_fsp_current'] = { "inventory_function" : inventory_adva_fsp_current, @@ -63,6 +71,5 @@ check_info['adva_fsp_current'] = { "2.5.5.1.1.1", # inventoryUnitName "2.5.5.2.1.5", # entityIndexAid ]), - "snmp_scan_function" : lambda oid: - oid(".1.3.6.1.2.1.1.1.0") == "Fiber Service Platform F7", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "Fiber Service Platform F7", } diff --git a/checks/blade_bx_blades b/checks/blade_bx_blades index 5969a1f..137f3d4 100644 --- a/checks/blade_bx_blades +++ b/checks/blade_bx_blades @@ -24,29 +24,43 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def check_blade_bx_blades(item, no_params, info): - blade_status_codes = { 1 : "Unknown", 2 : "OK", 3 : "not-present", 4 : "Error", 5 : "Critical", 6 : "Standby" } - for blade_id, blade_status, blade_serial, blade_name in info: - state = 0 - blade_status = saveint(blade_status) - if blade_id == item: - if blade_status == 4 or blade_status == 5: - state = 2 - return (state, "Blade %s %s %s Status %s " % (blade_id, blade_name, blade_serial, blade_status_codes.get(blade_status, 1))) +def inventory_blade_bx_blades(info): + for id_, status, serial, name in info: + if status != "3": # blade not present + yield id_, None + + +def check_blade_bx_blades(item, _no_params, info): + status_codes = { + "1": (3, "unknown"), + "2": (0, "OK"), + "3": (3, "not present"), + "4": (2, "error"), + "5": (2, "critical"), + "6": (0, "standby"), + } + + for id_, status, serial, name in info: + if id_ == item: + state, state_readable = status_codes[status] + if name: + name_info = "[%s, Serial: %s]" % (name, serial) + else: + name_info = "[Serial: %s]" % serial + return state, "%s Status: %s" % (name_info, state_readable) - return (3, "no data for '%s' in SNMP info" % item) check_info['blade_bx_blades'] = { - "check_function" : check_blade_bx_blades, - "inventory_function" : lambda info: [ (line[0], None) for line in info if int(line[1]) != 3] , - "service_description" : "Blade %s", - "snmp_info" : (".1.3.6.1.4.1.7244.1.1.1.4.2.1.1", [ - 1, # bladeId - 2, # bladestatus - 5, # Serialnumber - 21, # Name - ]), - "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0") \ - or oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.7244.1.1.1", + "inventory_function" : inventory_blade_bx_blades, + "check_function" : check_blade_bx_blades, + "service_description" : "Blade %s", + "snmp_info" : (".1.3.6.1.4.1.7244.1.1.1.4.2.1.1", [ + 1, # bladeId + 2, # bladestatus + 5, # Serialnumber + 21, # Name + ]), + "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0") \ + or oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.7244.1.1.1", } diff --git a/checks/watchdog_sensors b/checks/watchdog_sensors index aa6a453..11b2d62 100644 --- a/checks/watchdog_sensors +++ b/checks/watchdog_sensors @@ -165,18 +165,15 @@ check_info['watchdog_sensors'] = { def inventory_watchdog_sensors_temp(parsed): for key in parsed: - yield ( key, {} ) + yield (key, {}) -def check_watchdog_sensors_temp(item, params, parsed): - for key in parsed: - if key == item: - data = parsed[key] - temperature = float(data['temp'][0])/10.0 - unit = data['temp'][1] - if unit == "F": - temperature = 5.0/9.0*(temperature-32) - yield check_temperature(temperature, params, "check_watchdog_sensors.%s" % item) +def check_watchdog_sensors_temp(item, params, parsed): + if item in parsed: + temperature_str, unit = parsed[item]['temp'] + return check_temperature(float(temperature_str) / 10.0, params, + "check_watchdog_sensors.%s" % item, + dev_unit=unit.lower()) check_info['watchdog_sensors.temp'] = { @@ -187,7 +184,6 @@ check_info['watchdog_sensors.temp'] = { 'group' : 'temperature', } - #. # .--humidity------------------------------------------------------------. # | _ _ _ _ _ |

6 years, 4 months

Fixed subclassing issue

by Lars Michelsen

Module: check_mk Branch: master Commit: ccc230fd1937f079f0af130d064523a42c50f7cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccc230fd1937f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 1 15:52:56 2018 +0100 Fixed subclassing issue Change-Id: Ieabf7428df595f33308fe4d178ff477ddd69f07f --- cmk_base/data_sources/abstract.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index 7e82a05..605b979 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -566,7 +566,7 @@ class CheckMKAgentDataSource(DataSource): -class ManagementBoardDataSource(object): +class ManagementBoardDataSource(DataSource): """Abstract base class for all data sources that work with the management board configuration""" _for_mgmt_board = True

6 years, 4 months

Win-agent: update code comments

by Jukka Aro

Module: check_mk Branch: master Commit: c9bc7a00d9c98c7eb4b06cff644c76eeba13ca7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9bc7a00d9c98c… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Mar 1 15:38:37 2018 +0100 Win-agent: update code comments The comments contained now outdated information as eventlog state offsets are no longer preserved in memory but read every time from file. Related to a1fb8bc3a01beb2687a1cc90fae85195ba952e87. --- agents/windows/sections/SectionEventlog.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index 5eb5936..6ba469b 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -434,11 +434,11 @@ void SectionEventlog::handleExistingLog(std::ostream &out, // the logwatch agent for Linux and UNIX bool SectionEventlog::produceOutputInner(std::ostream &out) { Debug(_logger) << "SectionEventlog::produceOutputInner"; - // This agent remembers the record numbers + // The agent reads from a state file the record numbers // of the event logs up to which messages have - // been processed. When started, the eventlog - // is skipped to the end. Historic messages are - // not been processed. + // been processed. When no state information is available, + // the eventlog is skipped to the end (unless the sendall config + // option is used). Historic messages are not been processed. if (auto states = loadEventlogOffsets(_env.eventlogStatefile(), *_sendall, _logger); @@ -448,8 +448,7 @@ bool SectionEventlog::produceOutputInner(std::ostream &out) { handleExistingLog(out, state); } } - // The offsets are persisted in file after each run as we never know - // when the agent will be stopped. + // The offsets are persisted in a state file. saveEventlogOffsets(_env.eventlogStatefile(), states); }

6 years, 4 months

Win-agent: read eventlog offsets every time

by Jukka Aro

Module: check_mk Branch: master Commit: a1fb8bc3a01beb2687a1cc90fae85195ba952e87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1fb8bc3a01beb… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Mar 1 15:05:42 2018 +0100 Win-agent: read eventlog offsets every time Until now, Windows agent read the saved eventlog offsets from the state file only once, upon startup, and used from then on data stored (cached) in memory. In preparation for storing the offsets per host / remote IP address, we need to read the offsets from disk every time the agent is called and not preserve the offsets in memory as way may be handling different remote hosts across different agent calls. --- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 164 ++++++++++----------- agents/windows/sections/SectionEventlog.h | 34 ++--- .../windows/test/sections/SectionEventlogTest.cc | 22 +-- 4 files changed, 99 insertions(+), 123 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a1fb8bc3a0…

6 years, 4 months

Fixed typo.

by Sven Panne

Module: check_mk Branch: master Commit: f30f120cc9fb4e3e764ea7b07423fb563b52cafe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f30f120cc9fb4e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Mar 1 14:39:23 2018 +0100 Fixed typo. Change-Id: I676bf53cce99e472e9035af73e9653dc39a95521 --- bin/mkeventd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mkeventd b/bin/mkeventd index 3de7f31..179c2e9 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -946,7 +946,7 @@ def quote_tab(col): col = "\1" + "\1".join([quote_tab(e) for e in col]) elif col is None: col = "\2" - elif col is unicode: + elif ty is unicode: col = col.encode("utf-8") return col.replace("\t", " ")

6 years, 4 months

Fixed typo

by Simon Betz

Module: check_mk Branch: master Commit: 1d9bdb2c1752c46c3f059979131af5835488cae5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d9bdb2c1752c4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 1 14:39:37 2018 +0100 Fixed typo Change-Id: I147cb7459f7586c36f599cf871fcbfddb3cd6efc --- web/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index fa86d91..0eb90d3 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -6594,7 +6594,7 @@ graph_info["battery_capacity"] = { graph_info["qos_class_traffic"] = { "title" : _("QoS class traffic"), "metrics" : [ - ( "qos_outbound_bytes_rate,8,*@bits/s", "area", _("Qos outbound bits")), + ( "qos_outbound_bytes_rate,8,*@bits/s", "area", _("QoS outbound bits")), ( "qos_dropped_bytes_rate,8,*@bits/s", "-area", _("QoS dropped bits")), ], }

6 years, 4 months

Add mgmt_ipmi_firmware section for testing

by Lars Michelsen

Module: check_mk Branch: master Commit: bd57a3713de3fc086d2884b098afdf8c02099a44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd57a3713de3fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 1 12:37:30 2018 +0100 Add mgmt_ipmi_firmware section for testing Change-Id: I5998569112f35c21e2c4027365935939ea351298 --- cmk_base/data_sources/ipmi.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/cmk_base/data_sources/ipmi.py b/cmk_base/data_sources/ipmi.py index 6476321..53c5c55 100644 --- a/cmk_base/data_sources/ipmi.py +++ b/cmk_base/data_sources/ipmi.py @@ -69,6 +69,7 @@ class IPMIManagementBoardDataSource(ManagementBoardDataSource, CheckMKAgentDataS userid=credentials["username"], password=credentials["password"]) + self._logger.debug("[%s] Fetching sensor data via UDP from %s:623" % (self.id(), self._ipaddress)) sdr = ipmi_sdr.SDR(cmd) sensors = [] for number in sdr.get_sensor_numbers(): @@ -104,5 +105,14 @@ class IPMIManagementBoardDataSource(ManagementBoardDataSource, CheckMKAgentDataS sensors.append(parts) - return "<<<mgmt_ipmi_sensors:sep(124)>>>\n" \ - + "\n".join([ "|".join(sensor) for sensor in sensors ]) + output = "<<<mgmt_ipmi_sensors:sep(124)>>>\n" \ + + "".join([ "|".join(sensor) + "\n" for sensor in sensors ]) + + self._logger.debug("[%s] Fetching firmware information via UDP from %s:623" % (self.id(), self._ipaddress)) + + output += "<<<mgmt_ipmi_firmware:sep(124)>>>\n" + for entity_name, attributes in cmd.get_firmware(): + for attribute_name, value in attributes.items(): + output += "%s|%s|%s\n" % (entity_name, attribute_name, value) + + return output

6 years, 4 months

5858 FIX agent_ipmi_sensors: Search PATH for ipmi-sensors command

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d0b8a388eb15c054ad461658b7bcd21513db88d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d0b8a388eb15c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 22 18:12:05 2018 +0100 5858 FIX agent_ipmi_sensors: Search PATH for ipmi-sensors command The special agent was only searching the hard coded directories /usr/sbin, /usr/bin, /usr/local/sbin and /usr/local/bin. Instead of this, the special agent is now using the PATH variable of the environment to search for this command, which also includes environment related custom paths. Change-Id: I1a85175ecfaefbd56227658ee9878cbbf0d42633 --- .werks/5858 | 14 ++++++ .werks/5859 | 10 +++++ agents/special/agent_ipmi_sensors | 92 +++++++++++++++++++-------------------- 3 files changed, 70 insertions(+), 46 deletions(-) diff --git a/.werks/5858 b/.werks/5858 new file mode 100644 index 0000000..5896f31 --- /dev/null +++ b/.werks/5858 @@ -0,0 +1,14 @@ +Title: agent_ipmi_sensors: Search PATH for ipmi-sensors command +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519319399 +Class: fix + +The special agent was only searching the hard coded directories +/usr/sbin, /usr/bin, /usr/local/sbin and /usr/local/bin. Instead +of this, the special agent is now using the PATH variable of the +environment to search for this command, which also includes +environment related custom paths. diff --git a/.werks/5859 b/.werks/5859 new file mode 100644 index 0000000..c2b0834 --- /dev/null +++ b/.werks/5859 @@ -0,0 +1,10 @@ +Title: agent_ipmi_sensors: Fixed exception when using debug mode +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519320176 +Class: fix + + diff --git a/agents/special/agent_ipmi_sensors b/agents/special/agent_ipmi_sensors index 9ef158f..4410886 100755 --- a/agents/special/agent_ipmi_sensors +++ b/agents/special/agent_ipmi_sensors @@ -26,6 +26,7 @@ import os +import errno import sys import getopt import subprocess @@ -60,26 +61,10 @@ OPTIONS: with the remote host for IPMI 2.0. """ ) - -# output -# ID | Name | Type | Reading | Units | Event -# 4 | CPU Temp | Temperature | 28.00 | C | 'OK' -# 71 | System Temp | Temperature | 28.00 | C | 'OK' -# 607 | P1-DIMMC2 TEMP | Temperature | N/A | C | N/A - - -def agent_ipmi_sensors_parse_data( ipmi_sensor_data ): - for line in ipmi_sensor_data: - if line.startswith( "ID" ): - continue - else: - sys.stdout.write( "%s\n" % line ) - - -def agent_ipmi_sensors_main( cmdline_args ): - short_options = 'u:p:l:' + 'D:k:' - long_options = [ 'help', 'debug' ] + \ - [ 'quiet-cache', 'sdr-cache-recreate', 'interpret-oem-data', +def agent_ipmi_sensors_main(cmdline_args): + short_options = 'u:p:l:D:k:' + long_options = [ 'help', 'debug' + 'quiet-cache', 'sdr-cache-recreate', 'interpret-oem-data', 'output-sensor-state', 'ignore-not-available-sensors', 'driver-type=', 'output-sensor-thresholds' ] @@ -127,10 +112,6 @@ def agent_ipmi_sensors_main( cmdline_args ): elif o in [ '--output-sensor-thresholds' ]: additional_opts.append( o ) - if opt_debug: - sys.stderr.write( "DEBUG: opts are '%s'.\n" % opts + \ - "DEBUG: args are '%s'.\n" % args ) - if len(args) == 1: hostname = args[0] else: @@ -141,33 +122,52 @@ def agent_ipmi_sensors_main( cmdline_args ): sys.stderr.write( "ERROR: Credentials are missing.\n" ) sys.exit(1) - for sub_path in [ "sbin", "bin", "local/sbin", "local/bin" ]: - ipmi_cmd = [ "/usr/%s/ipmi-sensors" % sub_path, - "-h", hostname, "-u", username, - "-p", password, "-l", privilege_lvl ] + \ - additional_opts + os.environ["PATH"] = "/usr/local/sbin:/usr/sbin:/sbin:" + os.environ["PATH"] + + ipmi_cmd = [ "ipmi-sensors", + "-h", hostname, "-u", username, + "-p", password, "-l", privilege_lvl ] + \ + additional_opts + ipmi_cmd_str = subprocess.list2cmdline(ipmi_cmd) - if opt_debug: - sys.stderr.write( "DEBUG: try executing '%s'.\n" % " ".join( ipmi_cmd ) ) + if opt_debug: + sys.stderr.write("Executing: '%s'\n" % ipmi_cmd_str) + try: try: - p = subprocess.Popen( ipmi_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE ) - sensor_data, err = p.communicate() - break - except Exception, e: - err = e - if opt_debug: - sys.stderr.write( "ERROR: '%s': %s.\n" % (ipmi_cmd_str, e) ) - continue + p = subprocess.Popen(ipmi_cmd, shell=False, close_fds=True, + stdin=open(os.devnull), + stdout=subprocess.PIPE, stderr=subprocess.PIPE) + except OSError, e: + if e.errno == errno.ENOENT: # No such file or directory + raise Exception("Could not find 'ipmi-sensors' command (PATH: %s)" % + os.environ.get("PATH")) + else: + raise + + stdout, stderr = p.communicate() + except Exception, e: + sys.stderr.write("ERROR: %s\n" % (e)) + sys.exit(1) - if err: - sys.stderr.write( "ERROR: '%s'.\n" % err ) + if stderr: + sys.stderr.write("ERROR: '%s'.\n" % stderr) sys.exit(1) - else: - sys.stdout.write( "<<<ipmi_sensors:sep(124)>>>\n" ) - agent_ipmi_sensors_parse_data( sensor_data.splitlines() ) - sys.exit(0) + + # output + # ID | Name | Type | Reading | Units | Event + # 4 | CPU Temp | Temperature | 28.00 | C | 'OK' + # 71 | System Temp | Temperature | 28.00 | C | 'OK' + # 607 | P1-DIMMC2 TEMP | Temperature | N/A | C | N/A + sys.stdout.write( "<<<ipmi_sensors:sep(124)>>>\n" ) + for line in stdout.splitlines(): + if line.startswith("ID"): + continue + + sys.stdout.write( "%s\n" % line ) + + sys.exit(0) if __name__ == "__main__": - agent_ipmi_sensors_main( sys.argv[1:] ) + agent_ipmi_sensors_main(sys.argv[1:])

6 years, 4 months

IPMI is now configurable for management boards of hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: f7182a61bc166036991fb1ce3e8e78ed1438f115 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7182a61bc1660… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 16:39:31 2018 +0100 IPMI is now configurable for management boards of hosts Change-Id: I7040e28c759e9bc53e9a37369d9530c8e0ab1718 --- checkman/mgmt_ipmi_sensors | 16 ++ checks/ipmi_sensors | 180 +----------------- checks/ipmi_sensors.include | 202 +++++++++++++++++++++ checks/mgmt_ipmi_sensors | 36 ++++ cmk_base/config.py | 16 +- cmk_base/data_sources/__init__.py | 29 ++- cmk_base/data_sources/abstract.py | 47 +++++ cmk_base/data_sources/ipmi.py | 108 +++++++++++ cmk_base/data_sources/snmp.py | 48 +---- cmk_base/default_config/base.py | 1 + omd/packages/python-modules/Makefile | 2 + .../0014-make-pkyghmi-use-pycryptodomex.dif | 24 +++ .../python-modules/src/pyghmi-1.0.38.tar.gz | Bin 0 -> 143531 bytes tests/cmk_base/test_mgmt_board.py | 173 ++++++++++++------ web/htdocs/wato.py | 18 ++ web/htdocs/watolib.py | 2 + web/plugins/metrics/check_mk.py | 4 + web/plugins/wato/builtin_attributes.py | 27 ++- web/plugins/wato/check_mk_configuration.py | 1 + web/plugins/wato/datasource_programs.py | 76 ++++---- 20 files changed, 675 insertions(+), 335 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f7182a61bc…

6 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018