Checkmk git commits June 2014

checkmk-commits@lists.checkmk.com

6 participants
135 discussions

Check_MK Git: check_mk: Some preparations for stathist cache in Micro Core

by Mathias Kettner

Module: check_mk Branch: master Commit: de41b65be4e20d68666dd3c4aa3036c8909abe49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de41b65be4e20d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 3 10:48:03 2014 +0200 Some preparations for stathist cache in Micro Core --- livestatus/src/AndingFilter.h | 6 +- livestatus/src/Filter.h | 2 + livestatus/src/LogEntry.cc | 16 ++-- livestatus/src/LogEntry.h | 31 ++++---- livestatus/src/Logfile.cc | 6 +- livestatus/src/NegatingFilter.h | 2 + livestatus/src/Query.cc | 16 +++- livestatus/src/Query.h | 1 + livestatus/src/TableStateHistory.cc | 139 ++++++++++------------------------- livestatus/src/TableStateHistory.h | 7 +- 10 files changed, 96 insertions(+), 130 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=de41b65be4…

10 years

Check_MK Git: check_mk: FIX LDAP: Improved slightly missleading logging of LDAP sync actions

by Lars Michelsen

Module: check_mk Branch: master Commit: 63cfd32c5669564109c8397ddd39c9f136be916c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63cfd32c566956… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 4 08:39:38 2014 +0200 FIX LDAP: Improved slightly missleading logging of LDAP sync actions In some situations a call to WATO issued by the user are causing LDAP syncs, for example when a user starts the sync interactively or the cache lifetime has exceeded. In the past, the name of the triggering user was logged to the audit / pending log, which was a bit missleading. Now, the name of the user is not logged anymore. --- .werks/813 | 12 ++++++++++++ ChangeLog | 3 +++ web/htdocs/wato.py | 26 ++++++++++++++++---------- web/plugins/userdb/ldap.py | 8 +++++--- 4 files changed, 36 insertions(+), 13 deletions(-) diff --git a/.werks/813 b/.werks/813 new file mode 100644 index 0000000..3cb96eb --- /dev/null +++ b/.werks/813 @@ -0,0 +1,12 @@ +Title: LDAP: Improved slightly missleading logging of LDAP sync actions +Level: 1 +Component: wato +Version: 1.2.5i4 +Date: 1401863855 +Class: fix + +In some situations a call to WATO issued by the user are causing LDAP syncs, +for example when a user starts the sync interactively or the cache lifetime +has exceeded. In the past, the name of the triggering user was logged +to the audit / pending log, which was a bit missleading. Now, the name +of the user is not logged anymore. diff --git a/ChangeLog b/ChangeLog index abfe129..154f620 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ Multisite: * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... + WATO: + * 0813 FIX: LDAP: Improved slightly missleading logging of LDAP sync actions... + 1.2.5i3: Core & Setup: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4caca4d..97a8e1c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4970,13 +4970,13 @@ def mode_changelog(phase): def foreign_changes(): changes = {} for t, linkinfo, user, action, text in parse_audit_log("pending"): - if user != config.user_id: + if user != '-' and user != config.user_id: changes.setdefault(user, 0) changes[user] += 1 return changes -def log_entry(linkinfo, action, message, logfilename): +def log_entry(linkinfo, action, message, logfilename, user_id = None): if type(message) == unicode: message = message.encode("utf-8") message = message.strip() @@ -4991,16 +4991,21 @@ def log_entry(linkinfo, action, message, logfilename): else: link = ":" + linkinfo + if user_id == None: + user_id = config.user_id + elif user_id == '': + user_id = '-' + log_file = log_dir + logfilename make_nagios_directory(log_dir) f = create_user_file(log_file, "ab") - f.write("%d %s %s %s %s\n" % (int(time.time()), link, config.user_id, action, message)) + f.write("%d %s %s %s %s\n" % (int(time.time()), link, user_id, action, message)) -def log_audit(linkinfo, what, message): +def log_audit(linkinfo, what, message, user_id = None): if config.wato_use_git: g_git_messages.append(message) - log_entry(linkinfo, what, message, "audit.log") + log_entry(linkinfo, what, message, "audit.log", user_id) # status is one of: # SYNC -> Only sync neccessary @@ -5011,13 +5016,13 @@ def log_audit(linkinfo, what, message): # LOCALRESTART-> Called after inventory. In distributed mode, affected # sites have already been marked for restart. Do nothing here. # In non-distributed mode mark for restart -def log_pending(status, linkinfo, what, message): - log_audit(linkinfo, what, message) +def log_pending(status, linkinfo, what, message, user_id = None): + log_audit(linkinfo, what, message, user_id) need_sidebar_reload() if not is_distributed(): if status != SYNC: - log_entry(linkinfo, what, message, "pending.log") + log_entry(linkinfo, what, message, "pending.log", user_id) cmc_rush_ahead() @@ -5025,7 +5030,7 @@ def log_pending(status, linkinfo, what, message): # the site is really affected. This needs to be optimized # in future. else: - log_entry(linkinfo, what, message, "pending.log") + log_entry(linkinfo, what, message, "pending.log", user_id) for siteid, site in config.sites.items(): changes = {} @@ -5255,12 +5260,13 @@ def render_audit_log(log, what, with_filename = False, hilite_others=False): even = "even" for t, linkinfo, user, action, text in log: even = even == "even" and "odd" or "even" - hilite = hilite_others and config.user_id != user + hilite = hilite_others and user != '-' and config.user_id != user htmlcode += '<tr class="data %s%d">' % (even, hilite and 2 or 0) htmlcode += '<td class=nobreak>%s</td>' % render_linkinfo(linkinfo) htmlcode += '<td class=nobreak>%s</td>' % fmt_date(float(t)) htmlcode += '<td class=nobreak>%s</td>' % fmt_time(float(t)) htmlcode += '<td class=nobreak>' + user = user == '-' and ('<i>%s</i>' % _('internal')) or user if hilite: htmlcode += '<img class=icon src="images/icon_foreign_changes.png" title="%s">' \ % _("This change has been made by another user") diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 7a27705..3627c55 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1014,7 +1014,8 @@ def ldap_sync(add_to_changelog, only_username): for user_id, user in users.items(): if user.get('connector') == 'ldap' and user_id not in ldap_users: del users[user_id] # remove the user - wato.log_pending(wato.SYNCRESTART, None, "edit-users", _("LDAP Connector: Removed user %s" % user_id)) + wato.log_pending(wato.SYNCRESTART, None, "edit-users", + _("LDAP Connector: Removed user %s" % user_id), user_id = '') for user_id, ldap_user in ldap_users.items(): if user_id in users: @@ -1047,7 +1048,7 @@ def ldap_sync(add_to_changelog, only_username): if mode_create: wato.log_pending(wato.SYNCRESTART, None, "edit-users", - _("LDAP Connector: Created user %s" % user_id)) + _("LDAP Connector: Created user %s" % user_id), user_id = '') else: details = [] if added: @@ -1066,7 +1067,8 @@ def ldap_sync(add_to_changelog, only_username): if details: wato.log_pending(wato.SYNCRESTART, None, "edit-users", - _("LDAP Connector: Modified user %s (%s)") % (user_id, ', '.join(details))) + _("LDAP Connector: Modified user %s (%s)") % (user_id, ', '.join(details)), + user_id = '') duration = time.time() - start_time ldap_log('SYNC FINISHED - Duration: %0.3f sec' % duration)

