Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

Check_MK Git: check_mk: Fix further WATO permissions in manual mode

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 43d72c2bbe1dffec77e2868b4569bcbe8d7f37d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43d72c2bbe1dff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 3 14:07:10 2012 +0100 Fix further WATO permissions in manual mode --- .bugs/361 | 9 +++++++-- scripts/setup.sh | 14 +++++++++++++- web/htdocs/wato.py | 44 ++++++++++++++++++++++++-------------------- 3 files changed, 44 insertions(+), 23 deletions(-) diff --git a/.bugs/361 b/.bugs/361 index c6ebe38..c10b1bb 100644 --- a/.bugs/361 +++ b/.bugs/361 @@ -1,11 +1,16 @@ Title: setup.sh does not setup permissions for WATO correctly Component: core +State: done +Class: cleanup Benefit: 1 -State: open Cost: 2 Date: 2011-08-27 14:04:23 -Class: cleanup +Targetversion: future The setup.sh should try to setup permissions for WATO. We might need a SGID bit and 775 permissions for the Webserver. Also check if OMD share mode is working correctly. + +2012-01-03 14:06:53: changed state open -> done +I've fixed several directory permissions and hope +that it's mostly working now. diff --git a/scripts/setup.sh b/scripts/setup.sh index aaf5028..9f9425d 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -449,7 +449,7 @@ autochecksdir = '$vardir/autochecks' precompiled_hostchecks_dir = '$vardir/precompiled' counters_directory = '$vardir/counters' tcp_cache_dir = '$vardir/cache' -tmp_dir = '$vardir' +tmp_dir = '$vardir/tmp' logwatch_dir = '$vardir/logwatch' nagios_objects_file = '$nagconfdir/check_mk_objects.cfg' nagios_command_pipe_path = '$nagpipe' @@ -638,9 +638,21 @@ do chmod -R g+w $DESTDIR$vardir/web && chgrp -R $wwwgroup $DESTDIR$vardir/wato && chmod -R g+w $DESTDIR$vardir/wato + mkdir -p $DESTDIR$vardir/tmp && + chgrp -R $wwwgroup $DESTDIR$vardir/tmp && + chmod g+w $DESTDIR$vardir/tmp && mkdir -p $DESTDIR$confdir/conf.d/wato && chmod -R g+w $DESTDIR$confdir/conf.d/wato && chgrp -R $wwwgroup $DESTDIR$confdir/conf.d/wato + mkdir -p $DESTDIR$confdir/multisite.d/wato && + chmod -R g+w $DESTDIR$confdir/multisite.d/wato && + chgrp -R $wwwgroup $DESTDIR$confdir/multisite.d/wato + touch $DESTDIR$confdir/multisite.d/sites.mk && + chgrp $wwwgroup $DESTDIR$confdir/multisite.d/sites.mk && + chmod 664 $DESTDIR$confdir/multisite.d/sites.mk && + touch $DESTDIR$confdir/conf.d/distributed_wato.mk && + chgrp $wwwgroup $DESTDIR$confdir/conf.d/distributed_wato.mk && + chmod 664 $DESTDIR$confdir/conf.d/distributed_wato.mk fi && tar xzf $SRCDIR/conf.tar.gz -C $DESTDIR$confdir && if [ -e $DESTDIR$confdir/check_mk.cfg -a ! -e $DESTDIR$confdir/main.mk ] ; then diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 61ef16f..9fc43ae 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6300,8 +6300,11 @@ def create_distributed_wato_file(siteid, mode): def delete_distributed_wato_file(): p = defaults.check_mk_configdir + "/distributed_wato.mk" + # We do not delete the file but empty it. That way + # we do not need write permissions to the conf.d + # directory! if os.path.exists(p): - os.remove(p) + file(p, "w").write("") #. # .-Users/Contacts-------------------------------------------------------. @@ -6832,25 +6835,26 @@ def load_users(): # That way heroes of the command line will still be able to # change passwords with htpasswd. filename = defaults.htpasswd_file - for line in file(filename): - id, password = line.strip().split(":")[:2] - if password.startswith("!"): - locked = True - password = password[1:] - else: - locked = False - if id in result: - result[id]["password"] = password - result[id]["locked"] = locked - elif id in config.admin_users: - # Create entry if this is an admin user - new_user = { - "roles" : [ "admin" ], - "password" : password, - "locked" : False - } - result[id] = new_user - # Other unknown entries will silently be dropped. Sorry... + if os.path.exists(filename): + for line in file(filename): + id, password = line.strip().split(":")[:2] + if password.startswith("!"): + locked = True + password = password[1:] + else: + locked = False + if id in result: + result[id]["password"] = password + result[id]["locked"] = locked + elif id in config.admin_users: + # Create entry if this is an admin user + new_user = { + "roles" : [ "admin" ], + "password" : password, + "locked" : False + } + result[id] = new_user + # Other unknown entries will silently be dropped. Sorry... # Now read the automation secrets and add them to existing # users or create new users automatically

