Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

Check_MK Git: check_mk: setup: fixed help texts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 09fd729b78751febf974041a45afc96a1cda515d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09fd729b78751f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 28 12:31:56 2011 +0100 setup: fixed help texts --- scripts/setup.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index b0155c3..cae47b3 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -233,13 +233,13 @@ always have to specify the installation path when calling check_mk" ask_dir confdir /etc/$NAME $HOMEBASEDIR $OMD_ROOT/etc/check_mk "Check_MK configuration" \ "Directory where check_mk looks for its main configuration file main.mk. An example configuration file will be installed there if no main.mk is -present from a previous version." +present from a previous version" ask_dir sharedir /usr/share/$NAME $HOMEBASEDIR $OMD_ROOT/local/share/check_mk "Check_MK software" \ "The base directory for the software installation of Check_MK. This -directory will get the subdirectories checks, modules, web, locale, -agents and pnp-templates. Note: in previous versions it was possible -to specify each of those directories separately. This is no longer possible." +directory will get the subdirectories checks, modules, web, locale and +agents. Note: in previous versions it was possible to specify each of +those directories separately. This is no longer possible" ask_dir docdir /usr/share/doc/$NAME $HOMEBASEDIR/doc $OMD_ROOT/local/share/check_mk/doc "documentation" \ "Some documentation about check_mk will be installed here. Please note,

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0088

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: da16d4b4df9517b39aff093dbc01bb290227dbbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da16d4b4df9517… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 28 12:24:26 2011 +0100 Updated bug entries #0088 --- .bugs/88 | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/88 b/.bugs/88 index 84b5611..ba70af7 100644 --- a/.bugs/88 +++ b/.bugs/88 @@ -1,12 +1,16 @@ Title: Move check_mk_templates.cfg to /usr/share/check_mk Component: core +State: done +Class: cleanup Benefit: 1 -State: open Cost: 2 Date: 2011-01-04 13:51:15 -Class: cleanup Targetversion: 1.2.0 The directory /usr/share/doc is not optimal since the templates are no longer an example but a vital part - usually never changed by the admin. + +2011-12-28 12:05:26: changed state open -> done +This is now implemented. Positive tests are still being waited +for.

12 years, 9 months

Check_MK Git: check_mk: Moved check_mk_templates.cfg to share/check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 45b1c1d52133cbda0e343b434d983fc6f739893f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45b1c1d52133cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 28 12:03:46 2011 +0100 Moved check_mk_templates.cfg to share/check_mk Currently that file was living in doc/, which does not make sense. In order for that the setup process was slightly changed. Instead of five separate directories for agents, checks, etc. there is now one share_dir. --- Makefile | 1 + check_mk.spec | 1 + ...heck_mk_templates.cfg => check_mk_templates.cfg | 0 scripts/setup.sh | 49 ++++++++------------ 4 files changed, 21 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index 71eb3b6..569484d 100644 --- a/Makefile +++ b/Makefile @@ -60,6 +60,7 @@ dist: mk-livestatus @echo "Making $(DISTNAME)" rm -rf $(DISTNAME) mkdir -p $(DISTNAME) + tar czf $(DISTNAME)/share.tar.gz $(TAROPTS) check_mk_templates.cfg tar czf $(DISTNAME)/checks.tar.gz $(TAROPTS) -C checks $$(cd checks ; ls) tar czf $(DISTNAME)/checkman.tar.gz $(TAROPTS) -C checkman $$(cd checkman ; ls) tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web htdocs plugins diff --git a/check_mk.spec b/check_mk.spec index 989884d..6ea088e 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -145,6 +145,7 @@ rm -rf $RPM_BUILD_ROOT /usr/share/check_mk/checks /usr/share/check_mk/modules /usr/share/check_mk/pnp-templates/* +/usr/share/check_mk/check_mk_templates.cfg /usr/share/doc/check_mk %dir /var/lib/check_mk %dir %attr(-,nagios,root) /var/lib/check_mk/counters diff --git a/doc/check_mk_templates.cfg b/check_mk_templates.cfg similarity index 100% rename from doc/check_mk_templates.cfg rename to check_mk_templates.cfg diff --git a/scripts/setup.sh b/scripts/setup.sh index 60d9667..b0155c3 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -235,26 +235,11 @@ ask_dir confdir /etc/$NAME $HOMEBASEDIR $OMD_ROOT/etc/check_mk "Check_MK configu An example configuration file will be installed there if no main.mk is present from a previous version." -ask_dir checksdir /usr/share/$NAME/checks $HOMEBASEDIR/checks $OMD_ROOT/local/share/check_mk/checks "check_mk checks" \ - "check_mk's different checks are implemented as small Python scriptlets -that parse and interpret the various output sections of the agents. Where -shall those be installed" - -ask_dir modulesdir /usr/share/$NAME/modules $HOMEBASEDIR/modules $OMD_ROOT/local/share/check_mk/modules "check_mk modules" \ - "Directory for main componentents of check_mk itself. The setup will -also create a file 'defaults' in that directory that reflects all settings -you are doing right now" - -ask_dir web_dir /usr/share/$NAME/web $HOMEBASEDIR/web $OMD_ROOT/local/share/check_mk/web "Check_MK Multisite GUI" \ - "Directory where Check_mk's Multisite GUI should be installed. Multisite is -an optional replacement for the Nagios GUI, but is also needed for the -logwatch extension. That directory should [4;1mnot[0m be -in your WWW document root. A separate apache configuration file will be -installed that maps the directory into your URL schema" - -ask_dir localedir /usr/share/$NAME/locale $HOMEBASEDIR/locale $OMD_ROOT/local/share/check_mk/locale "Localization dir" \ - "Base directory for gettext localization files. Multisite comes prepared for localzation -but does not ship any language per default." +ask_dir sharedir /usr/share/$NAME $HOMEBASEDIR $OMD_ROOT/local/share/check_mk "Check_MK software" \ + "The base directory for the software installation of Check_MK. This +directory will get the subdirectories checks, modules, web, locale, +agents and pnp-templates. Note: in previous versions it was possible +to specify each of those directories separately. This is no longer possible." ask_dir docdir /usr/share/doc/$NAME $HOMEBASEDIR/doc $OMD_ROOT/local/share/check_mk/doc "documentation" \ "Some documentation about check_mk will be installed here. Please note, @@ -270,10 +255,6 @@ ask_dir vardir /var/lib/$NAME $HOMEBASEDIR/var $OMD_ROOT/var/check_mk "working d other files into this directory. The setup will create several subdirectories and makes them writable by the Nagios process" -ask_dir agentsdir /usr/share/$NAME/agents $HOMEBASEDIR/agents $OMD_ROOT/local/share/check_mk/agents "agents for operating systems" \ - "Agents for various operating systems will be installed here for your -conveniance. Take them and install them onto your target hosts" - ask_title "Configuration of Linux/UNIX Agents" @@ -433,6 +414,11 @@ other systems. Currently this is only Nagvis, but other might follow later." fi +checksdir=$sharedir/checks +modulesdir=$sharedir/modules +web_dir=$sharedir/web +localedir=$sharedir/locale +agentsdir=$sharedir/agents create_defaults () { @@ -450,6 +436,7 @@ cat <<EOF check_mk_version = '$VERSION' default_config_dir = '$confdir' check_mk_configdir = '$confdir/conf.d' +share_dir = '$sharedir' checks_dir = '$checksdir' check_manpages_dir = '$checkmandir' modules_dir = '$modulesdir' @@ -615,6 +602,8 @@ do fi if [ -z "$YES" ] ; then echo ")" ; fi fi && + mkdir -p $DESTDIR$sharedir && + tar xzf $SRCDIR/share.tar.gz -C $DESTDIR$sharedir && mkdir -p $DESTDIR$modulesdir && create_defaults > $DESTDIR$modulesdir/defaults && mkdir -p $DESTDIR$localedir && @@ -676,14 +665,14 @@ do ln -snf check_mk $DESTDIR$bindir/cmk && echo -e "#!/bin/sh\nexec python $modulesdir/check_mk.py -P "'"$@"' > $DESTDIR$bindir/mkp && chmod 755 $DESTDIR$bindir/mkp && - sed -i "s#@BINDIR@#$bindir#g" $DESTDIR$docdir/check_mk_templates.cfg && - sed -i "s#@VARDIR@#$vardir#g" $DESTDIR$docdir/check_mk_templates.cfg && - sed -i "s#@CHECK_ICMP@#$check_icmp_path#g" $DESTDIR$docdir/check_mk_templates.cfg && - sed -i "s#@CGIURL@#${url_prefix}nagios/cgi-bin/#g" $DESTDIR$docdir/check_mk_templates.cfg && - sed -i "s#@PNPURL@#${url_prefix}pnp4nagios/#g" $DESTDIR$docdir/check_mk_templates.cfg && + sed -i "s#@BINDIR@#$bindir#g" $DESTDIR$sharedir/check_mk_templates.cfg && + sed -i "s#@VARDIR@#$vardir#g" $DESTDIR$sharedir/check_mk_templates.cfg && + sed -i "s#@CHECK_ICMP@#$check_icmp_path#g" $DESTDIR$sharedir/check_mk_templates.cfg && + sed -i "s#@CGIURL@#${url_prefix}nagios/cgi-bin/#g" $DESTDIR$sharedir/check_mk_templates.cfg && + sed -i "s#@PNPURL@#${url_prefix}pnp4nagios/#g" $DESTDIR$sharedir/check_mk_templates.cfg && mkdir -p "$DESTDIR$nagconfdir" if [ ! -e $DESTDIR$nagconfdir/check_mk_templates.cfg ] ; then - ln -s $docdir/check_mk_templates.cfg $DESTDIR$nagconfdir 2>/dev/null + ln -s $sharedir/check_mk_templates.cfg $DESTDIR$nagconfdir 2>/dev/null fi if [ -n "$nagiosaddconf" -a -n "$DESTDIR$nagios_config_file" ] ; then echo "# added by setup.sh of check_mk " >> $DESTDIR$nagios_config_file

12 years, 9 months

Check_MK Git: check_mk: Cleaned up comments in check_mk_templates.cfg

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3b028040348d584fdf3e32bdeebbdb4ccf583b83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b028040348d58… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 28 11:05:03 2011 +0100 Cleaned up comments in check_mk_templates.cfg --- doc/check_mk_templates.cfg | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/doc/check_mk_templates.cfg b/doc/check_mk_templates.cfg index 4b8fb15..47fd36d 100644 --- a/doc/check_mk_templates.cfg +++ b/doc/check_mk_templates.cfg @@ -1,15 +1,25 @@ -# This is an example configuration file for integrating -# check_mk into Nagios. It defines several templates for -# hosts and services that are referred to by the Nagios- -# configuration output by check_mk. It also defines -# commands called by active check_mk-checks. +# These file contains templates for monitoring objects. The +# configuration that Check_MK creates uses these templates. +# You *can* modify this file, but if you want to change parameters +# for hosts and services a better idea is using extra_host_conf +# and extra_service_conf. +# +# OMD users: your modifications to this file are handled +# by 'omd update' so no problems should arise during an +# update as long as your modifications to not collide +# with modifications due to new versions of the file. OMD +# will let you interactively resolve such a conflict. +# +# Non-OMD users: Usually this file is created as a symlink +# in nagios/etc/conf.d (or objects or whatever directory +# you are using) pointing to the shipped file. If you want +# to modify this file, then replace the symlink with a true +# copy of the file. Note, however, that a software update +# of Check_MK will not update your check_mk_templates.cfg +# anymore and you might get incompatible as time goes by. # ------------------------------------------------------------------ -# In most cases it should be sufficient to copy or -# symlink this file into your nagios object-directory -# without changing it. - # ____ _ _ # / ___|___ _ __ | |_ __ _ ___| |_ ___ # | | / _ \| '_ \| __/ _` |/ __| __/ __| @@ -18,11 +28,12 @@ # # This contact is only needed while you have not configured contacts -# for your hosts and services with the varibables +# for your hosts and services with the variables # service_contactgroups and host_contactgroups. This is, because # Nagios does not allow a host or service to not have a contact. # And we want this default configuration file to be complete # and work. + define contact { contact_name check_mk alias check_mk dummy contact @@ -234,7 +245,7 @@ define service { # the configuration variable service_dependencies. Since we # only deal with passive checks the dependencies are not # used to suppress service checks. But they are very useful -# for suppression notifications. If you set inherits_parent +# for suppressing notifications. If you set inherits_parent # to 1, then if A depends on B and B depends on C, A will # automatically depend on C. This is usually what you want. # If A depends on B and B is in WARNING state, the notification

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0061

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e92ba21038509ff2fe297a0ea2ab8cef9dfb88bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e92ba21038509f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 28 09:53:04 2011 +0100 Updated bug entries #0061 --- .bugs/61 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/61 b/.bugs/61 index 6f7d209..fc5d568 100644 --- a/.bugs/61 +++ b/.bugs/61 @@ -1,10 +1,10 @@ Title: Installation von FreeBSD Agent dokumentieren Component: docu +State: done +Class: todo Benefit: 1 -State: open Cost: 2 Date: 2010-12-21 22:19:48 -Class: todo Targetversion: 1.2.0 Auf der Homepage sollte ein Hinweis platziert werden, dass es einen neuen @@ -25,3 +25,6 @@ Eventuell kann man eine Verteilerseite machen, in der die Installation der Agenten auf allen Betriebssystemen beschrieben wird - inklusive Link zum (separaten) Download der Agenten. + +2011-12-28 09:53:01: changed state open -> done +Ein neuer Artikel existiert nun.

12 years, 9 months

Check_MK Git: check_mk: isabled obsolete checks fc_brocade_port and fc_brocade_port_detailed.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7bb2817fbfce71420d104f69b9fca673533ac6b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bb2817fbfce71… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 27 19:42:59 2011 +0100 isabled obsolete checks fc_brocade_port and fc_brocade_port_detailed. --- ChangeLog | 2 + checkman/fc_brocade_port | 7 ++ checkman/fc_brocade_port_detailed | 80 +-------------- checks/fc_brocade_port | 70 +------------ checks/fc_brocade_port_detailed | 203 +------------------------------------ doc/.f12 | 1 + doc/helpers/wato-migrate-1.2.0.sh | 2 +- 7 files changed, 22 insertions(+), 343 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7bb2817fbf…

12 years, 9 months

Check_MK Git: check_mk: aironet_errors, statgrab_disk, statgrab_net: use rates instead of counters in perfdata

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 89a3b4e7f76d1bc591ec5c27c2ba6116ce8d7d71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89a3b4e7f76d1b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 27 19:54:28 2011 +0100 aironet_errors, statgrab_disk, statgrab_net: use rates instead of counters in perfdata --- .bugs/46 | 2 ++ ChangeLog | 4 ++++ checks/aironet_errors | 4 ++-- checks/statgrab_disk | 4 ++-- checks/statgrab_net | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.bugs/46 b/.bugs/46 index 790fe2e..56ae00f 100644 --- a/.bugs/46 +++ b/.bugs/46 @@ -33,3 +33,5 @@ Bleiben drei Checks: aironet_errors statgrab_disk statgrab_net + +-> Diese wurden am 27.12.2011 von Countern auf 1/sec umgestellt. diff --git a/ChangeLog b/ChangeLog index 469277d..42f327c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,10 @@ should fix problems with german umlauts in message texts. * Disabled obsolete checks fc_brocade_port and fc_brocade_port_detailed. Please use brocade_fcport instead. + * aironet_errors, statgrab_disk, statgrab_net: Performance data has + been converted from counters to rates. You might need to delete your + existing RRDs of these checks. Sorry, but these have been that last + checks still using counters... 1.1.13i2: diff --git a/checks/aironet_errors b/checks/aironet_errors index 8939812..b6dabc4 100644 --- a/checks/aironet_errors +++ b/checks/aironet_errors @@ -27,7 +27,7 @@ aironet_default_error_levels = ( 1.0, 10.0 ) # per second def inventory_aironet_errors(info): - return [ (int(line[0]), "", 'aironet_default_error_levels') for line in info ] + return [ (int(line[0]), 'aironet_default_error_levels') for line in info ] def check_aironet_errors(item, params, info): for line in info: @@ -36,7 +36,7 @@ def check_aironet_errors(item, params, info): this_time = time.time() timedif, persec = get_counter("aironet_errors.%s" % item, this_time, value) warn, crit = params - perfdata = [("errors","%dc" % value, None, None, warn, crit)] + perfdata = [("errors", persec, None, None, warn, crit)] infotxt = " - %.2f errors/s in last %d secs" % (persec, int(timedif)) if persec >= crit: return (2, "CRIT" + infotxt, perfdata) diff --git a/checks/statgrab_disk b/checks/statgrab_disk index d83bdf5..8c69e18 100644 --- a/checks/statgrab_disk +++ b/checks/statgrab_disk @@ -27,7 +27,7 @@ def inventory_statgrab_disk(info): for line in info: if line[0].endswith('read_bytes') or line[0].endswith('write_bytes'): - return [ ('read', None, None), ('write', None, None) ] + return [ ('read', None), ('write', None) ] return [] def check_statgrab_disk(item, params, info): @@ -42,7 +42,7 @@ def check_statgrab_disk(item, params, info): this_time = int(time.time()) timedif, per_sec = get_counter("diskstat." + item, this_time, this_val) - perfdata = [ (item, "%dc" % this_val ) ] + perfdata = [ (item, per_sec) ] return (0, "OK - %s/s (in last %d secs)" % (get_bytes_human_readable(per_sec), timedif), perfdata) diff --git a/checks/statgrab_net b/checks/statgrab_net index 36ccf03..02e9878 100644 --- a/checks/statgrab_net +++ b/checks/statgrab_net @@ -136,7 +136,7 @@ def check_statgrab_net_ctr(nic, _no_params, info): continue value = int(value) timedif, items_per_sec = get_counter( "netctr." + nic + "." + countername, this_time, value) - perfdata_dict[countername] = ( countername, "%dc" % value ) + perfdata_dict[countername] = ( countername, items_per_sec ) if countername == 'rx_bytes': infotxt += ' - Receive: %.2f MB/sec' % (float(items_per_sec) / float(1024*1024)) elif countername == 'tx_bytes': @@ -153,7 +153,7 @@ def check_statgrab_net_ctr(nic, _no_params, info): if perf: perfdata.append(perf) else: - perfdata.append((countername, "0c")) + perfdata.append((countername, 0.0)) return (0, "OK" + infotxt, perfdata)

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0046

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bbf036f804e7ff2c6a2c9df431d2e75631b7977c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbf036f804e7ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 27 20:00:13 2011 +0100 Updated bug entries #0046 --- .bugs/46 | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/46 b/.bugs/46 index 56ae00f..cfc10ea 100644 --- a/.bugs/46 +++ b/.bugs/46 @@ -1,10 +1,10 @@ Title: Keine Counter mehr in den Perfdaten senden Component: checks +State: done +Class: cleanup Benefit: 2 -State: open Cost: 5 Date: 2010-12-21 21:28:27 -Class: cleanup Targetversion: 1.2.0 Performance counter: Generell sollten *alle* Counter von Check_MK @@ -35,3 +35,5 @@ statgrab_disk statgrab_net -> Diese wurden am 27.12.2011 von Countern auf 1/sec umgestellt. + +2011-12-27 20:00:03: changed state open -> done

12 years, 9 months

Check_MK Git: check_mk: cmk -d: honor --cache and --no-tcp

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 76fc062ef7d63f674130707dbdcaa2b69bc2e465 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76fc062ef7d63f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 27 19:25:14 2011 +0100 cmk -d: honor --cache and --no-tcp --- .bugs/38 | 8 ++++++-- ChangeLog | 4 ++++ modules/check_mk.py | 4 ++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.bugs/38 b/.bugs/38 index cfbcb79..dca4ae0 100644 --- a/.bugs/38 +++ b/.bugs/38 @@ -1,9 +1,13 @@ Title: cmk -d verwendet --cache nicht Component: core +State: done +Class: nastiness Benefit: 1 -State: open Cost: 2 Date: 2010-12-21 21:15:52 -Class: nastiness +Targetversion: future Sollte es aber tun. So wird es erwartet. + +2011-12-27 19:25:03: changed state open -> done +Ist nun umgesetzt. Auch --no-tcp funktioniert. diff --git a/ChangeLog b/ChangeLog index 2bf2f39..8b3bf36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,12 @@ 1.1.13i3: + Core, Setup, etc.: + * cmk -d does now honor --cache and --no-tcp + Checks & Agents: * Windows agent: output eventlog texts in UTF-8 encoding. This should fix problems with german umlauts in message texts. + 1.1.13i2: Core, Setup, etc.: * cmk -I: accept host tags and cluster names diff --git a/modules/check_mk.py b/modules/check_mk.py index add0ecd..e90115a 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3144,6 +3144,10 @@ def list_all_hosts_with_tags(tags): # Implementation of option -d def output_plain_hostinfo(hostname): + info = read_cache_file(hostname, 999999999) + if info: + sys.stdout.write(info) + return try: ipaddress = lookup_ipaddress(hostname) sys.stdout.write(get_agent_info(hostname, ipaddress, 0))

12 years, 9 months

Check_MK Git: check_mk: Windows agent: output eventlogs UTF-8 encoded

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3a01b75418c6732e497049a99f6ee69e5e268967 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a01b75418c673… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 27 17:30:42 2011 +0100 Windows agent: output eventlogs UTF-8 encoded --- .bugs/28 | 8 ++++- ChangeLog | 5 +++ agents/windows/check_mk.ini | 3 ++ agents/windows/check_mk_agent.cc | 55 ++++++++++++++++++++++--------------- agents/windows/check_mk_agent.exe | Bin 102912 -> 102912 bytes 5 files changed, 47 insertions(+), 24 deletions(-) diff --git a/.bugs/28 b/.bugs/28 index acc7039..3f45d44 100644 --- a/.bugs/28 +++ b/.bugs/28 @@ -1,12 +1,16 @@ Title: Windows agent: Eventlog nach UTF-8 kodieren Component: checks +State: done +Class: nastiness Benefit: 2 -State: open Cost: 4 Date: 2010-12-21 16:41:20 -Class: nastiness Targetversion: 1.2.0 Dazu müsste man aber erstmal rausfinden, wie man bei Windows dies anstellt. Es hängt ja von der Landeseinstellung ab. Vielleicht gibt es ja dafür eine spezielle Hilfsfunktion. + +2011-12-27 17:29:37: changed state open -> done +Das sollte jetzt funktionieren. Umfangreichere Tests stehen aber +noch aus. diff --git a/ChangeLog b/ChangeLog index 93b6c39..2bf2f39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1.1.13i3: + Checks & Agents: + * Windows agent: output eventlog texts in UTF-8 encoding. This + should fix problems with german umlauts in message texts. + 1.1.13i2: Core, Setup, etc.: * cmk -I: accept host tags and cluster names diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini index 0f94b3d..04c1059 100644 --- a/agents/windows/check_mk.ini +++ b/agents/windows/check_mk.ini @@ -22,6 +22,9 @@ # counters = 10332:msx_queues [logwatch] + # Testing: output *all* messages from the eventlogs + # sendall = yes + # From application log send only critical messages # logfile application = crit diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 46bf45f..a9fe798 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -855,7 +855,7 @@ void grow_eventlog_buffer(int newsize) bool output_eventlog_entry(SOCKET &out, char *dllpath, EVENTLOGRECORD *event, char type_char, - const char *logname, const char *source_name, char **strings) + const char *logname, const char *source_name, WCHAR **strings) { char msgbuffer[2048]; char dll_realpath[128]; @@ -883,20 +883,30 @@ bool output_eventlog_entry(SOCKET &out, char *dllpath, EVENTLOGRECORD *event, ch } else dll = NULL; - DWORD len = FormatMessage( + + WCHAR wmsgbuffer[2048]; + DWORD len = FormatMessageW( + // DWORD len = FormatMessage( FORMAT_MESSAGE_ARGUMENT_ARRAY | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM, dll, event->EventID, 0, // accept any language - (LPTSTR)msgbuffer, - sizeof(msgbuffer), - strings); + wmsgbuffer, + // msgbuffer, + 2048, + (char **)strings); if (dll) FreeLibrary(dll); + if (len) + { + // convert message to UTF-8 + len = WideCharToMultiByte(CP_UTF8, 0, wmsgbuffer, -1, msgbuffer, sizeof(msgbuffer), NULL, NULL); + } + if (len == 0) // message could not be converted { // if conversion was not successfull while trying to load a DLL, we return a @@ -913,15 +923,17 @@ bool output_eventlog_entry(SOCKET &out, char *dllpath, EVENTLOGRECORD *event, ch int n = 0; while (strings[n]) // string array is zero terminated { - char *s = strings[n]; - int l = strlen(s); - if (l + 1 < sizeleft) { - strcpy(w, s); - w += l; - *w++ = ' '; - sizeleft -= l + 1; - } + WCHAR *s = strings[n]; + DWORD len = WideCharToMultiByte(CP_UTF8, 0, s, -1, w, sizeleft, NULL, NULL); + if (!len) + break; + sizeleft -= len; + w += len; + if (sizeleft <= 0) + break; n++; + if (strings[n]) + *w++ = ' '; } } @@ -950,7 +962,7 @@ void process_eventlog_entries(SOCKET &out, const char *logname, char *buffer, DWORD bytesread, DWORD *record_number, bool just_find_end, int *worst_state, int level) { - char *strings[64]; + WCHAR *strings[64]; char regpath[128]; BYTE dllpath[128]; char source_name[128]; @@ -993,11 +1005,10 @@ void process_eventlog_entries(SOCKET &out, const char *logname, char *buffer, if (!just_find_end) { // The source name is the name of the application that produced the event - LPCTSTR lpSourceName = (LPCTSTR) ((LPBYTE) event + sizeof(EVENTLOGRECORD)); + // It is UTF-16 encoded + WCHAR *lpSourceName = (WCHAR *) ((LPBYTE) event + sizeof(EVENTLOGRECORD)); + WideCharToMultiByte(CP_UTF8, 0, lpSourceName, -1, source_name, sizeof(source_name), NULL, NULL); - // prepare source name without spaces (for check_mk output) - strncpy(source_name, lpSourceName, sizeof(source_name)-1); - source_name[sizeof(source_name)-1] = 0; // strncpy does not zero-terminate, if buffer is too small! char *w = source_name; while (*w) { if (*w == ' ') *w = '_'; @@ -1007,12 +1018,12 @@ void process_eventlog_entries(SOCKET &out, const char *logname, char *buffer, // prepare array of zero terminated strings to be inserted // into message template. DWORD num_strings = event->NumStrings; - char *s = ((char *)event) + event->StringOffset; + WCHAR *s = (WCHAR *)(((char *)event) + event->StringOffset); unsigned ns; for (ns = 0; ns < num_strings; ns++) { if (ns >= 63) break; strings[ns] = s; - s += strlen(s) + 1; + s += wcslen(s) + 1; } strings[ns] = 0; // end marker in array @@ -1021,7 +1032,7 @@ void process_eventlog_entries(SOCKET &out, const char *logname, char *buffer, // DLL to load in the registry. Hard to image how one could // have contrieved this more complicated... snprintf(regpath, sizeof(regpath), - "SYSTEM\\CurrentControlSet\\Services\\Eventlog\\%s\\%s", + "SYSTEM\\CurrentControlSet\\Services\\Eventlog\\%s\\%S", logname, lpSourceName); HKEY key; @@ -1104,7 +1115,7 @@ void output_eventlog(SOCKET &out, const char *logname, flags = EVENTLOG_SEEK_READ | EVENTLOG_FORWARDS_READ; } - if (ReadEventLog(hEventlog, + if (ReadEventLogW(hEventlog, flags, *record_number + 1, eventlog_buffer, diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 807f1cc..b4c6f45 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011