Checkmk git commits January 2013

checkmk-commits@lists.checkmk.com

3 participants
210 discussions

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 1ae746f0f816e16e91a6009bb5c6df74fe17f5ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ae746f0f816e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 28 18:33:47 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 8 months

Check_MK Git: check_mk: FIX: Fixed permissions of sqlplus.sh and logwatch. cfg in RPMs

by Lars Michelsen

Module: check_mk Branch: master Commit: d924f2a979eb57f435632095bfd6d26893925c66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d924f2a979eb57… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 28 10:49:44 2013 +0100 FIX: Fixed permissions of sqlplus.sh and logwatch.cfg in RPMs --- check_mk.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/check_mk.spec b/check_mk.spec index 0a2eb78..e9faa7c 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -126,8 +126,8 @@ mkdir -p $R/usr/lib/check_mk_agent/local # logwatch and oracle extension install -m 755 $R/usr/share/check_mk/agents/plugins/mk_logwatch $R/usr/lib/check_mk_agent/plugins install -m 755 $R/usr/share/check_mk/agents/plugins/mk_oracle $R/usr/lib/check_mk_agent/plugins -install -m 755 $R/usr/share/check_mk/agents/logwatch.cfg $R/etc/check_mk -install -m 644 $R/usr/share/check_mk/agents/sqlplus.sh $R/etc/check_mk +install -m 644 $R/usr/share/check_mk/agents/logwatch.cfg $R/etc/check_mk +install -m 755 $R/usr/share/check_mk/agents/sqlplus.sh $R/etc/check_mk %clean rm -rf $RPM_BUILD_ROOT

11 years, 8 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ed8d0b5011a233a0a6da862277bc68db1eac4be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ed8d0b5011a23… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 16:20:26 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

11 years, 8 months

Check_MK Git: check_mk: FIX: more robust deletion of precompiled files to ensure the correct creation of the files (Thanks to Guido Günther)

by Lars Michelsen

Module: check_mk Branch: master Commit: 3df72238704a69863d60eb01496aad399f2306ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3df72238704a69… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 16:20:01 2013 +0100 FIX: more robust deletion of precompiled files to ensure the correct creation of the files (Thanks to Guido Günther) --- ChangeLog | 2 ++ modules/check_mk.py | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2d0f0b..1c74438 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ * cmk --notify: added the macros NOTIFY_LASTHOSTSTATECHANGE, NOTIFY_HOSTSTATEID, NOTIFY_LASTSERVICESTATECHANGE, NOTIFY_SERVICESTATEID, NOTIFY_NOTIFICATIONCOMMENT, NOTIFY_NOTIFICATIONAUTHOR, NOTIFY_NOTIFICATIONAUTHORNAME, NOTIFY_NOTIFICATIONAUTHORALIAS + * FIX: more robust deletion of precompiled files to ensure the correct + creation of the files (Thanks to Guido Günther) Checks & Agents: diff --git a/modules/check_mk.py b/modules/check_mk.py index bfe2d7b..0bbec6e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2588,11 +2588,11 @@ def precompile_hostcheck(hostname): compiled_filename = precompiled_hostchecks_dir + "/" + hostname source_filename = compiled_filename + ".py" - try: - os.remove(compiled_filename) - os.remove(source_filename) - except: - pass + for fname in [ compiled_filename, source_filename ]: + try: + os.remove(fname) + except: + pass # check table, enriched with addition precompiled information. check_table = get_precompiled_check_table(hostname)

11 years, 8 months

Check_MK Git: check_mk: logwatch.ec: use unix socket instead of pipe

by Mathias Kettner

Module: check_mk Branch: master Commit: b8446f49de1f1cc94e35243efc66cada1e481676 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8446f49de1f1c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 25 17:17:37 2013 +0100 logwatch.ec: use unix socket instead of pipe This fixes a race condition when two checks run exactly at the same time. --- checks/logwatch | 9 +++++---- web/plugins/wato/check_parameters.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index bae6758..a8a0706 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -446,7 +446,7 @@ def check_logwatch_ec(_unused, params, info): # d) remote via tcp method = params.get('method') if method == None: - method = os.getenv('OMD_ROOT') + "/tmp/run/mkeventd/events" + method = os.getenv('OMD_ROOT') + "/tmp/run/mkeventd/eventsocket" try: if isinstance(method, tuple): @@ -466,9 +466,10 @@ def check_logwatch_ec(_unused, params, info): # is *not* existing! This prevents us from hanging in such # situations. So we must make sure that we do not create a file # instead of the pipe! - pipe = os.open(method, os.O_WRONLY) - os.write(pipe, '\n'.join(messages)) - os.close(pipe) + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + sock.connect(method) + sock.send('\n'.join(messages)) + sock.close() num_messages = len(messages) return (0, 'OK - Forwarded %d messages to event console' % num_messages, [('messages', num_messages)]) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 1a6b6d2..a3b1529 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2222,7 +2222,7 @@ checkgroups.append(( title = _("Send events to local event console in same OMD site"), ), TextAscii( - title = _("Send events to local event console into pipe"), + title = _("Send events to local event console into unix socket"), allow_empty = False, ), Tuple(

