Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 8dbe13aa67db52f3f52a823205aeb1ad2ccfb487 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dbe13aa67db52… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 11:43:32 2016 +0100 Set version to 1.2.9i1 --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 63f8edd..aa5b267 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ -1.2.7i4: +1.2.9i1: + +1.2.8b1: Core & Setup: * 2771 Errors in Check_MK configuration do not prevent the core from being restarted anymore... * 2881 Automatically restart core instead of reload after changes in local check plugins...

8 years, 7 months

Set version to 1.2.9i1

by Lars Michelsen

Module: check_mk Branch: master Commit: 711107d57330745b89aba81e0c5af41d7264bf3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=711107d5733074… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 11:42:18 2016 +0100 Set version to 1.2.9i1 --- Makefile | 2 +- agents/Makefile | 2 +- agents/check-mk-agent-1.2.7i4-1.noarch.rpm | Bin 22022 -> 0 bytes agents/check-mk-agent-1.2.9i1-1.noarch.rpm | Bin 0 -> 28336 bytes agents/check-mk-agent_1.2.7i4-1_all.deb | Bin 18342 -> 0 bytes agents/check-mk-agent_1.2.9i1-1_all.deb | Bin 0 -> 20214 bytes agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.macosx | 2 +- agents/check_mk_agent.netbsd | 2 +- agents/check_mk_agent.openbsd | 2 +- agents/check_mk_agent.openvms | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/Makefile | 2 +- agents/windows/check_mk_agent-64.exe | Bin 908288 -> 908288 bytes agents/windows/check_mk_agent.exe | Bin 832000 -> 832000 bytes agents/windows/check_mk_agent.msi | Bin 2000896 -> 2000896 bytes agents/windows/install_agent-64.exe | Bin 417015 -> 417017 bytes agents/windows/install_agent.exe | Bin 407477 -> 407478 bytes agents/windows/installer-64.nsi | 2 +- agents/windows/installer.nsi | 2 +- debian/files | 2 +- livestatus/configure.ac | 2 +- mkeventd/bin/mkeventd | 2 +- scripts/setup.sh | 2 +- 27 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index bbc16b8..ac25a4b 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL := /bin/bash -VERSION := 1.2.7i4 +VERSION := 1.2.9i1 NAME := check_mk PREFIX := /usr BINDIR := $(PREFIX)/bin diff --git a/agents/Makefile b/agents/Makefile index 5ed2fdc..9d38264 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.7i4 +VERSION = 1.2.9i1 RPM_VERSION = $(subst -,_,$(VERSION)) NAME = check-mk-agent DISTNAME = $(NAME)-$(VERSION) diff --git a/agents/check-mk-agent-1.2.7i4-1.noarch.rpm b/agents/check-mk-agent-1.2.7i4-1.noarch.rpm deleted file mode 100644 index 961da1c..0000000 Binary files a/agents/check-mk-agent-1.2.7i4-1.noarch.rpm and /dev/null differ diff --git a/agents/check-mk-agent-1.2.9i1-1.noarch.rpm b/agents/check-mk-agent-1.2.9i1-1.noarch.rpm new file mode 100644 index 0000000..19fc1b8 Binary files /dev/null and b/agents/check-mk-agent-1.2.9i1-1.noarch.rpm differ diff --git a/agents/check-mk-agent_1.2.7i4-1_all.deb b/agents/check-mk-agent_1.2.7i4-1_all.deb deleted file mode 100644 index 6500c8c..0000000 Binary files a/agents/check-mk-agent_1.2.7i4-1_all.deb and /dev/null differ diff --git a/agents/check-mk-agent_1.2.9i1-1_all.deb b/agents/check-mk-agent_1.2.9i1-1_all.deb new file mode 100644 index 0000000..4e39ed8 Binary files /dev/null and b/agents/check-mk-agent_1.2.9i1-1_all.deb differ diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index e20f717..15da341 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -119,7 +119,7 @@ function run_cached { } echo '<<<check_mk>>>' -echo Version: 1.2.7i4 +echo Version: 1.2.9i1 echo AgentOS: aix echo Hostname: $(hostname) diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index ed30dc1..a5e65f9 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -105,7 +105,7 @@ function run_cached() { } echo '<<<check_mk>>>' -echo Version: 1.2.7i4 +echo Version: 1.2.9i1 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index b287409..98f95da 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -49,7 +49,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.7i4 +echo Version: 1.2.9i1 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index def834a..8ea302e 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -202,7 +202,7 @@ function run_real_time_checks() } echo '<<<check_mk>>>' -echo Version: 1.2.7i4 +echo Version: 1.2.9i1 echo AgentOS: linux echo Hostname: $HOSTNAME echo AgentDirectory: $MK_CONFDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index b170080..a3a7530 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -44,7 +44,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.7i4 +echo Version: 1.2.9i1 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index 65f854c..8f18d74 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -60,7 +60,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.7i4 +echo Version: 1.2.9i1 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 3dd45ec..287c195 100755 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -60,7 +60,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.7i4 +echo Version: 1.2.9i1 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index afd731f..1de6a42 100755 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -163,7 +163,7 @@ $set noVerify $define sys$output "''cacheFile'_new" $on error then goto WCFdone $say "<<<check_mk>>>" -$say "Version: 1.2.7i4" +$say "Version: 1.2.9i1" $say "AgentOS: openvms" $say "Nodename: ",f$getsyi("nodename") $say "Architecture: ''HWinfo'" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index d226755..9a0eba0 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -114,7 +114,7 @@ function run_cached () { echo '<<<check_mk>>>' -echo Version: 1.2.7i4 +echo Version: 1.2.9i1 echo AgentOS: solaris diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 9b32d08..cac5b7a 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -24,7 +24,7 @@ SHELL = /bin/bash -VERSION = 1.2.7i4 +VERSION = 1.2.9i1 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ WINDRES = i686-w64-mingw32-windres COPTIONS = -s -O2 -Wall -Wformat=2 -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -std=c++11 -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 4037e7a..d4ae38b 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 54559eb..d15cedc 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 428f210..fd3612d 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index b2931d7..f4aa3e4 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 6c0da5e..8c31ae6 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer-64.nsi b/agents/windows/installer-64.nsi index 9ba0ce6..8e56529 100644 --- a/agents/windows/installer-64.nsi +++ b/agents/windows/installer-64.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.7i4" +!define CHECK_MK_VERSION "1.2.9i1" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index fab6615..1eb58c9 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.7i4" +!define CHECK_MK_VERSION "1.2.9i1" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/debian/files b/debian/files index 0050707..2aa41ea 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.7i4-1_all.deb net optional +check-mk_1.2.9i1-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index a7e038f..e6e0798 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.2.7i4], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.9i1], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index e934e0b..f61a6b2 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -6,7 +6,7 @@ import socket, os, time, sys, getopt, signal, thread, pprint, re, \ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.7i4" +VERSION="1.2.9i1" # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | diff --git a/scripts/setup.sh b/scripts/setup.sh index eace419..b18dc17 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.7i4 +VERSION=1.2.9i1 NAME=check_mk LANG= LC_ALL=

