Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1736 FIX lparstat_aix: Trying to deal with more kind of lparstat output

by Lars Michelsen

Module: check_mk Branch: master Commit: 7c3d0dc7784f5eb71bab9184c787dd6f7e20cf0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c3d0dc7784f5e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 15:25:54 2014 +0100 #1736 FIX lparstat_aix: Trying to deal with more kind of lparstat output Depending on versions the output of the lparstat command seems to be different. Reworked the check, trying to handle more cases. --- .werks/1736 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/1736 b/.werks/1736 new file mode 100644 index 0000000..dba598c --- /dev/null +++ b/.werks/1736 @@ -0,0 +1,10 @@ +Title: lparstat_aix: Trying to deal with more kind of lparstat output +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418135108 +Class: fix + +Depending on versions the output of the lparstat command seems to be +different. Reworked the check, trying to handle more cases. diff --git a/ChangeLog b/ChangeLog index 4a30051..1572a3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -154,6 +154,7 @@ * 1659 FIX: windows agent: fixed output of 64 bit performance counters... * 1748 FIX: win_dhcp_pools: fix naming of WATO rules and informal WARN/CRIT levels in performance data * 1735 FIX: oracle_instance: Inventory function deals better with old bogus agent output + * 1736 FIX: lparstat_aix: Trying to deal with more kind of lparstat output... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results...

9 years, 9 months

Check_MK Git: check_mk: #1735 FIX oracle_instance: Inventory function deals better with old bogus agent output

by Lars Michelsen

Module: check_mk Branch: master Commit: 10ff6ead79674fb6ed8ca7657e0a2c1a2ba1ec76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10ff6ead79674f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 15:23:59 2014 +0100 #1735 FIX oracle_instance: Inventory function deals better with old bogus agent output --- .werks/1735 | 9 +++++++++ ChangeLog | 1 + checks/oracle_instance | 8 ++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/1735 b/.werks/1735 new file mode 100644 index 0000000..4cf49d1 --- /dev/null +++ b/.werks/1735 @@ -0,0 +1,9 @@ +Title: oracle_instance: Inventory function deals better with old bogus agent output +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418135014 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a89671d..4a30051 100644 --- a/ChangeLog +++ b/ChangeLog @@ -153,6 +153,7 @@ * 1747 FIX: zfsget: try to speed up agent code for Linux/Solaris/FreeBSD by using -t filesystem,volume... * 1659 FIX: windows agent: fixed output of 64 bit performance counters... * 1748 FIX: win_dhcp_pools: fix naming of WATO rules and informal WARN/CRIT levels in performance data + * 1735 FIX: oracle_instance: Inventory function deals better with old bogus agent output Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/oracle_instance b/checks/oracle_instance index d814312..5607ba3 100644 --- a/checks/oracle_instance +++ b/checks/oracle_instance @@ -38,7 +38,12 @@ factory_settings["oracle_instance_defaults"] = { def inventory_oracle_instance(info): - return [ (line[0], {} ) for line in info ] + # Skip ORA- error messages from broken old oracle agent + # <<<oracle_instance:sep(124)>>> + # ORA-99999 tnsping failed for +ASM1 + return [ (line[0], {} ) for line in info + if not (line[0].startswith('ORA-') and line[0][4].isdigit()) + and len(line[0]) < 20 ] def check_oracle_instance(item, params, info): @@ -56,7 +61,6 @@ def check_oracle_instance(item, params, info): state = 0 for line in info: if line[0] == item: - # In case of a general error (e.g. authentication failed), the second # column contains the word "FAILURE" if line[1] == 'FAILURE':

9 years, 9 months

Check_MK Git: check_mk: win_dhcp_pools: Fixed PNP template

by Mathias Kettner

