Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

logwatch: fixed status 3 - unknown being reported if the logfile is empty

by Sebastian Herbord

Module: check_mk Branch: master Commit: 2722732ae6104aa5181d2bcaa826920154a6da76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2722732ae6104a… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Apr 14 11:58:23 2016 +0200 logwatch: fixed status 3 - unknown being reported if the logfile is empty --- checks/logwatch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index 0388b2a..a250d3c 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -260,15 +260,16 @@ def check_logwatch(item, params, info): return 3, "Error in agent configuration: %s" % " ".join(info[0][4:]) found = False + right_block = False loglines = [] for l in info: node = l[0] line = " ".join(l[1:]) if line == "[[[%s]]]" % item: - found = True + found = right_block = True elif len(line) > 6 and line[0:3] == "[[[" and line[-3:] == "]]]": - found = False - elif found and is_cache_new(node): + right_block = False + elif right_block and is_cache_new(node): loglines.append(line) return check_logwatch_generic(item, params, loglines, found)

8 years, 5 months

3122 FIX netapp_fcpio: the rules for this check are now actually used

by Sebastian Herbord

Module: check_mk Branch: master Commit: 1bb1394dae31858c80a1c10bfc2fa96168a463c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bb1394dae3185… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Apr 14 11:31:13 2016 +0200 3122 FIX netapp_fcpio: the rules for this check are now actually used A typo prevented this rule from being applied --- .werks/3122 | 10 ++++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3122 b/.werks/3122 new file mode 100644 index 0000000..bc55e53 --- /dev/null +++ b/.werks/3122 @@ -0,0 +1,10 @@ +Title: netapp_fcpio: the rules for this check are now actually used +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460626211 + +A typo prevented this rule from being applied diff --git a/ChangeLog b/ChangeLog index 9aab253..fd5d4e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -147,6 +147,7 @@ * 3117 FIX: windows agent: fixed installer may fail to re-start service on update... * 3406 FIX: hp_proliant_temp: fixed wrong params data type * 3408 FIX: temperature.include: now does not ignore levels with value 0 any more + * 3122 FIX: netapp_fcpio: the rules for this check are now actually used... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 2512ea1..04b872a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2765,7 +2765,7 @@ register_check_parameters( register_check_parameters( subgroup_storage, - "netapp_fcprtio", + "netapp_fcportio", _("Netapp FC Port throughput"), Dictionary( elements = [

8 years, 5 months

Updated bug entries #2488

by Mathias Kettner

Module: check_mk Branch: master Commit: fedc69ceeea10ca869909cd75cf10b85d674a567 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fedc69ceeea10c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 14 10:55:01 2016 +0200 Updated bug entries #2488 --- .bugs/2488 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2488 b/.bugs/2488 new file mode 100644 index 0000000..ebf3bd5 --- /dev/null +++ b/.bugs/2488 @@ -0,0 +1,9 @@ +Title: View-Editor: Try out does not work anymore... +Component: multisite +State: open +Date: 2016-04-14 10:54:21 +Targetversion: 1.2.8 +Class: bug + +If you hit Try out then you will just see the edit form again, but not the actual +view below it.

8 years, 5 months

Remove bogus newlines from ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: a746498de770520d90faf9d9e19eea83563e87eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a746498de77052… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 14 10:29:21 2016 +0200 Remove bogus newlines from ChangeLog --- ChangeLog | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef251c1..9aab253 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,5 @@ 1.2.9i1: Core & Setup: - * 3342 MKP: local/lib and local/bin of sites can now be packed... * 3114 linux and windows agent can now be configured to directly encrypt their output. For real-time updates encryption is now optional (but active per default)... * 3193 FIX: Fixed fake check results for hosts... @@ -16,7 +15,6 @@ * 3349 FIX: Added rule to disable Inline-SNMP per host... Checks & Agents: - * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller * 3184 varnish, varnish.backend, varnish.backend_success_ratio, varnish.cache, varnish.cache_hit_ratio, varnish.client, varnish.esi, varnish.fetch, varnish.objects, varnish.worker, varnish.worker_thread_ratio: new checks which monitor HTTP Accelerator Statistics via varnishstat on Linux * 2994 brocade.temp: increased temperature default levels from 35/40 to 55/60 @@ -151,7 +149,6 @@ * 3408 FIX: temperature.include: now does not ignore levels with value 0 any more Multisite: - * 3187 notification view: new filter for log command via regex * 3228 The BI Treestate painter now exports the aggregation tree as real json structure * 3288 Implemented grouping of services in table views... @@ -205,7 +202,6 @@ * 3398 FIX: Fix exception in Matrix layout if it contains certain complex columns WATO: - * 3244 WATO BI Module: swap order of aggregation function and child node selection... * 3002 Treasure script wato_import.py: now able to set wato host tag groups * 3003 New treasure script: migrate_oldcmk2wato.py... @@ -267,13 +263,11 @@ * 3377 FIX: Network scan: The scan was broken when having no regex exclude patterns since 1.2.8b9 Notifications: - * 3263 Notifications: allow users to restrict by their contact groups... * 3253 FIX: sms: notification script sms now handles single quotes in the message in the right way * 3346 FIX: Re-added envelope sender to asciimail/mail notification plugins BI: - * 3271 New option in aggregation for tuning aggregation of downtimes... * 3396 Change default setting of Precompile aggregations on demand to ON now... * 3247 FIX: Do not allow multiple BI aggregates with the same title... @@ -282,7 +276,6 @@ * 3358 FIX: Fixed BI Boxes views when "Enable BI compilation diagnostics" enabled Reporting & Availability: - * 3267 New availability option for reclassifying host state "unreachable"... * 3102 added option to availability to include host alias in reports... * 3394 Availability: Annotations can now be used to reclassify the scheduled downtime status... @@ -294,7 +287,6 @@ * 3393 FIX: Availability annotations: also show annotations for hosts when showing services Event Console: - * 2999 The contact name is now included in Event Console notifications... * 3262 Event Console: bulk delete button for custom MIBs now available * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... @@ -305,12 +297,10 @@ * 3240 FIX: Fixed various quotation issues in GUI parts related to the EC Livestatus: - * 3233 FIX: Fixed shutdown of Nagios core with Livestatus module... * 3235 FIX: Unbreak COMMAND handling... HW/SW-Inventory: - * 3192 snmp_extended_info: now inventorizes all physical components of devices which support the ENTITY-MIB * 3319 HW/SW-Inventory service can now be OK in case of unreachable host... * 3322 esx_vsphere_hostsystem: inventory now adds information about memory, uuid and service tag...

8 years, 5 months

Remove bogus newlines from ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: 11eca52242076924121337b373a520d1a56f3962 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11eca522420769… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 14 10:28:04 2016 +0200 Remove bogus newlines from ChangeLog Conflicts: ChangeLog --- werk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/werk b/werk index 4ccb5ed..db40952 100755 --- a/werk +++ b/werk @@ -149,8 +149,7 @@ def rewrite_changelog(*args): else: chn.write("\n") compname = dict(components).get(compid, compid) - chn.write(" %s:\n" - "\n" % compname) + chn.write(" %s:\n" % compname) for werk in werks: write_changelog_line(chn, werk)

8 years, 5 months

3398 FIX Fix exception in Matrix layout if it contains certain complex columns

by Mathias Kettner

Module: check_mk Branch: master Commit: d6768d38ad924f4088dbaecd89369ceff6e16f3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6768d38ad924f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 14 10:23:46 2016 +0200 3398 FIX Fix exception in Matrix layout if it contains certain complex columns --- .werks/3398 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/views.py | 10 +++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/3398 b/.werks/3398 new file mode 100644 index 0000000..7c37f1b --- /dev/null +++ b/.werks/3398 @@ -0,0 +1,10 @@ +Title: Fix exception in Matrix layout if it contains certain complex columns +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460622196 + + diff --git a/ChangeLog b/ChangeLog index 298247a..ef251c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -202,6 +202,7 @@ * 3375 FIX: Fixed exception when adding a bookmark while having a list not named my_bookmarks * 3118 FIX: Availability view now takes daylight saving time into account * 3395 FIX: Fix performance issue when many BI aggregations are active... + * 3398 FIX: Fix exception in Matrix layout if it contains certain complex columns WATO: diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e9df56f..783c5f9 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2421,7 +2421,15 @@ def group_value(row, group_painters): for c in get_painter_columns(p[0]): if c in row: group.append(row[c]) - return tuple(group) + return create_dict_key(group) + +def create_dict_key(value): + if type(value) in (list, tuple): + return tuple(map(create_dict_key, value)) + elif type(value) == dict: + return tuple([ (k, create_dict_key(v)) for (k, v) in sorted(value.items()) ]) + else: + return value def get_painter_option(name): opt = multisite_painter_options[name]

8 years, 5 months

3408 FIX temperature.include: now does not ignore levels with value 0 any more

by Simon Betz

Module: check_mk Branch: master Commit: 13633527094302db7817b4deaa5fb0b5a9eb6f40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13633527094302… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 13 17:24:54 2016 +0200 3408 FIX temperature.include: now does not ignore levels with value 0 any more --- .werks/3408 | 10 ++++++++++ ChangeLog | 1 + checks/temperature.include | 18 +++++++++--------- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.werks/3408 b/.werks/3408 new file mode 100644 index 0000000..bb5b81a --- /dev/null +++ b/.werks/3408 @@ -0,0 +1,10 @@ +Title: temperature.include: now does not ignore levels with value 0 any more +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460561025 + + diff --git a/ChangeLog b/ChangeLog index f2b6174..298247a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -148,6 +148,7 @@ * 3372 FIX: check_mailboxes: Improved error handling * 3117 FIX: windows agent: fixed installer may fail to re-start service on update... * 3406 FIX: hp_proliant_temp: fixed wrong params data type + * 3408 FIX: temperature.include: now does not ignore levels with value 0 any more Multisite: diff --git a/checks/temperature.include b/checks/temperature.include index e4e1f33..a38a8eb 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -120,23 +120,23 @@ def check_temperature_determine_levels(dlh, usr_warn, usr_crit, usr_warn_lower, # Use user's levels if present, otherwise the device's elif dlh == "usrdefault": - if usr_warn and usr_crit: + if usr_warn is not None and usr_crit is not None: warn, crit = usr_warn, usr_crit else: warn, crit = dev_warn, dev_crit - if usr_warn_lower and usr_crit_lower: + if usr_warn_lower is not None and usr_crit_lower is not None: warn_lower, crit_lower = usr_warn_lower, usr_crit_lower else: warn_lower, crit_lower = dev_warn_lower, dev_crit_lower # Use device's levels if present, otherwise yours elif dlh == "devdefault": - if dev_warn and dev_crit: + if dev_warn is not None and dev_crit is None: warn, crit = dev_warn, dev_crit else: warn, crit = usr_warn, usr_crit - if dev_warn_lower and dev_crit_lower: + if dev_warn_lower is not None and dev_crit_lower is not None: warn_lower, crit_lower = dev_warn_lower, dev_crit_lower else: warn_lower, crit_lower = usr_warn_lower, usr_crit_lower @@ -187,16 +187,16 @@ def check_temperature_trend(temp, params, output_unit, crit, crit_lower, unique_ else: warn_lower_trend = crit_lower_trend = None - if crit_upper_trend and trend > crit_upper_trend: + if crit_upper_trend is not None and trend > crit_upper_trend: combiner(2, u"rising faster than %s/%g min(!!)" %\ (render_temp(crit_upper_trend, output_unit, True), trend_range_min)) - elif warn_upper_trend and trend > warn_upper_trend: + elif warn_upper_trend is not None and trend > warn_upper_trend: combiner(1, u"rising faster than %s/%g min(!)" %\ (render_temp(warn_upper_trend, output_unit, True), trend_range_min)) - elif crit_lower_trend and trend < crit_lower_trend: + elif crit_lower_trend is not None and trend < crit_lower_trend: combiner(2, u"falling faster than %s/%g min(!!)" %\ (render_temp(crit_lower_trend, output_unit, True), trend_range_min)) - elif warn_lower_trend and trend < warn_lower_trend: + elif warn_lower_trend is not None and trend < warn_lower_trend: combiner(1, u"falling faster than %s/%g min(!)" %\ (render_temp(warn_lower_trend, output_unit, True), trend_range_min)) @@ -312,7 +312,7 @@ def check_temperature(reading, params, unique_name, dev_unit = "c", # Render actual temperature, e.g. "17.8 °F" infotext = "%s %s" % (render_temp(temp, output_unit), temp_unitsym[output_unit]) - if dev_status != None and dev_status != 0 and dev_status_name: # omit status in OK case + if dev_status is not None and dev_status != 0 and dev_status_name: # omit status in OK case infotext += ", %s" % dev_status_name # In case of a non-OK status output the information about the levels

8 years, 5 months

3407 cisco_mem_asa64: new check which monitors the used memory of Cisco Adaptive Security Appliances

by Simon Betz

Module: check_mk Branch: master Commit: 72cc639883b0f04c9fb75b8a306ab1c8b98cb016 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72cc639883b0f0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 13 17:19:11 2016 +0200 3407 cisco_mem_asa64: new check which monitors the used memory of Cisco Adaptive Security Appliances Cisco Adaptive Security Appliances Version 9 and higher provide wrong data given by 32-bit counter. This new check now uses 64-bit counter instead to monitor the used memory. --- .werks/3407 | 10 ++++++++++ ChangeLog | 2 ++ checkman/cisco_mem_asa64 | 31 ++++++++++++++++++++++++++++++ checks/cisco_mem.include | 13 ++++++++++++- checks/cisco_mem_asa | 10 ++++++---- checks/cisco_mem_asa64 | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 108 insertions(+), 5 deletions(-) diff --git a/.werks/3407 b/.werks/3407 new file mode 100644 index 0000000..0ea6254 --- /dev/null +++ b/.werks/3407 @@ -0,0 +1,10 @@ +Title: cisco_mem_asa64: new check which monitors the used memory of Cisco Adaptive Security Appliances +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.9i1 +Date: 1460560557 +Class: feature + +Cisco Adaptive Security Appliances Version 9 and higher provide wrong data given by 32-bit counter. +This new check now uses 64-bit counter instead to monitor the used memory. diff --git a/ChangeLog b/ChangeLog index 057b8e2..f2b6174 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,8 @@ * 3404 fireeye_sys_status: new inventory plugin which gives information about serial number and model of Fireeye Appliances which support the FE-FIREEYE-MIB * 3405 cisco_fantray, cisco_fru_power: now these checks have readable item names NOTE: Please refer to the migration notes! + * 3407 cisco_mem_asa64: new check which monitors the used memory of Cisco Adaptive Security Appliances... + NOTE: Please refer to the migration notes! * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checkman/cisco_mem_asa64 b/checkman/cisco_mem_asa64 new file mode 100644 index 0000000..ebc3b90 --- /dev/null +++ b/checkman/cisco_mem_asa64 @@ -0,0 +1,31 @@ +title: Cisco Adaptive Security Appliances Version 9.x: System Memory +agents: snmp +catalog: hw/network/cisco +license: GPL +distribution: check_mk +description: + This Check does the same as the normal cisco_mem check. The only difference is + that this check only monitors the System memory. The reason is a + bug in the ASA firmware: http://www.cisco.com/c/en/us/support/docs/security/asa-5500-x-series-next-g… + + Moreover there are problems with newer ASA version 9.x: from cisco + Deprecate 32-bit SNMP OIDs for Memory UtilizationCSCuu46705DescriptionSymptom: + Currently the ASA has two ways to check memory via SNMP. 1.3.6.1.4.1.9.9.48 can be polled + and the OIDs under that will dig into each individual memory pool, including DMA and + GLOBAL SHARED but all the counters are 32-bit which means that the information contained + in them is wrong for some of the modern ASAs that run with more memory. Also, polling some + of these OIDs will cause CPU-hogs on the ASA, as per CSCtx43501. + In recent codes, you can poll the CISCO-ENHANCED-MEMPOOL-MIB, 1.3.6.1.4.1.9.9.221, and it + will provide overall system memory, but it does so with 64-bit counters as well. This is + the only way to get valid memory numbers on platforms with more than 4GB of RAM. + Also, polling this MIB has not caused CPU-hogs for the SNMP process. + Conditions: + ASA 9.x + Monitoring memory via SNMP polling + 5500-x platform + +item: + The sytem memory. + +inventory: + One service is created. diff --git a/checks/cisco_mem.include b/checks/cisco_mem.include index f6f2148..2963a29 100644 --- a/checks/cisco_mem.include +++ b/checks/cisco_mem.include @@ -24,14 +24,25 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +def scan_cisco_mem_asa64(oid): + version = int((oid(".1.3.6.1.2.1.1.1.0").split("Version")[-1]).split(".")[0]) + if version >= 9: + return True + else: + return False + + cisco_mem_default_levels = (80.0, 90.0) + def inventory_cisco_mem(info): return [ (line[0], "cisco_mem_default_levels") for line in info if line[0] != "Driver text" ] + def check_cisco_mem(item, params, info): for line in info: if line[0] == item: @@ -39,7 +50,7 @@ def check_cisco_mem(item, params, info): mem_used = saveint(line[1]) mem_total = mem_free + mem_used return check_cisco_mem_sub(params, mem_used, mem_total) - return 3, "Error getting information. Try a reinventory" + def check_cisco_mem_sub(params, mem_used, mem_total): perc_used = 100 * (float(mem_used) / float(mem_total)) diff --git a/checks/cisco_mem_asa b/checks/cisco_mem_asa index 2839b0b..b0754e2 100644 --- a/checks/cisco_mem_asa +++ b/checks/cisco_mem_asa @@ -27,19 +27,21 @@ # The reason for this check is a problem on ASA devices # See: http://www.cisco.com/c/en/us/support/docs/security/asa-5500-x-series-next-g… + def parse_cisco_mem_asa(info): return [ info[0][0], info[1][0] ] check_info["cisco_mem_asa"] = { - "check_function" : check_cisco_mem, + "parse_function" : parse_cisco_mem_asa, "inventory_function" : inventory_cisco_mem, + "check_function" : check_cisco_mem, "service_description" : "Mem used %s", "has_perfdata" : True, "group" : "cisco_mem", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("cisco adaptive security"), - "snmp_info" : [( ".1.3.6.1.4.1.9.9.48.1.1.1", [ "2.1", "5.1", "6.1" , "7.1" ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("cisco adaptive security") \ + and not scan_cisco_mem_asa64(oid), + "snmp_info" : [( ".1.3.6.1.4.1.9.9.48.1.1.1", [ "2.1", "5.1", "6.1" , "7.1" ]), ( ".1.3.6.1.4.1.9.9.48.1.1.1", [ "2.6", "5.6", "6.6" , "7.6" ])], "includes" : ['cisco_mem.include'], - "parse_function" : parse_cisco_mem_asa, } diff --git a/checks/cisco_mem_asa64 b/checks/cisco_mem_asa64 new file mode 100644 index 0000000..47df7e2 --- /dev/null +++ b/checks/cisco_mem_asa64 @@ -0,0 +1,47 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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- +# tails. 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. + + +# .1.3.6.1.4.1.9.9.221.1.1.1.1.3.2.1 System memory --> CISCO-ENHANCED-MEMPOOL-MIB::cempMemPoolName.2.1 +# .1.3.6.1.4.1.9.9.221.1.1.1.1.18.2.1 902008879 --> CISCO-ENHANCED-MEMPOOL-MIB::cempMemPoolHCUsed.2.1 +# .1.3.6.1.4.1.9.9.221.1.1.1.1.20.2.1 3392957761 --> CISCO-ENHANCED-MEMPOOL-MIB::cempMemPoolHCFree.2.1 + + +check_info["cisco_mem_asa64"] = { + "inventory_function" : inventory_cisco_mem, + "check_function" : check_cisco_mem, + "service_description" : "Mem used %s", + "has_perfdata" : True, + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("cisco adaptive security") \ + and scan_cisco_mem_asa64(oid), + "snmp_info" : (".1.3.6.1.4.1.9.9.221.1.1.1.1", [ + "3", # cempMemPoolName + "18", # cempMemPoolHCUsed + "20", # cempMemPoolHCFree + ]), + "group" : "cisco_mem", + "includes" : [ 'cisco_mem.include' ], +}

8 years, 5 months

3406 FIX hp_proliant_temp: fixed wrong params data type

by Simon Betz

Module: check_mk Branch: master Commit: f8ad4187b06c9e4051bd6bdddad1b4e4ef3bd1bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8ad4187b06c9e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 13 17:03:47 2016 +0200 3406 FIX hp_proliant_temp: fixed wrong params data type --- .werks/3406 | 10 ++++++++++ ChangeLog | 1 + checks/hp_proliant_temp | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3406 b/.werks/3406 new file mode 100644 index 0000000..1c25c2b --- /dev/null +++ b/.werks/3406 @@ -0,0 +1,10 @@ +Title: hp_proliant_temp: fixed wrong params data type +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460559805 + + diff --git a/ChangeLog b/ChangeLog index 6869d86..057b8e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -145,6 +145,7 @@ * 3370 FIX: check_mail: Fixed mail parsing bug when using POP3 * 3372 FIX: check_mailboxes: Improved error handling * 3117 FIX: windows agent: fixed installer may fail to re-start service on update... + * 3406 FIX: hp_proliant_temp: fixed wrong params data type Multisite: diff --git a/checks/hp_proliant_temp b/checks/hp_proliant_temp index 2edda3f..9f99e51 100644 --- a/checks/hp_proliant_temp +++ b/checks/hp_proliant_temp @@ -31,7 +31,7 @@ def format_hp_proliant_name(line): def inventory_hp_proliant_temp(info): for line in info: - yield format_hp_proliant_name(line), None + yield format_hp_proliant_name(line), {} def check_hp_proliant_temp(item, params, info): for line in info:

8 years, 5 months

3405 cisco_fantray, cisco_fru_power: now these checks have readable item names

by Simon Betz

Module: check_mk Branch: master Commit: ad79a826a2a0c3742b45ac4fa380be21bfe4c30b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad79a826a2a0c3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 13 16:46:09 2016 +0200 3405 cisco_fantray, cisco_fru_power: now these checks have readable item names --- .werks/3405 | 9 +++ ChangeLog | 2 + checks/cisco_fantray | 115 +++++++++++++++++++++++++++++-------- checks/cisco_fru_power | 149 +++++++++++++++++++++++++++++++----------------- 4 files changed, 200 insertions(+), 75 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ad79a826a2…

8 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016