Checkmk git commits April 2011

checkmk-commits@lists.checkmk.com

2 participants
103 discussions

Check_MK Git: check_mk: Windows agent: always output system counters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 610e0443cc8f62d5fdba629988f498b70d375de9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=610e0443cc8f62… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 14 16:23:57 2011 +0200 Windows agent: always output system counters --- agents/windows/check_mk.ini | 3 +-- agents/windows/check_mk_agent.cc | 21 ++++++++++----------- agents/windows/check_mk_agent.exe | Bin 96768 -> 96768 bytes 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini index 4ea6924..97691eb 100644 --- a/agents/windows/check_mk.ini +++ b/agents/windows/check_mk.ini @@ -5,5 +5,4 @@ [winperf] # Select counters to extract. The following counters # are needed by checks shipped with check_mk. - # 11838:msx_owa 12042:msx_async 10332:msx_queues - counters = 238:processor 234:phydisk + # counters = 10332:msx_queues diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index a635168..0fec8e6 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -917,17 +917,12 @@ void section_mem(SOCKET &out) void section_winperf(SOCKET &out) { - // no counters configured in check_mk.ini => output all below 700 except some - if (g_num_winperf_counters == 0) { - dump_performance_counters(out, 234, "phydisk"); - dump_performance_counters(out, 238, "processor"); - } + dump_performance_counters(out, 234, "phydisk"); + dump_performance_counters(out, 238, "processor"); - // output configured counters - else { - for (unsigned i=0; i<g_num_winperf_counters; i++) - dump_performance_counters(out, g_winperf_counters[i].id, g_winperf_counters[i].name); - } + // also output additionally configured counters + for (unsigned i=0; i<g_num_winperf_counters; i++) + dump_performance_counters(out, g_winperf_counters[i].id, g_winperf_counters[i].name); } @@ -1576,7 +1571,11 @@ char *next_word(char **line) s++; *s = 0; *line = s + 1; - return value; + rstrip(value); + if (strlen(value) > 0) + return value; + else + return 0; } return 0; } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index ec7c0f7..89afa3d 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ

13 years, 5 months

