Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64404 discussions

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

Check_MK Git: check_mk: jolokia_metrics.mem/pnpgraph: fixed bugs when warn/ crit levels were not set

by Andreas Boesl

Module: check_mk Branch: master Commit: 57e98ba5a974208ae7a35ceaaf88ca2869ecb053 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57e98ba5a97420… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 24 18:46:57 2013 +0100 jolokia_metrics.mem/pnpgraph: fixed bugs when warn/crit levels were not set --- checks/jolokia_metrics | 2 + pnp-templates/check_mk-jolokia_metrics.mem.php | 26 ++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index d0096ef..96f686c 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -209,6 +209,8 @@ def check_jolokia_metrics_mem(item, params, info): elif value >= value_max * params[what][0] / 100.0: param_state = 1 level_info = "%s(warn at %s%%)" % (state_sign[1], params[what][0]) + else: + perfdata.append((what, value, "", "", "", value_max)) info_list.append("%s: %0.fMB/%.1f%% used%s" % (what.title(), value, value/value_max*100, level_info)) diff --git a/pnp-templates/check_mk-jolokia_metrics.mem.php b/pnp-templates/check_mk-jolokia_metrics.mem.php index 3d6ae47..c892bb2 100644 --- a/pnp-templates/check_mk-jolokia_metrics.mem.php +++ b/pnp-templates/check_mk-jolokia_metrics.mem.php @@ -32,17 +32,23 @@ $def[1] = "" . "CDEF:total=heap,nonheap,+ " . "AREA:heap#00c0ff:\"Heap\" " - . "LINE1:$WARN[1]#a0ad00:\"Heap WARN\" " - . "LINE1:$CRIT[1]#ad0000:\"Heap CRIT\" " - . "LINE1:$MAX[1]#003077:\"Heap MAX\" " + . "LINE1:$MAX[1]#003077:\"Heap MAX\" "; +if ($CRIT[1]) { + $def[1] .= "LINE1:$WARN[1]#a0ad00:\"Heap WARN\" " + . "LINE1:$CRIT[1]#ad0000:\"Heap CRIT\" "; +} - . "AREA:min_nonheap#3430bf:\"Nonheap\" " - . "LINE1:-$WARN[2]#adfd30:\"Nonheap WARN\" " - . "LINE1:-$CRIT[2]#ff0080:\"Nonheap CRIT\" " - . "LINE1:-$MAX[2]#003233:\"Nonheap MAX \" " - . "GPRINT:total:LAST:\"Total %.2lfMB last\" " +$def[1] .= "AREA:min_nonheap#3430bf:\"Nonheap\" " + . "LINE1:-$MAX[2]#003233:\"Nonheap MAX \" "; +if ($CRIT[2]) { + $def[1] .= "LINE1:-$WARN[2]#adfd30:\"Nonheap WARN\" " + . "LINE1:-$CRIT[2]#ff0080:\"Nonheap CRIT\" "; +} + + +$def[1] .= "GPRINT:total:LAST:\"Total %.2lfMB last\" " . "GPRINT:total:AVERAGE:\"%.2lfMB avg\" " - . "GPRINT:total:MAX:\"%.2lfMB max \" " - . ""; + . "GPRINT:total:MAX:\"%.2lfMB max \" " . ""; + ?>

11 years, 8 months

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

by Andreas Boesl

Module: check_mk Branch: master Commit: 0dcb4f2e1946a319cbb8dc5ddbcf4c692b71cb1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0dcb4f2e1946a3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 24 18:47:04 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 8 months

Check_MK Git: check_mk: Jolokia JVM Memory checks now with heap, nonheap, total.

by Andreas Boesl

Module: check_mk Branch: master Commit: 033db4a616d6b00922cd5eacfb2eb62a18d277c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=033db4a616d6b0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 24 17:42:10 2013 +0100 Jolokia JVM Memory checks now with heap,nonheap,total. Uses WATO check_parameter group jvm_memory --- ChangeLog | 2 + checkman/jolokia_metrics.mem | 34 +++++++-- checks/jolokia_metrics | 95 +++++++++++++++--------- pnp-templates/check_mk-jolokia_metrics.mem.php | 48 ++++++++++++ web/plugins/wato/check_parameters.py | 74 ++++++++++++++++++ 5 files changed, 211 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=033db4a616…

