Checkmk git commits August 2013

checkmk-commits@lists.checkmk.com

6 participants
167 discussions

Check_MK Git: check_mk: fixed error in wato field name

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: e3c128f9ea4f63b33c1e6bf14cfd374a59feae53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3c128f9ea4f63… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Aug 9 13:55:21 2013 +0200 fixed error in wato field name --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 02103d7..c0c93d2 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2884,7 +2884,7 @@ register_check_parameters( help = _("The critical battery current in Ampere"), ), Integer( - title = _("Max. Voltage"), + title = _("Min. Voltage"), help = _("The output voltage at and below which a critical state is triggered."), ), ]

10 years, 11 months

Check_MK Git: check_mk: Fixed small issue in ldap config dialog layout

by Lars Michelsen

Module: check_mk Branch: master Commit: 6faf868dbde7537d8c0a74353fd8c6af90e18a79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6faf868dbde753… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 5 14:00:34 2013 +0200 Fixed small issue in ldap config dialog layout --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 7765b4e..5c5a3b4 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -536,7 +536,7 @@ register_configvar(group, title = _("Bind DN"), help = _("Specify the distinguished name to be used to bind to " "the LDAP directory."), - size = 80, + size = 63, ), Password( title = _("Bind Password"),

10 years, 11 months

Check_MK Git: check_mk: Visualizing staleness in multisite (painters, icon, styles, filters)

by Lars Michelsen

Module: check_mk Branch: master Commit: 4d012c4624e8e03277ce21d2fbe334baf60f5798 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d012c4624e8e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 8 14:49:41 2013 +0200 Visualizing staleness in multisite (painters, icon, styles, filters) --- ChangeLog | 1 + web/htdocs/images/icon_stale.png | Bin 0 -> 2588 bytes web/htdocs/status.css | 52 +++++++++++++++++++++++----- web/htdocs/views.py | 3 ++ web/plugins/icons/builtin.py | 22 ++++++++++++ web/plugins/views/filters.py | 6 ++++ web/plugins/views/layouts.py | 5 ++- web/plugins/views/painters.py | 37 +++++++++++++++++++- web/plugins/views/sorters.py | 1 + web/plugins/wato/check_mk_configuration.py | 12 +++++++ 10 files changed, 129 insertions(+), 10 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4d012c4624…

10 years, 11 months

Check_MK Git: check_mk: Fixed bug in tag filter

by Lars Michelsen

Module: check_mk Branch: master Commit: c3ebe0aff8307b550759188e71b74acf7e3daf77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3ebe0aff8307b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 9 13:14:24 2013 +0200 Fixed bug in tag filter --- web/plugins/views/filters.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index b65c7ff..2bc31a7 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -708,7 +708,9 @@ class FilterHostTags(Filter): for entry in config.wato_host_tags: grouped.setdefault(entry[0], [["", ""]]) - for tag, title, aux_tags in entry[2]: + for tag_entry in entry[2]: + tag = tag_entry[0] + title = tag_entry[1] if tag is None: tag = '' grouped[entry[0]].append([tag, str(title)])

10 years, 11 months

Check_MK Git: check_mk: First steps to save the time of the last user activity ( disabled by default)

by Lars Michelsen

Module: check_mk Branch: master Commit: 39d7d7f0d59e3746bc37fb0b251ac3b784f0006b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39d7d7f0d59e37… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 9 13:31:44 2013 +0200 First steps to save the time of the last user activity (disabled by default) --- web/htdocs/images/icon_offline.png | Bin 0 -> 2844 bytes web/htdocs/images/icon_online.png | Bin 0 -> 4152 bytes web/htdocs/userdb.py | 11 +++++++++++ web/htdocs/wato.py | 11 +++++++++++ web/plugins/config/builtin.py | 14 ++++++++------ web/plugins/wato/check_mk_configuration.py | 4 ++-- 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/web/htdocs/images/icon_offline.png b/web/htdocs/images/icon_offline.png new file mode 100644 index 0000000..0e22744 Binary files /dev/null and b/web/htdocs/images/icon_offline.png differ diff --git a/web/htdocs/images/icon_online.png b/web/htdocs/images/icon_online.png new file mode 100644 index 0000000..5707ba9 Binary files /dev/null and b/web/htdocs/images/icon_online.png differ diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 0a1db01..965dbc7 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -123,8 +123,17 @@ def user_locked(username): def on_succeeded_login(username): users = load_users(lock = True) + changed = False + if users[username].get('num_failed', 0) != 0: users[username]["num_failed"] = 0 + changed = True + + if config.save_user_access_times: + users[username]['last_seen'] = time.time() + changed = True + + if changed: save_users(users) def on_failed_login(username): @@ -314,6 +323,7 @@ def save_users(profiles): "serial", "connector", "num_failed", + "last_seen", ] + custom_values # Keys to put into multisite configuration @@ -324,6 +334,7 @@ def save_users(profiles): "alias", "language", "connector", + "last_seen", ] + custom_values # Remove multisite keys in contacts. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e914555..14ee24e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8181,6 +8181,7 @@ def mode_users(phase): entries.sort(cmp = lambda a, b: cmp(a[1].get("alias", a[0]).lower(), b[1].get("alias", b[0]).lower())) table.begin("users", None, empty_text = _("There are not defined any users yet.")) + online_threshold = time.time() - config.user_online_maxage for id, user in entries: table.row() @@ -8201,6 +8202,16 @@ def mode_users(phase): # ID table.cell(_("ID"), id) + # Online/Offline + if config.save_user_access_times: + if user.get('last_seen', 0) >= online_threshold: + title = _('Online') + img_txt = 'on' + else: + title = _('Offline') + img_txt = 'off' + table.cell(_("Act."), '<img class=icon title="%s" src="images/icon_%sline.png" />' % (title, img_txt)) + # Connector if connector: table.cell(_("Connector"), connector['short_title']) diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 76bee9a..7c836f6 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -33,12 +33,14 @@ roles = {} # User supplied roles # define default values for all settings -debug = False -profile = False -users = [] -admin_users = [] -guest_users = [] -default_user_role = "user" +debug = False +profile = False +users = [] +admin_users = [] +guest_users = [] +default_user_role = "user" +save_user_access_times = False +user_online_maxage = 10 # seconds # New style, used by WATO multisite_users = {} diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 11a9a2b..e6dbab2 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -776,11 +776,11 @@ register_configvar(group, register_configvar(group, "save_user_access_times", Checkbox( - title = _("Store access times of users"), + title = _("Save last access times of users"), label = _("Save the time of the latest user activity"), help = _("When enabled, the time of the last access is stored for each user. The last " "activity is shown on the users page."), - default_value = True + default_value = False ), domain = "multisite" )