12 years, 8 months

Check_MK Git: check_mk: setup.sh now setups up permissions for conf.d/wato

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 462e9b3893785821f079ec8d20d0ced0b93dea44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=462e9b38937858… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 3 13:20:09 2012 +0100 setup.sh now setups up permissions for conf.d/wato --- ChangeLog | 2 ++ scripts/setup.sh | 5 ++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index dcf341d..87f62a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Core, Setup, etc.: * cmk -d does now honor --cache and --no-tcp * cmk -O/-R now uses omd re{start,load} core if using OMD + * FIX: setup.sh now setups up permissions for conf.d/wato + correctly Checks & Agents: * Windows agent: output eventlog texts in UTF-8 encoding. This diff --git a/scripts/setup.sh b/scripts/setup.sh index cae47b3..aaf5028 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -632,13 +632,16 @@ do chown -R $nagiosuser $DESTDIR$vardir/{counters,cache,logwatch} chown $nagiosuser $DESTDIR$vardir/web fi && + mkdir -p $DESTDIR$confdir/conf.d && if [ -z "$DESTDIR" ] ; then chgrp -R $wwwgroup $DESTDIR$vardir/web && chmod -R g+w $DESTDIR$vardir/web && chgrp -R $wwwgroup $DESTDIR$vardir/wato && chmod -R g+w $DESTDIR$vardir/wato + mkdir -p $DESTDIR$confdir/conf.d/wato && + chmod -R g+w $DESTDIR$confdir/conf.d/wato && + chgrp -R $wwwgroup $DESTDIR$confdir/conf.d/wato fi && - mkdir -p $DESTDIR$confdir/conf.d && tar xzf $SRCDIR/conf.tar.gz -C $DESTDIR$confdir && if [ -e $DESTDIR$confdir/check_mk.cfg -a ! -e $DESTDIR$confdir/main.mk ] ; then mv -v $DESTDIR$confdir/check_mk.cfg $DESTDIR$confdir/main.mk

12 years, 8 months

Check_MK Git: check_mk: Fix problem in htmllib with select()

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 95bb5f1f03eeb0ccf7f31818fe7efe16b465e2ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95bb5f1f03eeb0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 3 13:21:53 2012 +0100 Fix problem in htmllib with select() --- web/htdocs/htmllib.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9946354..dddf9b2 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -444,7 +444,7 @@ class html: # Sort according to display texts, not keys sorted = options[:] sorted.sort(lambda a,b: cmp(a[1].lower(), b[1].lower())) - self.select(self, varname, sorted, deflt, onchange, attrs) + self.select(varname, sorted, deflt, onchange, attrs) def select(self, varname, options, deflt="", onchange=None, attrs = {}): current = self.var(varname, deflt)

12 years, 8 months

