Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: Updated bug entries #1055

by Mathias Kettner

Module: check_mk Branch: master Commit: cb2915d03cfaa585047a9f4097fccb38ecc8ad74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb2915d03cfaa5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 10:46:03 2013 +0200 Updated bug entries #1055 --- .bugs/1055 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/1055 b/.bugs/1055 index a4ba84d..347b937 100644 --- a/.bugs/1055 +++ b/.bugs/1055 @@ -1,9 +1,9 @@ Title: in version 1.2.2p3 livestatus does not compile Component: livestatus -State: open +Class: bug +State: works4me Date: 2013-09-23 15:08:41 Targetversion: 1.2.2 -Class: bug when compiling livestatus from the actual 1.2.2 branch it breaks: @@ -27,3 +27,7 @@ make: *** [all] Error 2 compiling livestatus 1.2.2p2 on the same system works system is CentOS 5.9 64bit, Nagios 3.5.1 + +2013-10-03 10:46:01: changed state open -> works4me +Das passiert, wenn man noch ein Makefile vom master-Branch +rumliegen hast und auf den 1.2.2'er gewechselt hat.

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0963, #1031

by Mathias Kettner

Module: check_mk Branch: master Commit: 3129f348ea388ff00b51e36ab714e3e25b8b9823 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3129f348ea388f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 10:42:30 2013 +0200 Updated bug entries #0963, #1031 --- .bugs/1031 | 7 +++++-- .bugs/963 | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.bugs/1031 b/.bugs/1031 index 88ec608..6564d70 100644 --- a/.bugs/1031 +++ b/.bugs/1031 @@ -1,9 +1,9 @@ Title: Patch for setup.sh: fix DESTDIR Component: core -State: open +Class: cleanup +State: done Date: 2013-08-26 13:01:12 Targetversion: 1.2.3 -Class: cleanup ich verwende check_mk und check_mk-agent auch unter Gentoo. Der Build-Prozess wird dort in einer Sandbox vollzogen, was die @@ -29,3 +29,6 @@ setup.sh.patch touch "$serials_file" && chown $wwwuser "$serials_file" && chown $wwwuser "$htpasswd_file" && + +2013-10-03 10:40:26: changed state open -> done +Ist eingebaut. diff --git a/.bugs/963 b/.bugs/963 index 3e3a993..11a0e62 100644 --- a/.bugs/963 +++ b/.bugs/963 @@ -1,9 +1,9 @@ Title: Package for CentOS 6.4 (64bit): missing dependency Component: core -State: open +Class: todo +State: done Date: 2013-08-08 12:35:54 Targetversion: 1.2.3 -Class: todo FYI (the least I could do helping your team continue to do a great job with distro integration): @@ -12,3 +12,7 @@ On CentOS 6.4 (64bit), Perl module=Time::HiRes was missing after updating to OMD Thanks for the tip. We installed the OMD 1.2.3i1 RPM and then updated our "site" and now monitoring our ESXi hosts! Unfortunately, all of the PNP graphs stopped updating. Thoughts? + +2013-10-03 10:42:15: changed state open -> done +Ist allerdings bei 5.X nicht enthalten. Dort muss man dann das volle Pakete +nehmen oder den CMC.

10 years, 11 months

Check_MK Git: check_mk: FIX: add missing $DESTDIR to auth.serials in setup. sh

by Mathias Kettner

Module: check_mk Branch: master Commit: 61a6de0f659536d74bceb535a8eccc4633964c59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61a6de0f659536… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 10:39:26 2013 +0200 FIX: add missing $DESTDIR to auth.serials in setup.sh Conflicts: ChangeLog --- ChangeLog | 4 ++++ scripts/setup.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4c22169..1e62fb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -401,6 +401,10 @@ 1.2.2p3: Core: * FIX: get_average(): Gracefully handle time anomlies of target systems + * FIX: notifications: /var/lib/check_mk/notify directory is now created + correctly during setup from tgz file. (Without it notifications + did not get sent out.) + * FIX: add missing $DESTDIR to auth.serials in setup.sh Checks & Agents: * FIX: winperf_processor: fix case where CPU percent is exactly 100% diff --git a/scripts/setup.sh b/scripts/setup.sh index 9d5e274..71ace8a 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -1004,7 +1004,7 @@ EOF done && # make htpasswd writable by apache, since we need this for # WATO. Also create an empty and Apache-writable auth.serials - serials_file=${htpasswd_file%/*}/auth.serials && + serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials && touch "$serials_file" && chown $wwwuser "$serials_file" && chown $wwwuser "$htpasswd_file" &&

10 years, 11 months

Check_MK Git: check_mk: Support legacy mistypes log message intitial states

by Mathias Kettner

Module: check_mk Branch: master Commit: 557e4e48928967266b6101de1fd5b7bd4e1eeedc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=557e4e48928967… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 2 18:24:50 2013 +0200 Support legacy mistypes log message intitial states --- livestatus/src/LogEntry.cc | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 1744bab..1ef92e2 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -4,23 +4,24 @@ // | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | // | | |___| | | | __/ (__| < | | | | . \ | // | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | |_____| | +// | __ __ _ ____ | +// | | \/ (_) ___ _ __ ___ / ___|___ _ __ ___ | +// | | |\/| | |/ __| '__/ _ \ | | / _ \| '__/ _ \ | +// | | | | | | (__| | | (_) | | |__| (_) | | | __/ | +// | |_| |_|_|\___|_| \___/ \____\___/|_| \___| | // | | // | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | // +------------------------------------------------------------------+ // -// This file is part of Check_MK. -// The official homepage is at http://mathias-kettner.de/check_mk. +// This file is part of the Check_MK Micro Core. Copyright by Mathias +// Kettner, Preysingstr. 74, 81667 München, Germany. All rights are +// reserved. You may *not* redistribute or modify this software unless +// you have a written permission of the owner. This file is *not* +// available under GNU GPL. If you do not like this then please use a +// different monitoring core. // -// check_mk is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by -// the Free Software Foundation in version 2. check_mk is distributed -// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -// PARTICULAR PURPOSE. See the GNU General Public License for more de- -// ails. You should have received a copy of the GNU General Public -// License along with GNU Make; see the file COPYING. If not, write -// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -// Boston, MA 02110-1301 USA. +// Please note: This software is experimental. Use at your own risk. #include <string.h> #include <time.h> @@ -323,13 +324,17 @@ inline bool LogEntry::handleExternalCommandEntry() return false; } -inline bool LogEntry::handleTextEntry() { - if (!strncmp(_text, "LOG VERSION: 2.0", 16)){ +inline bool LogEntry::handleTextEntry() +{ + if (!strncmp(_text, "LOG VERSION: 2.0", 16)) + { _logclass = LOGCLASS_PROGRAM; _type = LOG_VERSION; return true; } - else if (!strncmp(_text, "logging initial states", 22)){ + else if (!strncmp(_text, "logging initial states", 22) + || !strncmp(_text, "logging intitial states", 23)) + { _logclass = LOGCLASS_PROGRAM; _type = LOG_INITIAL_STATES; return true;

10 years, 11 months

Check_MK Git: check_mk: notification plugin mail: fix host notification by CMC

by Mathias Kettner

Module: check_mk Branch: master Commit: 4b38bba9e7f40be6ca6310f4bd4215b8a0d1ef4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b38bba9e7f40b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 2 17:52:41 2013 +0200 notification plugin mail: fix host notification by CMC --- notifications/mail | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notifications/mail b/notifications/mail index b4e2589..6127843 100755 --- a/notifications/mail +++ b/notifications/mail @@ -390,7 +390,7 @@ def main(): context['SERVICELINK'] = '\nLink: %s' % service_url else: context['LINKEDHOSTNAME'] = context['HOSTNAME'] - context['LINKEDSERVICEDESC'] = context['SERVICEDESC'] + context['LINKEDSERVICEDESC'] = context.get('SERVICEDESC', '') context['HOSTLINK'] = '' context['SERVICELINK'] = ''

10 years, 11 months

Check_MK Git: check_mk: windows_agent: improved crashlog handling with multiple threads

by Andreas Boesl

Module: check_mk Branch: master Commit: 38827a066d8cbc76968066d27c985926eda70274 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38827a066d8cbc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 2 12:24:52 2013 +0200 windows_agent: improved crashlog handling with multiple threads --- agents/windows/check_mk_agent-64.exe | Bin 179200 -> 179200 bytes agents/windows/check_mk_agent.cc | 1 + agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes agents/windows/install_agent-64.exe | Bin 149297 -> 149312 bytes agents/windows/install_agent.exe | Bin 146756 -> 146754 bytes 5 files changed, 1 insertion(+) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 3ae686b..74dd1a6 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.cc b/agents/windows/check_mk_agent.cc index bc6d7b6..ea1508c 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2861,6 +2861,7 @@ void close_crash_log() WaitForSingleObject(crashlogMutex, INFINITE); crash_log("Closing crash log (no crash this time)"); fclose(g_connectionlog_file); + g_connectionlog_file = 0; unlink(g_success_log); rename(g_connection_log, g_success_log); ReleaseMutex(crashlogMutex); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index e9cd4f4..a4ed862 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index b13071d..0d91fdb 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 956f445..27b9726 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

10 years, 11 months

Check_MK Git: check_mk: agent_vsphere: now able to handle < > & ' " in login credentials

by Andreas Boesl