Module: check_mk Branch: master Commit: 777b97e4c7e558dcc0643154d3965c99132e71c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=777b97e4c7e558… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 9 15:08:39 2014 +0100 win_dhcp_pools: Fixed PNP template --- pnp-templates/check_mk-win_dhcp_pools.php | 51 +++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/pnp-templates/check_mk-win_dhcp_pools.php b/pnp-templates/check_mk-win_dhcp_pools.php new file mode 100644 index 0000000..385622d --- /dev/null +++ b/pnp-templates/check_mk-win_dhcp_pools.php @@ -0,0 +1,51 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +$opt[1] = "-l0 -u$MAX[1] --vertical-label \"IP Addresses\" --title \"$servicedesc\" "; + +$def[1] = "DEF:used=$RRDFILE[2]:$DS[2]:MAX "; +$def[1] .= "DEF:pending=$RRDFILE[3]:$DS[3]:MAX "; +$def[1] .= "DEF:free=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "CDEF:total=used,pending,+,free,+ "; +$def[1] .= "AREA:used#2080ff:\"Used\: \" "; +$def[1] .= "GPRINT:used:LAST:\"%2.0lf\" "; +$def[1] .= "GPRINT:used:AVERAGE:\"(Avg\: %2.0lf,\" "; +$def[1] .= "GPRINT:used:MIN:\"Min\: %2.0lf,\" "; +$def[1] .= "GPRINT:used:MAX:\"Max\: %2.0lf)\\n\" "; +$def[1] .= "AREA:pending#8020ff:\"Pending\: \":STACK "; +$def[1] .= "GPRINT:pending:LAST:\"%2.0lf\" "; +$def[1] .= "GPRINT:pending:AVERAGE:\"(Avg\: %2.0lf,\" "; +$def[1] .= "GPRINT:pending:MIN:\"Min\: %2.0lf,\" "; +$def[1] .= "GPRINT:pending:MAX:\"Max\: %2.0lf)\\n\" "; +$def[1] .= "AREA:free#80f0ff:\"Free\: \":STACK "; +$def[1] .= "GPRINT:free:LAST:\"%2.0lf\" "; +$def[1] .= "GPRINT:free:AVERAGE:\"(Avg\: %2.0lf,\" "; +$def[1] .= "GPRINT:free:MIN:\"Min\: %2.0lf,\" "; +$def[1] .= "GPRINT:free:MAX:\"Max\: %2.0lf)\\n\" "; +$def[1] .= "LINE:total#666666:\"Total\: \" "; +$def[1] .= "GPRINT:total:LAST:\"%2.0lf\\n\" "; +$def[1] .= "HRULE:$CRIT[1]#FF0000:Warning "; +$def[1] .= "HRULE:$WARN[1]#FFFF00:Critical\\n "; +?>

9 years, 9 months

Check_MK Git: check_mk: #1748 FIX win_dhcp_pools: fix naming of WATO rules and informal WARN/ CRIT levels in performance data

by Mathias Kettner