11 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0886

by Mathias Kettner

Module: check_mk Branch: master Commit: 0911dcca3d2256664fffacc8645760ecd66f4327 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0911dcca3d2256… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 24 16:47:01 2013 +0100 Updated bug entries #0886 --- .bugs/886 | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/.bugs/886 b/.bugs/886 new file mode 100644 index 0000000..d1aa9e9 --- /dev/null +++ b/.bugs/886 @@ -0,0 +1,98 @@ +Title: Manual installion of EC without OMD +Component: docu +State: open +Date: 2013-01-24 16:46:23 +Targetversion: 1.2.3 +Class: todo + +ch versuche mich gerade an der Event Console (mkeventd). +Ich habe jedoch massive Probleme in einer nicht OMD Umgebung. + +Hier mal die Schritte welche ich durchgeführt habe. + +Check_MK 1.2.1i4 installiert + +mkeventd-1.2.1i4.tar.gz geladen und entpackt. +cd mkevent +rsync -av bin/* /usr/local/bin/ +rsync -av checks/* /usr/share/check_mk/checks/ +rsync -av lib/* /usr/local/nagios/libexec/ +rsync -av web/* /usr/share/check_mk/web/ + +Multisite Integration: +====================== +cat > /etc/check_mk/multisite.mk +mkeventd_enabled = True +EOF + +service httpd restart + +Leere Config Datei erstellen: +============================= +touch /etc/check_mk/mkeventd.mk + + +WATO in Multisite geöffnet: +=========================== +Multisite -> Event Console -> New Rule -> Save +>>> Nun kommen einige Fehlermeldungen. +Your web server cannot create the directory /etc/check_mk/mkeventd.d, or cannot set the group to nagcmd or cannot set the permissions to 0770. Please make sure that: +the base directory is writable by the web server. +Both Nagios and the web server are in the group nagcmd. +Reason: [Errno 13] Permission denied: '/etc/check_mk/mkeventd.d' + +>>> Umgehungslösung: +mkdir -p /etc/check_mk/mkeventd.d/wato +touch /etc/check_mk/mkeventd.d/wato/global.mk +chgrp -R apache /etc/check_mk/mkeventd.d/wato +chmod g+w /etc/check_mk/mkeventd.d/wato/global.mk + +Internal error:: [Errno 13] Permission denied: '/etc/check_mk/mkeventd.d/wato/rules.mk' (Retry with debug mode) +touch /etc/check_mk/mkeventd.d/wato/rules.mk +chgrp -R apache /etc/check_mk/mkeventd.d/wato +chmod g+w /etc/check_mk/mkeventd.d/wato/rules.mk + +Daemon start: +============= +mkeventd -P /var/run/mkeventd/events -S /var/run/mkeventd/status --pidfile /var/run/mkeventd/mkeventd.pid + +Multisite im Browser geöffnet: +============================== +Multisite -> Event Console -> Events + +>>> Nun kommt in Multisite folgende Meldung: +Cannot connect to event daemon: [Errno 2] No such file or directory + +Ursache: Socket und Pipe Path unbekannt (run_dir Variable ist falsch) + +>>> Umgehungslösung: +In der Datei /usr/share/check_mk/web/htdocs/mkeventd.py +except: + run_dir = defaults.livestatus_unix_socket.rsplit("/",1)[0] + socket_path = run_dir + "/mkeventd/status" + pipe_path = run_dir + "/mkeventd/events" +ändern auf + socket_path = "/var/run/mkeventd/status" + pipe_path = "/var/run/mkeventd/events" + +service httpd restart + +>>> Nun kommt in Multisite folgende Meldung: +Cannot connect to event daemon: [Errno 13] Permission denied + +Ursache: Kann nicht in den Socket schreiben. + +>>> Umgehungslösung: +chmod o+w /var/run/mkeventd/status + +Dies muss nach jeden Neustart des Daemons durchgeführt werden. + + +Nun scheint alles so zu funktionieren wie es soll. + +Wäre toll wenn man die Umgehungslösungen in mkevent einpflegen könnte. + + +Versionsinfos: +CentOS 6.2 +check_MK 1.2.1i4

11 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits