Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

Check_MK Git: check_mk: Fixed error in windows agent which lead to compiler errors on newer

by Lars Michelsen

Module: check_mk Branch: master Commit: 4cf8c420aa4618bbdfded2358e9354247114bdc4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cf8c420aa4618… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 28 13:12:10 2014 +0200 Fixed error in windows agent which lead to compiler errors on newer ubuntu versions --- agents/windows/check_mk_agent.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 5889c94..91e2864 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2523,7 +2523,7 @@ bool handle_script_config_variable(char *var, char *value, script_type type) user = lstrip(var + 7); runas_include* tmp = new runas_include(); - memset(tmp, 0, sizeof(tmp)); + memset(tmp, 0, sizeof(*tmp)); if (user) snprintf(tmp->user, sizeof(tmp->user), user); @@ -3931,7 +3931,7 @@ bool handle_mrpe_config_variable(char *var, char *value) user = lstrip(var + 7); runas_include* tmp = new runas_include(); - memset(tmp, 0, sizeof(tmp)); + memset(tmp, 0, sizeof(*tmp)); if (user) snprintf(tmp->user, sizeof(tmp->user), user);

10 years, 2 months

Check_MK Git: check_mk: #1051 FIX tcp_conn_stats: fix missing performance data

by Mathias Kettner

Module: check_mk Branch: master Commit: cc8de0bc675f13b6aefc4f310e7a8786be30689d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc8de0bc675f13… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 28 12:18:22 2014 +0200 #1051 FIX tcp_conn_stats: fix missing performance data Due to a recent code rework the TCP Connections check had output invalid performance data. This has been fixed. --- .werks/1051 | 9 +++++++++ ChangeLog | 3 +++ 2 files changed, 12 insertions(+) diff --git a/.werks/1051 b/.werks/1051 new file mode 100644 index 0000000..18a0517 --- /dev/null +++ b/.werks/1051 @@ -0,0 +1,9 @@ +Title: tcp_conn_stats: fix missing performance data +Level: 1 +Component: checks +Version: 1.2.5i6 +Date: 1406542655 +Class: fix + +Due to a recent code rework the TCP Connections check had output invalid +performance data. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 9036286..5f92d9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.5i6: + Checks & Agents: + * 1051 FIX: tcp_conn_stats: fix missing performance data... + 1.2.5i5: Core & Setup:

10 years, 2 months

Check_MK Git: check_mk: tcp_conn_stats: fix missing performance data

by Mathias Kettner

Module: check_mk Branch: master Commit: 42d3c3726a27a32a305ad3524f5929552f0c6690 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42d3c3726a27a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 28 12:14:41 2014 +0200 tcp_conn_stats: fix missing performance data --- checks/tcp_conn_stats | 8 +++++--- modules/check_mk_base.py | 14 ++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/checks/tcp_conn_stats b/checks/tcp_conn_stats index 032afcc..55fc841 100644 --- a/checks/tcp_conn_stats +++ b/checks/tcp_conn_stats @@ -49,10 +49,10 @@ def check_tcp_conn_stats(item, params, info): stats = dict(info) for stat_state, hex in tcp_conn_stats_states: num = int(stats.get(stat_state, stats.get(hex, 0))) + state = 0 if num > 0: # Only check positive counts infotext = "%s: %d" % (stat_state, num) - state = 0 - perf = [state, num] + perf = [stat_state, num] levels = params.get(stat_state) if levels: warn, crit = levels @@ -64,7 +64,9 @@ def check_tcp_conn_stats(item, params, info): elif num >= warn: state = 1 infotext += " (warning at %d)" % warn - yield state, infotext, [perf] + else: + infotext = None + yield state, infotext, [perf] check_info["tcp_conn_stats"] = { diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 2494e02..61984e2 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1142,7 +1142,8 @@ def convert_check_result(result): return subresults[0] # Several sub results issued with multiple yields. Make that worst sub check - # decide the total state, join the texts and performance data + # decide the total state, join the texts and performance data. Subresults with + # an infotext of None are used for adding performance data. else: perfdata = [] infotexts = [] @@ -1150,11 +1151,12 @@ def convert_check_result(result): for subresult in subresults: st, text = subresult[:2] - infotexts.append(text + ["", "(!)", "(!!)", "(?)"][st]) - if st == 2 or status == 2: - status = 2 - else: - status = max(status, st) + if text != None: + infotexts.append(text + ["", "(!)", "(!!)", "(?)"][st]) + if st == 2 or status == 2: + status = 2 + else: + status = max(status, st) if len(subresult) == 3: perfdata += subresult[2]

10 years, 2 months

Check_MK Git: check_mk: Fixed broken check manpages