Check_MK Git: check_mk: Disable sound for OK state per default

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3beb7f3b6b3e2354452b73ce02db8811e39603e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3beb7f3b6b3e23… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 2 18:08:40 2012 +0100 Disable sound for OK state per default --- web/htdocs/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 9283855..07dfe98 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -481,7 +481,7 @@ sounds = [ ( "critical", "critical.wav" ), ( "unknown", "unknown.wav" ), ( "warning", "warning.wav" ), - ( None, "ok.wav" ), +# ( None, "ok.wav" ), ]

12 years, 8 months

Check_MK Git: check_mk: Multisite: enable sounds per default now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d70a053bf98aa2f5ca755fb1d377e6ac43b64059 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d70a053bf98aa2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 2 18:01:10 2012 +0100 Multisite: enable sounds per default now --- .bugs/342 | 10 ++++++++-- ChangeLog | 3 +++ multisite.mk | 19 ++++++++----------- web/htdocs/config.py | 10 +++++++++- web/htdocs/views.py | 4 +++- web/plugins/wato/check_mk_configuration.py | 11 +++++++++++ 6 files changed, 42 insertions(+), 15 deletions(-) diff --git a/.bugs/342 b/.bugs/342 index c90f26c..72d1a45 100644 --- a/.bugs/342 +++ b/.bugs/342 @@ -1,12 +1,18 @@ Title: Enable sounds per default Component: multisite +State: done +Class: cleanup Benefit: 1 -State: open Cost: 2 Date: 2011-08-24 16:32:16 -Class: cleanup Targetversion: 1.2.0 Enable the sound configuration in config.py per default. Change the comments in the example multisite.mk or remove that part completely. Update the documentation. + +2012-01-02 17:58:11: changed state open -> done +Sounds are now enabled per default. And I've made a new +configuration variable enable_sounds which only must be +set to False in order to disable them. The list config.sounds is +preset to useful defaults. diff --git a/ChangeLog b/ChangeLog index 4a1e381..dcf341d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,9 @@ Multisite: * Improve transaction handling and reload detection: user can have multiple action threads in parallel now + * Sounds in views are now enabled per default. The new configuration + variable enable_sounds can be set to False in multisite.mk in order + to disable sounds. 1.1.13i2: Core, Setup, etc.: diff --git a/multisite.mk b/multisite.mk index cbf5282..95d285e 100644 --- a/multisite.mk +++ b/multisite.mk @@ -12,11 +12,14 @@ admin_users = [ "nagiosadmin" ] nagvis_base_url = '/nagvis' # Views allow to play alarm sounds according to the -# "worst" state of the show items. Configure here -# which sounds to play. Possible events: critical, -# warning, unknown, ok, up, down, unreachable, -# pending. Sounds are expected in the sounds subdirectory -# of htdocs (Default is /usr/share/check_mk/web/htdocs/sounds) +# "worst" state of the shown items. Enable sounds here: +# enable_sounds = True + +# You can configure here which sounds to play. Possible events are "critical", +# "warning", "unknown", "ok", "up", "down", "unreachable" and +# "pending". Sounds are expected in the sounds subdirectory +# of htdocs (Default is /usr/share/check_mk/web/htdocs/sounds). The +# following setting is the default: # sounds = [ # ( "down", "down.wav" ), # ( "critical", "critical.wav" ), @@ -24,12 +27,6 @@ nagvis_base_url = '/nagvis' # ( "warning", "warning.wav" ), # ( None, "ok.wav" ), # ] -# Note: this example has not sound for unreachable hosts. -# set sound_url to another url, if you place your sound -# files elsewhere: -# sound_url = "http://otherhost/path/to/sound/" -# or -# sound_url = "/nagios/alarms/" # Tabs for choosing number of columns refresh # view_option_refreshes = [ 30, 60, 90, 0 ] diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 347bb04..9283855 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -475,7 +475,15 @@ declare_permission("ignore_hard_limit", # sound_url = "sounds/" -sounds = [] +enable_sounds = False +sounds = [ + ( "down", "down.wav" ), + ( "critical", "critical.wav" ), + ( "unknown", "unknown.wav" ), + ( "warning", "warning.wav" ), + ( None, "ok.wav" ), +] + # __ ___ _ _ # \ \ / (_) _____ __ ___ _ __ | |_(_) ___ _ __ ___ diff --git a/web/htdocs/views.py b/web/htdocs/views.py index a75e902..85382d1 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1577,8 +1577,10 @@ def do_table_join(master_ds, master_rows, master_filters, join_painters, join_co row["JOIN"] = joininfo - def play_alarm_sounds(): + if not config.enable_sounds: + return + url = config.sound_url if not url.endswith("/"): url += "/" diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 78caade..0066e42 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -71,6 +71,17 @@ register_configvar(group, domain = "multisite") register_configvar(group, + "enable_sounds", + Checkbox(title = _("Enabled sounds in views"), + label = _("enable sounds"), + help = _("If sounds are enabled then the user will be alarmed by problems shown " + "in a Multisite status view if that view has been configured for sounds. " + "From the views shipped in with Multisite all problem views have sounds " + "enabled."), + default_value = True), + domain = "multisite") + +register_configvar(group, "context_buttons_to_show", Optional( Integer(

12 years, 8 months

Check_MK Git: check_mk: Fix levels in trend perfdata

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fa28d378ce878d2e11a3389746390faa90702382 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa28d378ce878d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 2 17:43:56 2012 +0100 Fix levels in trend perfdata --- checks/df.include | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/checks/df.include b/checks/df.include index 10ff062..a2abc8a 100644 --- a/checks/df.include +++ b/checks/df.include @@ -222,8 +222,10 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): # MB / 24 hours. The same holds for the warn and crit information. # It is configured in MB / trend range but in the performance data # it's sent as MB / 24h. - perfdata.append(("trend", rate_avg * H24, warn_perf / range_sec * H24, - crit_perf / range_sec * H24, 0, size_mb / range)) + perfdata.append(("trend", rate_avg * H24, + warn_perf != None and (warn_perf / range_sec * H24) or None, + crit_perf != None and (crit_perf / range_sec * H24) or None, + 0, size_mb / range)) # compute time until filesystem is full (only for positive trend, of course) if trend > 0:

12 years, 8 months

Check_MK Git: check_mk: Wrapped long line

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 66bd1a03135c18fde9abb798c498eeb53b1d0e59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66bd1a03135c18… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 2 16:59:59 2012 +0100 Wrapped long line --- web/htdocs/htmllib.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index f7546b4..fb83ff2 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -223,7 +223,8 @@ class html: days = hours / 24 return "%d days" % days - def begin_form(self, name, action = None, method = "GET", onsubmit = None, add_transid = True): + def begin_form(self, name, action = None, method = "GET", + onsubmit = None, add_transid = True): self.form_vars = [] if action == None: action = self.req.myfile + ".py"

12 years, 8 months

Check_MK Git: check_mk: Improve transaction handling and reload detection

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3d0a3e80a6b36e2c390dd52d45293e41c9cadc88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d0a3e80a6b36e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 2 17:35:53 2012 +0100 Improve transaction handling and reload detection user can have multiple action threads in parallel now. For Details see bug #0322. --- .bugs/322 | 11 +++++- ChangeLog | 4 ++ web/htdocs/htmllib.py | 80 ++++++++++++++++++++++++++++++------------------ web/htdocs/sidebar.py | 4 +- web/htdocs/wato.py | 14 ++++---- 5 files changed, 72 insertions(+), 41 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3d0a3e80a6…

12 years, 8 months

Check_MK Git: check_mk: Linux agent: wrap freeipmi with lock

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 44c021fec61ae278a802e7ac97cdb178ed3437eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44c021fec61ae2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 2 16:48:22 2012 +0100 Linux agent: wrap freeipmi with lock --- .bugs/311 | 8 ++++++-- ChangeLog | 1 + agents/check_mk_agent.linux | 19 ++++++++++++------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.bugs/311 b/.bugs/311 index 901faf3..1ee43c0 100644 --- a/.bugs/311 +++ b/.bugs/311 @@ -1,10 +1,10 @@ Title: IPMI cache initialization race condition Component: checks +State: done +Class: nastiness Benefit: 1 -State: open Cost: 4 Date: 2011-07-18 15:42:34 -Class: nastiness Targetversion: 1.2.0 there is a very nasty issue with the IPMI agent code - if we kill the initial build of the SDR @@ -18,3 +18,7 @@ Very ugly issue, maybe xinetd can disable multiple runs of the same service (but mean staleness issues will stop the agent forever) Or we implement a caching feature similar to that of <<<ipmitool>>>. + +2012-01-02 16:47:41: changed state open -> done +I've implemented a lock with a timeout of 60 secs now. Still +need some host with freeipmi in order to test this. diff --git a/ChangeLog b/ChangeLog index 7805173..209d092 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ in the range-setting will not affect the graph anymore. * if/if64/lnx_if: pad port numbers with zeros in order to sort correctly. This can be turned off with if_inventory_pad_portnumbers = False. + * Linux agent: wrap freeipmi with lock in order to avoid cache corruption 1.1.13i2: Core, Setup, etc.: diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 9d2a9ce..8c8541d 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -249,13 +249,18 @@ then else IPMI_FORMAT="" fi - for class in Temperature 'Power Unit' Fan - do - $WAITMAX ipmi-sensors $IPMI_FORMAT --sdr-cache-directory /var/cache -g "$class" | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ $[^(]*$_($[^)]*$)@ \2_\1@' - # In case of a timeout immediately leave loop. - if [ $? = 255 ] ; then break ; fi - WAITMAX="waitmax 3" - done + # Aquire lock with flock in order to avoid multiple runs of ipmi-sensors + # in case of parallel or overlapping calls of the agent. + ( + flock -n 200 --wait 60 + for class in Temperature 'Power Unit' Fan + do + $WAITMAX ipmi-sensors $IPMI_FORMAT --sdr-cache-directory /var/cache -g "$class" | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ $[^(]*$_($[^)]*$)@ \2_\1@' + # In case of a timeout immediately leave loop. + if [ $? = 255 ] ; then break ; fi + WAITMAX="waitmax 3" + done + ) 200 >> $"$sdrcache" fi # State of LSI MegaRAID controller via MegaCli. You can download that tool from:

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0146, #0191

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2681a944a52ecdd771be290e4834469dcbec3c0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2681a944a52ecd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 2 11:55:55 2012 +0100 Updated bug entries #0146, #0191 --- .bugs/146 | 9 +++++++-- .bugs/191 | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.bugs/146 b/.bugs/146 index 406ba0c..77d2f88 100644 --- a/.bugs/146 +++ b/.bugs/146 @@ -1,9 +1,14 @@ Title: logwatch_max_filesize is missing in 'config variables' doku Component: docu +State: wontfix +Class: todo Benefit: 5 -State: open Cost: 6 Date: 2011-02-11 11:20:58 -Class: todo +Targetversion: future The parameter logwatch_max_filesize is not mentioned on the config variable page. + +2012-01-02 11:34:45: changed state open -> wontfix +This is a check specific setting and described in the +check man page of logwatch. diff --git a/.bugs/191 b/.bugs/191 index 3ad01de..cbb96ff 100644 --- a/.bugs/191 +++ b/.bugs/191 @@ -1,12 +1,16 @@ Title: scan parents: documentation about output missing Component: docu +State: done +Class: todo Benefit: 3 -State: open Cost: 3 Date: 2011-07-25 16:08:41 -Class: todo +Targetversion: future There is no documentation about the meanings of the output of the scan parents feature. The single chars like o, L, G aare not mentioned in the docs. + +2012-01-02 11:55:51: changed state open -> done +Is now exaplained.

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012