Module: check_mk Branch: master Commit: 91a2e0c85426a840a09746fe55f36656f719973f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91a2e0c85426a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 9 14:44:59 2014 +0100 #1748 FIX win_dhcp_pools: fix naming of WATO rules and informal WARN/CRIT levels in performance data --- .werks/1748 | 9 ++++++++ ChangeLog | 1 + checks/win_dhcp_pools | 40 ++++++++++++++++++---------------- web/plugins/wato/check_parameters.py | 4 ++-- 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/.werks/1748 b/.werks/1748 new file mode 100644 index 0000000..b78c2fa --- /dev/null +++ b/.werks/1748 @@ -0,0 +1,9 @@ +Title: win_dhcp_pools: fix naming of WATO rules and informal WARN/CRIT levels in performance data +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418132633 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1b8acf4..42a2894 100644 --- a/ChangeLog +++ b/ChangeLog @@ -150,6 +150,7 @@ * 1732 FIX: dell_powerconnect_cpu: Fixed exception during inventory for incompatible devices * 1733 FIX: dell_powerconnect_psu: Skipping inventory of not supported System temp sesnor for M6220 devices... * 1747 FIX: zfsget: try to speed up agent code for Linux/Solaris/FreeBSD by using -t filesystem,volume... + * 1748 FIX: win_dhcp_pools: fix naming of WATO rules and informal WARN/CRIT levels in performance data Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools index a64eb27..081dd64 100644 --- a/checks/win_dhcp_pools +++ b/checks/win_dhcp_pools @@ -123,25 +123,35 @@ def check_win_dhcp_pools(item, params, info): if size == 0: return (3, "DHCP Pool contains no IP addresses / is deactivated") - if size > 0: - perc_free = 100.0 * free / size - else: - perc_free = 0 + warn_perc, crit_perc = params + warn_abs = size * (warn_perc / 100.0) + crit_abs = size * (crit_perc / 100.0) - if perc_free < params[1]: + if free < crit_abs: status = 2 - elif perc_free < params[0]: + elif free < warn_abs: status = 1 - perfdata = [ ('free', free, params[0], params[1], 0, size), - ('used', used, None, None, 0, size), - ('pending', pending, None, None, 0, size) ] + perfdata = [ ('free', free, warn_abs, crit_abs, 0, size), + ('used', used, None, None, 0, size), + ('pending', pending, None, None, 0, size) ] - return (status, 'Addresses Free: %d, Used: %d, Pending: %d' % - (free, used, pending), perfdata) + infotext = 'Addresses Free: %d, Used: %d, Pending: %d' % (free, used, pending) + if status: + infotext += " (levels at %d/%d)" % (warn_abs, crit_abs) + return status, infotext, perfdata else: return (3, 'Pool information not found') +check_info["win_dhcp_pools"] = { + 'check_function': check_win_dhcp_pools, + 'inventory_function': inventory_win_dhcp_pools, + 'service_description': 'DHCP Pool %s', + 'has_perfdata': True, + 'group': 'win_dhcp_pools', +} + + def inventory_win_dhcp_pools_stats(info): return [ (None, None) for line in info if line[0] != '' ] @@ -166,14 +176,6 @@ def check_win_dhcp_pools_stats(item, params, info): return 0, output.rstrip(', '), perfdata -check_info["win_dhcp_pools"] = { - 'check_function': check_win_dhcp_pools, - 'inventory_function': inventory_win_dhcp_pools, - 'service_description': 'DHCP Pool %s', - 'has_perfdata': True, - 'group': 'win_dhcp_pools', -} - check_info["win_dhcp_pools.stats"] = { 'check_function': check_win_dhcp_pools_stats, 'inventory_function': inventory_win_dhcp_pools_stats, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index dc01fd8..d5ff0e4 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4219,8 +4219,8 @@ register_check_parameters( help = _("The count of remaining entries in the DHCP pool represents " "the number of IP addresses left which can be assigned in the network"), elements = [ - Percentage(title = _("Warning if more than"), unit = _("pool entries")), - Percentage(title = _("Critical if more than"), unit = _("pool entries")), + Percentage(title = _("Warning if less than"), unit = _("% free pool entries")), + Percentage(title = _("Critical if less than"), unit = _("% free pool entries")), ]), TextAscii( title = _("Service descriptions"),

9 years, 9 months

Check_MK Git: check_mk: The windows agent was unable to output 64 bit counters.

by Andreas Boesl