Check_MK Git: check_mk: Windows agent: use relative counter ids

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 43ebe3108210f7d9f2c124eae94ee39206dcce81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43ebe3108210f7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 14 15:48:01 2011 +0200 Windows agent: use relative counter ids --- agents/windows/check_mk.ini | 3 ++- agents/windows/check_mk_agent.cc | 17 +++++++---------- agents/windows/check_mk_agent.exe | Bin 96768 -> 96768 bytes checkman/winperf_msx_queues | 2 ++ checks/winperf_msx_queues | 10 +++++----- checks/winperf_phydisk | 4 ++-- checks/winperf_processor | 7 +++++-- 7 files changed, 23 insertions(+), 20 deletions(-) diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini index e17edab..4ea6924 100644 --- a/agents/windows/check_mk.ini +++ b/agents/windows/check_mk.ini @@ -5,4 +5,5 @@ [winperf] # Select counters to extract. The following counters # are needed by checks shipped with check_mk. - counters = 238:processor 234:phydisk 11838:msx_owa 12042:msx_async 10332:msx_queues + # 11838:msx_owa 12042:msx_async 10332:msx_queues + counters = 238:processor 234:phydisk diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 507613a..a635168 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -387,14 +387,14 @@ PERF_INSTANCE_DEFINITION *NextInstance (PERF_INSTANCE_DEFINITION *pInstance) { } -void dump_performance_counters(SOCKET &out, unsigned counter, const char *countername) +void dump_performance_counters(SOCKET &out, unsigned counter_base_number, const char *countername) { output(out, "<<<winperf_%s>>>\n", countername); - output(out, "%.2f\n", current_time()); + output(out, "%.2f %u\n", current_time(), counter_base_number); // registry entry is ascii representation of counter index char counter_index_name[8]; - snprintf(counter_index_name, sizeof(counter_index_name), "%u", counter); + snprintf(counter_index_name, sizeof(counter_index_name), "%u", counter_base_number); // allocate block to store counter data block DWORD size = DEFAULT_BUFFER_SIZE; @@ -436,7 +436,7 @@ void dump_performance_counters(SOCKET &out, unsigned counter, const char *counte for (unsigned int a=0 ; a < dataBlockPtr->NumObjectTypes ; a++) { // Have we found the object we seek? - if (objectPtr->ObjectNameTitleIndex == counter) + if (objectPtr->ObjectNameTitleIndex == counter_base_number) { // Yes. Great. Now: each object consist of a lot of counters. // We walk through the list of counters in this object: @@ -477,7 +477,7 @@ void dump_performance_counters(SOCKET &out, unsigned counter, const char *counte // Now walk through the counter list a second time and output all counters for (unsigned int b=0 ; b < objectPtr->NumCounters ; b++) { - outputCounter(out, datablock, counter, objectPtr, counterPtr); + outputCounter(out, datablock, counter_base_number, objectPtr, counterPtr); counterPtr = NextCounter(counterPtr); } } @@ -488,7 +488,7 @@ void dump_performance_counters(SOCKET &out, unsigned counter, const char *counte } -void outputCounter(SOCKET &out, BYTE *datablock, int counter, +void outputCounter(SOCKET &out, BYTE *datablock, int counter_base_number, PERF_OBJECT_TYPE *objectPtr, PERF_COUNTER_DEFINITION *counterPtr) { @@ -525,7 +525,7 @@ void outputCounter(SOCKET &out, BYTE *datablock, int counter, } // Output index of counter object and counter, and timestamp - output(out, "%d", counterPtr->CounterNameTitleIndex); + output(out, "%d", counterPtr->CounterNameTitleIndex - counter_base_number); // If this is a multi-instance-counter, loop over the instances int num_instances = objectPtr->NumInstances; @@ -921,9 +921,6 @@ void section_winperf(SOCKET &out) if (g_num_winperf_counters == 0) { dump_performance_counters(out, 234, "phydisk"); dump_performance_counters(out, 238, "processor"); - dump_performance_counters(out, 11838, "msx_owa"); - dump_performance_counters(out, 12042, "msx_async"); - dump_performance_counters(out, 10332, "msx_queues"); } // output configured counters diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index e32d339..ec7c0f7 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/checkman/winperf_msx_queues b/checkman/winperf_msx_queues index 37ec28b..58a0413 100644 --- a/checkman/winperf_msx_queues +++ b/checkman/winperf_msx_queues @@ -12,6 +12,8 @@ description: If the counter number is different in your installation or you are using a {check_mk.ini} with custom counter definitions, add the counter to the section {[winperf]} with {counters = 10332:msx_queues} ... . + Look in the output of {lodctr /s:counters.ini} for the object with + the name {MSExchangeTransport Queues}. You can set levels for warning and critical. Per default the queues {Active Remote Delivery}, {Active Mailbox Delivery}, diff --git a/checks/winperf_msx_queues b/checks/winperf_msx_queues index d20ed9e..1fda3e7 100644 --- a/checks/winperf_msx_queues +++ b/checks/winperf_msx_queues @@ -48,12 +48,12 @@ # Default warn/crit levels for length of queues msx_queues_default_levels = (500, 2000) -# Queues to be inventorized +# Queues to be inventorized (number are relative to counter base) winperf_msx_queues = { - "Active Remote Delivery" : "10334", - "Retry Remote Delivery" : "10336", - "Active Mailbox Delivery" : "10338", - "Poison Queue Length" : "10376", + "Active Remote Delivery" : "2", + "Retry Remote Delivery" : "4", + "Active Mailbox Delivery" : "6", + "Poison Queue Length" : "44", } def inventory_winperf_msx_queues(checktype, info): diff --git a/checks/winperf_phydisk b/checks/winperf_phydisk index f871eb1..2a4de3e 100644 --- a/checks/winperf_phydisk +++ b/checks/winperf_phydisk @@ -56,9 +56,9 @@ check_includes['winperf_phydisk'] = [ "diskstat.include" ] def winperf_phydisk_convert(info): disks = [ d.split('_')[-1] for d in info[1][2:-1] ] for line in info[2:]: - if line[0] == '220': + if line[0] == '-14': disk_reads = [ int(x) / 512 for x in line[1:-2] ] - elif line[0] == '222': + elif line[0] == '-12': disk_writes = [ int(x) / 512 for x in line[1:-2] ] return zip(disks, disk_reads, disk_writes) diff --git a/checks/winperf_processor b/checks/winperf_processor index ee0bf61..50d5630 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -28,9 +28,12 @@ winperf_cpu_default_levels = ( 101, 101 ) def inventory_winperf_util(checkname, info): + if len(info) <= 1: + return None + for line in info[1:]: try: - if line[0] == '6': + if line[0] == '-232': return [(None, "winperf_cpu_default_levels")] except: pass @@ -41,7 +44,7 @@ def check_winperf_util(item, params, info): this_time = int(float(info[0][0])) for line in info[1:]: - if line[0] == '6': + if line[0] == '-232': # Windows sends one counter for each CPU plus one counter that # sums up to total (called _Total). We only need that last value. ticks = int(line[-2])

