Checkmk git commits September 2015

checkmk-commits@lists.checkmk.com

8 participants
275 discussions

Check_MK Git: check_mk: fixed typo responese -> response

by Simon Betz

Module: check_mk Branch: master Commit: 0cb53d61e9ed6f24f98deedef8f86dc363cc0b47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cb53d61e9ed6f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 23 13:23:24 2015 +0200 fixed typo responese -> response --- web/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index cdc13b9..d8ebbff2 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2623,7 +2623,7 @@ check_metrics["check_mk_active-mail_loop"] = { } check_metrics["check_mk_active-http"] = { - "time" : { "name": "responese_time" }, + "time" : { "name": "response_time" }, "size" : { "name": "http_bandwidth" }, }

8 years, 12 months

Check_MK Git: check_mk: change check name of new check cisco_stackpower

by Simon Betz

Module: check_mk Branch: master Commit: c539d01a452ca13ddac35fefbe3f553663b5d0e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c539d01a452ca1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 23 13:11:22 2015 +0200 change check name of new check cisco_stackpower --- .werks/2633 | 2 +- ChangeLog | 2 +- checkman/{cisco_stackports => cisco_stackpower} | 0 checks/{cisco_stackports => cisco_stackpower} | 0 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/2633 b/.werks/2633 index 9581dc0..0461d29 100644 --- a/.werks/2633 +++ b/.werks/2633 @@ -1,4 +1,4 @@ -Title: new check cisco_stackports: monitors the link status of stack ports of Cisco Switches 3750-E Series +Title: new check cisco_stackpower: monitors the link status of stack ports of Cisco Switches 3750-E Series Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index a8bfdc2..1e99fa2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,7 +88,7 @@ * 2625 kernel.util and winperf_processor.util checks now support an optional graph showing utilization of individual cores... * 2626 ps check configurable to list state of individual processes in long output... * 2628 check_bi_aggr service now also goes into downtime if the monitored bi is in downtime... - * 2633 new check cisco_stackports: monitors the link status of stack ports of Cisco Switches 3750-E Series + * 2633 new check cisco_stackpower: monitors the link status of stack ports of Cisco Switches 3750-E Series * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checkman/cisco_stackports b/checkman/cisco_stackpower similarity index 100% rename from checkman/cisco_stackports rename to checkman/cisco_stackpower diff --git a/checks/cisco_stackports b/checks/cisco_stackpower similarity index 100% rename from checks/cisco_stackports rename to checks/cisco_stackpower

8 years, 12 months

Check_MK Git: check_mk: #2633 new check cisco_stackports:

by Simon Betz

monitors the link status of stack ports of Cisco Switches 3750-E Series Message-ID: <56026d09.xy9/n3ev48pIu75r%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: e35ee705677d53573f13f2ec38a335f3d52ccd7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e35ee705677d53… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 23 11:12:30 2015 +0200 #2633 new check cisco_stackports: monitors the link status of stack ports of Cisco Switches 3750-E Series --- .werks/2633 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/2633 b/.werks/2633 new file mode 100644 index 0000000..9581dc0 --- /dev/null +++ b/.werks/2633 @@ -0,0 +1,9 @@ +Title: new check cisco_stackports: monitors the link status of stack ports of Cisco Switches 3750-E Series +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1442999453 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 9e72585..a8bfdc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,7 @@ * 2625 kernel.util and winperf_processor.util checks now support an optional graph showing utilization of individual cores... * 2626 ps check configurable to list state of individual processes in long output... * 2628 check_bi_aggr service now also goes into downtime if the monitored bi is in downtime... + * 2633 new check cisco_stackports: monitors the link status of stack ports of Cisco Switches 3750-E Series * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space...

8 years, 12 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 3f33207b92bdb66260a32e1ecc40e4298e1cfdf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f33207b92bdb6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 23 11:10:40 2015 +0200 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 fd9d777..a54a3cb 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2633 +2643

8 years, 12 months

Check_MK Git: check_mk: added missing catalog in cisco_stackports man page

by Simon Betz

Module: check_mk Branch: master Commit: 3a26f99b744f87ede39539791f477bcedbcc7e57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a26f99b744f87… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 23 11:10:16 2015 +0200 added missing catalog in cisco_stackports man page --- checkman/cisco_stackports | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/cisco_stackports b/checkman/cisco_stackports index 480ed53..3d3e00e 100644 --- a/checkman/cisco_stackports +++ b/checkman/cisco_stackports @@ -1,6 +1,6 @@ title: CISCO Switch Catalyst 3750-E Series: Stack Port Link States agents: snmp -catalog: +catalog: hw/network/cisco license: GPL distribution: check_mk description:

8 years, 12 months

Check_MK Git: check_mk: added missing manpage

by Simon Betz