Module: check_mk Branch: master Commit: 3fd6d0c8a9a0b30f8a9b46e5db1335621a538496 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fd6d0c8a9a0b3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 9 14:23:00 2014 +0100 The windows agent was unable to output 64 bit counters. Those values were cut at 32 bit, which caused unwanted counter wraps in the checks. --- .werks/1659 | 10 ++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 209920 -> 209920 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 209920 -> 209920 bytes agents/windows/check_mk_agent.cc | 4 ++-- agents/windows/check_mk_agent.exe | Bin 178688 -> 178688 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 178688 -> 178688 bytes agents/windows/install_agent-64.exe | Bin 160521 -> 160572 bytes agents/windows/install_agent.exe | Bin 157440 -> 157529 bytes 10 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/1659 b/.werks/1659 new file mode 100644 index 0000000..d7974d3 --- /dev/null +++ b/.werks/1659 @@ -0,0 +1,10 @@ +Title: windows agent: fixed output of 64 bit performance counters +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418131110 +Class: fix + +The windows agent was unable to output 64 bit performance counters. +Those values were cut at 32 bit, which caused unwanted counter wraps in the checks. diff --git a/ChangeLog b/ChangeLog index aed1044..e97e55d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -145,6 +145,7 @@ * 1729 FIX: apc_symmetra_test: Cleaned up check, fixed exception when self test date is zero * 1730 FIX: apc_symmetra: Fixed exception when last diagnose date was not known * 1731 FIX: ipmi_sensors: Fixed agent part when ipmi-sensors call on first agent run... + * 1659 FIX: windows agent: fixed output of 64 bit performance counters... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/windows/build_version b/agents/windows/build_version index b16e5f7..fe4afb0 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -104 +106 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index e81bc5d..b7fec3e 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-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 8392ab5..e54c99f 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index cc73328..3ca45b5 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -988,10 +988,10 @@ void outputCounterValue(SOCKET &out, PERF_COUNTER_DEFINITION *counterPtr, PERF_C int size = counterPtr->CounterSize; BYTE *pData = ((BYTE *)counterBlockPtr) + offset; - if (counterPtr->CounterType | PERF_SIZE_DWORD) + if (counterPtr->CounterType & PERF_SIZE_DWORD) output(out, " %llu", (ULONGLONG)(*(DWORD*)pData)); - else if (counterPtr->CounterType | PERF_SIZE_LARGE) + else if (counterPtr->CounterType & PERF_SIZE_LARGE) output(out, " %llu", *(UNALIGNED ULONGLONG*)pData); // handle other data generically. This is wrong in some situation. diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index ba7960a..718690a 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index f31adbb..075b92a 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 26d6bd5..72b7f39 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 247575e..d571f24 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 9 months

Check_MK Git: check_mk: #1747 FIX zfsget: try to speed up agent code for Linux/Solaris/ FreeBSD by using -t filesystem, volume

by Mathias Kettner

Module: check_mk Branch: master Commit: 2e235ecd5e9083772c80349197a859a544aba434 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e235ecd5e9083… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 9 14:15:29 2014 +0100 #1747 FIX zfsget: try to speed up agent code for Linux/Solaris/FreeBSD by using -t filesystem,volume This removes snapshots from the list and thus greatly reduces the run time and output size. The option <tt>-t</tt> is not always available, however, so if the command fails with the option <tt>-t</tt> it is retried afterwards without. --- .werks/1747 | 11 +++++++++++ ChangeLog | 1 + agents/check_mk_agent.freebsd | 3 ++- agents/check_mk_agent.linux | 3 ++- agents/check_mk_agent.solaris | 3 ++- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/1747 b/.werks/1747 new file mode 100644 index 0000000..dd9db86 --- /dev/null +++ b/.werks/1747 @@ -0,0 +1,11 @@ +Title: zfsget: try to speed up agent code for Linux/Solaris/FreeBSD by using -t filesystem,volume +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418130856 +Class: fix + +This removes snapshots from the list and thus greatly reduces the run time and output size. +The option <tt>-t</tt> is not always available, however, so if the command fails with +the option <tt>-t</tt> it is retried afterwards without. diff --git a/ChangeLog b/ChangeLog index bc1ca88..1b8acf4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -149,6 +149,7 @@ * 1731 FIX: ipmi_sensors: Fixed agent part when ipmi-sensors call on first agent run... * 1732 FIX: dell_powerconnect_cpu: Fixed exception during inventory for incompatible devices * 1733 FIX: dell_powerconnect_psu: Skipping inventory of not supported System temp sesnor for M6220 devices... + * 1747 FIX: zfsget: try to speed up agent code for Linux/Solaris/FreeBSD by using -t filesystem,volume... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 0862727..008d613 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -130,7 +130,8 @@ fi # Filesystem usage for ZFS if type zfs > /dev/null 2>&1 ; then echo '<<<zfsget>>>' - zfs get -Hp name,quota,used,avail,mountpoint,type + zfs get -Hp name,quota,used,avail,mountpoint,type -t filesystem,volume || \ + zfs get -Hp name,quota,used,avail,mountpoint,type echo '[df]' df -kP -t zfs | sed 1d fi diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index a32122f..a476f0c 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -146,7 +146,8 @@ echo '[df_inodes_end]' # Filesystem usage for ZFS if type zfs > /dev/null 2>&1 ; then echo '<<<zfsget>>>' - zfs get -Hp name,quota,used,avail,mountpoint,type + zfs get -Hp name,quota,used,avail,mountpoint,type -t filesystem,volume || \ + zfs get -Hp name,quota,used,avail,mountpoint,type echo '[df]' df -PTlk -t zfs | sed 1d fi diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 7f999e0..18842fb 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -150,7 +150,8 @@ if type zfs &>/dev/null then echo '<<<zfsget>>>' echo '[zfs]' - zfs get -Hp name,quota,used,avail,mountpoint,type + zfs get -Hp name,quota,used,avail,mountpoint,type -t filesystem,volume || \ + zfs get -Hp name,quota,used,avail,mountpoint,type echo '[df]' df -l -k -F zfs 2>/dev/null | sed 1d fi

9 years, 9 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 6b60bb9fc787e900e989fca15d05a43c2997fcb7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b60bb9fc787e9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 9 14:14:03 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 c439d95..16ed94b 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1747 +1757

9 years, 9 months

Check_MK Git: check_mk: #1726 Move variable data of Linux/UNIX agents to / var/lib/check_mk_agent

by Mathias Kettner

Module: check_mk Branch: master Commit: e205e891466e44af76262d24f7439c3ab0cf34a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e205e891466e44… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 9 14:04:56 2014 +0100 #1726 Move variable data of Linux/UNIX agents to /var/lib/check_mk_agent The Linux, AIX, Solaris and other UNIX agents now put state and cache files no longer below <tt>/etc/check_mk</tt> but per default below <tt>/var/lib/check_mk_agent</tt>. This can be changed directly in the agent in the following line: F+:check_mk_agent.* export MK_VARDIR=/var/lib/check_mk_agent F-: This means that if you update to the new version of the agent, you must have in mind the following things: <ul> <li>Check_MK agent will not find saved <tt>logwatch.state</tt> files and will consider all logfiles as new. This means that you will miss up to one check cycle of possible new logfile entries.</li> <li>Check_MK agent will forget its cached data and recompute all asynchronous checks</li> <li>Maybe other plugin-specific loss of memory</li> </ul> You can prevent this by manually copying selective data from <tt>/etc/check_mk</tt>, if you like. --- .werks/1726 | 28 ++++++++++++++++++++++++++++ ChangeLog | 2 ++ agents/check_mk_agent.aix | 4 +++- agents/check_mk_agent.linux | 14 ++++++++------ agents/check_mk_agent.solaris | 9 ++++----- agents/mk-job | 4 +++- agents/mk-job.solaris | 4 +++- agents/plugins/mk_inventory.linux | 2 +- agents/plugins/mk_inventory.solaris | 2 +- agents/plugins/mk_logwatch | 16 +++++++++------- agents/plugins/mk_oracle | 12 ++++++++---- agents/plugins/mk_oracle.aix | 8 ++++++-- agents/plugins/mk_oracle.solaris | 6 +++--- agents/plugins/mk_sap | 7 +++++-- 14 files changed, 84 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e205e89146…

9 years, 9 months

Check_MK Git: check_mk: ipmi_sensors: Radicale simplification of agent code - hopefully more robust

by Lars Michelsen

Module: check_mk Branch: master Commit: 6792e20d14de548547ee8fe4a5d9f316d762f4ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6792e20d14de54… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 13:38:23 2014 +0100 ipmi_sensors: Radicale simplification of agent code - hopefully more robust --- agents/check_mk_agent.linux | 42 +++++++----------------------------------- 1 file changed, 7 insertions(+), 35 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 049b740..34f9b32 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -278,50 +278,22 @@ fi # IPMI data via ipmi-sensors (of freeipmi). Please make sure, that if you # have installed freeipmi that IPMI is really support by your hardware. -# The agent tries to avoid hanging forever by setting a limit of 300 seconds -# for the first run (where the cache is created). If ipmi-sensors runs into -# that timeout, it leaves and empty cache file. We skip this check forever -# if we find that empty cache file. -sdrcache=/var/cache/.freeipmi/sdr-cache/sdr-cache-$(hostname | cut -d. -f1).127.0.0.1 -if type ipmi-sensors >/dev/null && [ ! -e "$sdrcache" -o -s "$sdrcache" ] +if type ipmi-sensors >/dev/null then echo '<<<ipmi_sensors>>>' - # No cache file existing? => Impose a high time limit. We do not suffice - # in creating the cache we most probably run on a hardware where this tool - # is hanging forever. We make sure that we never try again in that case! - if [ ! -e "$sdrcache" ] - then - WAITMAX="waitmax 300" - elif tail --bytes 2 < "$sdrcache" | od -t x2 | grep -q 0a0a - then - WAITMAX="waitmax 3" - else - # Cache file corrupt. Must end with two linefeeds. - rm -f $sdrcache - WAITMAX= - fi # Newer ipmi-sensors version have new output format; Legacy format can be used if ipmi-sensors --help | grep -q legacy-output; then IPMI_FORMAT="--legacy-output" else IPMI_FORMAT="" fi - # On first run, before ipmi-sensors was first executed, the base directory is not - # available. Make sure it exists, otherwise the following subshell creation will fail - mkdir -p "${sdrcache%/*}" - # Aquire lock with flock in order to avoid multiple runs of ipmi-sensors - # in case of parallel or overlapping calls of the agent. - ( - flock -n 200 --wait 60 - # At least with ipmi-sensoirs 0.7.16 this group is Power_Unit instead of "Power Unit" - for class in Temperature Power_Unit Fan - do - $WAITMAX ipmi-sensors $IPMI_FORMAT --sdr-cache-directory /var/cache -g "$class" | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ $[^(]*$_($[^)]*$)@ \2_\1@' - # In case of a timeout immediately leave loop. + # At least with ipmi-sensoirs 0.7.16 this group is Power_Unit instead of "Power Unit" + run_cached -s ipmi_sensors 300 "for class in Temperature Power_Unit Fan + do + ipmi-sensors $IPMI_FORMAT --sdr-cache-directory /var/cache -g "$class" | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ $[^(]*$_($[^)]*$)@ \2_\1@' + # In case of a timeout immediately leave loop. if [ $? = 255 ] ; then break ; fi - WAITMAX="waitmax 3" - done - ) 200>>"$sdrcache" + done" fi # RAID status of Linux software RAID

9 years, 9 months

Check_MK Git: check_mk: Fixed bug in todays bugfix

by Lars Michelsen

Module: check_mk Branch: master Commit: 6cae81a43d1aebcf8c61c4260f42e401b8301389 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cae81a43d1aeb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 13:17:08 2014 +0100 Fixed bug in todays bugfix --- agents/check_mk_agent.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index a3c63f1..049b740 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -308,7 +308,7 @@ then fi # On first run, before ipmi-sensors was first executed, the base directory is not # available. Make sure it exists, otherwise the following subshell creation will fail - mkdir -p "$sdcache" + mkdir -p "${sdrcache%/*}" # Aquire lock with flock in order to avoid multiple runs of ipmi-sensors # in case of parallel or overlapping calls of the agent. (

9 years, 9 months

← Newer
1
...
18
19
20
21
22
23
24
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014