by Lars Michelsen

Module: check_mk Branch: master Commit: f6f54072b87a009df3ea08b5ea1fdb945d28075e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6f54072b87a00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 28 09:36:48 2014 +0200 Fixed broken check manpages --- checkman/jolokia_metrics.gc | 1 + checkman/jolokia_metrics.tp | 1 + modules/check_mk.py | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/checkman/jolokia_metrics.gc b/checkman/jolokia_metrics.gc index c829c7f..ef33f2d 100644 --- a/checkman/jolokia_metrics.gc +++ b/checkman/jolokia_metrics.gc @@ -1,5 +1,6 @@ title: Java virtual machine garbage collection agents: linux +catalog: app/java license: GPL distribution: check_mk description: diff --git a/checkman/jolokia_metrics.tp b/checkman/jolokia_metrics.tp index 24a0c7e..55bc528 100644 --- a/checkman/jolokia_metrics.tp +++ b/checkman/jolokia_metrics.tp @@ -1,6 +1,7 @@ title: Tomcat number of threads in thread pool agents: linux license: GPL +catalog: app/java distribution: check_mk description: This check monitors the number of threads in a tomcat thread pool. diff --git a/modules/check_mk.py b/modules/check_mk.py index 015e284..8c03880 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3622,7 +3622,12 @@ def read_manpage_catalog(): if filename.startswith("."): continue parsed = parse_man_header(checkname, path) - cat = parsed["catalog"] + try: + cat = parsed["catalog"] + except KeyError: + sys.stderr.write('ERROR: Invalid manpage: %s (Catalog info missing)\n' % checkname) + continue + if not cat: cat = [ "unsorted" ]

10 years, 2 months

Check_MK Git: check_mk: Updated bug entries #2159

by Mathias Kettner

Module: check_mk Branch: master Commit: 866ae84c2ee6de9c19f17127cebd718a6e07bf88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=866ae84c2ee6de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 28 09:29:06 2014 +0200 Updated bug entries #2159 --- .bugs/2159 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2159 b/.bugs/2159 new file mode 100644 index 0000000..3d25e2f --- /dev/null +++ b/.bugs/2159 @@ -0,0 +1,10 @@ +Title: Make NTP check more tolerant +Component: checks +State: open +Date: 2014-07-28 09:28:06 +Targetversion: future +Class: nastiness + +The message "CRIT - found 1 peers, but none is suitable" should be tolerated for +at least some time. Maybe the check could itself measure how long that state +is active and raise a MKCounterWrapped for an intermediate time...

10 years, 2 months

Check_MK Git: check_mk: Formated werk ids in commit messages

by Lars Michelsen

Module: check_mk Branch: master Commit: 76cb97413fc47bcd06c7d3c4d85c09a617ef8358 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76cb97413fc47b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 25 08:21:02 2014 +0200 Formated werk ids in commit messages --- werk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/werk b/werk index 9f18bc5..bd43a01 100755 --- a/werk +++ b/werk @@ -249,7 +249,7 @@ def git_commit(werk, custom_files): if prefix: title = "%s %s" % (prefix, title) - title = "%d %s" % (werk['id'], title) + title = "#%04d %s" % (werk['id'], title) if custom_files: files_to_commit = custom_files

10 years, 2 months

Check_MK Git: check_mk: Deleted entry for werk 642

by Mathias Kettner

Module: check_mk Branch: master Commit: e3007f163dada038c2493182a6ac8b6b9ae9a90c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3007f163dada0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 24 17:56:15 2014 +0200 Deleted entry for werk 642 --- .werks/642 | 8 -------- ChangeLog | 1 - 2 files changed, 9 deletions(-) diff --git a/.werks/642 b/.werks/642 deleted file mode 100644 index ebbf24c..0000000 --- a/.werks/642 +++ /dev/null @@ -1,8 +0,0 @@ -Title: fc_port: scan function of check modified ... again -Level: 1 -Component: checks -Version: 1.2.5i5 -Date: 1406216089 -Class: fix - - diff --git a/ChangeLog b/ChangeLog index ab347b3..b6180f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,7 +75,6 @@ * 1049 FIX: ups_capacity: Fix exception when running on battery... * 0639 FIX: jolokia_metrics: fix for problem when catalina uses the standalone engine * 1050 FIX: websphere_mq_queues: make compatible with old agent, fix not-found case - * 0642 FIX: fc_port: scan function of check modified ... again Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2...

10 years, 2 months

Check_MK Git: check_mk: modified draft for storage inventory

by Goetz Golla