13 years, 5 months

Check_MK Git: check_mk: winperf_processor: added PNP template and Perf-O-Meter

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ff7ba6bc77e3037b75db89a02fc00ee4b7750794 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff7ba6bc77e303… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 14 14:57:47 2011 +0200 winperf_processor: added PNP template and Perf-O-Meter --- checks/winperf_processor | 4 ++-- pnp-templates/check_mk-winperf_processor.util.php | 1 + web/plugins/perfometer/check_mk.py | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/checks/winperf_processor b/checks/winperf_processor index 8093f6a..ee0bf61 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -55,7 +55,8 @@ def check_winperf_util(item, params, info): used_perc = 0 elif used_perc > 100: used_perc = 100 - perfdata = [ ("util", "%.2f" % used_perc, '', '', 0, 100) ] + warn, crit = params + perfdata = [ ("util", "%.2f" % used_perc, warn, crit, 0, 100) ] if num_cpus == 1: num_txt = "" else: @@ -63,7 +64,6 @@ def check_winperf_util(item, params, info): infotext = " - %d%% used%s (in last %d secs)" % (int(used_perc), num_txt, timedif) - warn, crit = params if used_perc >= crit: return (2, "CRIT" + infotext, perfdata) elif used_perc >= warn: diff --git a/pnp-templates/check_mk-winperf_processor.util.php b/pnp-templates/check_mk-winperf_processor.util.php new file mode 120000 index 0000000..07c1c09 --- /dev/null +++ b/pnp-templates/check_mk-winperf_processor.util.php @@ -0,0 +1 @@ +check_mk-h3c_lanswitch_cpu.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index b13c78d..068b296 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -260,7 +260,7 @@ def perfometer_oracle_sessions(row, check_command, perf_data): perfometers["check_mk-oracle_sessions"] = perfometer_oracle_sessions perfometers["check_mk-oracle_logswitches"] = perfometer_oracle_sessions -def perfometer_h3c_lanswitch_cpu(row, check_command, perf_data): +def perfometer_cpu_utilization(row, check_command, perf_data): util = float(perf_data[0][1]) # is already percentage warn = float(perf_data[0][3]) crit = float(perf_data[0][4]) @@ -274,7 +274,8 @@ def perfometer_h3c_lanswitch_cpu(row, check_command, perf_data): return "%.0f%%" % util, perfometer_linear(util, color) #perfometer_linear(perc, color) -perfometers["check_mk-h3c_lanswitch_cpu"] = perfometer_h3c_lanswitch_cpu +perfometers["check_mk-h3c_lanswitch_cpu"] = perfometer_cpu_utilization +perfometers["check_mk-winperf_processor.util"] = perfometer_cpu_utilization def perfometer_check_mk_uptime(row, check_command, perf_data): days, rest = divmod(int(perf_data[0][1]), 60*60*24)

13 years, 5 months

