Checkmk git commits March 2014

checkmk-commits@lists.checkmk.com

6 participants
183 discussions

Check_MK Git: check_mk: enterasys_powersupply: fixed typo

by Bastian Kuhn

Module: check_mk Branch: master Commit: 418f3e4bf600cbd3735f1ce32c5da86feecc57b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=418f3e4bf600cb… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Mar 21 14:55:23 2014 +0100 enterasys_powersupply: fixed typo --- checks/enterasys_powersupply | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/enterasys_powersupply b/checks/enterasys_powersupply index 2c24968..0dae8f3 100644 --- a/checks/enterasys_powersupply +++ b/checks/enterasys_powersupply @@ -53,7 +53,7 @@ def check_enterasys_powersupply(item, _no_params, info): if state == '4': return 2, 'PSU installed and not operating' if redun != '1': - return 1, 'PSU %s' % redundancy_types[redyn] + return 1, 'PSU %s' % redundancy_types[redun] return 0, 'PSU working and redundant (%s)' % supply_types[typ]

10 years, 6 months

Check_MK Git: check_mk: improved scan function of enterasys checks

by Bastian Kuhn

Module: check_mk Branch: master Commit: b00707e5a682eb9bcee186420cef699a8efaa6ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b00707e5a682eb… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Mar 21 14:37:59 2014 +0100 improved scan function of enterasys checks --- checks/enterasys_cpu_util | 2 +- checks/enterasys_powersupply | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/enterasys_cpu_util b/checks/enterasys_cpu_util index 2f99fce..30c8a93 100644 --- a/checks/enterasys_cpu_util +++ b/checks/enterasys_cpu_util @@ -42,7 +42,7 @@ check_info["enterasys_cpu_util"] = { "inventory_function" : inventory_enterasys_cpu_util, "service_description" : "CPU utilization", "snmp_info" : ( ".1.3.6.1.4.1.5624.1.2.49.1.1.1.1", [ 3 ]), #util in last 1min - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.5624.2.1.169", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1"), "has_perfdata" : True, "group" : "cpu_utilization", "includes" : [ "cpu_util.include" ], diff --git a/checks/enterasys_powersupply b/checks/enterasys_powersupply index 81267fe..2c24968 100644 --- a/checks/enterasys_powersupply +++ b/checks/enterasys_powersupply @@ -62,6 +62,6 @@ check_info["enterasys_powersupply"] = { "inventory_function" : inventory_enterasys_powersupply, "service_description" : "PSU %s", "snmp_info" : ( ".1.3.6.1.4.1.52.4.3.1.2.1.1", [ OID_END, 2, 3, 4 ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.5624.2.1.169", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1"), }

10 years, 6 months

Check_MK Git: check_mk: apc_symmetra: Changed naming of Batterie Temperature to System Temerature

by Bastian Kuhn

Module: check_mk Branch: master Commit: b993f5f39a744a123d7abd9f7f963af9622f4b48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b993f5f39a744a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Mar 21 14:33:34 2014 +0100 apc_symmetra: Changed naming of Batterie Temperature to System Temerature Corse of a wrong naming in the APC MIB, the value AdvBatteryTemperature shows not the Battery Temperature but the System Temperature. Cause of the renaming also the name of the Performance value changed from battemp to systemp. If you don't want to loose that graph, you have to migrate the file to ne new name. --- .werks/145 | 13 +++++++++++++ ChangeLog | 2 ++ checkman/enterasys_cpu_util | 2 +- checks/apc_symmetra | 11 ++++++----- web/plugins/wato/check_parameters.py | 6 +++--- 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.werks/145 b/.werks/145 new file mode 100644 index 0000000..45ffff0 --- /dev/null +++ b/.werks/145 @@ -0,0 +1,13 @@ +Title: apc_symmetra: Changed naming of Batterie Temperature to System Temerature +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1395408589 +Class: incomp + +Corse of a wrong naming in the APC MIB, the value AdvBatteryTemperature shows not the Battery Temperature but the System Temperature. +Cause of the renaming also the name of the Performance value changed from battemp to systemp. If you don't want to loose that graph, you have to migrate +the file to ne new name. + + + diff --git a/ChangeLog b/ChangeLog index 56ced6a..a7e81a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,6 +121,8 @@ * 0595 dell_chassis_power, dell_chassis_powersupplies: new checks for Dell Poweredge Chassis Ppower consumption... * 0596 dell_chassis_status, dell_chassis_temp, dell_chassis_kvm, dell_chassis_io, dell_chassis_fans: new checks to monitor the overall status of various sections of the Dell Poweredge Chassis via CMC * 0597 dell_chassis_slots: new check to monitor the status of the blade slots of the Dell Poweredge Blade Servers + * 0145 apc_symmetra: Changed naming of Batterie Temperature to System Temerature... + NOTE: Please refer to the migration notes! * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/enterasys_cpu_util b/checkman/enterasys_cpu_util index 184d140..b8c19fe 100644 --- a/checkman/enterasys_cpu_util +++ b/checkman/enterasys_cpu_util @@ -4,7 +4,7 @@ catalog: hw/network/enterasys license: GPL distribution: check_mk description: - This check shows the current cpu utilization of a casa module + This check shows the current average cpu utilization of all plugged-in CPU modules. inventory: diff --git a/checks/apc_symmetra b/checks/apc_symmetra index aa56584..7570ef5 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -91,7 +91,7 @@ def check_apc(item, params, info): params = { "levels": params } # new format with up to 6 params in dict - crit_capacity, crit_batt_temp, crit_batt_curr, crit_voltage = params['levels'] + crit_capacity, crit_sys_temp, crit_batt_curr, crit_voltage = params['levels'] if params.get("post_calibration_levels"): delay_after_test = params['post_calibration_levels']['additional_time_span'] alt_crit_capacity = params['post_calibration_levels']['altcapacity'] @@ -146,14 +146,15 @@ def check_apc(item, params, info): single_states.append( (state, infotxt, ("capacity", AdvBatteryCapacity, "", crit_capacity, 0, 100)) ) - # 4. Check battery temperature - infotxt = "bat. temp. %dC" % AdvBatteryTemperature - if AdvBatteryTemperature >= crit_batt_temp: + # 4. Check System temperature + # The Name AdvBatteryTemperature is a wrong naming in the vendor mib. + infotxt = "sys. temp. %dC" % AdvBatteryTemperature + if AdvBatteryTemperature >= crit_sys_temp: state = 2 infotxt += "(!!)" else: state = 0 - single_states.append( (state, infotxt, ("battemp", AdvBatteryTemperature, "", crit_batt_temp) ) ) + single_states.append( (state, infotxt, ("systemp", AdvBatteryTemperature, "", crit_sys_temp) ) ) # 5. Check battery current infotxt = "bat. curr. %dA" % AdvBatteryCurrent diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index ce53f00..672927d 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3899,10 +3899,10 @@ register_check_parameters( unit = "%", default_value = 95, ), Integer( - title = _("Critical Battery Temperature"), - help = _("The critical temperature of the battery"), + title = _("Critical System Temperature"), + help = _("The critical temperature of the System"), unit = _("C"), - default_value = 40, + default_value = 55, ), Integer( title = _("Critical Battery Current"),

10 years, 6 months

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 12f324a97a0defa6dac4efcd6eba10e401c726f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12f324a97a0def… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Mar 21 14:34:03 2014 +0100 merge conflict ---

10 years, 6 months

Check_MK Git: check_mk: resource file: Fixed version calculation for daily builds

by Lars Michelsen

Module: check_mk Branch: master Commit: 309bc055d22c0013242e9c3787049fbd6afb6ff1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=309bc055d22c00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 21 14:31:04 2014 +0100 resource file: Fixed version calculation for daily builds --- agents/windows/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index a45d54c..14c9288 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -69,6 +69,7 @@ check_mk_agent-64.res: check_mk_agent.rc check_mk_agent.rc: check_mk_agent.rc.in V=$(VERSION) ; V=$${V//./, } ; V=$${V//i/, 1} ; V=$${V//b/, 2} ; \ + if [ $${#V} -eq 12 ]; then V+=", 0"; fi ; \ sed "s/%VERSION%/$(VERSION)/g;s/%YEAR%/$$(date +%Y)/g" check_mk_agent.rc.in > check_mk_agent.rc ; \ sed -i "s/%PVERSION%/$$V/g" check_mk_agent.rc

10 years, 6 months

Check_MK Git: check_mk: The windows agent contains meta information about version, manufacturer etc.

by Lars Michelsen

Module: check_mk Branch: master Commit: 9d9d169cce2524a2af96831181863b028b44f2b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d9d169cce2524… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 21 14:18:05 2014 +0100 The windows agent contains meta information about version, manufacturer etc. The windows agent exe files do contain meta information like product name, manufacturer, version etc. now. This might be useful for some software distribution systems. --- .werks/760 | 9 ++++++ ChangeLog | 1 + Makefile | 1 + agents/windows/.gitignore | 2 ++ agents/windows/Makefile | 30 +++++++++++++++----- agents/windows/check_mk_agent-64.exe | Bin 190464 -> 226816 bytes agents/windows/check_mk_agent.exe | Bin 160768 -> 175104 bytes .../windows/{installer.ico => check_mk_agent.ico} | Bin 12862 -> 12862 bytes agents/windows/check_mk_agent.rc.in | 29 +++++++++++++++++++ agents/windows/installer-64.nsi | 2 +- agents/windows/installer.nsi | 2 +- 11 files changed, 67 insertions(+), 9 deletions(-) diff --git a/.werks/760 b/.werks/760 new file mode 100644 index 0000000..fb45d99 --- /dev/null +++ b/.werks/760 @@ -0,0 +1,9 @@ +Title: The windows agent contains meta information about version, manufacturer etc. +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1395407804 +Class: feature + +The windows agent exe files do contain meta information like product name, manufacturer, +version etc. now. This might be useful for some software distribution systems. diff --git a/ChangeLog b/ChangeLog index fbe857f..0abb405 100644 --- a/ChangeLog +++ b/ChangeLog @@ -122,6 +122,7 @@ * 0596 dell_chassis_status, dell_chassis_temp, dell_chassis_kvm, dell_chassis_io, dell_chassis_fans: new checks to monitor the overall status of various sections of the Dell Poweredge Chassis via CMC * 0597 dell_chassis_slots: new check to monitor the status of the blade slots of the Dell Poweredge Blade Servers * 0759 check_notify_count: New active check to monitor the number of notifications sent to contacts... + * 0760 The windows agent contains meta information about version, manufacturer etc.... * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/Makefile b/Makefile index bceb8ca..658c7a4 100644 --- a/Makefile +++ b/Makefile @@ -156,6 +156,7 @@ setversion: sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' agents/check_mk_agent.openvms sed -i 's/#define CHECK_MK_VERSION .*/#define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/check_mk_agent.cc ; \ sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer.nsi ; \ + sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" agents/windows/Makefile ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' mkeventd/bin/mkeventd ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' doc/treasures/mknotifyd ; \ diff --git a/agents/windows/.gitignore b/agents/windows/.gitignore index ea9deef..1f6815e 100644 --- a/agents/windows/.gitignore +++ b/agents/windows/.gitignore @@ -2,3 +2,5 @@ check_mk.ini logstate.txt spool success.log +*.res +*.rc diff --git a/agents/windows/Makefile b/agents/windows/Makefile index bc4984f..a45d54c 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -22,9 +22,14 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +SHELL = /bin/bash +VERSION = 1.2.5i1 +WINDRES = i586-mingw32msvc-windres + ifeq ($(shell uname),Linux) - CXX = echo -e "\n\nWARNING: MinGW under Linux is broken! Use at your own risk!\n\n" ; i586-mingw32msvc-g++ - CXX_64 = x86_64-w64-mingw32-g++ + CXX = echo -e "\n\nWARNING: MinGW under Linux is broken! Use at your own risk!\n\n" ; i586-mingw32msvc-g++ + CXX_64 = x86_64-w64-mingw32-g++ + WINDRES_64 = x86_64-w64-mingw32-windres else CXX = mingw32-g++ endif @@ -50,11 +55,22 @@ install_agent-64.exe: check_mk_agent-64.exe crash.exe nowin.exe makensis installer-64.nsi chmod +x install_agent-64.exe -check_mk_agent.exe: check_mk_agent.cc Makefile - $(CXX) -s -O2 -Wall -Werror -o $@ $< -static -lwsock32 +check_mk_agent.exe: check_mk_agent.cc Makefile check_mk_agent.res + $(CXX) -s -O2 -Wall -Werror -o $@ $< -static -lwsock32 check_mk_agent.res + +check_mk_agent-64.exe: check_mk_agent.cc Makefile check_mk_agent-64.res + $(CXX_64) -s -O2 -Wall -Werror -o $@ $< -static -lwsock32 check_mk_agent-64.res + +check_mk_agent.res: check_mk_agent.rc + $(WINDRES) $< -O coff -o $@ + +check_mk_agent-64.res: check_mk_agent.rc + $(WINDRES_64) $< -O coff -o $@ -check_mk_agent-64.exe: check_mk_agent.cc Makefile - $(CXX_64) -s -O2 -Wall -Werror -o $@ $< -static -lwsock32 +check_mk_agent.rc: check_mk_agent.rc.in + V=$(VERSION) ; V=$${V//./, } ; V=$${V//i/, 1} ; V=$${V//b/, 2} ; \ + sed "s/%VERSION%/$(VERSION)/g;s/%YEAR%/$$(date +%Y)/g" check_mk_agent.rc.in > check_mk_agent.rc ; \ + sed -i "s/%PVERSION%/$$V/g" check_mk_agent.rc crash.exe: crash.cc Makefile $(CXX) -o $@ $< @@ -63,7 +79,7 @@ nowin.exe: nowin.cc Makefile $(CXX) -o $@ $< clean: - rm -f *.o *~ svn-*.tmp + rm -f *.o *~ svn-*.tmp *.rc *.res mrproper: clean rm -f *.exe diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index d8cc2e4..85683b7 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 9cccad6..f3658e2 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/installer.ico b/agents/windows/check_mk_agent.ico similarity index 100% rename from agents/windows/installer.ico rename to agents/windows/check_mk_agent.ico diff --git a/agents/windows/check_mk_agent.rc.in b/agents/windows/check_mk_agent.rc.in new file mode 100644 index 0000000..574c34b --- /dev/null +++ b/agents/windows/check_mk_agent.rc.in @@ -0,0 +1,29 @@ +1 VERSIONINFO +FILEVERSION %PVERSION% +PRODUCTVERSION %PVERSION% +FILEFLAGSMASK 0 +FILEOS 0x4 +FILETYPE 0x2 +{ + BLOCK "StringFileInfo" + { + BLOCK "040904b0" + { + VALUE "CompanyName", "Mathias Kettner GmbH" + VALUE "FileDescription", "Check_MK Agent" + VALUE "FileVersion", "%VERSION%" + VALUE "InternalName", "check_mk_agent" + VALUE "LegalCopyright", "%YEAR% Mathias Kettner GmbH" + VALUE "OriginalFilename", "check_mk_agent.exe" + VALUE "ProductName", "Check_MK Agent" + VALUE "ProductVersion", "%VERSION%" + VALUE "Comments", "Check_MK Monitoring Agent" + } + } + BLOCK "VarFileInfo" + { + VALUE "Translation", 0x0409, 0x04B0 + } +} + +AppIcon ICON "check_mk_agent.ico" diff --git a/agents/windows/installer-64.nsi b/agents/windows/installer-64.nsi index 5a6a851..83b8705 100644 --- a/agents/windows/installer-64.nsi +++ b/agents/windows/installer-64.nsi @@ -8,7 +8,7 @@ !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on -Icon "installer.ico" +Icon "check_mk_agent.ico" ; The name of the installer Name "${NAME}" diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index 750d0b1..0be28bb 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -8,7 +8,7 @@ !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on -Icon "installer.ico" +Icon "check_mk_agent.ico" ; The name of the installer Name "${NAME}"

10 years, 6 months

Check_MK Git: check_mk: dell_...: fix missing scan functions

by Mathias Kettner

Module: check_mk Branch: master Commit: 99df7f5fac44b78139f7e79c6b213daf21a8f373 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99df7f5fac44b7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 21 13:49:53 2014 +0100 dell_...: fix missing scan functions --- checks/dell_chassis_fans | 2 +- checks/dell_chassis_io | 2 +- checks/dell_chassis_kvm | 2 +- checks/dell_chassis_power | 2 +- checks/dell_chassis_powersupplies | 2 +- checks/dell_chassis_slots | 2 +- checks/dell_chassis_status | 2 +- checks/dell_chassis_temp | 2 +- checks/dell_poweredge_amperage | 4 ++-- checks/dell_poweredge_cpu | 2 +- checks/dell_poweredge_mem | 2 +- checks/dell_poweredge_netdev | 2 +- checks/dell_poweredge_pci | 2 +- checks/dell_poweredge_status | 2 +- checks/dell_poweredge_temp | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/checks/dell_chassis_fans b/checks/dell_chassis_fans index bcfb83e..4bb9b92 100644 --- a/checks/dell_chassis_fans +++ b/checks/dell_chassis_fans @@ -56,6 +56,6 @@ check_info["dell_chassis_fans"] = { "service_description" : "Overall Fan Status", "has_perfdata" : False, "snmp_info" : dell_chassis_fans_info, - "snmp_scan" : dell_chassis_fans_scan, + "snmp_scan_function" : dell_chassis_fans_scan, } diff --git a/checks/dell_chassis_io b/checks/dell_chassis_io index f343f12..fa9669b 100644 --- a/checks/dell_chassis_io +++ b/checks/dell_chassis_io @@ -56,6 +56,6 @@ check_info["dell_chassis_io"] = { "service_description" : "Overall IO Module Status", "has_perfdata" : False, "snmp_info" : dell_chassis_io_info, - "snmp_scan" : dell_chassis_io_scan, + "snmp_scan_function" : dell_chassis_io_scan, } diff --git a/checks/dell_chassis_kvm b/checks/dell_chassis_kvm index 7dab1cc..f5ba5b9 100644 --- a/checks/dell_chassis_kvm +++ b/checks/dell_chassis_kvm @@ -59,6 +59,6 @@ check_info["dell_chassis_kvm"] = { "service_description" : "Overall KVM Status", "has_perfdata" : False, "snmp_info" : dell_chassis_kvm_info, - "snmp_scan" : dell_chassis_kvm_scan, + "snmp_scan_function" : dell_chassis_kvm_scan, } diff --git a/checks/dell_chassis_power b/checks/dell_chassis_power index 3a0f454..9dcd067 100644 --- a/checks/dell_chassis_power +++ b/checks/dell_chassis_power @@ -63,6 +63,6 @@ check_info["dell_chassis_power"] = { "service_description" : "Chassis Power", "has_perfdata" : True, "snmp_info" : dell_chassis_power_info, - "snmp_scan" : dell_chassis_power_scan, + "snmp_scan_function" : dell_chassis_power_scan, } diff --git a/checks/dell_chassis_powersupplies b/checks/dell_chassis_powersupplies index 13b1b22..5f8b61a 100644 --- a/checks/dell_chassis_powersupplies +++ b/checks/dell_chassis_powersupplies @@ -63,6 +63,6 @@ check_info["dell_chassis_powersupplies"] = { "service_description" : "Power Supply %s", "has_perfdata" : True, "snmp_info" : dell_chassis_powersupplies_info, - "snmp_scan" : dell_chassis_powersupplies_scan, + "snmp_scan_function" : dell_chassis_powersupplies_scan, } diff --git a/checks/dell_chassis_slots b/checks/dell_chassis_slots index dda58f2..6702c16 100644 --- a/checks/dell_chassis_slots +++ b/checks/dell_chassis_slots @@ -69,6 +69,6 @@ check_info["dell_chassis_slots"] = { "service_description" : "Slot %s", "has_perfdata" : False, "snmp_info" : dell_chassis_slots_info, - "snmp_scan" : dell_chassis_slots_scan, + "snmp_scan_function" : dell_chassis_slots_scan, } diff --git a/checks/dell_chassis_status b/checks/dell_chassis_status index fee1df6..c1dc6a4 100644 --- a/checks/dell_chassis_status +++ b/checks/dell_chassis_status @@ -66,6 +66,6 @@ check_info["dell_chassis_status"] = { "service_description" : "Chassis Health", "has_perfdata" : False, "snmp_info" : dell_chassis_status_info, - "snmp_scan" : dell_chassis_status_scan, + "snmp_scan_function" : dell_chassis_status_scan, } diff --git a/checks/dell_chassis_temp b/checks/dell_chassis_temp index 1d056b2..0e75357 100644 --- a/checks/dell_chassis_temp +++ b/checks/dell_chassis_temp @@ -79,6 +79,6 @@ check_info["dell_chassis_temp"] = { "has_perfdata" : True, "group" : "hw_temperature", "snmp_info" : dell_chassis_temp_info, - "snmp_scan" : dell_chassis_temp_scan, + "snmp_scan_function" : dell_chassis_temp_scan, } diff --git a/checks/dell_poweredge_amperage b/checks/dell_poweredge_amperage index e31a561..0a6e1a8 100644 --- a/checks/dell_poweredge_amperage +++ b/checks/dell_poweredge_amperage @@ -106,7 +106,7 @@ check_info["dell_poweredge_amperage.power"] = { "service_description" : "%s", "has_perfdata" : True, "snmp_info" : dell_poweredge_amperage_info, - "snmp_scan" : dell_poweredge_amperage_scan, + "snmp_scan_function" : dell_poweredge_amperage_scan, } #check_info["dell_poweredge_amperage.current"] = { @@ -115,5 +115,5 @@ check_info["dell_poweredge_amperage.power"] = { # "service_description" : "%s", # "has_perfdata" : True, # "snmp_info" : dell_poweredge_amperage_info, -# "snmp_scan" : dell_poweredge_amperage_scan, +# "snmp_scan_function" : dell_poweredge_amperage_scan, #} diff --git a/checks/dell_poweredge_cpu b/checks/dell_poweredge_cpu index 2168a67..677de65 100644 --- a/checks/dell_poweredge_cpu +++ b/checks/dell_poweredge_cpu @@ -78,6 +78,6 @@ check_info["dell_poweredge_cpu"] = { "service_description" : "%s", "has_perfdata" : False, "snmp_info" : dell_poweredge_cpu_info, - "snmp_scan" : dell_poweredge_cpu_scan, + "snmp_scan_function" : dell_poweredge_cpu_scan, } diff --git a/checks/dell_poweredge_mem b/checks/dell_poweredge_mem index 083fefd..5092e60 100644 --- a/checks/dell_poweredge_mem +++ b/checks/dell_poweredge_mem @@ -82,6 +82,6 @@ check_info["dell_poweredge_mem"] = { "service_description" : "%s", "has_perfdata" : False, "snmp_info" : dell_poweredge_mem_info, - "snmp_scan" : dell_poweredge_mem_scan, + "snmp_scan_function" : dell_poweredge_mem_scan, } diff --git a/checks/dell_poweredge_netdev b/checks/dell_poweredge_netdev index 687a901..bccba96 100644 --- a/checks/dell_poweredge_netdev +++ b/checks/dell_poweredge_netdev @@ -92,6 +92,6 @@ check_info["dell_poweredge_netdev"] = { "service_description" : "%s", "has_perfdata" : False, "snmp_info" : dell_poweredge_netdev_info, - "snmp_scan" : dell_poweredge_netdev_scan, + "snmp_scan_function" : dell_poweredge_netdev_scan, } diff --git a/checks/dell_poweredge_pci b/checks/dell_poweredge_pci index f6a90c2..f94e580 100644 --- a/checks/dell_poweredge_pci +++ b/checks/dell_poweredge_pci @@ -75,6 +75,6 @@ check_info["dell_poweredge_pci"] = { "service_description" : "PCI %s", "has_perfdata" : False, "snmp_info" : dell_poweredge_pci_info, - "snmp_scan" : dell_poweredge_pci_scan, + "snmp_scan_function" : dell_poweredge_pci_scan, } diff --git a/checks/dell_poweredge_status b/checks/dell_poweredge_status index c3cd7ff..adf93b9 100644 --- a/checks/dell_poweredge_status +++ b/checks/dell_poweredge_status @@ -65,6 +65,6 @@ check_info["dell_poweredge_status"] = { "service_description" : "PowerEdge Health", "has_perfdata" : False, "snmp_info" : dell_poweredge_status_info, - "snmp_scan" : dell_poweredge_status_scan, + "snmp_scan_function" : dell_poweredge_status_scan, } diff --git a/checks/dell_poweredge_temp b/checks/dell_poweredge_temp index 0790493..1a661f9 100644 --- a/checks/dell_poweredge_temp +++ b/checks/dell_poweredge_temp @@ -88,6 +88,6 @@ check_info["dell_poweredge_temp"] = { "service_description" : "%s", "has_perfdata" : True, "snmp_info" : dell_poweredge_temp_info, - "snmp_scan" : dell_poweredge_temp_scan, + "snmp_scan_function" : dell_poweredge_temp_scan, }

10 years, 6 months

Check_MK Git: check_mk: make check handle situation when networkDeviceConnectionStatus is not available

by Götz Golla

Module: check_mk Branch: master Commit: a3fc9df54921f1501cc0444219bd5d2dfaa7c76d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3fc9df54921f1… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Mar 21 12:51:59 2014 +0100 make check handle situation when networkDeviceConnectionStatus is not available --- checks/dell_poweredge_netdev | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/checks/dell_poweredge_netdev b/checks/dell_poweredge_netdev index 687a901..81e9b96 100644 --- a/checks/dell_poweredge_netdev +++ b/checks/dell_poweredge_netdev @@ -65,22 +65,22 @@ def check_dell_poweredge_netdev(item, _no_params, info): "6" : ( "NonRecoverable,", 2 ), } connection_table = { - "1" : ( "connected", 0 ), - "2" : ( "disconnected", 2 ), - "3" : ( "driverBad", 2 ), - "4" : ( "driverDisabled", 2 ), - "10" : ( "hardwareInitializing", 2 ), - "11" : ( "hardwareResetting", 2 ), - "12" : ( "hardwareClosing", 2 ), - "13" : ( "hardwareNotReady", 2 ), + "1" : ( "connected, ", 0 ), + "2" : ( "disconnected, ", 2 ), + "3" : ( "driverBad, ", 2 ), + "4" : ( "driverDisabled, ", 2 ), + "10" : ( "hardwareInitializing, ", 2 ), + "11" : ( "hardwareResetting, ", 2 ), + "12" : ( "hardwareClosing, ", 2 ), + "13" : ( "hardwareNotReady, ", 2 ), } dev_state_txt, dev_state = state_table.get(status, ( "unknown device status,", 2 )) - conn_state_txt, conn_state = connection_table.get(connection_status, ( "unknown connection status", 1 )) + conn_state_txt, conn_state = connection_table.get(connection_status, ( "", 0 )) state = max(dev_state, conn_state) infotext = "%s %s" % (dev_state_txt, conn_state_txt) for parameter, value in di.items(): - infotext += ", %s: %s" % ( parameter, value ) - infotext = re.sub("^, ","", infotext) + infotext += "%s: %s, " % ( parameter, value ) + infotext = re.sub(", $","", infotext) return state, infotext

10 years, 6 months

Check_MK Git: check_mk: Fixed code formatting in WATO plugin

by Mathias Kettner

Module: check_mk Branch: master Commit: f98e350888c0bcf2a8149ee8090857b70063cc89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f98e350888c0bc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 21 12:35:36 2014 +0100 Fixed code formatting in WATO plugin --- web/plugins/wato/active_checks.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index a4515e1..67e8f04 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -88,8 +88,8 @@ register_rule(group, default_value = "PING", )) ] + check_icmp_params, - match = "all", - ) + ), + match = "all", ) register_rule(group, @@ -157,7 +157,8 @@ register_rule(group, ]), forth = lambda x: type(x) == tuple and x[1] or x, title = _("Check FTP Service"), - ) + ), + match = "all", ) @@ -223,7 +224,8 @@ register_rule(group, ]), ] ), - match = 'all') + match = 'all' +) register_rule(group, "active_checks:sql", @@ -321,7 +323,8 @@ register_rule(group, ) ] ), - match = 'all') + match = 'all' +) register_rule(group, "active_checks:tcp", @@ -462,7 +465,8 @@ register_rule(group, ]), ] ), - match = 'all') + match = 'all' +) register_rule(group, @@ -758,7 +762,8 @@ register_rule(group, ), ] ), - match = 'all') + match = 'all' +) register_rule(group, "active_checks:ldap", @@ -1003,7 +1008,8 @@ register_rule(group, ) ), ]) - ]), + ] + ), match = 'all' ) @@ -1068,7 +1074,8 @@ register_rule(group, ], required_keys = [ "share", "levels" ], ), - match = 'all') + match = 'all' +) def PluginCommandLine(addhelp = ""): return TextAscii(

10 years, 6 months

Check_MK Git: check_mk: INV: fixed rule for active check,

by Mathias Kettner

condition now works Message-ID: <532c240b.uh1+ckMDecUvp4fv%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: c03876e2c762fffaa2c818b7ff918fc33aaa8edd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c03876e2c762ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 21 12:35:23 2014 +0100 INV: fixed rule for active check, condition now works --- web/plugins/wato/inventory.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/plugins/wato/inventory.py b/web/plugins/wato/inventory.py index 559ba57..c5c10c1 100644 --- a/web/plugins/wato/inventory.py +++ b/web/plugins/wato/inventory.py @@ -31,7 +31,7 @@ group = "inventory" register_rule(group, "active_checks:cmk_inv", - None, # Currently no parameters + FixedValue(None, totext = _("No configuration neccessary")), title = _("Do hardware/software Inventory"), help = _("All hosts configured via this ruleset will do a hardware and " "software inventory. For each configured host a new active check " @@ -41,6 +41,7 @@ register_rule(group, "<b>Note:</b> in order to get any useful " "result for agent based hosts make sure that you have installed " "the agent plugin <tt>mk_inventory</tt> on these hosts."), + match = "all", ) register_rule(group,

10 years, 6 months

← Newer
1
...
5
6
7
8
9
10
11
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2014