10 years, 11 months

Check_MK Git: check_mk: Added program nsca2mkeventd to forward incoming nsca results to the event console

by Lars Michelsen

Module: check_mk Branch: master Commit: 209d427df5c9ee13fda86c6ae7714ad8da76e495 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=209d427df5c9ee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 9 13:31:02 2013 +0200 Added program nsca2mkeventd to forward incoming nsca results to the event console --- doc/treasures/Event_Console/nsca2mkeventd/LIESMICH | 33 +++ .../Event_Console/nsca2mkeventd/nsca2mkeventd | 268 ++++++++++++++++++++ .../Event_Console/nsca2mkeventd/nsca2mkeventd.init | 80 ++++++ 3 files changed, 381 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=209d427df5…

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0998

by Götz Golla

Module: check_mk Branch: master Commit: d918f99c655558f1780dd646714350e537dd7adc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d918f99c655558… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Aug 9 13:13:08 2013 +0200 Updated bug entries #0998 --- .bugs/998 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/998 b/.bugs/998 new file mode 100644 index 0000000..1994caa --- /dev/null +++ b/.bugs/998 @@ -0,0 +1,10 @@ +Title: ntp check does not disable dns lookups and uses ipv6 as default with newer ntp versions +Component: checks +State: open +Date: 2013-08-09 12:39:37 +Targetversion: 1.2.2 +Class: bug + +check_mk_agents ntp check calls 'ntpq -p' as check command. This uses dns to resolve +addresses of ntp servers and uses ipv6 as default if available. Both may lead to +timeouts of the check. Calling 'ntpq -4np' might be a better choice.

10 years, 11 months

Check_MK Git: check_mk: mkeventd message painter: improved multiline logwatch messages

by Andreas Boesl