Module: check_mk Branch: master Commit: 836881ec7dfe01123ce850ab78d1bac4f4d6e53d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=836881ec7dfe01… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Jul 24 17:48:42 2014 +0200 modified draft for storage inventory --- doc/drafts/LIESMICH.hardwareinventur | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/drafts/LIESMICH.hardwareinventur b/doc/drafts/LIESMICH.hardwareinventur index cc20275..62b0652 100644 --- a/doc/drafts/LIESMICH.hardwareinventur +++ b/doc/drafts/LIESMICH.hardwareinventur @@ -240,26 +240,26 @@ hardware.storage .fsnode "/dev/vg-01/lv-backup" .size 9823749827349823 .used 2943847238947 - .type "ext3" + .fstype "ext3" .mountpoint /srv/backup - .local True + .drive_type localdisk .disk inv_reference(... zu Platte) .partition inv_reference(... zu Partition) :1 .fsnode "/dev/vg-01/lv-unused" .size 9823749827349823 .used 2943847238947 - .type "swap" + .fstype "swap" .mountpoint None - .local True + .drive_type local disk :2 .server "rablfals.local" .volume "/wefoijweofijw" .size 9823749827349823 .used 2943847238947 - .type "nfs" + .fstype "nfs" .mountpoint "/sapdata" - .local False + .drive_type network drive .swapareas :0

10 years, 2 months

Check_MK Git: check_mk: knuerr_sensors: New Check to monitor

by Bastian Kuhn

Sensors on a =?iso-8859-1?Q?Kn=FCrr?= RMS Device Message-ID: <53d129bf.9uw/3wFJ1amG4fON%bk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: bbdb021b6c50a5f6dc769202c1f4bc61c7be7885 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbdb021b6c50a5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 24 17:43:24 2014 +0200 knuerr_sensors: New Check to monitor Sensors on a Knürr RMS Device --- .werks/184 | 8 ++++++++ ChangeLog | 3 ++- checkman/knuerr_sensors | 15 +++++++++++++++ checks/knuerr_sensors | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 1 deletion(-) diff --git a/.werks/184 b/.werks/184 new file mode 100644 index 0000000..50bff22 --- /dev/null +++ b/.werks/184 @@ -0,0 +1,8 @@ +Title: knuerr_sensors: New Check to monitor Sensors on a Knürr RMS Device +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1406216559 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d255d2e..9231198 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,9 +40,10 @@ * 1135 bintec_sensors.voltage, bintec_sensors.temp: New Checks for Voltage and Temperature Sensors of Bintec Routers * 1048 mem.win: support predictive levels... * 1136 bintec_brrp_status: New Check for BRRP States on Bintec Routers - * 0183 sentry_pdu: New check to monitor plugs of sentry PDUs * 0640 jolokia_metrics.gc, jolokia_metrics.tp: now come with its own pnp templates * 1088 included check_mk_agent windows msi installer... + * 0183 sentry_pdu: New check to monitor plugs of sentry PDUs + * 0184 knuerr_sensors: New Check to monitor Sensors on a Knürr RMS Device * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/checkman/knuerr_sensors b/checkman/knuerr_sensors new file mode 100644 index 0000000..fdd99a7 --- /dev/null +++ b/checkman/knuerr_sensors @@ -0,0 +1,15 @@ +title: Knürr RMS Sensors +agents: snmp +catalog: hw/environment/knuerr +license: GPL +distribution: +description: + This check monitors the sensor contacts on a Knürr RMS Monitoring System. For each Sensor who is not in a ok state, a {CRITICAL} will be + triggered. + +item: + The Sesorname as configured in the device + +inventory: + All available sensors are automatically inventorized. + diff --git a/checks/knuerr_sensors b/checks/knuerr_sensors new file mode 100644 index 0000000..6b43b7c --- /dev/null +++ b/checks/knuerr_sensors @@ -0,0 +1,46 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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_knuerr_sensors(info): + for sensor, state in info: + yield sensor, None + +def check_knuerr_sensors(item, _no_params, info): + for sensor, state in info: + if sensor == item: + if state != '0': + return 2, "Sensor triggered" + return 0, "Sensor not triggered" + return 3, "Sensor not longer found" + +check_info["knuerr_sensors"] = { + "check_function" : check_knuerr_sensors, + "inventory_function" : inventory_knuerr_sensors, + "service_description" : "Sensor %s", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.3711.15.1", + "snmp_info" : ( ".1.3.6.1.4.1.3711.15.1.1.2", [ 1, 5 ]) +} +

10 years, 2 months

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: b967f5b5d75cb51b0ded13e6468b7f52cbf37bcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b967f5b5d75cb5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 24 17:43:53 2014 +0200 merge conflict ---

10 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits