Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

Adjust Windows integration tests for Jenkins

by Jukka Aro

Module: check_mk Branch: master Commit: fbce681255154e4e2b30410f0b0d2b229452a990 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbce681255154e… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Jan 25 15:25:03 2018 +0100 Adjust Windows integration tests for Jenkins * Pass WORKSPACE variable to sudo in chroot. * Add JUnit xml output for Jenkins build. --- agents/windows/Makefile.am | 13 +++++++++++-- agents/windows/make-agent | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 4e0df39..13b65f3 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -15,6 +15,10 @@ WindowsAgentTest_LDADD = libcheck_mk_agent.a -lgtest -lgmock $(LD_COMMON) wmitest_LDADD = $(LD_COMMON) +pytest = /usr/bin/env pytest +pytest_options = --cache-clear --maxfail=10 +pytest_jenkins = $(pytest_options) --junitxml=$$WORKSPACE/results/junit.xml + build_version: $(check_mk_agent_SOURCES:.cc=.o) echo $$(( $$(cat $(VPATH)/build_version) + 1 )) > $(VPATH)/build_version @@ -36,8 +40,13 @@ unittest: WindowsAgentTest$(EXEEXT) integrationtest: install-strip cd $(bindir)/it ; \ - pytest --maxfail=10 ; \ - cd - + rm -f remote.pyc ; \ + if [[ $$SUDO_USER == jenkins ]] ; then \ + $(pytest) $(pytest_jenkins) ; \ + else \ + $(pytest) $(pytest_options) ; \ + fi ; \ + cd - libcheck_mk_agent_a_SOURCES = \ Configuration.cc \ diff --git a/agents/windows/make-agent b/agents/windows/make-agent index 41af275..1c744ee 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -96,4 +96,4 @@ echo "[MAKE-CHROOT LOCK] released" # Build the Windows agent within chroot by calling the 'build-agent' script as # $SUDO_USER. ./do-chroot \ - "/bin/su - $SUDO_USER -c bash -c 'CHROOT_NAME=$CHROOT_NAME CHROOT_PATH=$CHROOT_PATH CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR NEW_VERSION=$NEW_VERSION SSH_AUTH_SOCK=$SSH_AUTH_SOCK /$CHROOT_BUILD_DIR/agents/windows/build-agent -j${njobs} $targets'" + "/bin/su - $SUDO_USER -c bash -c 'CHROOT_NAME=$CHROOT_NAME CHROOT_PATH=$CHROOT_PATH CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR NEW_VERSION=$NEW_VERSION WORKSPACE=$WORKSPACE /$CHROOT_BUILD_DIR/agents/windows/build-agent -j${njobs} $targets'"

6 years, 7 months

Fixed broken graph pages in raw edition

by Lars Michelsen

Module: check_mk Branch: master Commit: 26eb5ec266668f834f5b01454b702e09e135869f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26eb5ec266668f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 25 09:04:47 2018 +0100 Fixed broken graph pages in raw edition Change-Id: Ia15dabbbf530a4cee0ec317e23cd93b77b7bc9a6 --- web/plugins/views/painters.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 1d44d64..ab13d8a 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1138,6 +1138,13 @@ def paint_time_graph_pnp(row): config.url_prefix() + "check_mk/", pnp_url, with_link, _('Add this graph to...'), from_ts, to_ts) +def time_graph_params(): + if not metrics.cmk_graphs_possible(): + return # The method is only available in CEE + + return cmk_time_graph_params() + + multisite_painters["svc_pnpgraph" ] = { "title" : _("Service Graphs"), "columns" : [ "host_name", "service_description", "service_perf_data", "service_metrics", "service_check_command" ],

6 years, 7 months

Windows agent: add build target integrationtest

by Jukka Aro

