Checkmk git commits February 2014

checkmk-commits@lists.checkmk.com

6 participants
141 discussions

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 9b8ab2af3e71abcb6ec5c991cb38594c6a4490c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b8ab2af3e71ab… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 6 16:02:54 2014 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 9ed20bf..ea5a0a5 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -708 +718

10 years, 7 months

Check_MK Git: check_mk: FIX Minimum port for the mknotifyd is now 1024 ( never use well known ports)

by Lars Michelsen

Module: check_mk Branch: master Commit: 3018ef0f48e139a0e7cc77852c8b79680982ea40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3018ef0f48e139… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 6 16:01:37 2014 +0100 FIX Minimum port for the mknotifyd is now 1024 (never use well known ports) This limitation has been added to prevent permission problem errors and mixups with other running services on a host. --- .werks/666 | 9 +++++++++ ChangeLog | 1 + web/plugins/wato/mknotifyd.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/666 b/.werks/666 new file mode 100644 index 0000000..0946ce6 --- /dev/null +++ b/.werks/666 @@ -0,0 +1,9 @@ +Title: Minimum port for the mknotifyd is now 1024 (never use well known ports) +Level: 1 +Component: wato +Version: 1.2.5i1 +Date: 1391698838 +Class: fix + +This limitation has been added to prevent permission problem errors and mixups +with other running services on a host. diff --git a/ChangeLog b/ChangeLog index 8694e36..5a68ab2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -261,6 +261,7 @@ * 0271 FIX: Fixed sorting in duallist element (two lists with interchangable elements)... * 0131 FIX: Error rates for network interfaces can now be set smaller then 0.1 when using Wato.... * 0690 FIX: Fix language jumping to German when saving user profiles + * 0666 FIX: Minimum port for the mknotifyd is now 1024 (never use well known ports)... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/plugins/wato/mknotifyd.py b/web/plugins/wato/mknotifyd.py index 9732b20..8694909 100644 --- a/web/plugins/wato/mknotifyd.py +++ b/web/plugins/wato/mknotifyd.py @@ -61,7 +61,7 @@ if mknotifyd_enabled: ), Integer( title = _("TCP port"), - minvalue = 1, + minvalue = 1024, maxvalue = 65535, default_value = 6555, ), @@ -102,7 +102,7 @@ if mknotifyd_enabled: "notification_daemon_listen_port", Optional( Integer( - minvalue = 1, + minvalue = 1024, maxvalue = 65535, default_value = 6555, ),

10 years, 7 months

Check_MK Git: check_mk: wut_webtherm: Support new versions of WUT-Thermometer

by Mathias Kettner

Module: check_mk Branch: master Commit: 77eb8361584548dbed19b0bc496e0f2366139be1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77eb8361584548… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 6 16:00:03 2014 +0100 wut_webtherm: Support new versions of WUT-Thermometer Now also support devices with OID 18. --- .werks/694 | 9 +++++++++ ChangeLog | 1 + checks/wut_webtherm | 7 ++++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/694 b/.werks/694 new file mode 100644 index 0000000..bfaa36e --- /dev/null +++ b/.werks/694 @@ -0,0 +1,9 @@ +Title: wut_webtherm: Support new versions of WUT-Thermometer +Level: 1 +Component: checks +Class: feature +State: unknown +Version: 1.2.5i1 +Date: 1391698766 + +Now also support devices with OID 18. diff --git a/ChangeLog b/ChangeLog index 8694e36..005fb67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,7 @@ * 0700 arcserve_backup: new check for status of backups in an Arcserve Backup Server * 0580 emc_datadomain_fans, emc_datadomain_nvbat, emc_datadomain_power, emc_datadomain_temps: new hardware checks for EMC Datadomain * 0691 Solaris agent: include lofs in list of monitored filesystem types + * 0694 wut_webtherm: Support new versions of WUT-Thermometer... * 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/checks/wut_webtherm b/checks/wut_webtherm index 445479a..fdcbb07 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -27,7 +27,7 @@ wut_webtherm_defaultlevels = (30, 35) def inventory_webtherm(info): - # line[0] is 1.1, 2.1, 3.1, 6.1, 8.1 or 16.1 depending on MIB variant. We chop + # line[0] is 1.1, 2.1, 3.1, 6.1, 8.1, 16.1 or 18.1 depending on MIB variant. We chop # of the first part in order to get independent of that. return [ (line[0].split(".")[1], "wut_webtherm_defaultlevels") for line in info if len(line) == 2 ] @@ -56,7 +56,8 @@ def detect_webtherm(oid): ".1.3.6.1.4.1.5040.1.2.7", ".1.3.6.1.4.1.5040.1.2.8", ".1.3.6.1.4.1.5040.1.2.9", - ".1.3.6.1.4.1.5040.1.2.16" ] + ".1.3.6.1.4.1.5040.1.2.16", + ".1.3.6.1.4.1.5040.1.2.18" ] check_info["wut_webtherm"] = { 'check_function': check_webtherm, @@ -64,7 +65,7 @@ check_info["wut_webtherm"] = { 'service_description': 'Thermograph Sensor %s', 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.5040.1.2', - ['1', '2', '3', '6', '7', '8', '9', '16'], + ['1', '2', '3', '6', '7', '8', '9', '16', '18'], ['1.2.1.1', '1.3.1.1'] ), 'snmp_scan_function': detect_webtherm,

10 years, 7 months

Check_MK Git: check_mk: FIX hpux_lvm: avoid problem when alternative vgdisplay is installed

by Mathias Kettner

Module: check_mk Branch: master Commit: 20b58646110fac09d102a605a9051ccb97883ca7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20b58646110fac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 6 14:32:27 2014 +0100 FIX hpux_lvm: avoid problem when alternative vgdisplay is installed The agent now uses <tt>/sbin/vgdisplay</tt>. That avoids an invalid output in case an alternative version of the command is installed e.g. in <tt>/usr/bin</tt>. --- .werks/693 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.hpux | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/693 b/.werks/693 new file mode 100644 index 0000000..a9ae7ed --- /dev/null +++ b/.werks/693 @@ -0,0 +1,10 @@ +Title: hpux_lvm: avoid problem when alternative vgdisplay is installed +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1391693475 + +The agent now uses <tt>/sbin/vgdisplay</tt>. That avoids an invalid output +in case an alternative version of the command is installed e.g. in <tt>/usr/bin</tt>. diff --git a/ChangeLog b/ChangeLog index 6f61f04..8694e36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -162,6 +162,7 @@ * 0689 FIX: postgres_sessions: fix empty agent section in case of 0 sessions... * 0579 FIX: veeam_client: fix for case when no StopTime section in agent output * 0692 FIX: fileinfo: Avoid duplicate entries in Solaris agent... + * 0693 FIX: hpux_lvm: avoid problem when alternative vgdisplay is installed... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 35a1876..9f49eaa 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -93,7 +93,7 @@ done # Logical Volume Manager echo '<<<hpux_lvm:sep(58)>>>' -vgdisplay -v -F +/sbin/vgdisplay -v -F # Multipathing echo '<<<hpux_multipath>>>'

10 years, 7 months

Check_MK Git: check_mk: FIX fileinfo: Avoid duplicate entries in Solaris agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 0479245f5e8314afd471fb6450529aee3e879b7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0479245f5e8314… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 6 12:56:19 2014 +0100 FIX fileinfo: Avoid duplicate entries in Solaris agent If due to redundant patterns files would be listed twice, the duplicates are now correctly suppressed. --- .werks/692 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/692 b/.werks/692 new file mode 100644 index 0000000..538021d --- /dev/null +++ b/.werks/692 @@ -0,0 +1,10 @@ +Title: fileinfo: Avoid duplicate entries in Solaris agent +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1391687738 + +If due to redundant patterns files would be listed twice, the duplicates +are now correctly suppressed. diff --git a/ChangeLog b/ChangeLog index 3eaa2b0..6f61f04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -161,6 +161,7 @@ * 0578 FIX: zypper: check is always registered as soon as mk_zypper plugin detects zypper tool... * 0689 FIX: postgres_sessions: fix empty agent section in case of 0 sessions... * 0579 FIX: veeam_client: fix for case when no StopTime section in agent output + * 0692 FIX: fileinfo: Avoid duplicate entries in Solaris agent... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 0469809..ef03a60 100644 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -231,7 +231,7 @@ if [ -f "$MK_CONFDIR/fileinfo.cfg" ] then echo '<<<fileinfo:sep(124)>>>' /usr/bin/perl -e 'print time."\n"' - ls $(cat "$MK_CONFDIR/fileinfo.cfg") | \ + ls $(cat "$MK_CONFDIR/fileinfo.cfg") | sort -u | \ /usr/bin/perl -e ' while(my $file = <>) { $file =~ s/\n$//;

10 years, 7 months

Check_MK Git: check_mk: Solaris agent: include lofs in list of monitored filesystem types

by Mathias Kettner

Module: check_mk Branch: master Commit: 6f506d8ca4787321f1d8d410173e384a15a3c174 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f506d8ca47873… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 6 12:40:36 2014 +0100 Solaris agent: include lofs in list of monitored filesystem types --- .werks/691 | 8 ++++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 6 +++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.werks/691 b/.werks/691 new file mode 100644 index 0000000..4401bd1 --- /dev/null +++ b/.werks/691 @@ -0,0 +1,8 @@ +Title: Solaris agent: include lofs in list of monitored filesystem types +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1391686794 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 929d70e..3eaa2b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,7 @@ * 0697 check_dns: allow to specify multiple expected answers * 0700 arcserve_backup: new check for status of backups in an Arcserve Backup Server * 0580 emc_datadomain_fans, emc_datadomain_nvbat, emc_datadomain_power, emc_datadomain_temps: new hardware checks for EMC Datadomain + * 0691 Solaris agent: include lofs in list of monitored filesystem types * 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/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 90f058e..0469809 100644 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -51,8 +51,8 @@ fi function file_age() { /usr/bin/perl -e 'if (! -f $ARGV[0]){die "0000000"};$mtime=(stat($ARGV[0]))[9];print ($^T-$mtime);' "$1" } - - + + # Runs a command asynchronous by use of a cache file @@ -110,7 +110,7 @@ fi # Filesystem usage for UFS and VXFS echo '<<<df>>>' -for fs in ufs vxfs samfs +for fs in ufs vxfs samfs lofs do df -l -k -F $fs 2>/dev/null | sed 1d | \ while read Filesystem kbytes used avail capacity Mountedon

10 years, 7 months

Check_MK Git: check_mk: New option to use expect string in response heads for check_http in wato

by Bastian Kuhn

Module: check_mk Branch: master Commit: cd2b24a9951f9db70aaa12add18b7026f6b475d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd2b24a9951f9d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Feb 6 11:00:50 2014 +0100 New option to use expect string in response heads for check_http in wato The parameter -d from check_http (String to expect in the response headers) can now be set via wato. --- .werks/134 | 10 ++++++++++ ChangeLog | 3 ++- checks/check_http | 3 +++ web/plugins/wato/active_checks.py | 5 +++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/134 b/.werks/134 new file mode 100644 index 0000000..394238b --- /dev/null +++ b/.werks/134 @@ -0,0 +1,10 @@ +Title: New option to use expect string in response heads for check_http in wato +Level: 1 +Component: wato +Version: 1.2.5i1 +Date: 1391680748 +Class: feature + +The parameter -d from check_http (String to expect in the response headers) can now be set via wato. + + diff --git a/ChangeLog b/ChangeLog index 975b7f8..929d70e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,8 +81,8 @@ * 0699 emc_isilon_iops: New check for Disk Operations per Second (IOPS) in EMC Isilon Storage * 0132 New checks fjdarye101_disks fjdarye101_rluns: Fujitsu Storage Systems with 2013 Firmware * 0697 check_dns: allow to specify multiple expected answers - * 0580 emc_datadomain_fans, emc_datadomain_nvbat, emc_datadomain_power, emc_datadomain_temps: new hardware checks for EMC Datadomain * 0700 arcserve_backup: new check for status of backups in an Arcserve Backup Server + * 0580 emc_datadomain_fans, emc_datadomain_nvbat, emc_datadomain_power, emc_datadomain_temps: new hardware checks for EMC Datadomain * 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... @@ -218,6 +218,7 @@ * 0685 Distributed WATO now disabled WATO on slave sites per default... * 0687 New summary pages with all settings of a host or service... * 0275 WATO "Notify Users" feature: Improved confirmation info... + * 0134 New option to use expect string in response heads for check_http in wato... * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... * 0241 FIX: Improved sorting of WATO folders in dropdown menu... * 0019 FIX: Fixed wording in WATO rule for MSSQL check diff --git a/checks/check_http b/checks/check_http index 1ac9f7e..05adfe8 100644 --- a/checks/check_http +++ b/checks/check_http @@ -88,6 +88,9 @@ def check_http_arguments(params): if "expect_string" in settings: args += ' -s %s' % quote_shell_string(settings["expect_string"]) + if "expect_response_header" in settings: + args += ' -d %s' % quote_shell_string(settings["expect_response_header"]) + if "expect_regex" in settings: if len(settings['expect_regex']) >= 4 and settings['expect_regex'][3]: args += ' -l ' diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 0cc357c..0c97a2d 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -615,6 +615,11 @@ register_rule(group, ], default_value = 'follow'), ), + ( "expect_response_header", + TextAscii( + title = _("String to expect in response headers"), + ) + ), ( "expect_response", ListOfStrings( title = _("Strings to expect in server response"),

10 years, 7 months

Check_MK Git: check_mk: Fixed permissions in several linux agent plugins

by Mathias Kettner

Module: check_mk Branch: master Commit: fa98b0f28d7b23669e055d1296b41e078ed712c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa98b0f28d7b23… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 6 10:54:37 2014 +0100 Fixed permissions in several linux agent plugins --- 0 files changed diff --git a/agents/plugins/arc_raid_status.sh b/agents/plugins/arc_raid_status.sh old mode 100644 new mode 100755 diff --git a/agents/plugins/arcserve_backup.ps1 b/agents/plugins/arcserve_backup.ps1 old mode 100644 new mode 100755 diff --git a/agents/plugins/db2_mem.sh b/agents/plugins/db2_mem.sh old mode 100644 new mode 100755 diff --git a/agents/plugins/dmi_sysinfo b/agents/plugins/dmi_sysinfo old mode 100644 new mode 100755

10 years, 7 months

Check_MK Git: check_mk: emc_datadomain_fans, emc_datadomain_power, emc_datadomain_nvbat,

by Götz Golla

Module: check_mk Branch: master Commit: 52771916f046a2ab84a9030bcdef5e3010cdeb6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52771916f046a2… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Feb 6 09:59:23 2014 +0100 emc_datadomain_fans, emc_datadomain_power, emc_datadomain_nvbat, emc_datadomain_temps now have a man page plus a small bug fix for cases when they report a state not documented in the MIB --- checkman/emc_datadomain_fans | 22 ++++++++++++++++++++++ checkman/emc_datadomain_nvbat | 22 ++++++++++++++++++++++ checkman/emc_datadomain_power | 19 +++++++++++++++++++ checkman/emc_datadomain_temps | 23 +++++++++++++++++++++++ checks/emc_datadomain_fans | 4 ++-- checks/emc_datadomain_nvbat | 4 ++-- checks/emc_datadomain_power | 4 ++-- checks/emc_datadomain_temps | 4 ++-- 8 files changed, 94 insertions(+), 8 deletions(-) diff --git a/checkman/emc_datadomain_fans b/checkman/emc_datadomain_fans new file mode 100644 index 0000000..70ffde0 --- /dev/null +++ b/checkman/emc_datadomain_fans @@ -0,0 +1,22 @@ +title: EMC Datadomain: fan status +agents: snmp +catalog: hw/storagehw/emc +license: GPL +distribution: check_mk +description: + Reports the status of the fans of the EMC Datadomain + Deduplication Storage Systems. The state is {OK} when the status + of the fan as reported by the device is {1=OK}, it is {WARN} + when the status of the device is reported to be {0=notfound}, + and it is {CRIT} when the device reports its status as {2=Fail}. + +item: + "ID of the enclosure" - "ID of the fan" + +perfdata: + The fan level measured by the sensor. This can only be unknown, + low, medium or high + +inventory: + Automatically configures one check for every fan found on the + device diff --git a/checkman/emc_datadomain_nvbat b/checkman/emc_datadomain_nvbat new file mode 100644 index 0000000..e57429c --- /dev/null +++ b/checkman/emc_datadomain_nvbat @@ -0,0 +1,22 @@ +title: EMC Datadomain: Battery Status of NVRAM +agents: snmp +catalog: hw/storagehw/emc +license: GPL +distribution: check_mk +description: + Reports the status of the batteries on NVRAM cards of the EMC Datadomain + Deduplication Storage Systems. The state of the check is determined from + the state which is reported by the device as follows: + The check is {OK} when the device reports {0=ok}. The check is {WARN} + when the device reports {1=disabled} or {3=softdisabled}. The check is + {CRIT} when the device reports {2=discharged}. + +item: + "ID of the NVRAM card" - "ID of the battery on this card" + +perfdata: + The electrical charge of the battery in percent + +inventory: + Automatically configures one check for every NVRAM battery found on the + device diff --git a/checkman/emc_datadomain_power b/checkman/emc_datadomain_power new file mode 100644 index 0000000..6ccd165 --- /dev/null +++ b/checkman/emc_datadomain_power @@ -0,0 +1,19 @@ +title: EMC Datadomain: Power Modules +agents: snmp +catalog: hw/storagehw/emc +license: GPL +distribution: check_mk +description: + Reports the status of the power modules of the EMC Datadomain + Deduplication Storage Systems. The state of the check is {OK} + when the state reported by the device is {0=Absent} or {1=OK}. + The state of the check is {WARN} when device reports a state of + {4=ACNone}. The state is {CRIT} when the device reports a state + of {2=Failed} or {3=Faulty}. + +item: + "ID of the enclosure" - "ID of the module" + +inventory: + Automatically configures one check for every power module found on the + device diff --git a/checkman/emc_datadomain_temps b/checkman/emc_datadomain_temps new file mode 100644 index 0000000..ea5c7d1 --- /dev/null +++ b/checkman/emc_datadomain_temps @@ -0,0 +1,23 @@ +title: EMC Datadomain: Temperature Sensors +agents: snmp +catalog: hw/storagehw/emc +license: GPL +distribution: check_mk +description: + Reports the status of the temperature sensors of the EMC Datadomain + Deduplication Storage Systems. The state of the check is determined + from the state reported by the device as follows: + The check is {OK} when the sensor reports {1=OK}. The check is {WARN} + when the sensor device reports a state of {0=Failed}, {3=OverheatWarning} + or {2=Notfound}. The check is {CRIT} when the sensor reports a state of + {4=OverheatCritical}. + +item: + "ID of the enclosure" - "ID of the sensor" + +perfdata: + The temperatur measured by the sensor + +inventory: + Automatically configures one check for every sensor found on the + device diff --git a/checks/emc_datadomain_fans b/checks/emc_datadomain_fans index e95f708..cf2b538 100644 --- a/checks/emc_datadomain_fans +++ b/checks/emc_datadomain_fans @@ -46,8 +46,8 @@ def check_emc_datadomain_fans(item, _no_params, info): dev_descr = line[2] dev_level = line[3] dev_state = line[4] - dev_state_str = state_table.get(dev_state, "Unknown")[0] - dev_state_rc = state_table.get(dev_state, 3)[1] + dev_state_str = state_table.get(dev_state, ("Unknown",3))[0] + dev_state_rc = state_table.get(dev_state, ("Unknown",3))[1] dev_level_str = fan_level.get(dev_level, "Unknown") infotext = "%s %s RPM %s" % ( dev_descr, dev_state_str, dev_level_str ) return dev_state_rc, infotext diff --git a/checks/emc_datadomain_nvbat b/checks/emc_datadomain_nvbat index 4ef059d..d577b3c 100644 --- a/checks/emc_datadomain_nvbat +++ b/checks/emc_datadomain_nvbat @@ -41,8 +41,8 @@ def check_emc_datadomain_nvbat(item, _no_params, info): if item == line[0]+"-"+line[1]: dev_charge = line[3] dev_state = line[2] - dev_state_str = state_table.get(dev_state, "Unknown")[0] - dev_state_rc = state_table.get(dev_state, 3)[1] + dev_state_str = state_table.get(dev_state, ("Unknown",3))[0] + dev_state_rc = state_table.get(dev_state, ("Unknown",3))[1] infotext = "Status %s Charge Level %s%%" % ( dev_state_str, dev_charge ) perfdata = [('charge', dev_charge+"%" )] return dev_state_rc, infotext, perfdata diff --git a/checks/emc_datadomain_power b/checks/emc_datadomain_power index eaa5a39..b138fdd 100644 --- a/checks/emc_datadomain_power +++ b/checks/emc_datadomain_power @@ -43,8 +43,8 @@ def check_emc_datadomain_power(item, _no_params, info): if item == line[0]+"-"+line[1]: dev_descr = line[2] dev_state = line[3] - dev_state_str = state_table.get(dev_state,"Unknown")[0] - dev_state_rc = state_table.get(dev_state,3)[1] + dev_state_str = state_table.get(dev_state,("Unknown",3))[0] + dev_state_rc = state_table.get(dev_state,("Unknown",3))[1] infotext = "%s Status %s" % ( dev_descr, dev_state_str ) return dev_state_rc, infotext diff --git a/checks/emc_datadomain_temps b/checks/emc_datadomain_temps index 3e301ea..f1535e3 100644 --- a/checks/emc_datadomain_temps +++ b/checks/emc_datadomain_temps @@ -43,8 +43,8 @@ def check_emc_datadomain_temps(item, _no_params, info): dev_temp = line[3] dev_descr = line[2] dev_state = line[4] - dev_state_str = state_table.get(dev_state, "Unknown")[0] - dev_state_rc = state_table.get(dev_state, 3)[1] + dev_state_str = state_table.get(dev_state, ("Unknown",3))[0] + dev_state_rc = state_table.get(dev_state, ("Unknown",3))[1] infotext = "%s Temperature %sC Status %s" % ( dev_descr, dev_temp, dev_state_str ) perfdata = [('temp', dev_temp+"C" )] return dev_state_rc, infotext,perfdata

10 years, 7 months

Check_MK Git: check_mk: emc_datadomain_fans, emc_datadomain_nvbat, emc_datadomain_power, emc_datadomain_temps: new hardware checks for EMC Datadomain

by Götz Golla

Module: check_mk Branch: master Commit: 4d98a231ee63f2b1e542d3f674f63cd2bd244400 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d98a231ee63f2… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Feb 5 17:26:59 2014 +0100 emc_datadomain_fans, emc_datadomain_nvbat, emc_datadomain_power, emc_datadomain_temps: new hardware checks for EMC Datadomain --- .werks/580 | 8 ++++ ChangeLog | 3 +- checks/emc_datadomain_fans | 72 ++++++++++++++++++++++++++++++++++++ checks/emc_datadomain_nvbat | 66 +++++++++++++++++++++++++++++++++ checks/emc_datadomain_power | 66 +++++++++++++++++++++++++++++++++ checks/emc_datadomain_temps | 68 ++++++++++++++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 4 ++ 7 files changed, 286 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4d98a231ee…

10 years, 7 months

← Newer
1
...
9
10
11
12
13
14
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2014