Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

3108 network interface and switch port discovery rules can now be combined to dicover multiple sets of interfaces

by Sebastian Herbord

Module: check_mk Branch: master Commit: 143343aaf7761bcf2611f98f8584780a000765b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=143343aaf7761b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Mar 31 08:58:06 2016 +0200 3108 network interface and switch port discovery rules can now be combined to dicover multiple sets of interfaces Previously, multiple rules "network interface and switch port discovery" were merged and thus their parameters overwritten or combined. I.E. if one rule had "Match interface alias (regex)" and the other "Match interface description (regex)" both those conditions had to apply for the interface to be discovered. This has been changed so that only one of the supplied rules has to match for an interface to be discovered and the visual parameters (i.e. "Pad port numbers with zeroes") of only that (first) matching rule will apply. This is an incompatible change in that if you have multiple rules apply for the same host already, re-discovery may now produce different items. Without re-discovery, nothing will change. --- .werks/3108 | 19 +++ ChangeLog | 2 + checks/if.include | 258 ++++++++++++++++++---------------- web/plugins/wato/check_parameters.py | 2 +- 4 files changed, 156 insertions(+), 125 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=143343aaf7…

8 years, 5 months

Fixed missing autoreconf in "make mk-livestatus"

by Lars Michelsen

Module: check_mk Branch: master Commit: d8a2f47da7419ab1a715d2c523ef49a24f163cdd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8a2f47da7419a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 31 08:51:30 2016 +0200 Fixed missing autoreconf in "make mk-livestatus" --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e2954c9..8553fc7 100644 --- a/Makefile +++ b/Makefile @@ -154,7 +154,7 @@ packages: mk-livestatus: cd livestatus ; \ for i in aclocal.m4 ar-lib compile config.h.in configure depcomp install-sh Makefile.in missing; do \ - if test ! -f $i; then \ + if test ! -f $$i; then \ autoreconf --install ; \ break ; \ fi \

8 years, 5 months

3309 FIX zpool_status: fixed wrong error handling

by Simon Betz

Module: check_mk Branch: master Commit: 6d7dcce90e96c32d1da44b92b435d08f587f658c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d7dcce90e96c3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Mar 30 18:26:13 2016 +0200 3309 FIX zpool_status: fixed wrong error handling If 'status' or 'action' is given then there are some errors which should be detected. --- .werks/3309 | 12 ++++++++++++ ChangeLog | 1 + checks/zpool_status | 52 ++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 50 insertions(+), 15 deletions(-) diff --git a/.werks/3309 b/.werks/3309 new file mode 100644 index 0000000..4cb42bc --- /dev/null +++ b/.werks/3309 @@ -0,0 +1,12 @@ +Title: zpool_status: fixed wrong error handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459355106 + +If 'status' or 'action' is given then there are some errors +which should be detected. + diff --git a/ChangeLog b/ChangeLog index 67a4c01..9fdcdf4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -109,6 +109,7 @@ * 3341 FIX: df: Ignoring mounted lib*.so.1 volumes (seen on Solaris 10) * 3306 FIX: docsis_channels_upstream: fixed missing channel handling * 3307 FIX: dell_poweredge_netdev: does not discover disconnected network devices any more + * 3309 FIX: zpool_status: fixed wrong error handling... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/zpool_status b/checks/zpool_status index a2320de..f0cbfe4 100644 --- a/checks/zpool_status +++ b/checks/zpool_status @@ -61,27 +61,31 @@ # errors: No known data errors # --------------------------------- -# inventory function + def inventory_zpool_status(info): if not info or " ".join(info[0]) == "no pools available": return [] return [(None, None)] + def check_zpool_status(_no_item, _no_params, info): if " ".join(info[0]) == "all pools are healthy": - return(0, "All pools are healthy") + return 0, "All pools are healthy" - start_pool = False - last_pool = None - error_pools = {} + start_pool = False + multiline = False + last_pool = None + error_pools = {} warning_pools = {} pool_messages = {} - state = 0 message = [] + state = 0 for line in info: if line[0] == "pool:": last_pool = line[1] + pool_messages.setdefault(last_pool, []) + continue if line[0] == "state:": if line[1] == "ONLINE": @@ -105,15 +109,26 @@ def check_zpool_status(_no_item, _no_params, info): state = 1 continue + if line[0] in ["status:", "action:"]: + pool_messages[last_pool].append(" ".join(line[1:])) + multiline = True + continue + + if line[0] in ["scrub:", "see:", "scan:", "config:"]: + multiline = False + continue + if line[0] == "NAME": + multiline = False start_pool = True continue if line[0] == "errors:": + multiline = False start_pool = False msg = " ".join(line[1:]) if msg != 'No known data errors': - pool_messages[last_pool] = msg + pool_messages[last_pool].append(msg) continue if line[0] in ["spares", "logs", "cache"]: @@ -127,25 +142,32 @@ def check_zpool_status(_no_item, _no_params, info): if saveint(line[4]) != 0: warning_pools[line[0]] = tuple(line[1:]) + continue + + if multiline: + pool_messages[last_pool].append(" ".join(line)) + continue - for pool in pool_messages.keys(): + for pool in pool_messages.keys(): state = 1 - message.append("%s: %s" % (pool, pool_messages[pool])) + message.append("%s: %s" % (pool, " ".join(pool_messages[pool]))) for pool in warning_pools.keys(): state = 1 - message.append("%s CKSUM:%d(!)" % (pool, saveint(warning_pools[pool][3]))) + message.append("%s CKSUM: %d" % (pool, saveint(warning_pools[pool][3]))) for pool in error_pools.keys(): state = 2 - message.append("%s State:%s(!!)" % (pool, error_pools[pool][0])) + message.append("%s state: %s" % (pool, error_pools[pool][0])) if len(message) == 0: message = ['No critical errors'] - return (state, ", ".join(message)) + + return state, ", ".join(message) + check_info["zpool_status"] = { - 'check_function': check_zpool_status, - 'inventory_function': inventory_zpool_status, - 'service_description': 'zpool status', + 'check_function' : check_zpool_status, + 'inventory_function' : inventory_zpool_status, + 'service_description' : 'zpool status', }

8 years, 5 months

Added gitignore for minified js files

by Lars Michelsen

Module: check_mk Branch: master Commit: d1091ca87413b39ba0134f32670dea019ef97227 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1091ca87413b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 30 13:58:21 2016 +0200 Added gitignore for minified js files --- web/htdocs/js/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/js/.gitignore b/web/htdocs/js/.gitignore new file mode 100644 index 0000000..15ed41f --- /dev/null +++ b/web/htdocs/js/.gitignore @@ -0,0 +1 @@ +*_min.js

8 years, 5 months

Fixed broken "make mk-livestatus" in some cases

by Lars Michelsen

Module: check_mk Branch: master Commit: 7b813141b1267c70338a2dae835c43aab01f2832 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b813141b1267c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 30 13:53:39 2016 +0200 Fixed broken "make mk-livestatus" in some cases --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7a943d5..176626a 100644 --- a/Makefile +++ b/Makefile @@ -157,9 +157,13 @@ mk-eventd: -zf mkeventd-$(VERSION).tar.gz mkeventd mk-livestatus: - if [ ! -e livestatus/configure ] ; then \ - cd livestatus && autoreconf --install ; \ - fi + cd livestatus ; \ + for i in aclocal.m4 ar-lib compile config.h.in configure depcomp install-sh Makefile.in missing; do \ + if test ! -f $i; then \ + autoreconf --install ; \ + break ; \ + fi \ + done rm -rf mk-livestatus-$(VERSION) mkdir -p mk-livestatus-$(VERSION) cd livestatus ; tar cf - $(LIVESTATUS_SOURCES) | tar xf - -C ../mk-livestatus-$(VERSION)

8 years, 5 months

Fixed missing files in "make mk-livestatus" target

by Lars Michelsen

Module: check_mk Branch: master Commit: 634fd3d86ad0fe2942ee89dc7fde91a1f2cbc305 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=634fd3d86ad0fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 30 16:13:04 2016 +0200 Fixed missing files in "make mk-livestatus" target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 176626a..810fc08 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ BEAR := bear-fixed # File to pack into livestatus-$(VERSION).tar.gz LIVESTATUS_SOURCES := configure aclocal.m4 config.guess config.h.in config.sub \ - configure.ac ltmain.sh Makefile.am Makefile.in missing \ + configure.ac ltmain.sh Makefile.{in,am} missing ar-lib compile \ nagios/README nagios/*.h nagios4/README nagios4/*.h \ src/*.{h,c,cc} src/Makefile.{in,am} \ depcomp install-sh api/python/{*.py,README} api/perl/*

8 years, 5 months

3350 FIX Merged source of Event Console with Check_MK

by Lars Michelsen