Module: check_mk Branch: master Commit: e7a603920097332532c4b237cb528b03ea456860 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7a60392009733… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Dec 1 16:44:34 2017 +0100 Windows agent: add build target integrationtest Update chroot jail with necessary additional packages for pytest and SSH. Copy existing SSH RSA key pair from SUDO_USER to chroot jail. Prerequisite: the ssh keys must be generated without passphrase and named correctly (id_rsa_windows_test). Change-Id: I95e99458fa6c69c42260fa487cf5c168c6f9182d --- agents/windows/Makefile.am | 5 +++++ agents/windows/build-agent | 17 ++++++++++++++--- agents/windows/build.sh | 2 +- agents/windows/chroot_version | 2 +- agents/windows/make-agent | 13 ++++++++++--- agents/windows/make-chroot | 10 ++++++++-- agents/windows/setup-ssh | 38 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 77 insertions(+), 10 deletions(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index a658312..4e0df39 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -34,6 +34,11 @@ check_mk_agent.res: check_mk_agent.rc $(VPATH)/check_mk_agent.ico unittest: WindowsAgentTest$(EXEEXT) DISPLAY="$$DISPLAY xterm" wine WindowsAgentTest$(EXEEXT) 2>/dev/null +integrationtest: install-strip + cd $(bindir)/it ; \ + pytest --maxfail=10 ; \ + cd - + libcheck_mk_agent_a_SOURCES = \ Configuration.cc \ CrashHandler.cc \ diff --git a/agents/windows/build-agent b/agents/windows/build-agent index 3f9847e..b64c4d9 100755 --- a/agents/windows/build-agent +++ b/agents/windows/build-agent @@ -24,8 +24,14 @@ cd /$CHROOT_BUILD_DIR/agents/windows autoreconf --install build_archs=(32 64) -if [[ "$targets" == unittest ]] ; then - # Only unittest + +if [[ " $targets " =~ " integrationtest " && "$targets" != integrationtest ]] ; then + echo "integrationtest cannot be combined with other targets" + exit 1 +fi + +if [[ "$targets" == unittest || "$targets" == integrationtest ]] ; then + # Only unittest or integrationtest build_archs=() elif [[ " $targets " =~ " unittest " ]] ; then # unittest together with other target(s) @@ -54,8 +60,13 @@ if [[ -z "$targets" ]] ; then cd - fi -if [[ ! "$targets" =~ clean ]] ; then +if [[ ! "$targets" =~ clean && "$targets" != integrationtest ]] ; then # Run unittest only in 64 bit targets=unittest build 64 fi + +if [[ " $targets " =~ " integrationtest " ]] ; then + targets=integrationtest + build 64 +fi diff --git a/agents/windows/build.sh b/agents/windows/build.sh index 4c18a4c..45136f0 100644 --- a/agents/windows/build.sh +++ b/agents/windows/build.sh @@ -75,5 +75,5 @@ function build { # If special targets given, do just them. make -j${njobs} "$targets" || return 1 fi - cd - + cd .. } diff --git a/agents/windows/chroot_version b/agents/windows/chroot_version index 7f8f011..45a4fb7 100644 --- a/agents/windows/chroot_version +++ b/agents/windows/chroot_version @@ -1 +1 @@ -7 +8 diff --git a/agents/windows/make-agent b/agents/windows/make-agent index 372efe4..41af275 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -15,6 +15,8 @@ if [ -z $SUDO_USER ]; then exit 1 fi +script_dir="$(realpath "$(dirname "${BASH_SOURCE[0]}")")" + . build.sh parse-args "$@" @@ -40,7 +42,7 @@ fi # elements to make # a) different namespaces possible for (windows agent, agent updater) # b) parallel builds of different chroot versions possible -CHROOT_VERSION=$(<$base/agents/windows/$versionfile) +export CHROOT_VERSION=$(<$base/agents/windows/$versionfile) CHROOT_BASE_PATH=${CHROOT_BASE_PATH:-$base/$base_rel_dir/chroot} export CHROOT_PATH=$CHROOT_BASE_PATH/$CHROOT_NAME/$CHROOT_VERSION @@ -79,14 +81,19 @@ echo "CHROOT_PATH is $CHROOT_PATH" # Check that user does not exist before since SUDO_USER may be root, as well. # # Do this not only during setup, because the setup is only executed once and - # the build may be started with different SUDO_USER users). + # the build may be started with different SUDO_USER users. if ! grep -q "\<${SUDO_USER}\>" "$CHROOT_PATH/etc/passwd" ; then ./do-chroot "useradd -lmo -u $(id -u $SUDO_USER) -s /bin/bash $SUDO_USER" fi + + # Copy windows test-specific ssh key pair from ~$SUDO_USER/.ssh to chroot. + if [[ ! -f "$CHROOT_PATH/home/$SUDO_USER/.ssh/id_rsa" ]] ; then + $script_dir/setup-ssh + fi ) 200>/var/lock/cmk-make-agent_${CHROOT_PATH//\//-}.lock echo "[MAKE-CHROOT LOCK] released" # Build the Windows agent within chroot by calling the 'build-agent' script as # $SUDO_USER. ./do-chroot \ - "/bin/su - $SUDO_USER -c bash -c 'CHROOT_NAME=$CHROOT_NAME CHROOT_PATH=$CHROOT_PATH CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR NEW_VERSION=$NEW_VERSION /$CHROOT_BUILD_DIR/agents/windows/build-agent -j${njobs} $targets'" + "/bin/su - $SUDO_USER -c bash -c 'CHROOT_NAME=$CHROOT_NAME CHROOT_PATH=$CHROOT_PATH CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR NEW_VERSION=$NEW_VERSION SSH_AUTH_SOCK=$SSH_AUTH_SOCK /$CHROOT_BUILD_DIR/agents/windows/build-agent -j${njobs} $targets'" diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index 9b6824b..1214319 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -56,8 +56,8 @@ package_names=( autoconf automake build-essential - cabextract ca-certificates + cabextract curl gcc gettext @@ -85,11 +85,12 @@ package_names=( libio-socket-ssl-perl liblwp-mediatypes-perl liblwp-protocol-https-perl - libmailtools-perl + libmailtools-perl libnet-http-perl libnet-smtp-ssl-perl libnet-ssleay-perl libperl-dev + libpython-stdlib libtimedate-perl libtool liburi-perl @@ -100,11 +101,16 @@ package_names=( locales make mingw-w64 + openssh-client openssl patch perl-openssl-defaults pkg-config + python + python-minimal + python-pytest python2.7 + ssh-askpass uuid-dev wine-stable ) diff --git a/agents/windows/setup-ssh b/agents/windows/setup-ssh new file mode 100755 index 0000000..d1cebfd --- /dev/null +++ b/agents/windows/setup-ssh @@ -0,0 +1,38 @@ +#!/bin/bash +# This script copies a ssh key pair from ~$SUDO_USER/.ssh/ or +# /var/lib/jenkins/.ssh/ to chroot jail. + +set -e + +if [[ -z $CHROOT_PATH ]] ; then + echo "CHROOT_PATH is not set" + exit 1 +fi + +script_dir="$(realpath "$(dirname "${BASH_SOURCE[0]}")")" +ssh_key=id_rsa_windows_test +remote_ip=$(grep "remote_ip =" $script_dir/it/remote.py | sed "s/^.*'$.*$'/\1/g") +remoteuser=$(grep "remoteuser =" $script_dir/it/remote.py | sed "s/^.*'$.*$'/\1/g") + +if [[ $SUDO_USER == jenkins ]] ; then + home_dir=/var/lib/jenkins +else + home_dir=/home/$SUDO_USER +fi + +if [[ ! -f "$home_dir/.ssh/$ssh_key" ]] || [[ ! -f "$home_dir/.ssh/${ssh_key}.pub" ]] ; then + echo "SSH key pair '$ssh_key' not found. Please generate a new key pair with the command" + echo "ssh-keygen -t rsa -N '' -C '$SUDO_USER@$HOSTNAME (Windows test)' -f $home_dir/.ssh/$ssh_key" + echo "and append the public key to \\Users\\$remoteuser\\.ssh\\authorized_keys at host $remote_ip" + exit 1 +fi + +if [[ ! -d "$CHROOT_PATH/home/$SUDO_USER/.ssh" ]] ; then + su - $SUDO_USER -c bash -c "mkdir -p $CHROOT_PATH/home/$SUDO_USER/.ssh" +fi + +for ending in "" ".pub"; do + cp "$home_dir/.ssh/${ssh_key}${ending}" "$CHROOT_PATH/home/$SUDO_USER/.ssh/id_rsa${ending}" + chown $SUDO_USER:$SUDO_USER "$CHROOT_PATH/home/$SUDO_USER/.ssh/id_rsa${ending}" +done +

6 years, 7 months

5493 check_mk_agent.solaris: deliver informations about tmpfs filesystems

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 4349d354617648945d2258453d0c4718d81a73ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4349d354617648… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jan 25 11:50:02 2018 +0100 5493 check_mk_agent.solaris: deliver informations about tmpfs filesystems The check_mk_agent.solaris now additionally delivers informations about tmpfs filesystems. This way it can be used together with werk #5523 to monitor tmpfs filesystems on Solaris hosts. Change-Id: I6ddb1f3648faec8618c5da2f2f874b7a6a833381 --- .werks/5493 | 12 ++++++++++++ agents/check_mk_agent.solaris | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/5493 b/.werks/5493 new file mode 100644 index 0000000..da2f709 --- /dev/null +++ b/.werks/5493 @@ -0,0 +1,12 @@ +Title: check_mk_agent.solaris: deliver informations about tmpfs filesystems +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516876151 +Class: feature + +The check_mk_agent.solaris now additionally delivers informations about +tmpfs filesystems. This way it can be used together with werk #5523 to +monitor tmpfs filesystems on Solaris hosts. diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index be70671..937826e 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -173,7 +173,7 @@ fi # Filesystem usage for UFS and VXFS echo '<<<df>>>' -for fs in ufs vxfs samfs lofs +for fs in ufs vxfs samfs lofs tmpfs do df -l -k -F $fs 2>/dev/null | sed 1d | grep -v "^[^ ]*/lib/[^ ]*\.so\.1 " | \ while read Filesystem kbytes used avail capacity Mountedon

6 years, 7 months

5491 FIX Show failed host notifications in tactival overview

by Tom Baerwinkel

Module: check_mk Branch: master Commit: da262ee9535c6fd7c4a1a5cf2d8a16e4be084f0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da262ee9535c6f… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jan 25 09:29:25 2018 +0100 5491 FIX Show failed host notifications in tactival overview Due to an error in a livestatus query only failed service notificaitons were shown. Change-Id: I0afa86d81182c9e31e78df564467141d1cad01fd --- .werks/5491 | 11 +++++++++++ web/htdocs/notifications.py | 32 ++++++++++++++++---------------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/.werks/5491 b/.werks/5491 new file mode 100644 index 0000000..dc64ea3 --- /dev/null +++ b/.werks/5491 @@ -0,0 +1,11 @@ +Title: Show failed host notifications in tactival overview +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516868860 +Class: fix + +Due to an error in a livestatus query only failed service +notificaitons were shown. diff --git a/web/htdocs/notifications.py b/web/htdocs/notifications.py index a750d84..f9c86df 100644 --- a/web/htdocs/notifications.py +++ b/web/htdocs/notifications.py @@ -97,31 +97,31 @@ def load_failed_notifications(before=None, after=None, stat_only=False, extra_he if not may_see_notifications: return [0] - query_filters = [ - "class = 3", - "log_type = SERVICE NOTIFICATION RESULT", - ] + query = ["GET log"] + if stat_only: + query.append("Stats: log_state != 0") + else: + query.append("Columns: %s" % " ".join(g_columns)) + query.append("Filter: log_state != 0") + + query.extend([ + "Filter: class = 3", + "Filter: log_type = SERVICE NOTIFICATION RESULT", + "Filter: log_type = HOST NOTIFICATION RESULT", + "Or: 2", + ]) if before is not None: - query_filters.append("time <= %d" % before) + query.append("Filter: time <= %d" % before) if after is not None: - query_filters.append("time >= %d" % after) + query.append("Filter: time >= %d" % after) if may_see_notifications: if config.user.may("general.see_failed_notifications"): horizon = config.failed_notification_horizon else: horizon = 86400 - - query_filters.append("time > %d" % (int(time.time()) - horizon)) - - query = ["GET log"] - if stat_only: - query.append("Stats: log_state != 0") - else: - query.append("Columns: %s" % " ".join(g_columns)) - query_filters.append("log_state != 0") - query += ["Filter: %s" % filt for filt in query_filters] + query.append("Filter: time > %d" % (int(time.time()) - horizon)) query = "\n".join(query)

6 years, 7 months

5492 FIX Prefer local/lib over lib in the PYTHONPATH

by Tom Baerwinkel

Module: check_mk Branch: master Commit: c459b6b19e60fbd3336643e3d58afac1e6dd9a38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c459b6b19e60fb… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Jan 22 15:10:03 2018 +0100 5492 FIX Prefer local/lib over lib in the PYTHONPATH Locally installed Python packages under $OMD_ROOT/local/lib/python will now be prefered over shipped packages in $OMD_ROOT/lib/python. Change-Id: I08cb9144cc26ba3805c6ecf5d9e07d2947664243 --- .werks/5492 | 11 +++++++++++ omd/packages/omd/omd | 2 +- omd/packages/omd/skel/.profile | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/5492 b/.werks/5492 new file mode 100644 index 0000000..b1552ef --- /dev/null +++ b/.werks/5492 @@ -0,0 +1,11 @@ +Title: Prefer local/lib over lib in the PYTHONPATH +Level: 1 +Component: packages +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516870075 +Class: fix + +Locally installed Python packages under $OMD_ROOT/local/lib/python +will now be prefered over shipped packages in $OMD_ROOT/lib/python. diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index ef3f0ea..d419094 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -2300,7 +2300,7 @@ def set_environment(): putenv("LD_LIBRARY_PATH", "%s/local/lib:%s/lib" % (g_sitedir, g_sitedir)) putenv("HOME", g_sitedir) - putenv("PYTHONPATH", "%s/lib/python:%s/local/lib/python" % (g_sitedir, g_sitedir)) + putenv("PYTHONPATH", "%s/local/lib/python:%s/lib/python" % (g_sitedir, g_sitedir)) # allow user to define further environment variable in ~/etc/environment envfile = g_sitedir + "/etc/environment" diff --git a/omd/packages/omd/skel/.profile b/omd/packages/omd/skel/.profile index 8efe3a0..7ee3d55 100644 --- a/omd/packages/omd/skel/.profile +++ b/omd/packages/omd/skel/.profile @@ -11,7 +11,7 @@ export PATH="$OMD_ROOT/lib/perl5/bin:$PATH" export MODULEBUILDRC="$OMD_ROOT/.modulebuildrc" export PERL_MM_OPT=INSTALL_BASE="$OMD_ROOT/local/lib/perl5/" export MANPATH="$OMD_ROOT/share/man:$MANPATH" -export PYTHONPATH="$OMD_ROOT/lib/python:$OMD_ROOT/local/lib/python" +export PYTHONPATH="$OMD_ROOT/local/lib/python:$OMD_ROOT/lib/python" export MAILRC="$OMD_ROOT/etc/mail.rc" # Make the python requests module trust the CAs configured in Check_MK

6 years, 7 months

5356 emcvnx_info, emcvnx_agent: move information from emcvnx_info into subchecks and a agent check

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 30f6c845dc0bc4a40b395523c2a3f0f1f7e64700 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30f6c845dc0bc4… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Nov 15 15:04:41 2017 +0100 5356 emcvnx_info,emcvnx_agent: move information from emcvnx_info into subchecks and a agent check This werk moves information from the existing emcvnx_info check into new subchecks for configuration settings, IO statistics, management port information, and storage proccessor information. Additionally, the check emcvnx_agent is added. It contains information about the devices that the destination Unisphere agent controls. This information was included in in emcvnx_info as well. Furthermore the info check now returns {CRIT} if the System Fault LED is on, the management port subcheck returns {CRIT} if the link is down, and the IO check returns {CRIT} if there are any hard errors. To use these new checks a service discovery on the affected hosts will be necessary. Change-Id: I25b98929469100665fdbe724b1231e75f52cb4cd --- .werks/5356 | 21 +++++ agents/special/agent_emcvnx | 3 +- checkman/emcvnx_agent | 24 ++++++ checkman/emcvnx_info | 22 ++--- checkman/emcvnx_info.config | 19 +++++ checkman/emcvnx_info.io | 20 +++++ checkman/emcvnx_info.link | 19 +++++ checkman/emcvnx_info.storage | 20 +++++ checks/emcvnx.include | 82 ++++++++++++++++++ checks/emcvnx_agent | 56 ++++++++++++ checks/emcvnx_info | 198 ++++++++++++++++++++++++++++++++++++++++--- 11 files changed, 458 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=30f6c845dc…

6 years, 7 months

Changed warning text from "event handlers" to "alert handlers"

by Marcel Schulte

Module: check_mk Branch: master Commit: db2e067f6ab43c33f8ef3f23228d33d46fc02df2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db2e067f6ab43c… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Wed Jan 24 21:16:01 2018 +0100 Changed warning text from "event handlers" to "alert handlers" Change-Id: I175e160def93dfb763d6fae0a6f5c30b239062ba --- checks/livestatus_status | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/livestatus_status b/checks/livestatus_status index 81f0262..6d7d6a3 100644 --- a/checks/livestatus_status +++ b/checks/livestatus_status @@ -137,7 +137,7 @@ def check_livestatus_status(item, params, parsed): ("accept_passive_service_checks", "Passive service checks are disabled"), ("check_host_freshness", "Host freshness checking is disabled"), ("check_service_freshness", "Service freshness checking is disabled"), - ("enable_event_handlers", "Event handlers are disabled"), + ("enable_event_handlers", "Alert handlers are disabled"), ("enable_flap_detection", "Flap detection is disabled"), ("enable_notifications", "Notifications are disabled"), ("process_performance_data", "Performance data is disabled"),

6 years, 7 months

5602 FIX ups_modulys_alarms: Make check handle devices outputting NULL instead of integer type flags on some values

by Konstantin Büttner

Module: check_mk Branch: master Commit: c8372e573794bd69bbf51fae9ff549f392216d59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8372e573794bd… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 24 17:46:51 2018 +0100 5602 FIX ups_modulys_alarms: Make check handle devices outputting NULL instead of integer type flags on some values Change-Id: Ia80ed310f72fde114cbc4d27b8ea99afdd10c2a8 --- .werks/5602 | 11 +++++++++++ checks/ups_modulys_alarms | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/5602 b/.werks/5602 new file mode 100644 index 0000000..60624f0 --- /dev/null +++ b/.werks/5602 @@ -0,0 +1,11 @@ +Title: ups_modulys_alarms: Make check handle devices outputting NULL instead of integer type flags on some values +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1516812347 + + diff --git a/checks/ups_modulys_alarms b/checks/ups_modulys_alarms index 0481fbf..e945bbf 100644 --- a/checks/ups_modulys_alarms +++ b/checks/ups_modulys_alarms @@ -64,9 +64,9 @@ def check_ups_modulys_alarms(_no_item, _no_params, info): '29' : (2, 'Output breaker open'), } + result = False for oidend, flag in info: - result = False - if flag and int(flag): + if flag and flag != "NULL" and int(flag): result = True yield oiddef[oidend]

6 years, 7 months

5655 FIX Discovery: Display parse function errors on console instead of suppressing

by Lars Michelsen

Module: check_mk Branch: master Commit: aa578ca7e48e1f33c3ede3fc2c1c3e0e1ba3f929 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa578ca7e48e1f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 24 16:15:17 2018 +0100 5655 FIX Discovery: Display parse function errors on console instead of suppressing Change-Id: I2cfd05ea814d2f83c2fd36382aace43cdf96ea32 --- .werks/5655 | 10 ++++++++++ cmk_base/discovery.py | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.werks/5655 b/.werks/5655 new file mode 100644 index 0000000..3412040 --- /dev/null +++ b/.werks/5655 @@ -0,0 +1,10 @@ +Title: Discovery: Display parse function errors on console instead of suppressing +Level: 1 +Component: core +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516806215 +Class: fix + + diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 4b97d41..b29bcbd 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -941,7 +941,20 @@ def _execute_discovery(multi_host_sections, hostname, ipaddress, check_plugin_na except KeyError: raise MKGeneralException("No such check type '%s'" % check_plugin_name) - section_content = multi_host_sections.get_section_content(hostname, ipaddress, check_plugin_name, for_discovery=True) + try: + section_content = multi_host_sections.get_section_content(hostname, ipaddress, + check_plugin_name, for_discovery=True) + except MKParseFunctionError, e: + if cmk.debug.enabled(): + x = e.exc_info() + raise x[0], x[1], x[2] # re-raise the original exception to not destory the trace + + if on_error == "warn": + section_name = checks.section_name_of(check_plugin_name) + console.warning("Exception while parsing agent section '%s': %s\n" % (section_name, e)) + elif on_error == "raise": + raise + return [] if section_content is None: # No data for this check type return []

6 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018