Check_MK Git: check_mk: Removed obsolete winperf_system

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0946a6602f9f825c9958c91f9e5a9a40415b73ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0946a6602f9f82… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 14 14:48:32 2011 +0200 Removed obsolete winperf_system --- agents/windows/check_mk.ini | 6 +- agents/windows/check_mk_agent.cc | 1 - checkman/winperf_system.diskio | 26 ---------- checks/winperf_system | 64 -------------------------- pnp-rraconf/check_mk-winperf_phydisk.rra.cfg | 1 + 5 files changed, 4 insertions(+), 94 deletions(-) diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini index e9e16c1..e17edab 100644 --- a/agents/windows/check_mk.ini +++ b/agents/windows/check_mk.ini @@ -3,6 +3,6 @@ # only_from = 127.0.0.1 192.168.56.0/24 [winperf] - # Select counters to extract - counters = 2:system 238:processor 11838:msx_owa 12042:msx_async 10332:msx_queues 234:phydisk - # 230:process + # Select counters to extract. The following counters + # are needed by checks shipped with check_mk. + counters = 238:processor 234:phydisk 11838:msx_owa 12042:msx_async 10332:msx_queues diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 4e766d2..507613a 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -919,7 +919,6 @@ void section_winperf(SOCKET &out) { // no counters configured in check_mk.ini => output all below 700 except some if (g_num_winperf_counters == 0) { - dump_performance_counters(out, 2, "system"); dump_performance_counters(out, 234, "phydisk"); dump_performance_counters(out, 238, "processor"); dump_performance_counters(out, 11838, "msx_owa"); diff --git a/checkman/winperf_system.diskio b/checkman/winperf_system.diskio deleted file mode 100644 index 3032d34..0000000 --- a/checkman/winperf_system.diskio +++ /dev/null @@ -1,26 +0,0 @@ -title: Measure Disk IO on Windows systems -agents: windows -author: Mathias Kettner <mk(a)mathias-kettner.de> -license: GPL -distribution: check_mk -description: - This check monitors the summarized disk IO on a Windows system - using the windows performance counters (agent section {<<<winperf_system>>>}). - - The current implementation does not allow to set levels, and the check - is thus always OK. The reason is, that currently only data of the - last check cycle is available for measurement. In order to define - useful levels an average over a longer period of time would be needed. - A future implementation might change this. - - This check replaces the old check {winperf.diskstat} and is compatible - with the new agent version {1.1.11i1}. - -perfdata: - Two variables: the averaged disk throughput summed up over all disks, - for read and for write access. - -inventory: - A check of this type is automatically created for all Windows - hosts. - diff --git a/checks/winperf_system b/checks/winperf_system deleted file mode 100644 index 7c7db56..0000000 --- a/checks/winperf_system +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2010 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. - - -def inventory_win_diskstat(checkname, info): - for line in info[1:]: - try: - if line[0] == '16' or line[0] == '18': - return [(None, None)] - except: - pass - - -def check_win_diskstat(item, params, info): - this_time = int(float(info[0][0])) - read_bytes_ctr = 0 - write_bytes_ctr = 0 - for line in info[1:]: - if line[0] == '16': - read_bytes_ctr = int(line[1]) - elif line[0] == '18': - write_bytes_ctr = int(line[1]) - break - try: - read_timedif, read_per_sec = \ - get_counter("winperf_system.diskio.read", this_time, read_bytes_ctr) - write_timedif, write_per_sec = \ - get_counter("winperf_system.diskio.write", this_time, write_bytes_ctr) - - except MKCounterWrapped, e: - # make sure that inital check does not need three cycles for all counters - # to be initialized - get_counter("winperf_system.diskio.write", this_time, write_bytes_ctr) - raise e - - perfdata = [ ("read", "%dc" % read_bytes_ctr), - ("write", "%dc" % write_bytes_ctr) ] - return (0, "OK - reading %.1f MB/s, writing %.1f MB/s (in last %d secs)" % - (read_per_sec / 1048576, write_per_sec / 1048576, read_timedif), perfdata) - -check_info['winperf_system.diskio'] = (check_win_diskstat, "Disk IO SUMMARY", 1, inventory_win_diskstat) diff --git a/pnp-rraconf/check_mk-winperf_phydisk.rra.cfg b/pnp-rraconf/check_mk-winperf_phydisk.rra.cfg new file mode 120000 index 0000000..15fd63d --- /dev/null +++ b/pnp-rraconf/check_mk-winperf_phydisk.rra.cfg @@ -0,0 +1 @@ +check_mk-diskstat.rra.cfg \ No newline at end of file

13 years, 5 months

Check_MK Git: check_mk: winperf_phydisk: new check for per-device disk IO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e7b047fb41328b6cb7d9bff5904d1b45ced2b6c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7b047fb41328b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 14 14:43:13 2011 +0200 winperf_phydisk: new check for per-device disk IO --- ChangeLog | 1 + agents/windows/check_mk.ini | 3 +- agents/windows/check_mk_agent.cc | 72 +++++++++------------ agents/windows/check_mk_agent.exe | Bin 96768 -> 96768 bytes checkman/winperf.diskstat | 5 ++ checkman/winperf_phydisk | 97 +++++++++++++++++++++++++++ checks/diskstat | 127 +++++------------------------------- checks/diskstat.include | 127 ++++++++++++++++++++++++++++++++++++ checks/winperf_phydisk | 74 +++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 1 + 10 files changed, 354 insertions(+), 153 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e7b047fb41…

13 years, 5 months

Check_MK Git: check_mk: hp_procurve_cpu: rename load to utilization

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1c68ed0f1b0e98d7174aaadc33c1b9c794a09aec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c68ed0f1b0e98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 14 11:38:26 2011 +0200 hp_procurve_cpu: rename load to utilization --- ChangeLog | 1 + checks/hp_procurve_cpu | 16 +++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63246cf..e4ac38b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,7 @@ using S.M.A.R.T * mcdata_fcport: new check for ports of MCData FC Switches * hp_procurve_cpu: add PNP template + * hp_procurve_cpu: rename load to utilization, rename service to CPU utilizition 1.1.10: Core, Setup, etc.: diff --git a/checks/hp_procurve_cpu b/checks/hp_procurve_cpu index 40a3541..43267e3 100644 --- a/checks/hp_procurve_cpu +++ b/checks/hp_procurve_cpu @@ -24,8 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Author: Lars Michelsen <lm(a)mathias-kettner.de> - # Relevant SNMP OIDs: # 1.3.6.1.4.1.11.2.14.11.5.1.9.6.1 @@ -37,20 +35,20 @@ def inventory_hp_procurve_cpu(checkname, info): def check_hp_procurve_cpu(item, params, info): if len(info) == 1: - cpu_load = int(info[0][0]) - if cpu_load >= 0 <= 100: + cpu_util = int(info[0][0]) + if cpu_util >= 0 <= 100: status = 0 output = '' - if cpu_load >= params[1]: + if cpu_util >= params[1]: status = 2 output = ' (Above %d%%)' % params[1] - elif cpu_load >= params[0]: + elif cpu_util >= params[0]: status = 1 output = ' (Above %d%%)' % params[0] - return (status, '%s - CPU load is %d%% %s' % - (nagios_state_names[status], cpu_load, output), - [('load', '%d%%' % cpu_load, params[0], params[1], 0, 100)]) + return (status, '%s - CPU utilization is %d%% %s' % + (nagios_state_names[status], cpu_util, output), + [('util', '%d%%' % cpu_util, params[0], params[1], 0, 100)]) return (3, "UNKNOWN - Invalid information in snmp data")

13 years, 5 months

Check_MK Git: check_mk: if.include: fix detection of non-unique items

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3d19c8e9f741ac2ca851e8c20373413723d95656 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d19c8e9f741ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 14 11:26:24 2011 +0200 if.include: fix detection of non-unique items --- checks/if.include | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/checks/if.include b/checks/if.include index d3d7d92..2de2ab9 100644 --- a/checks/if.include +++ b/checks/if.include @@ -68,20 +68,29 @@ def inventory_if_common(info): if len(info) == 0 or len(info[0]) != 19: return [] pre_inventory = [] + + seen_items = set([]) + duplicate = set([]) for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, inucast, inmcast, inbcast, ifInDiscards, \ ifInErrors, ifOutOctets, outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, ifOutQLen, ifAlias in info: ifDescr = cleanup_if_strings(ifDescr) ifAlias = cleanup_if_strings(ifAlias) - if ifType in if_inventory_porttypes and ifOperStatus in if_inventory_portstates: - if if_inventory_uses_description and ifDescr: - item = ifDescr - elif if_inventory_uses_alias and ifAlias: - item = ifAlias - else: - item = ifIndex + # compute item now - also for unmonitored ports - in order to see if it + # is uninque. + if if_inventory_uses_description and ifDescr: + item = ifDescr + elif if_inventory_uses_alias and ifAlias: + item = ifAlias + else: + item = ifIndex + + if item in seen_items: # duplicate + duplicate.add(item) + seen_items.add(item) + if ifType in if_inventory_porttypes and ifOperStatus in if_inventory_portstates: paramstring = '{ "errors" : if_default_error_levels, ' \ '"traffic" : if_default_traffic_levels, ' \ '"average" : if_default_average ' @@ -95,13 +104,6 @@ def inventory_if_common(info): pre_inventory.append( (item, paramstring, int(ifIndex)) ) # Check for duplicate items (e.g. when using Alias as item and the alias is not unique) - seen_items = set([]) - duplicate = set([]) - for item, params, index in pre_inventory: - if item in seen_items: # duplicate - duplicate.add(item) - seen_items.add(item) - inventory = [] for item, params, index in pre_inventory: if item in duplicate: @@ -109,6 +111,7 @@ def inventory_if_common(info): else: new_item = item inventory.append((new_item, params)) + return inventory

13 years, 5 months