Module: check_mk Branch: master Commit: a06858c083e83f3171a546b25b80c04227061591 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a06858c083e83f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 30 16:35:40 2016 +0200 3350 FIX Merged source of Event Console with Check_MK This is more an internal cleanup than a thing you need to care about when you are using the Check_MK Raw or Enterprise Edition. This is only interesting for you if you are compiling Check_MK from source on your own using the source packages. We have merged the mkeventd-*.tar.gz into the check_mk-*.tar.gz. So if you are trying to install Check_MK with the setup.sh you don't need to download the Event Console package anymore. --- .werks/3350 | 16 +++++++++++++ ChangeLog | 1 + Makefile | 23 +++++++----------- bin/.f12 | 10 ++++++++ {mkeventd/src => bin}/.gitignore | 0 {mkeventd/src => bin}/Makefile | 0 {mkeventd/src => bin}/mkevent.c | 0 {mkeventd/bin => bin}/mkeventd | 0 {mkeventd/src => bin}/mkeventd_open514.c | 0 {mkeventd/checks => checks}/check_mkevents | 0 doc/treasures/active_checks/.f12 | 13 ++++++++-- .../lib => doc/treasures/active_checks}/.gitignore | 0 .../lib => doc/treasures/active_checks}/Makefile | 0 .../treasures/active_checks}/check_mkevents.cc | 0 .../treasures/active_checks}/check_mkevents.py | 0 mkeventd/.f12 | 25 -------------------- mkeventd/.gitignore | 4 ---- mkeventd/checks/.f12 | 6 ----- mkeventd/web/.f12 | 9 ------- mkeventd/web/htdocs/images/icon_ack.png | Bin 4736 -> 0 bytes scripts/setup.sh | 16 +++++-------- .../web => web}/htdocs/images/button_mkeventd.png | Bin 4609 -> 4609 bytes .../htdocs/images/button_mkeventd_rules.png | Bin 2203 -> 2203 bytes {mkeventd/web => web}/htdocs/images/icon_clear.png | Bin 2484 -> 2484 bytes .../web => web}/htdocs/images/icon_counting.png | Bin 2907 -> 2907 bytes .../web => web}/htdocs/images/icon_delayed.png | Bin 4812 -> 4812 bytes .../web => web}/htdocs/images/icon_inverted.png | Bin 2653 -> 2653 bytes .../web => web}/htdocs/images/icon_mkeventd.png | Bin 4609 -> 4609 bytes .../htdocs/images/icon_mkeventd_rules.png | Bin 2203 -> 2203 bytes .../htdocs/images/icon_resetcounters.png | Bin 2484 -> 2484 bytes .../web => web}/htdocs/images/icon_snmpmib.png | Bin 4522 -> 4522 bytes .../web => web}/htdocs/images/icons/mkeventd.png | Bin 4609 -> 4609 bytes {mkeventd/web => web}/htdocs/mkeventd.py | 0 {mkeventd/web => web}/plugins/config/mkeventd.py | 0 {mkeventd/web => web}/plugins/icons/mkeventd.py | 0 {mkeventd/web => web}/plugins/sidebar/mkeventd.py | 0 {mkeventd/web => web}/plugins/views/mkeventd.py | 0 {mkeventd/web => web}/plugins/visuals/mkeventd.py | 0 {mkeventd/web => web}/plugins/wato/mkeventd.py | 0 39 files changed, 53 insertions(+), 70 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a06858c083…

8 years, 5 months

setup.sh: Fixed possible encoding problem in defaults.py and fixed apache user write permissions on var dir

by Lars Michelsen

Module: check_mk Branch: master Commit: e5ce909d4d6ca4d4691bf98242352762f8e63b26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5ce909d4d6ca4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 30 16:14:58 2016 +0200 setup.sh: Fixed possible encoding problem in defaults.py and fixed apache user write permissions on var dir --- scripts/setup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/setup.sh b/scripts/setup.sh index b18dc17..74e94e8 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -468,6 +468,7 @@ create_defaults () { cat <<EOF +# encoding: utf-8 # This file has been created during setup of check_mk at $(date). # Do not edit this file. Also do not try to override these settings # in main.mk since some of them are hardcoded into several files @@ -838,6 +839,8 @@ do fi && mkdir -p $DESTDIR$confdir/conf.d && if [ -z "$DESTDIR" ] ; then + chgrp -R $wwwgroup $DESTDIR$vardir && + chmod -R g+w $DESTDIR$vardir && chgrp -R $wwwgroup $DESTDIR$vardir/web && chmod -R g+w $DESTDIR$vardir/web && chgrp -R $wwwgroup $DESTDIR$vardir/log &&

8 years, 5 months

Removed dead code.

by Sven Panne

Module: check_mk Branch: master Commit: 78022b13cceaf9f3ca24185d85f9257e135ecb09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78022b13cceaf9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 30 15:47:24 2016 +0200 Removed dead code. --- livestatus/src/Logfile.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 51ea0b4..98c74f7 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -38,8 +38,6 @@ #ifdef CMC #include "cmc.h" -struct Core; -extern Core *g_core; #endif using std::make_pair;

8 years, 5 months

3308 pvecm_status, pvecm_nodes: new checks which monitor a Proxmox Virtual Environment cluster setup

by Simon Betz

Module: check_mk Branch: master Commit: fc0365dc7b99e09f43beebcca47916256bcc3ce0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc0365dc7b99e0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Mar 30 14:36:15 2016 +0200 3308 pvecm_status, pvecm_nodes: new checks which monitor a Proxmox Virtual Environment cluster setup --- .werks/3308 | 9 ++++ ChangeLog | 1 + agents/check_mk_agent.linux | 8 ++++ checkman/pvecm_nodes | 20 +++++++++ checkman/pvecm_status | 22 +++++++++ checks/pvecm_nodes | 90 +++++++++++++++++++++++++++++++++++++ checks/pvecm_status | 105 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 255 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fc0365dc7b…

8 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016