8 years, 7 months

Updated changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 6efe1b6fd7dcf446e40c1f0a30e3dfc22e748e75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6efe1b6fd7dcf4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 10:55:15 2016 +0100 Updated changelog --- .werks/3057 | 9 +++++++++ ChangeLog | 1 + checks/arc_raid_status | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3057 b/.werks/3057 new file mode 100644 index 0000000..29a6357 --- /dev/null +++ b/.werks/3057 @@ -0,0 +1,9 @@ +Title: arc_raid_status: Fixed exception when number of disks changed +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1455269277 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index fcf5832..63f8edd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -274,6 +274,7 @@ * 3055 FIX: ibm_svc_mdiskgrp: Fixed exception in case of configured thresholds... * 3056 FIX: vms_cpu: Fixed exception when having thresholds configured * 3072 FIX: windows agent: agent can now handle utf-16 encoded output from plugins... + * 3057 FIX: arc_raid_status: Fixed exception when number of disks changed Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/arc_raid_status b/checks/arc_raid_status index 7c0c71d..c0d19fd 100644 --- a/checks/arc_raid_status +++ b/checks/arc_raid_status @@ -54,7 +54,8 @@ def check_arc_raid_status(item, params, info): i_disks = params c_disks = saveint(line[-5]) if i_disks != c_disks: - message.append("Number of disks has changed from %d to %d(!!)" % ( i_disks, c_disks )) + messages.append("Number of disks has changed from %d to %d(!!)" % + (i_disks, c_disks)) state = 2 return state, ", ".join(messages)

8 years, 7 months

innovaphone_temp: Fixed broken check

by Lars Michelsen

Module: check_mk Branch: master Commit: c1281c54d11f19d630322589a47846635c384711 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1281c54d11f19… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 10:31:22 2016 +0100 innovaphone_temp: Fixed broken check --- checks/innovaphone_temp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/innovaphone_temp b/checks/innovaphone_temp index a1dccc4..1073012 100644 --- a/checks/innovaphone_temp +++ b/checks/innovaphone_temp @@ -31,7 +31,7 @@ factory_settings["innovaphone_temp_default_levels"] = { def inventory_innovaphone_temp(info): yield "Ambient", {} -def check_innovaphone_temp(_no_item, params, info): +def check_innovaphone_temp(item, params, info): return check_temperature(int(info[0][1]), params, "innovaphone_temp_%s" % item) check_info["innovaphone_temp"] = {

8 years, 7 months

resolved gitbug #2405

by Sebastian Herbord

Module: check_mk Branch: master Commit: e75a46f49bbae9015dbff3404b4cbea1f5975535 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e75a46f49bbae9… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Feb 12 10:44:03 2016 +0100 resolved gitbug #2405 --- .bugs/2405 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2405 b/.bugs/2405 index 4904846..536ce16 100644 --- a/.bugs/2405 +++ b/.bugs/2405 @@ -1,10 +1,13 @@ Title: Windows inventory plugin seems to crash with cyrillic symbols in sofware list Component: checks -State: open +Class: bug +State: done Date: 2016-01-22 10:11:05 Targetversion: 1.2.8 -Class: bug With cyrillic symbols in the software list (manufacturer field) the inventory plugin crashs and doesn't report remaining sections. The same probably applies to other symbols not present in the current code page. + +2016-02-12 10:43:36: changed state open -> done +This was a more fundamental problem in how output is piped from scripts to the agent, which failed for all symbols that couldn't be encoded in the current ansi codepage. With commit 091316c the agent can now handle utf16 output (if it contains a BOM) and the inventory plugin now uses that.

8 years, 7 months

hp_msa_disk, netapp_api_temp, ucs_bladecenter_fans, ucs_bladecenter_psu: fixed trend computation

by Sebastian Herbord

Module: check_mk Branch: master Commit: 0e9b7df8f17341ecb23d0ae0f37ba4d485039181 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e9b7df8f17341… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Feb 12 10:39:57 2016 +0100 hp_msa_disk, netapp_api_temp, ucs_bladecenter_fans, ucs_bladecenter_psu: fixed trend computation --- checks/temperature.include | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/checks/temperature.include b/checks/temperature.include index 1ec5af0..e4e1f33 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -291,7 +291,7 @@ def check_temperature(reading, params, unique_name, dev_unit = "c", warn, crit, warn_lower, crit_lower =\ check_temperature_determine_levels(dlh, usr_warn, usr_crit, - usr_warn_lower, usr_warn_lower, + usr_warn_lower, usr_crit_lower, dev_warn, dev_crit, dev_warn_lower, dev_crit_lower, dev_unit) @@ -456,8 +456,17 @@ def check_temperature_list(sensorlist, params, unique_name): if "trend_compute" in params and\ "period" in params["trend_compute"]: + usr_warn, usr_crit = params.get("levels") or (None, None) + usr_warn_lower, usr_crit_lower = params.get("levels_lower") or (None, None) + + # no support for dev_unit or dev_levels in check_temperature_list so + # this ignores the device level handling set in params warn, crit, warn_lower, crit_lower =\ - check_temperature_determine_levels(params, None, None, dev_unit) + check_temperature_determine_levels("usr", usr_warn, usr_crit, + usr_warn_lower, usr_crit_lower, + None, None, + None, None, "c") + trend_status, trend_infotext =\ check_temperature_trend(tempavg, params["trend_compute"], output_unit,

8 years, 7 months

fixed wrong keyword

by Simon Betz

Module: check_mk Branch: master Commit: 90ea37b6ce9f7f6453db876e6258fbb37151a38c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90ea37b6ce9f7f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 12 10:38:57 2016 +0100 fixed wrong keyword --- web/plugins/views/inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 93e57b3..40002b5 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -666,7 +666,7 @@ inventory_displayhints.update({ ".networking.wlan" : { "title" : _("WLAN") }, ".networking.wlan.controller" : { "title" : _("Controller") }, - ".networking.wlan.controller.accesspoints:" : { "title" : _("Access Points"), "keyorder" : ["name", "group", "model", "serial_nr", "sys_location"], "render" : render_inv_dicttable }, + ".networking.wlan.controller.accesspoints:" : { "title" : _("Access Points"), "keyorder" : ["name", "group", "model", "serial", "sys_location"], "render" : render_inv_dicttable }, ".networking.wlan.controller.accesspoints:*.name" : { "title" : _("Name") }, ".networking.wlan.controller.accesspoints:*.group" : { "title" : _("Group") }, ".networking.wlan.controller.accesspoints:*.model" : { "title" : _("Model") },

8 years, 7 months

#2982 solaris_services.summary: new check which gives a summary of services provided by SMF on Solaris

by Simon Betz

Module: check_mk Branch: master Commit: a5f4430a065498891e80f0bd12f8a5957e27b0f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5f4430a065498… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 12 10:33:29 2016 +0100 #2982 solaris_services.summary: new check which gives a summary of services provided by SMF on Solaris --- .werks/2982 | 9 ++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 9 ++++ checkman/solaris_services.summary | 22 +++++++++ checks/solaris_services | 83 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 18 ++++++++ 6 files changed, 142 insertions(+) diff --git a/.werks/2982 b/.werks/2982 new file mode 100644 index 0000000..9ecfa45 --- /dev/null +++ b/.werks/2982 @@ -0,0 +1,9 @@ +Title: solaris_services.summary: new check which gives a summary of services provided by SMF on Solaris +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1455269547 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index c306b1b..fcf5832 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,7 @@ * 2979 aruba_wlc_aps: new inventory plugin for Aruba Networks WLAN Controller which displays name, group name, model, serial number and system location of all access points of this WLC * 2980 agent_ipmi_sensors: new special agent to monitor IPMI data via ipmi-sensors (of freeipmi)... * 2981 isc_dhcpd: added leases path /var/lib/dhcpd/dhcpd.leases for CentOS + * 2982 solaris_services.summary: new check which gives a summary of services provided by SMF on Solaris * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index d3e674b..d226755 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -327,6 +327,15 @@ then fmadm faulty fi +# Getting Information About Services Running on Solaris +# We can get a list of all service instances, including disabled +# or incomplete ones by 'svcs -a' +if type svcs > /dev/null 2>&1 +then + echo '<<<solaris_services>>>' + svcs -a +fi + # MK's Remote Plugin Executor if test -f "$MK_CONFDIR/mrpe.cfg" then diff --git a/checkman/solaris_services.summary b/checkman/solaris_services.summary new file mode 100644 index 0000000..77bc68c --- /dev/null +++ b/checkman/solaris_services.summary @@ -0,0 +1,22 @@ +title: SMF Solaris: Services Summary +agents: solaris +catalog: os/services +license: GPL +distribution: check_mk +description: + This check gives a summary of the solaris services provided by + the Service Management Facility command 'svcs -a'. + The check reports the number of all services and for each service + type, i.e. 'online', 'disabled', 'legacy_run', 'maintenance' and + other ones. + You can configure the status of the services of type + 'maintenance'. + +item: + No item. + +perfdata: + No performance data. + +Inventory: + One service is created diff --git a/checks/solaris_services b/checks/solaris_services new file mode 100644 index 0000000..766f0fc --- /dev/null +++ b/checks/solaris_services @@ -0,0 +1,83 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 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. + + +# <<<solaris_services>>> +# STATE STIME FMRI +# legacy_run Jun_14 lrc:/etc/rcS_d/S99openconnect-clean +# legacy_run Jun_14 lrc:/etc/rc2_d/S47pppd +# legacy_run Jun_14 lrc:/etc/rc2_d/S81dodatadm_udaplt +# legacy_run Jun_14 lrc:/etc/rc2_d/S89PRESERVE +# disabled Jun_14 svc:/system/device/mpxio-upgrade:default +# disabled Jun_14 svc:/network/install:default +# disabled Jun_14 svc:/network/ipfilter:default +# disabled Jun_14 svc:/network/ipsec/ike:default +# disabled Jun_14 svc:/network/ipsec/manual-key:default +# disabled Jun_14 svc:/system/name-service-cache:default +# disabled Jun_14 svc:/network/ldap/client:default +# disabled Jun_14 svc:/network/nis/client:default +# disabled Jun_14 svc:/network/ibd-post-upgrade:default +# disabled Jun_14 svc:/network/inetd-upgrade:default +# disabled Jun_14 svc:/network/nfs/status:default +# disabled Jun_14 svc:/network/nfs/nlockmgr:default +# online Jun_14 svc:/system/zones:default +# online Jun_14 svc:/system/power:default +# online Jun_14 svc:/system/hal:default +# online Jun_14 svc:/application/texinfo-update:default +# online Jun_14 svc:/application/pkg/update:default +# maintenance Jul_09 svc:/network/smtp:sendmail + + +def inventory_solaris_services_summary(info): + return [ (None, {}) ] + + +def check_solaris_services_summary(_no_item, params, info): + collected_services = {} + if len(info) >= 1: + for line in info[1:]: + collected_services.setdefault(line[0], []) + collected_services[line[0]].append(line[2]) + + yield 0, "%d services" % (len(info) - 1) + + for srv_type, srv_names in collected_services.items(): + state = 0 + extra_info = "" + if srv_type == "maintenance": + if params.get("maintenance_state", 0): + extra_info += " (%s)" % ", ".join(srv_names) + state = params["maintenance_state"] + + yield state, "%d %s%s" % (len(srv_names), srv_type.replace("_", " "), extra_info) + + +check_info['solaris_services.summary'] = { + 'inventory_function' : inventory_solaris_services_summary, + 'check_function' : check_solaris_services_summary, + 'service_description' : 'SMF Services Summary', # Service Management Facility + 'group' : 'solaris_services_summary', +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 42942a4..5126988 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4692,6 +4692,24 @@ register_check_parameters( register_check_parameters( subgroup_applications, + "solaris_services_summary", + _("Solaris Services Summary"), + Dictionary( + title = _('SMF Services'), + elements = [ + ('maintenance_state', + MonitoringState( + title = _("State if 'maintenance' services are found"), + default_value = 0, + )), + ], + ), + None, + "dict" +) + +register_check_parameters( + subgroup_applications, "esx_vsphere_objects", _("State of ESX hosts and virtual machines"), Dictionary(

8 years, 7 months

windows agent: mk_inventory now uses utf16 output

by Sebastian Herbord

Module: check_mk Branch: master Commit: 091316cf59c22e518738b7eadcd58a1ae708827c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=091316cf59c22e… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Feb 12 10:18:13 2016 +0100 windows agent: mk_inventory now uses utf16 output this was actually in the last commit, in this commit the code was only cleaned up slightly --- agents/windows/plugins/mk_inventory.vbs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/agents/windows/plugins/mk_inventory.vbs b/agents/windows/plugins/mk_inventory.vbs index 929bded..d11163c 100644 --- a/agents/windows/plugins/mk_inventory.vbs +++ b/agents/windows/plugins/mk_inventory.vbs @@ -10,8 +10,9 @@ exePaths = Array("") regPaths = Array("Software\Microsoft\Windows\CurrentVersion\Uninstall","Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall") Set fso = CreateObject("Scripting.FileSystemObject") -' request unicode stdout -Set objStdout = fso.GetStandardStream(1, True) +' request unicode stdout and add a bom so the agent knows we send utf-16 +Set objStdout = fso.GetStandardStream(1, True) +objStdout.Write(chrW(&HFEFF)) Set objClass = GetObject("winmgmts:{impersonationLevel=impersonate}!\\.\root\cimv2") Set wshShell = WScript.CreateObject( "WScript.Shell" ) remote_host = wshShell.ExpandEnvironmentStrings( "%REMOTE_HOST%" ) @@ -48,8 +49,6 @@ End If ' handle error message ourselves so this script can also be run directly, for testing On Error Resume Next -'need a bom so the agent knows we send utf-16 -outPut(chrW(&HFEFF)) ' create new timestamp file ' only allowed when script runs as administrator user

8 years, 7 months

#3072 FIX windows agent: agent can now handle utf-16 encoded output from plugins

by Sebastian Herbord

Module: check_mk Branch: master Commit: e9e095f48d4f7f6c6995c4d3b175691936949130 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9e095f48d4f7f… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Feb 12 10:15:13 2016 +0100 #3072 FIX windows agent: agent can now handle utf-16 encoded output from plugins utf-16 is the default unicode encoding used on windows and appears to be the only one supported as an output encoding for vbs scripts. Previously the agent would print an empty string instead of the utf-16 encoded output. For this to work the plugin/local check has to use a unicode-enabled stdout and print a utf-16 BOM, i.e.: Set objStdout = fso.GetStandardStream(1, True) objStdout.Write(chrW(&HFEFF)) --- .werks/3072 | 15 ++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 907776 -> 908288 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 907776 -> 908288 bytes agents/windows/check_mk_agent.cc | 42 +++++++++++++--------- agents/windows/check_mk_agent.exe | Bin 832000 -> 832000 bytes agents/windows/check_mk_agent.msi | Bin 2000384 -> 2000896 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 832000 -> 832000 bytes agents/windows/install_agent-64.exe | Bin 416904 -> 417015 bytes agents/windows/install_agent.exe | Bin 407353 -> 407477 bytes agents/windows/plugins/mk_inventory.vbs | 8 +++-- 12 files changed, 48 insertions(+), 20 deletions(-) diff --git a/.werks/3072 b/.werks/3072 new file mode 100644 index 0000000..ba4f312 --- /dev/null +++ b/.werks/3072 @@ -0,0 +1,15 @@ +Title: windows agent: agent can now handle utf-16 encoded output from plugins +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1455267933 +Class: fix + +utf-16 is the default unicode encoding used on windows and appears to be the only one supported as +an output encoding for vbs scripts. +Previously the agent would print an empty string instead of the utf-16 encoded output. +For this to work the plugin/local check has to use a unicode-enabled stdout and print a utf-16 BOM, +i.e.: +Set objStdout = fso.GetStandardStream(1, True) +objStdout.Write(chrW(&HFEFF)) diff --git a/ChangeLog b/ChangeLog index 02ac762..c306b1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -272,6 +272,7 @@ * 3054 FIX: ups_modulys_battery: Fixed wrong remaining minutes in some cases * 3055 FIX: ibm_svc_mdiskgrp: Fixed exception in case of configured thresholds... * 3056 FIX: vms_cpu: Fixed exception when having thresholds configured + * 3072 FIX: windows agent: agent can now handle utf-16 encoded output from plugins... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/windows/build_version b/agents/windows/build_version index 939b0cb..837dd96 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1233 +1258 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 5ffab7b..4037e7a 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 4e864d9..a8dbb2c 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 082538a..e7522c3 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2047,17 +2047,16 @@ char *add_interpreter(char *path, char *newpath) { // -> Get-ExecutionPolicy / Set-ExecutionPolicy // // actually, microsoft always installs the powershell interpreter to the - // same - // directory (independent of the version) so even if it's not in the - // path, - // we have a good chance with this fallback. + // same directory (independent of the version) so even if it's not in + // the path, we have a good chance with this fallback. + const char *fallback = + "C:\\Windows\\System32\\WindowsPowershell\\v1.0\\powershell.exe"; + char dummy; ::SearchPathA(NULL, "powershell.exe", NULL, 1, &dummy, NULL); const char *interpreter = ::GetLastError() != ERROR_FILE_NOT_FOUND ? "powershell.exe" - : "C:" - "\\Windows\\System32\\WindowsPowershell" - "\\v1.0\\powershell.exe"; + : fallback; snprintf(newpath, 256, "%s -NoLogo -ExecutionPolicy RemoteSigned \"& \'%s\'\"", interpreter, path); @@ -2230,6 +2229,18 @@ int launch_program(script_container *cont) { CloseHandle(pi.hThread); CloseHandle(pi.hProcess); + // if the output has a utf-16 bom, we need to convert it now, as the remaining + // code doesn't handle wide characters + unsigned char *buf_u = reinterpret_cast<unsigned char *>(cont->buffer_work); + if ((buf_u[0] == 0xFF) && (buf_u[1] == 0xFE)) { + wchar_t *buffer_u16 = reinterpret_cast<wchar_t *>(cont->buffer_work); + std::string buffer_u8 = to_utf8(buffer_u16); + HeapFree(GetProcessHeap(), 0, buffer_u16); + cont->buffer_work = + (char *)HeapAlloc(GetProcessHeap(), 0, buffer_u8.size() + 1); + memcpy(cont->buffer_work, buffer_u8.c_str(), buffer_u8.size() + 1); + } + return exit_code; } @@ -2341,16 +2352,13 @@ void output_external_programs(OutputProxy &out, script_type type) { cont->buffer = NULL; } - // Replace BOM for UTF-16 LE and UTF-8 with newlines - if ((strlen(cont->buffer_work)) >= 2 && - ((unsigned char)cont->buffer_work[0] == 0xFF && - (unsigned char)cont->buffer_work[1] == 0xFE)) { - cont->buffer_work[0] = '\n'; - cont->buffer_work[1] = '\n'; - } else if (strlen(cont->buffer_work) >= 3 && - (unsigned char)cont->buffer_work[0] == 0xEF && - (unsigned char)cont->buffer_work[1] == 0xBB && - (unsigned char)cont->buffer_work[2] == 0xBF) { + // Replace BOM with newlines. + // At this point the buffer must not contain a wide character + // encoding as the code can't handle it! + if (strlen(cont->buffer_work) >= 3 && + (unsigned char)cont->buffer_work[0] == 0xEF && + (unsigned char)cont->buffer_work[1] == 0xBB && + (unsigned char)cont->buffer_work[2] == 0xBF) { cont->buffer_work[0] = '\n'; cont->buffer_work[1] = '\n'; cont->buffer_work[2] = '\n'; diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 2b81fa5..54559eb 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 95d0461..428f210 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 22c2986..ab45e69 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 8b18ba5..b2931d7 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 9ad7b41..6c0da5e 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/plugins/mk_inventory.vbs b/agents/windows/plugins/mk_inventory.vbs index 190118a..929bded 100644 --- a/agents/windows/plugins/mk_inventory.vbs +++ b/agents/windows/plugins/mk_inventory.vbs @@ -10,7 +10,8 @@ exePaths = Array("") regPaths = Array("Software\Microsoft\Windows\CurrentVersion\Uninstall","Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall") Set fso = CreateObject("Scripting.FileSystemObject") -Set objStdout = WScript.Stdout +' request unicode stdout +Set objStdout = fso.GetStandardStream(1, True) Set objClass = GetObject("winmgmts:{impersonationLevel=impersonate}!\\.\root\cimv2") Set wshShell = WScript.CreateObject( "WScript.Shell" ) remote_host = wshShell.ExpandEnvironmentStrings( "%REMOTE_HOST%" ) @@ -47,12 +48,15 @@ End If ' handle error message ourselves so this script can also be run directly, for testing On Error Resume Next +'need a bom so the agent knows we send utf-16 +outPut(chrW(&HFEFF)) + ' create new timestamp file ' only allowed when script runs as administrator user Set stampo = fso.CreateTextFile(timestamp) If Err.Number <> 0 Then - outPut "Failed to create time stamp: " & Err.Description & " (" & Err.Number & ")" + outPut "Failed to create time stamp: " & Err.Description & " (" & Err.Number & ")" Err.Clear End If

8 years, 7 months

← Newer
1
...
14
15
16
17
18
19
20
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016