Module: check_mk Branch: master Commit: 33e6153327a916164463ce405b3d3ec200c7c63c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33e6153327a916… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 2 11:48:54 2013 +0200 agent_vsphere: now able to handle < > & ' " in login credentials --- ChangeLog | 1 + agents/special/agent_vsphere | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5bb6989..4c22169 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * FIX: cups default printer is now monitored again in linux agent * FIX: host notification email in html format: fixed formating error (typo in tag) + * agent_vsphere: now able to handle < > & ' " in login credentials Multisite: * FIX: add missing service icons to view "All Services with this descr..." diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 7565706..4580645 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -334,7 +334,15 @@ try: # Prepare request data if name == "2_login": - soapdata = soapdata.replace("###user###", user).replace("###secret###", secret) + def encode_url(text): + for char, replacement in [ ( "&", "&"), + ( ">", ">" ), + ( "<", "<"), + ( "'", "'"), + ( "\"", """) ]: + text = text.replace(char, replacement) + return text + soapdata = soapdata.replace("###user###", encode_url(user)).replace("###secret###", encode_url(secret)) elif name == "8_perf_counter_syntax": needed_ids = get_counters(esx_version_num) counter_data = []

10 years, 11 months

Check_MK Git: check_mk: Notif-Konzept verfeinert

by Mathias Kettner

Module: check_mk Branch: master Commit: 80dd5801d45743060753f710248b073999dd1bfe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80dd5801d45743… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 2 10:16:05 2013 +0200 Notif-Konzept verfeinert --- doc/drafts/LIESMICH.rule_based_notifications | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/drafts/LIESMICH.rule_based_notifications b/doc/drafts/LIESMICH.rule_based_notifications index 6a81979..89d3254 100644 --- a/doc/drafts/LIESMICH.rule_based_notifications +++ b/doc/drafts/LIESMICH.rule_based_notifications @@ -44,6 +44,8 @@ Wie bei bestehenden "Flexible Notifications": * Service-Bedingungen wie bei den WATO-Regeln mit Regexen Neu kommt dazu: +* Eventuell: Ausgangszustand bzw. kompletter Übergang, also nicht + nur "bei WARN", sondern bei "CRIT -> WARN". * Eventuell: Bedingung über den Typ des Checks (z.B. nur df) * Eventuell: enthalten in bestimmter Host oder Servicegruppe * Eventuell: enthalten in bestimmter Kontaktgruppe @@ -69,6 +71,9 @@ mit dem Aufbau Kontakt, Plugin, Parameter +Und eine Checkbox: [ ] Kann vom Benutzer deaktiviert werden. +(siehe Auschlussregeln) + AUSSCHLUSS-REGELN ----------------- @@ -90,7 +95,13 @@ ausgewertet werden, muss man hier die Ausnahmen *nach* den allgemeinen Regeln definieren. So können spätere Regeln frühere immer wieder revidieren. Auch bei Sperrregeln kann man ein Plugin auswählen. Dann werden nur die -Notifikationen mit diesem Plugin gelöscht (um z.B. keine SMS zu bekommen) +Notifikationen mit diesem Plugin gelöscht (um z.B. keine SMS zu bekommen). +Wenn man kein Plugin auswählt, dann werden alle Notifikationen gelöscht. + +Positive Regeln und Ausschlussreglen können sich beliebig Abwechseln. +Die Reihenfolge ist frei definierbar. Damit kann man z.B. erstmal alles +zulassen, dann für eine Gruppe von Benutzern wieder abklemmen und +dann für einen Benutzer doch wieder aktivieren. BENUTZER-REGELN @@ -109,6 +120,10 @@ Der Benutzer kann somit: Merke: Der Benutzer kann so auch Notifikationen "abbonieren" für Hosts/Services, für die er im Nagios kein Kontakt ist! +Notifikationen, die der Admin gesperrt hat (siehe oben), können vom +Benutzer nicht abgeklemmt werden. + + FALLBACK --------

10 years, 11 months

Check_MK Git: check_mk: Fix help text in global settings of EC forwarding

by Mathias Kettner

Module: check_mk Branch: master Commit: ba9d4b22a67c4cc74e9e48b5c93da2dbdf569799 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba9d4b22a67c4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 1 23:17:09 2013 +0200 Fix help text in global settings of EC forwarding --- mkeventd/web/plugins/wato/mkeventd.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 44c5068..d546b46 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1632,7 +1632,9 @@ register_configvar(group, help = _("If you select a contact group here, then all notifications of " "hosts and services in that contact group will be sent to the " "event console. Note: you still need to create a rule " - "matching those messages in order to have events created."), + "matching those messages in order to have events created. Note (2): " + "If you are using the Check_MK Micro Core then this setting is deprecated. " + "Please use the notification plugin Forward Notification to Event Console instead."), default_value = '', ),

10 years, 11 months

Check_MK Git: check_mk: EC: remove debug message when receiving forwarded nagios alerts

by Mathias Kettner

Module: check_mk Branch: master Commit: e91496886653b40d6486a9b150ceea7c7c8e2beb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e91496886653b4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 1 23:06:03 2013 +0200 EC: remove debug message when receiving forwarded nagios alerts --- mkeventd/bin/mkeventd | 1 - 1 file changed, 1 deletion(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 49dac4d..4f95e3d 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1685,7 +1685,6 @@ class EventServer: event = {} # line starts with '@' if line[11] == ';': - log(line) timestamp_str, sl, contact, rest = line[1:].split(';', 3) host, rest = rest.split(None, 1) if len(sl):

10 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013