Module: check_mk Branch: master Commit: 8d96747127aaae0d9494eb121ee2012631fc4c66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d96747127aaae… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 23 11:07:17 2015 +0200 added missing manpage --- checkman/cisco_stackports | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/checkman/cisco_stackports b/checkman/cisco_stackports new file mode 100644 index 0000000..480ed53 --- /dev/null +++ b/checkman/cisco_stackports @@ -0,0 +1,18 @@ +title: CISCO Switch Catalyst 3750-E Series: Stack Port Link States +agents: snmp +catalog: +license: GPL +distribution: check_mk +description: + This check monitors the link states of the stack ports of a + Cisco Switch of the Catalyst 3750-E Series. + + If the link is up then the service reports OK. + If the link is forced down or not connected then the service state + will be CRIT. + +item: + The stackpower interface number. + +inventory: + One service per stackpower interface is created.

8 years, 12 months

Check_MK Git: check_mk: #2430 FIX Fixed crash with availability queries when using nagios as core

by Andreas Boesl

Module: check_mk Branch: master Commit: d21c5573c5ac4a7ceab6a4426ade551bd761b2a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d21c5573c5ac4a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 23 10:42:50 2015 +0200 #2430 FIX Fixed crash with availability queries when using nagios as core The nagios core crashed when a query on the statehist table did return zero entries. This happened when a timewindow was queried where the hosts/services in question did not exist. --- .werks/2430 | 11 +++++++++++ ChangeLog | 1 + livestatus/src/TableStateHistory.cc | 21 ++++++++++++--------- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.werks/2430 b/.werks/2430 new file mode 100644 index 0000000..e4d46bd --- /dev/null +++ b/.werks/2430 @@ -0,0 +1,11 @@ +Title: Fixed crash with availability queries when using nagios as core +Level: 2 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1442997503 + +The nagios core crashed when a query on the statehist table did return zero entries. +This happened when a timewindow was queried where the hosts/services in question did not exist. diff --git a/ChangeLog b/ChangeLog index d64011b..9e72585 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 2540 FIX: Process piggy backed data even if host is set to "No Agent"... * 2543 FIX: Fixed usage of icons/actions configured directly with process rules * 2630 FIX: fixed incorrect check interval of Check_MK Discovery... + * 2430 FIX: Fixed crash with availability queries when using nagios as core... Checks & Agents: * 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats, emc_vplex_if, emc_vplex_volumes... diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index df39ab4..02887c9 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -186,7 +186,7 @@ void TableStateHistory::addColumns(Table *table) LogEntry *TableStateHistory::getPreviousLogentry() { - if (_it_entries == _entries->begin()) { + while (_it_entries == _entries->begin()) { // open previous logfile if (_it_logs == g_store->logCache()->logfiles()->begin()) return 0; @@ -196,25 +196,28 @@ LogEntry *TableStateHistory::getPreviousLogentry() _it_entries = _entries->end(); } } + return (--_it_entries)->second; } LogEntry *TableStateHistory::getNextLogentry() { - if (++_it_entries == _entries->end()) { - if (++_it_logs == g_store->logCache()->logfiles()->end()) { - // No further logfiles available - // prevent errors on subsequent getNextLogentry() - --_it_entries; - --_it_logs; + if (_it_entries != _entries->end()) + ++_it_entries; + + while (_it_entries == _entries->end()) { + _logfiles_t::iterator _it_logs_cpy = _it_logs; + if (++_it_logs_cpy == g_store->logCache()->logfiles()->end()) { return 0; } else { + ++_it_logs; _entries = _it_logs->second->getEntriesFromQuery(_query, g_store->logCache(), _since, _until, CLASSMASK_STATEHIST); _it_entries = _entries->begin(); } } return _it_entries->second; + } void TableStateHistory::answerQuery(Query *query) @@ -306,10 +309,11 @@ void TableStateHistory::answerQuery(Query *query) return; } + // Determine initial logentry LogEntry* entry; _entries = _it_logs->second->getEntriesFromQuery(query, g_store->logCache(), _since, _until, CLASSMASK_STATEHIST); - if (_it_logs != newest_log) { + if (_entries->size() > 0 &&_it_logs != newest_log) { _it_entries = _entries->end(); // Check last entry. If it's younger than _since -> use this logfile too if (--_it_entries != _entries->begin()) { @@ -321,7 +325,6 @@ void TableStateHistory::answerQuery(Query *query) } else _it_entries = _entries->begin(); - // From now on use getPreviousLogentry() / getNextLogentry() HostServiceKey key; bool only_update = true;

8 years, 12 months

Check_MK Git: check_mk: artec checks: minor cleanups

by Mathias Kettner

Module: check_mk Branch: master Commit: 71a80eef2374511250245779042dffdb58f92830 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71a80eef237451… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 23 09:42:04 2015 +0200 artec checks: minor cleanups --- checks/artec_documents | 14 +++++++------- checks/artec_storage | 2 +- checks/artec_temp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/checks/artec_documents b/checks/artec_documents index 42ecbe9..5b52e4e 100644 --- a/checks/artec_documents +++ b/checks/artec_documents @@ -37,19 +37,19 @@ def inventory_artec_documents(info): def check_artec_documents(_no_item, _no_params, info): + now = time.time() for doc_name, doc_val_str in info: - if doc_val_str == "": - doc_val_str = "0" - yield 0, "%s: %s" % (doc_name.replace("Count", "") \ - .replace("count", "") \ - .strip(), \ - doc_val_str) + if doc_val_str: + documents = int(doc_val_str) + name = doc_name.replace("Count", "").replace("count", "").strip() + rate = get_rate(doc_name, now, documents) + yield 0, "%s: %d (%.2f/s)" % (name, documents, rate) check_info['artec_documents'] = { 'inventory_function' : inventory_artec_documents, 'check_function' : check_artec_documents, - 'service_description' : 'Documents SUMMARY', + 'service_description' : 'Documents', 'snmp_info' : (".1.3.6.1.4.1.31560.0.0.3.1", [ "3", # artecDocumentsName "1", # artecDocumentsValues diff --git a/checks/artec_storage b/checks/artec_storage index e8455e4..218a3af 100644 --- a/checks/artec_storage +++ b/checks/artec_storage @@ -52,7 +52,7 @@ def check_artec_storage(_no_item, _no_params, info): check_info['artec_storage'] = { 'inventory_function' : inventory_artec_storage, 'check_function' : check_artec_storage, - 'service_description' : 'Storage SUMMARY', + 'service_description' : 'Storage', # 'has_perfdata' : True, # TODO define perf var and adapt man page 'snmp_info' : (".1.3.6.1.4.1.31560.0.1.3.1", [ "3", # artecStorageName diff --git a/checks/artec_temp b/checks/artec_temp index 09549ef..75c01e8 100644 --- a/checks/artec_temp +++ b/checks/artec_temp @@ -34,7 +34,7 @@ factory_settings["artec_temp_default_levels"] = { def inventory_artec_temp(info): - return [ ("HDD", {}) ] + return [ ("Disk", {}) ] def check_artec_temp(item, params, info):

8 years, 12 months

Check_MK Git: check_mk: prelimiary version of cisco_stackports check

by Simon Betz

Module: check_mk Branch: master Commit: 19dc6a1e4840d72e80bbe85b59576023e4c3ee01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19dc6a1e4840d7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 23 09:05:31 2015 +0200 prelimiary version of cisco_stackports check --- checks/cisco_stackports | 78 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/checks/cisco_stackports b/checks/cisco_stackports new file mode 100644 index 0000000..ec7ad73 --- /dev/null +++ b/checks/cisco_stackports @@ -0,0 +1,78 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2015 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. + +# example: +# 1001 stack member and master +# 2001 stack member +# 3001 stack member +# 4001 stack member + +# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.1001.0 Port 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.1001.0 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.1001.1 Port 2 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.1001.1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.2001.0 Port 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.2001.0 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.2001.1 Port 2 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.2001.1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.3001.0 Port 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.3001.0 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.3001.1 Port 2 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.3001.1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.4001.0 Port 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.4001.0 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.4001.1 Port 2 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.4001.1 + +# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.1001.0 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.1001.0 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.1001.1 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.1001.1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.2001.0 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.2001.0 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.2001.1 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.2001.1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.3001.0 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.3001.0 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.3001.1 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.3001.1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.4001.0 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.4001.0 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.4001.1 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.4001.1 + + +def inventory_cisco_stackports(info): + return [ ("%s %s" % (oid.split(".")[0], port_name), None) \ + for oid, port_name, port_status in info ] + + +def check_cisco_stackports(item, params, info): + map_status = { + "1" : (0, "connected and operational"), + "2" : (2, "forced down or not connected"), + } + for oid, port_name, port_status in info: + if "%s %s" % (oid.split(".")[0], port_name) == item: + state, state_readable = map_status[port_status] + return state, "link status: %s" % state_readable + + +check_info['cisco_stackports'] = { + 'inventory_function' : inventory_cisco_stackports, + 'check_function' : check_cisco_stackports, + 'service_description' : 'Stackpower Interface %s', + 'snmp_info' : (".1.3.6.1.4.1.9.9.500.1.3.2.1", [ + OID_END, + "7", # cswStackPowerPortName + "5", # cswStackPowerPortLinkStatus + ]), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.9.1.516"), +}

8 years, 12 months

Check_MK Git: check_mk: preliminary version of artec checks

by Simon Betz

Module: check_mk Branch: master Commit: 2fdb72ca5a095b6718694a5bb880fe91c908f287 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fdb72ca5a095b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 23 09:04:42 2015 +0200 preliminary version of artec checks --- checks/artec_disk | 58 ++++++++++++++++++++++++++++++++ checks/artec_documents | 58 ++++++++++++++++++++++++++++++++ checks/artec_load | 53 +++++++++++++++++++++++++++++ checks/artec_mem | 60 +++++++++++++++++++++++++++++++++ checks/artec_processes | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ checks/artec_storage | 62 ++++++++++++++++++++++++++++++++++ checks/artec_temp | 54 ++++++++++++++++++++++++++++++ checks/sophos_messages | 5 ++- 8 files changed, 436 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2fdb72ca5a…

8 years, 12 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2015