Check_MK Git: check_mk: hp_procurve_cpu: add PNP template

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e76960fc37684fcd3de0893886b921c7052723c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e76960fc37684… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 14 11:12:10 2011 +0200 hp_procurve_cpu: add PNP template --- ChangeLog | 1 + pnp-templates/check_mk-hp_procurve_cpu.php | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4597d94..63246cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,7 @@ * smart.temp/smart.stats: added new check for monitoring health of HDDs using S.M.A.R.T * mcdata_fcport: new check for ports of MCData FC Switches + * hp_procurve_cpu: add PNP template 1.1.10: Core, Setup, etc.: diff --git a/pnp-templates/check_mk-hp_procurve_cpu.php b/pnp-templates/check_mk-hp_procurve_cpu.php new file mode 120000 index 0000000..07c1c09 --- /dev/null +++ b/pnp-templates/check_mk-hp_procurve_cpu.php @@ -0,0 +1 @@ +check_mk-h3c_lanswitch_cpu.php \ No newline at end of file

13 years, 5 months

Check_MK Git: check_mk: FIX: fc_brocade_port_detailed: fix PNP template in MULTIPLE mode

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0d148250e7cddc0f3120a8b79ba9f07f8b93c582 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d148250e7cddc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 14 10:59:39 2011 +0200 FIX: fc_brocade_port_detailed: fix PNP template in MULTIPLE mode --- ChangeLog | 1 + .../check_mk-fc_brocade_port_detailed.php | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index af8abb8..4597d94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ * FIX: heartbeat_rscstatus handles empty agent output correctly * FIX: hp_procurve_cpu: fix synatx error in man page * FIX: hp_procurve_memory: fix syntax error in man page + * FIX: fc_brocade_port_detailed: fix PNP template in MULTIPLE mode * printer_supply: Changed order of tests. When a printer reports -3 this is used before the check if maxlevel is -2. * printer_supply: Skipping inventory of supplies which have current value diff --git a/pnp-templates/check_mk-fc_brocade_port_detailed.php b/pnp-templates/check_mk-fc_brocade_port_detailed.php index 32c486c..e423370 100644 --- a/pnp-templates/check_mk-fc_brocade_port_detailed.php +++ b/pnp-templates/check_mk-fc_brocade_port_detailed.php @@ -64,13 +64,13 @@ if ($MAX[1] != "") { $ds_name[2] = 'Error counter'; $opt[2] = "--vertical-label \"Error counter\" --title \"Problems on $hostname / $servicedesc\" "; -$def[2] = "DEF:crcerrors=$RRDFILE[1]:$DS[3]:MAX " ; -$def[2] .= "DEF:encout=$RRDFILE[1]:$DS[4]:MAX " ; -$def[2] .= "DEF:c3discards=$RRDFILE[1]:$DS[5]:MAX " ; +$def[2] = "DEF:crcerrors=$RRDFILE[3]:$DS[3]:MAX " ; +$def[2] .= "DEF:encout=$RRDFILE[4]:$DS[4]:MAX " ; +$def[2] .= "DEF:c3discards=$RRDFILE[5]:$DS[5]:MAX " ; $def[2] .= "LINE1:crcerrors#ff0000:\"CRC Errors \" " ; -$def[2] .= "GPRINT:crcerrors:LAST:\"%.0lf\\n\" " ; +$def[2] .= "GPRINT:crcerrors:LAST:\"last\: %.0lf\\n\" " ; $def[2] .= "LINE1:encout#60a020:\"ENC-Out \" " ; -$def[2] .= "GPRINT:encout:LAST:\"%.0lf\\n\" " ; +$def[2] .= "GPRINT:encout:LAST:\"last\: %.0lf\\n\" " ; $def[2] .= "LINE1:c3discards#2060a0:\"Class 3 Discards\" " ; -$def[2] .= "GPRINT:c3discards:LAST:\"%.0lf\\n\" " ; +$def[2] .= "GPRINT:c3discards:LAST:\"last\: %.0lf\\n\" " ; ?>

13 years, 5 months

Check_MK Git: check_mk: mcdata_fcport: new check for ports of MCData FC Switches

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8a5113601af4be63cebd84f78163933a348a1795 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a5113601af4be… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 14 10:49:22 2011 +0200 mcdata_fcport: new check for ports of MCData FC Switches --- ChangeLog | 1 + checkman/mcdata_fcport | 131 ++++++++++++++++++++++++++++ checks/mcdata_fcport | 99 +++++++++++++++++++++ pnp-rraconf/check_mk-mcdata_fcport.rra.cfg | 1 + pnp-templates/check_mk-mcdata_fcport.php | 1 + web/plugins/perfometer/check_mk.py | 15 ++-- 6 files changed, 241 insertions(+), 7 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8a5113601a…

13 years, 5 months

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2011