10 years

Check_MK Git: check_mk: nginx_status: New check for monitoring status information of the Nginx web server

by Lars Michelsen

Module: check_mk Branch: master Commit: eebf84a2b8162261dbb719fc69a78cdee3399460 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eebf84a2b81622… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 3 15:48:33 2014 +0200 nginx_status: New check for monitoring status information of the Nginx web server Implemented a new check which uses the Nginx stub status module to monitoring inner information of the Nginx process about number of active connections, connections per second, requests per second and so on. --- .werks/812 | 10 +++ ChangeLog | 1 + agents/plugins/nginx_status | 119 +++++++++++++++++++++++++++++++ checkman/nginx_status | 77 ++++++++++++++++++++ checks/nginx_status | 112 +++++++++++++++++++++++++++++ pnp-templates/check_mk-nginx_status.php | 86 ++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 26 +++++++ 7 files changed, 431 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=eebf84a2b8…

10 years

Check_MK Git: check_mk: Fixed werk version

by Lars Michelsen

Module: check_mk Branch: master Commit: c411a6381b720984b0256ac45ec91bb916a0ed54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c411a6381b7209… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 3 15:49:44 2014 +0200 Fixed werk version --- .werks/812 | 2 +- ChangeLog | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.werks/812 b/.werks/812 index f5c4e1b..a326220 100644 --- a/.werks/812 +++ b/.werks/812 @@ -1,7 +1,7 @@ Title: nginx_status: New check for monitoring status information of the Nginx web server Level: 2 Component: checks -Version: 1.2.5i3 +Version: 1.2.5i4 Date: 1401803233 Class: feature diff --git a/ChangeLog b/ChangeLog index 8158c18..abfe129 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.5i4: + Checks & Agents: + * 0812 nginx_status: New check for monitoring status information of the Nginx web server... + Multisite: * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... @@ -73,11 +76,8 @@ * 0165 ups checks now supports also GE devices (Thanks to Andy Taylor)... * 0928 runas: new plugin script to include and execute mrpe, local and plugin scripts as different user... * 0929 windows agent: now able to include and execute additional local and plugin scripts as different user... -<<<<<<< HEAD * 0812 nginx_status: New check for monitoring status information of the Nginx web server... -======= * 0961 fast_lta_volumes: new check of capacity of volumes in FAST LTA Storage Systems... ->>>>>>> ad3197103fd23d053fa8941a5c23ecfbc34b1c8b * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection

10 years

Check_MK Git: check_mk: fixed version for werk 934

by Andreas Boesl

Module: check_mk Branch: master Commit: ad3197103fd23d053fa8941a5c23ecfbc34b1c8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad3197103fd23d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 3 14:48:51 2014 +0200 fixed version for werk 934 --- .werks/934 | 2 +- ChangeLog | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.werks/934 b/.werks/934 index 4f20e7f..aff05b2 100644 --- a/.werks/934 +++ b/.werks/934 @@ -1,7 +1,7 @@ Title: Logwatch messages with class unknown ( 'u' ) now displayed as WARN Level: 1 Component: multisite -Version: 1.2.5i3 +Version: 1.2.5i4 Date: 1401799125 Class: fix diff --git a/ChangeLog b/ChangeLog index ad420f3..586ff12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.5i4: + Multisite: + * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... + 1.2.5i3: Core & Setup: @@ -115,7 +118,6 @@ * 0921 FIX: dashboards: fixed bug not updating header timestamp... * 0923 FIX: json export: fixed bug not stripping html tags from output * 0931 FIX: pnp-template ps.perf: fixed display bug of cpu averaging - * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids

10 years

Check_MK Git: check_mk: FIX Logwatch messages with class unknown ( 'u' ) now displayed as WARN

by Andreas Boesl

Module: check_mk Branch: master Commit: f7949d8d696640bf87cb1435b4408bf4f6a325be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7949d8d696640… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 3 14:43:18 2014 +0200 FIX Logwatch messages with class unknown ( 'u' ) now displayed as WARN Certain windows messages don't have a correct error level classification and there get reported as the error type 'u' (unknown).<br> Unknown types were not shown correctly in the multisite logfile viewer. --- .werks/934 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/logwatch.py | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/934 b/.werks/934 new file mode 100644 index 0000000..4f20e7f --- /dev/null +++ b/.werks/934 @@ -0,0 +1,10 @@ +Title: Logwatch messages with class unknown ( 'u' ) now displayed as WARN +Level: 1 +Component: multisite +Version: 1.2.5i3 +Date: 1401799125 +Class: fix + +Certain windows messages don't have a correct error level classification +and there get reported as the error type 'u' (unknown).<br> +Unknown types were not shown correctly in the multisite logfile viewer. diff --git a/ChangeLog b/ChangeLog index c0898b7..5a187f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,7 @@ * 0921 FIX: dashboards: fixed bug not updating header timestamp... * 0923 FIX: json export: fixed bug not stripping html tags from output * 0931 FIX: pnp-template ps.perf: fixed display bug of cpu averaging + * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 6b734be..7bc20fe 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -360,6 +360,10 @@ def parse_file(host, file, hidecontext = False): line_level = 1 line_class = 'WARN' + if line[0] == 'u': + line_level = 1 + line_class = 'WARN' + elif line[0] == 'C': line_level = 2 line_class = 'CRIT'