Module: check_mk Branch: master Commit: d16d5664fdaf8313f4be161280047e810e392d31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d16d5664fdaf83… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Aug 9 12:55:37 2013 +0200 mkeventd message painter: improved multiline logwatch messages --- mkeventd/web/plugins/views/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index bc35130..465a324 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -398,7 +398,7 @@ if mkeventd_enabled: "title" : _("Text/Message of the event"), "short" : _("Message"), "columns" : ["event_text"], - "paint" : lambda row: ("", row["event_text"]), + "paint" : lambda row: ("", row["event_text"].replace("\x01","<br>")), } multisite_painters["event_first"] = {

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0968, #0965, #0966, #0967

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 42c5e85b1e95f5e693be3ada0ccd313b1fa709a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42c5e85b1e95f5… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Aug 9 12:47:15 2013 +0200 Updated bug entries #0968, #0965, #0966, #0967 --- .bugs/965 | 38 ++++++++++++++++++++++++++++++++++++++ .bugs/966 | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ .bugs/967 | 45 +++++++++++++++++++++++++++++++++++++++++++++ .bugs/968 | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+) diff --git a/.bugs/965 b/.bugs/965 new file mode 100644 index 0000000..8574846 --- /dev/null +++ b/.bugs/965 @@ -0,0 +1,38 @@ +Title: Windows Agent switches disk IO label on reboot +Component: checks +State: open +Date: 2013-08-08 16:59:01 +Targetversion: 1.2.3 +Class: bug + +came in via feedback@ / original mail available at feedback/gitbug folder + +Subject: [Bug]: Windows Agent switches disk IO label on reboot +Date: Thu, 23 May 2013 10:38:03 +0200 +Message-ID: <614B6EB6F693564AB7BDB8907D75FE91198B70BF(a)NTEXS05.swp.de> +X-MS-Has-Attach: +X-MS-TNEF-Correlator: +Thread-Topic: [Bug]: Windows Agent switches disk IO label on reboot +Thread-Index: Ac5XkDKSzo0isThdQ3SeTOyRGNi4Uw== +From: "Vogt, Jonathan (SDS)" <J.Vogt(a)swp.de> +To: <feedback(a)check-mk.org> + +Hello, + +when a windows maschine has 2 (or maybe more) logical volumes on one physical disk, only one „Disk IO“ is found by the inventory. When a maschine reboots sometimes a switch occours. On our machines this switches between Disk IO C: and Disk IO E: as they have a C: and an E: drive. + +When a maschine has two logical disks each on a physical disk the behavior is not seen. + +Sincerly + +Jonthan Vogt + +Jonathan Vogt +IT-Systembetreuung +Tel: +49(731)156-892, Fax: +49(731)156-805 + +Südwest Presse Data Service GmbH +Frauenstrasse 77, 89073 Ulm +Registergericht Ulm: HRB 3671 +Geschäftsführer: +Thomas Brackvogel, Marino Milite diff --git a/.bugs/966 b/.bugs/966 new file mode 100644 index 0000000..e1ff7dd --- /dev/null +++ b/.bugs/966 @@ -0,0 +1,51 @@ +Title: defunct and other entries on ps section of AIX agent confuse ps check +Component: checks +State: open +Date: 2013-08-08 17:05:36 +Targetversion: 1.2.3 +Class: bug + +reported on checkmk-en(a)lists.mathias-kettner.de / original mail available in folder feedback/gitbug + +From: Dale Stubblefield <dalestubblefield(a)gmail.com> +Date: Thu, 23 May 2013 09:56:16 -0500 +Message-ID: <CABBA0287p4L9eW76op_=qTrccOhdEKOmmkKMhLscLxufw11Jsg(a)mail.gmail.com> +To: Mathias Kettner <mk(a)mathias-kettner.de> +Cc: "checkmk-en(a)lists.mathias-kettner.de" <checkmk-en(a)lists.mathias-kettner.de> +Subject: Re: [Check_mk (english)] AIX Agent bug regarding "Match all + processes" + +Mathias, + +The section that needs to be reviewed is "<<<ps>>>". I would prefer not to +post the entire agent output, but instead I will provide the relevant +section and offending entries. The first entry below is a standard entry +that looks good. It's the "defunct", "idle", and "exiting" entries that +the ps.check chokes on. As a workaround, I have used "grep -v" on the +entries in my agent script to make sure they are not returned. This is not +ideal as it would be awesome if the ps.check interpreted those entries and +possibly even included them in performance data. + +<<<ps>>> +(root,776,180,0.0) /etc/init +(<defunct>,,,) +(<defunct>,,,) +(<idle>,,,) +(<exiting>,,,) + +Let me know if I can provide any additional information. + +Thanks, +Dale + + + +On Wed, May 22, 2013 at 10:00 AM, Mathias Kettner <mk(a)mathias-kettner.de>wrote: + +> Hi Dale, +> +> could you send us an example agent output in such a case? So that +> we can simulate and fix the problem without touching the agent... +> +> Mathais +> diff --git a/.bugs/967 b/.bugs/967 new file mode 100644 index 0000000..8e6410a --- /dev/null +++ b/.bugs/967 @@ -0,0 +1,45 @@ +Title: non working mail notifications after upgrading to cmk 1.2.2 +Component: core +State: open +Date: 2013-08-08 17:15:04 +Targetversion: 1.2.3 +Class: bug + +reported very often on the different mailinglists +one mail for example below, You can find original mail in folder feedback/gitbug + +From: "JDMA (Jason Magee)" <Jason.Magee(a)panduit.com> +To: Marco Lenhardt <0815(a)lenhardt.in>, "checkmk-en(a)lists.mathias-kettner.de" + <checkmk-en(a)lists.mathias-kettner.de> +Thread-Topic: [Check_mk (english)] Notifications no longer working +Thread-Index: Ac5Xy3nfmEKptLJmRr2h/2T2lGDbIg== +Date: Thu, 23 May 2013 15:38:59 +0000 +Subject: Re: [Check_mk (english)] Notifications no longer working + +-----Original Message----- +From: checkmk-en-bounces(a)lists.mathias-kettner.de +[mailto:checkmk-en-bounces@lists.mathias-kettner.de] On Behalf Of +Marco Lenhardt +Sent: Thursday, May 23, 2013 7:44 AM +To: checkmk-en(a)lists.mathias-kettner.de +Subject: Re: [Check_mk (english)] Notifications no longer working + +Hi! + +I had also the problem with non working mail notifications after upgrading to cmk 1.2.2. + +Custom notifications were working fine. + +After reading +http://mathias-kettner.de/checkmk_flexible_notifications.html + +I created the (missing) folder +$CHECK_MK_HOME/var/notify + +and switched logging on in main.mk +notification_logging = 1 + +After that, standard check_mk mail notification was working again! + +br, +Marco diff --git a/.bugs/968 b/.bugs/968 new file mode 100644 index 0000000..ead3b54 --- /dev/null +++ b/.bugs/968 @@ -0,0 +1,54 @@ +Title: Patch for PNP4Nagios Template: check_mk-cmctc.temp.php +Component: checks +State: open +Date: 2013-08-09 12:38:29 +Targetversion: 1.2.3 +Class: feature + +kam rein checkmk-de@ / orginal-Mail noch vorhanden unter feedback/gitbug + +From: "Roeder, Christoph" <Christoph.Roeder(a)ZIT-BB.Brandenburg.de> +To: "checkmk-de(a)lists.mathias-kettner.de" <checkmk-de(a)lists.mathias-kettner.de> +Thread-Topic: PNP4Nagios Template: check_mk-cmctc.temp.php +Thread-Index: Ac6Rw6diJVz9Y/EYSEOuESZ8IDeZVQ== +Date: Mon, 5 Aug 2013 10:16:51 +0000 + +Subject: [Check_mk (deutsch)] PNP4Nagios Template: check_mk-cmctc.temp.php + +Hallo, + + + +ich habe eine kleine Änderung am Template „check_mk-cmctc.temp.php“ vorgenommen, die m.E. die Daten viel besser lesbar machen, da der Graph das autoscaling von rrdgraph nutzt: + + + + + +--- check_mk-cmctc.temp.php.org 2013-08-05 12:13:28.347456051 +0200 + ++++ check_mk-cmctc.temp.php 2013-08-05 12:12:37.018879220 +0200 + +@@ -23,7 +23,7 @@ + +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + +# Boston, MA 02110-1301 USA. + + + +-$opt[1] = "--vertical-label \"Celsius\" -l 0 -u 40 --title \"Temperature $servicedesc\" "; + ++$opt[1] = "--vertical-label \"Celsius\" -A --title \"Temperature $servicedesc\" "; + + + +$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX "; + +$def[1] .= "AREA:var1#2080ff:\"Temperature\:\" "; + + +_______________________________________________ +checkmk-de mailing list +checkmk-de(a)lists.mathias-kettner.de +http://lists.mathias-kettner.de/mailman/listinfo/checkmk-de

10 years, 11 months

Check_MK Git: check_mk: text improvements

by Götz Golla

Module: check_mk Branch: master Commit: 163deccb6e8a4bd866a489a378634bcceeec1f12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=163deccb6e8a4b… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Aug 9 09:51:12 2013 +0200 text improvements --- web/plugins/wato/check_parameters.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 8991e7e..02103d7 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2286,8 +2286,8 @@ register_check_parameters( help = _("The count of remaining entries in the DHCP pool represents " "the number of IP addresses left which can be assigned in the network"), elements = [ - Percentage(title = _("Warning if pool usage higher than")), - Percentage(title = _("Critical if pool usage higher than")), + Percentage(title = _("Warning if more than"), unit = _("pool entries")), + Percentage(title = _("Critical if more than"), unit = _("pool entries")), ]), TextAscii( title = _("Service descriptions"), @@ -3064,12 +3064,12 @@ register_check_parameters( "being queued for processing."), elements = [ Integer( - title = _("Queue warning above"), + title = _("Warning if above"), unit = _("requests"), default_value = 20, ), Integer( - title = _("Queue critical above"), + title = _("Critical if above"), unit = _("requests"), default_value = 50, ), @@ -3229,8 +3229,8 @@ register_check_parameters( _("Memory levels for DB2 memory usage"), Tuple( elements = [ - Percentage(title = _("Memory left warning at")), - Percentage(title = _("Memory left critical at")), + Percentage(title = _("Warning if less than"), unit = _("% memory left")), + Percentage(title = _("Critical if less than"), unit = _("% memory left")), ], ), TextAscii(

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 August 2013