11 years, 8 months

Check_MK Git: check_mk: Updated ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: 327481bb142aaf8d82cac0cb77923f039487d80a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=327481bb142aaf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 25 17:20:04 2013 +0100 Updated ChangeLog --- ChangeLog | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4992c2f..7278b4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,10 +10,11 @@ Checks & Agents: * FIX: mssql_counters.file_sizes - Fixed wrong value for "Log Files" in output * FIX: drbd: Parameters for expected roles and disk states can now be set to - * Add: Added check for ricoh printer supply levels - None to disable alerting on changed values - * Add: jolokia_metrics now support warn/crit levels for heap, nonheap, totalheap - * Add: pnpgraph for jolokia_metrics + None to disable alerting on changed values + * printer_supply_ricoh: New check for Ricoh printer supply levels + * jolokia_metrics.mem: now supports warn/crit levels for heap, nonheap, totalheap + * jolokia_metrics.mem: add dedicated PNP graph + * FIX: logwatch.ec: use UNIX socket instead of Pipe for forwarding into EC Multisite: * Added comment painter to notification related views

11 years, 8 months

Check_MK Git: check_mk: Added UNIX socket for sending events to the EC

by Mathias Kettner

Module: check_mk Branch: master Commit: 5e0aad8e40bb69675b7b08303f263322012f1c0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e0aad8e40bb69… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 25 16:59:08 2013 +0100 Added UNIX socket for sending events to the EC --- ChangeLog | 3 + mkeventd/bin/mkeventd | 186 +++++++++++++++++++++++--------- mkeventd/web/plugins/wato/mkeventd.py | 18 +++- 3 files changed, 153 insertions(+), 54 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5e0aad8e40…

11 years, 8 months

Check_MK Git: check_mk: Event Console: wait until it is stopped while in start script

by Mathias Kettner

Module: check_mk Branch: master Commit: 70ace6c96f14583f64c19832fd44f8de88514e85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70ace6c96f1458… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 25 16:21:33 2013 +0100 Event Console: wait until it is stopped while in start script --- mkeventd/omd/mkeventd.init | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/mkeventd/omd/mkeventd.init b/mkeventd/omd/mkeventd.init index 55e13de..4e6237a 100755 --- a/mkeventd/omd/mkeventd.init +++ b/mkeventd/omd/mkeventd.init @@ -31,13 +31,22 @@ case "$1" in if [ -z "$THE_PID" ] ; then echo 'Not running.' else - echo "killing $THE_PID..." + echo -n "killing $THE_PID..." kill $THE_PID + N=0 + while [ -e "$PIDFILE" ] ; do + sleep 0.5 + echo -n . + N=$((N + 1)) + if [ $N -gt 20 ] ; then + echo "PID file did not vanish." + exit 1 + fi + done fi ;; restart) - $0 stop - $0 start + $0 stop && $0 start ;; reload) echo -n 'Reloading mkeventd...'

11 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0824

by Mathias Kettner

Module: check_mk Branch: master Commit: 02e8db53a02ebe1652fdea179100c5436605086c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02e8db53a02ebe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 25 15:59:16 2013 +0100 Updated bug entries #0824 --- .bugs/824 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/.bugs/824 b/.bugs/824 index cfa232d..12091c7 100644 --- a/.bugs/824 +++ b/.bugs/824 @@ -19,3 +19,7 @@ I'm testing on CentOS 6.2 64bit. Best regards Wolfgang + + +Resolution: We do not try to create this file but assume a serial +number of 0 for all users in case that file is missing.

11 years, 8 months

Check_MK Git: check_mk: fixed bug: removing pending log in distr. setup

by Andreas Boesl

Module: check_mk Branch: master Commit: 56edfc200d4d485789095db2a156fd97693dbdb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56edfc200d4d48… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jan 25 10:21:36 2013 +0100 fixed bug: removing pending log in distr. setup --- ChangeLog | 1 + web/htdocs/wato.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9772273..81e2cd1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * FIX: Fixed problem on user profile page when no alias set for a user * FIX: list valuespecs could not be extended after once saving * FIX: fix title of foldable areas contained in list valuespecs + * FIX: Fixed bug where pending log was not removed in multisite setup 1.2.1i5: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f5da593..fd309f9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6677,11 +6677,11 @@ def mode_edit_site(phase): save_sites(sites) - # Own site needs SYNCRESTART in any case + # Own site needs RESTART in any case update_replication_status(our_site_id(), { "need_restart" : True }) - if new: - update_replication_status(id, { "need_sync" : True, "need_restart" : True }) + if not site_is_local(id): + update_replication_status(id, { "need_sync" : True, "need_restart" : True }) log_pending(AFFECTED, None, "edit-sites", _("Created new connection to site %s" % id)) else: log_pending(AFFECTED, None, "edit-sites", _("Modified site connection %s" % id))

11 years, 8 months

← Newer
1
2
3
4
5
6
7
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2013