Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: FIX: Fix output of rule search:

by Mathias Kettner

chapters appeared twice sometimes Message-ID: <515be101.xzOs0sFSsH5MSvub%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: b0569bf59112e2bfc4cc2fbc972fdcc6d2f2e93b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0569bf59112e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 3 09:54:18 2013 +0200 FIX: Fix output of rule search: chapters appeared twice sometimes Conflicts: web/htdocs/wato.py --- ChangeLog | 1 + web/.f12 | 2 +- web/htdocs/wato.py | 4 ++++ 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 274f2bb..4d7e652 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,7 @@ WATO: * FIX: Removed "No roles assigned" text in case of unlocked role attribute in user management dialog + * FIX: Fix output of rule search: chapters appeared twice sometimes Event Console: * FIX: check_mkevents: fix usage help if called with illegal options diff --git a/web/.f12 b/web/.f12 index f8ea798..f2d6c0e 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,6 +1,6 @@ #!/bin/bash SITE=${SITE:-$(omd sites --bare | head -n 1)} -C=$(sudo cp --preserve=mode -rv * /omd/sites/$SITE/share/check_mk/web/ | wc -l) +sudo rsync --exclude=defaults.py --delete -varx htdocs plugins /omd/sites/$SITE/share/check_mk/web/ echo "$C files copied" if [ "$SITE" != - ] ; then sudo omd restart $SITE apache diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 05243d7..1868304 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9767,6 +9767,10 @@ def mode_rulesets(phase): groupnames = [ gn for gn, rulesets in g_rulespec_groups if only_used or search != None or gn == group or gn.startswith(group + "/") ] + # In case of search we need to sort the groups since main chapters would + # appear more than once otherwise. + if search != None: + groupnames.sort() html.write('<div class=rulesets>')

11 years, 2 months

Check_MK Git: check_mk: check_mkevents: fix usage help if called with illegal options

by Mathias Kettner

Module: check_mk Branch: master Commit: 2d6e44f21bbec570abe499196a527b587eb5b16c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d6e44f21bbec5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 2 17:27:39 2013 +0200 check_mkevents: fix usage help if called with illegal options --- ChangeLog | 1 + mkeventd/lib/check_mkevents | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3dacbce..33e744f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -118,6 +118,7 @@ in user management dialog Event Console: + * FIX: check_mkevents: fix usage help if called with illegal options * setup.py now tries to setup Event Console even in non-OMD world 1.2.2b5: diff --git a/mkeventd/lib/check_mkevents b/mkeventd/lib/check_mkevents index f875861..1ffa8e1 100755 --- a/mkeventd/lib/check_mkevents +++ b/mkeventd/lib/check_mkevents @@ -60,7 +60,7 @@ try: application = sys.argv[2] else: application = None -except 1: +except: sys.stdout.write("Usage: check_mkevents [-H REMOTE:PORT] [-a] HOST [APPLICATION]\n") sys.stdout.write("\n -a do not take into account acknowledged events.\n") sys.stdout.write("\n")

11 years, 2 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 4f0e66e9e51729c20ba0cb4fbf70a29eaa1dc776 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f0e66e9e51729… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 2 17:28:54 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: notifications: Warn user if only_services does never match

by Andreas Boesl

Module: check_mk Branch: master Commit: d792dd639912a5465f9f06636705179d25dc922c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d792dd639912a5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 2 16:12:44 2013 +0200 notifications: Warn user if only_services does never match --- ChangeLog | 1 + modules/notify.py | 14 +++++++- web/htdocs/valuespec.py | 45 ++++++++++++++++++++++++++-- web/htdocs/wato.py | 10 ++++++ web/plugins/wato/check_mk_configuration.py | 1 + 5 files changed, 66 insertions(+), 5 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d792dd6399…

11 years, 2 months

Check_MK Git: check_mk: windows agent: fixed error in buffered output whenstarting in test mode

by Andreas Boesl