10 years

Check_MK Git: check_mk: Headrify: savely skip directories

by Mathias Kettner

Module: check_mk Branch: master Commit: 52d65b485af7d36d66cab5a2109857f0005f73d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52d65b485af7d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 3 10:19:55 2014 +0200 Headrify: savely skip directories --- doc/helpers/headrify | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/helpers/headrify b/doc/helpers/headrify index 72e583e..33a2bdc 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -39,6 +39,10 @@ EOF headrify () { + if [ ! -f "$file" ] ; then + echo "Skipping $file. It's not a file." + return + fi echo "$file..." PERMISSIONS=$(stat -c %a "$file") TMP=$(mktemp .headrify.new.XXXXXX) @@ -89,7 +93,7 @@ headrify () else cat $file >> $TMP fi - mv $TMP $file + mv $TMP $file || rm -f $TMP chmod $PERMISSIONS "$file" }

10 years

Check_MK Git: check_mk: Fixed file header of LogEntry.cc

by Mathias Kettner

Module: check_mk Branch: master Commit: 201a1eb2c74447483c708ce541d0e755798d6b39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=201a1eb2c74447… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 3 10:38:44 2014 +0200 Fixed file header of LogEntry.cc --- livestatus/src/LogEntry.cc | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 5d4783b..2706a20 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -4,24 +4,23 @@ // | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | // | | |___| | | | __/ (__| < | | | | . \ | // | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -// | |_____| | -// | __ __ _ ____ | -// | | \/ (_) ___ _ __ ___ / ___|___ _ __ ___ | -// | | |\/| | |/ __| '__/ _ \ | | / _ \| '__/ _ \ | -// | | | | | | (__| | | (_) | | |__| (_) | | | __/ | -// | |_| |_|_|\___|_| \___/ \____\___/|_| \___| | // | | // | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | // +------------------------------------------------------------------+ // -// This file is part of the Check_MK Micro Core. Copyright by Mathias -// Kettner, Preysingstr. 74, 81667 München, Germany. All rights are -// reserved. You may *not* redistribute or modify this software unless -// you have a written permission of the owner. This file is *not* -// available under GNU GPL. If you do not like this then please use a -// different monitoring core. +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. // -// Please note: This software is experimental. Use at your own risk. +// check_mk is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// ails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. #include <string.h> #include <time.h>

10 years

Check_MK Git: check_mk: fixed permissions of agent_ibmsvc

by Andreas Boesl

Module: check_mk Branch: master Commit: 8b954f740c9ebe0bcb4c05b254a2abe135b289ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b954f740c9ebe… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 3 10:31:00 2014 +0200 fixed permissions of agent_ibmsvc --- agents/special/agent_ibmsvc | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc index 3e3ac39..3806044 100755 --- a/agents/special/agent_ibmsvc +++ b/agents/special/agent_ibmsvc @@ -215,3 +215,4 @@ def output_profile(): if g_profile: output_profile() +

10 years

Check_MK Git: check_mk: fixed permissions of agent_ibmsvc

by Andreas Boesl

Module: check_mk Branch: master Commit: 6c6809d2a54b1ecf1351bb73d08600eff6e0d36b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c6809d2a54b1e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 3 10:26:02 2014 +0200 fixed permissions of agent_ibmsvc --- 0 files changed diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc old mode 100644 new mode 100755

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2014