Module: check_mk Branch: master Commit: 6ef99ce8a3be2bdd35efbf46ae79b46b40a9ea47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ef99ce8a3be2b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 2 15:38:39 2013 +0200 windows agent: fixed error in buffered output whenstarting in test mode --- agents/windows/check_mk_agent.cc | 6 ++++-- agents/windows/check_mk_agent.exe | Bin 111104 -> 111104 bytes agents/windows/install_agent.exe | Bin 130952 -> 130964 bytes 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 9fddea0..d558c0f 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3125,8 +3125,10 @@ void output(SOCKET &out, const char *format, ...) break; } } - else - fwrite(outbuffer, len, 1, stdout); + else { + fwrite(outbuffer, len, 1, stdout); + len = 0; + } } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index abb7633..3f21a99 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.exe b/agents/windows/install_agent.exe index 401e933..bf76f55 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

11 years, 2 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: a9cc4006e4c810c1f95fd09e6a17879a425125a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9cc4006e4c810… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 2 15:38:43 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: re-enabled topology view as nagvis version in omd has been updated now

by Lars Michelsen

Module: check_mk Branch: master Commit: 1704417ce6b3dfb60384eba808c23af4baf05789 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1704417ce6b3df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 15:35:25 2013 +0200 re-enabled topology view as nagvis version in omd has been updated now --- web/plugins/dashboard/builtin.py | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index fabfaf2..dc942ff 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -69,20 +69,18 @@ builtin_dashboards["main"] = { ] } -# New topology dashboard: Will be activated as soon as we have a NagVis -# version that supports this... -# builtin_dashboards["topology"] = { -# "title" : _("Network Topology"), -# "dashlets" : [ -# { -# "title" : "Topology of Site " + defaults.omd_site, -# "iframe" : defaults.url_prefix + 'nagvis/frontend/nagvis-js/index.php?' + \ -# 'mod=Map&header_template=default&header_menu=0&label_show=1' + \ -# '&sources=automap&act=view&backend_id=' + defaults.omd_site + \ -# '&render_mode=undirected&url_target=main', -# "reload_on_resize" : True, -# "position" : (1, 0), -# "size" : (GROW, GROW), -# }, -# ] -# } +builtin_dashboards["topology"] = { + "title" : _("Network Topology"), + "dashlets" : [ + { + "title" : "Topology of Site " + defaults.omd_site, + "iframe" : defaults.url_prefix + 'nagvis/frontend/nagvis-js/index.php?' + \ + 'mod=Map&header_template=default&header_menu=0&label_show=1' + \ + '&sources=automap&act=view&backend_id=' + defaults.omd_site + \ + '&render_mode=undirected&url_target=main', + "reload_on_resize" : True, + "position" : (1, 0), + "size" : (GROW, GROW), + }, + ] +}

11 years, 2 months

Check_MK Git: check_mk: FIX: Removed "No roles assigned" text from user management dialog

by Lars Michelsen

Module: check_mk Branch: master Commit: 2f67a4b48436f1607b44d33e19337b43ce0988b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f67a4b48436f1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 13:33:46 2013 +0200 FIX: Removed "No roles assigned" text from user management dialog --- ChangeLog | 4 ++++ web/htdocs/wato.py | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 531df24..3dacbce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,10 @@ Livestatus: * FIX: memory leak when removing downtime / comment + WATO: + * FIX: Removed "No roles assigned" text in case of unlocked role attribute + in user management dialog + Event Console: * setup.py now tries to setup Event Console even in non-OMD world diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index aa4f096..dc717d2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8199,7 +8199,7 @@ def mode_edit_user(phase): html.write("<a href='%s'>%s</a><br>" % (url, role["alias"])) html.hidden_field("role_" + role_id, is_member and '1' or '') - if not is_member_of_at_least_one: + if is_locked('roles') and not is_member_of_at_least_one: html.write('<i>%s</i>' % _('No roles assigned.')) # Contact groups

11 years, 2 months

Check_MK Git: check_mk: Fixed ipaddress regex

by Lars Michelsen

Module: check_mk Branch: master Commit: 52c7073aa68959587a9dd96aa3e6843a7f789cc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52c7073aa68959… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 13:22:03 2013 +0200 Fixed ipaddress regex --- web/htdocs/js/search.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/js/search.js b/web/htdocs/js/search.js index 741e250..db828b8 100644 --- a/web/htdocs/js/search.js +++ b/web/htdocs/js/search.js @@ -278,7 +278,7 @@ function is_ipaddress(add, prefix) { if (prefix) return add.match(/^[0-9]{1,3}(\.[0-9]{1,3}){0,2}\.?$/); else - return add.match(/^([1-9][0-9]{0,2}\.){3}[1-9][0-9]{0,2}$/); + return add.match(/^([0-9]{1,3}\.){3}[0-9]{1,3}$/); } function mkSearchGetUrl(objType, objName, objSite, numMatches) {

11 years, 2 months

Check_MK Git: check_mk: Updated bug entries #0905

by Lars Michelsen

Module: check_mk Branch: master Commit: e78ba92aea78b510c1c6193b501c3d8f79f256e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e78ba92aea78b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 12:23:34 2013 +0200 Updated bug entries #0905 --- .bugs/905 | 58 ++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 32 insertions(+), 26 deletions(-) diff --git a/.bugs/905 b/.bugs/905 index bdb8103..c7c893e 100644 --- a/.bugs/905 +++ b/.bugs/905 @@ -1,36 +1,42 @@ -Title: We need an option to make "expect messages" based on subregexes possible -Component: ec +Title: Improve shinken support +Component: core +State: open +Date: 2013-04-02 12:22:30 +Targetversion: future Class: feature -State: done -Date: 2013-01-31 11:18:44 -Targetversion: 1.2.2 -For example, when having several logentries which are sent regularly, like +Added from old ticket system #755912: -SRV-12345 is alive -SRV-52345 is alive -SRV-62345 is alive -SRV-72345 is alive -SRV-82345 is alive +Hi everyone, -The following pattern matches them all: + +just wanted to share my experience i made today while setting up check_mk with Shinken as monitoring core (using OMD 0.56). -SRV-([0-9]{5}) is alive +Credits also go to several bug-reports and forum posts :) -Imagine, we have about 2000 different SRV-* entries in the log and we must -create a regular message expectation rule for each of those single SRV-* -items. + +1. When exporting check_mk's configuration to Nagios, cmk validates the "Nagios"-configuration by using the actual Nagios binary and also expects the config to sit at /omd/sites/sitename/tmp/nagios/nagios.cfg, which does not exist when using Shinken as monitoring core. -Once a number (subpatter) is received for the first time, the expection counter -must start and raise an event for this single number if it has not been received -for about a minute. + +I worked around that by symlinking /omd/sites/sitename/tmp/shinken/shinken-apache.cfg (which is a legacy-Nagios-compatible version of shinken.cfg) to /omd/sites/sitename/tmp/nagios/nagios.cfg. -Loesung: Dies wird ausserhalb der EC geloest durch eine EC-Aktion, die -von einer Regel aufgerufen wird, die auf obigen Text matcht. Diese fuegt -autoamtisch eine neue EC-Regel direkt vor der Generator-Regel ein, die -dann auf den speziellen Host wartet. Danach muss die EC neu geladen werden. -Frage ist, ob das aus einer Aktion heraus sauber geht. Wahrscheinlich ja. + +2. Shinken does not seem to care about check results being submitted as file, since I could see my passive services being created correctly, but never received any result. + +After setting check_submission = 'pipe' in main.mk the check results were processed correctly. -2013-02-12 13:40:26: changed state open -> done -solved. + +My thoughts on these findings are: + +Regarding 1.) Wouldn't it be possible to let OMD decide which core binary to use when doing a config check with check_mk, so that the correct one is being used (and therefore the correct config file is being parsed)? + + +Regarding 2.) check_mk recommends submitting the check results by file for performance and scalability reasons. Do these reasons also apply to the Shinken core? Shinken ignores any settings regarding this, such as check_result_path. + +Would it be possible to set check_submission to pipe automatically when using Shinken instead of Nagios / Icinga? + + +Regards, + +Markus

11 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2013