Checkmk git commits November 2013

checkmk-commits@lists.checkmk.com

6 participants
274 discussions

Check_MK Git: check_mk: FIX Checkboxes for hosts/ services were missing on modified views

by Mathias Kettner

Module: check_mk Branch: master Commit: 3fdb53d600e420c6f21913951683b10a5a08a5ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fdb53d600e420… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 14 17:06:21 2013 +0100 FIX Checkboxes for hosts/services were missing on modified views If you have modified a view then activating the checkbox for hosts or services would not work anymore. This bug was introduced by the new option for forcing the checkboxes to be enabled in a view. This has now been fixed. --- .werks/6 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/views.py | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/6 b/.werks/6 new file mode 100644 index 0000000..23bff0b --- /dev/null +++ b/.werks/6 @@ -0,0 +1,11 @@ +Title: Checkboxes for hosts/services were missing on modified views +Level: 2 +Component: multisite +Version: 1.2.3i7 +Date: 1384445099 +Class: fix + +If you have modified a view then activating the checkbox for hosts +or services would not work anymore. This bug was introduced by the +new option for forcing the checkboxes to be enabled in a view. This +has now been fixed. diff --git a/ChangeLog b/ChangeLog index 1a0966c..ef447a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * 0206 FIX: Fixed logwatch permission check when using liveproxy... * 0210 FIX: LDAP: Fixed problem syncing contactgroups of a user with umlauts in CN * 0035 FIX: display http[s] links in plugin output + * 0006 FIX: Checkboxes for hosts/services were missing on modified views... WATO: * 0053 New rule for configuring the display_name of a service... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 58a5c13..9386859 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1262,7 +1262,8 @@ def show_view(view, show_heading = False, show_buttons = True, num_columns = vo.get("num_columns", view.get("num_columns", 1)) browser_reload = vo.get("refresh", view.get("browser_reload", None)) - show_checkboxes = view.get("force_checkboxes", html.var('show_checkboxes', '0') == '1') + force_checkboxes = view.get("force_checkboxes", False) + show_checkboxes = force_checkboxes or html.var('show_checkboxes', '0') == '1' # Get the datasource (i.e. the logical table) datasource = multisite_datasources[view["datasource"]]

10 years, 10 months

Check_MK Git: check_mk: Try to fix LDAP exception with nested groups

by Mathias Kettner

Module: check_mk Branch: master Commit: e964a0772ff6cccafcc9d99a08ba766b70a0326c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e964a0772ff6cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 14 16:49:33 2013 +0100 Try to fix LDAP exception with nested groups --- web/plugins/userdb/ldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index e7aa448..d419730 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -532,7 +532,7 @@ def ldap_group_members(filters, filt_attr = 'cn', nested = False): for dn, obj in ldap_search(ldap_replace_macros(config.ldap_groupspec['dn']), filt, ['cn', member_attr]): groups[dn] = { 'cn' : obj['cn'][0], - 'members' : [ m.encode('utf-8') for m in obj[member_attr] ], + 'members' : [ m.encode('utf-8') for m in obj.get(member_attr,[]) ], } else: # Nested querying is more complicated. We have no option to simply do a query for group objects

10 years, 10 months

Check_MK Git: check_mk: Fixes for mssql check

by Götz Golla

Module: check_mk Branch: master Commit: d60b50e753673d0f9943abf3b7ec1e31796f40f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d60b50e753673d… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Nov 14 16:26:32 2013 +0100 Fixes for mssql check --- doc/treasures/active_checks/check_sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/treasures/active_checks/check_sql b/doc/treasures/active_checks/check_sql index 95a5464..761f1e1 100755 --- a/doc/treasures/active_checks/check_sql +++ b/doc/treasures/active_checks/check_sql @@ -167,8 +167,8 @@ try: db = pymssql if opt_port == None: opt_port=1433 - db_connection = db.connect(host=opt_hostname+":"+opt_port, \ - database=opt_name, user=opt_user, passwd=opt_password ) + db_connection = db.connect(host=opt_hostname+":"+str(opt_port), \ + database=opt_name, user=opt_user, password=opt_password ) elif opt_dbms == "oracle": sys.path.append('/usr/lib/python2.7/site-packages') @@ -232,7 +232,7 @@ try: #if len(result) > 1: # print "UNKNOWN - SQL statement/procedure returned more than one line" # sys.exit(3) - if len(result) == 0: + if result == None or len(result) == 0: print "UNKNOWN - SQL statement/procedure returned no data" sys.exit(3)

10 years, 10 months

Check_MK Git: check_mk: FIX fixed bug in multisite command execution

by Andreas Boesl

Module: check_mk Branch: master Commit: 0850b4767b80137dfa63c83d67b04de43451f211 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0850b4767b8013… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 14 16:00:16 2013 +0100 FIX fixed bug in multisite command execution The command STAR (set/unset favorites) got called on every action command --- .werks/36 | 8 ++++++++ ChangeLog | 1 + web/plugins/views/commands.py | 13 +++++++------ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.werks/36 b/.werks/36 new file mode 100644 index 0000000..9400de2 --- /dev/null +++ b/.werks/36 @@ -0,0 +1,8 @@ +Title: fixed bug in multisite command execution +Level: 2 +Component: ec +Version: 1.2.3i7 +Date: 1384441145 +Class: fix + +The command STAR (set/unset favorites) got called on every action command diff --git a/ChangeLog b/ChangeLog index 96b7217..1a0966c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ Event Console: * 0026 FIX: snmpd_mkevent.py: fixed crash on startup + * 0036 FIX: fixed bug in multisite command execution... Livestatus: * 0067 livedump: new option to mark the mode at the beginning of the dump and documentation fixes... diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 9a80f28..77a0595 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -522,12 +522,13 @@ def save_stars(stars): def command_star(cmdtag, spec, row): - star = html.var("_star") and 1 or 0 - if star: - title = _("add to you favorites") - else: - title = _("remove from your favorites") - return "STAR;%d;%s" % (star, spec), title + if html.var("_star") or html.var("_unstar"): + star = html.var("_star") and 1 or 0 + if star: + title = _("add to you favorites") + else: + title = _("remove from your favorites") + return "STAR;%d;%s" % (star, spec), title def command_executor_star(command, site):

10 years, 10 months

Check_MK Git: check_mk: typo in man page corrected

by Götz Golla

Module: check_mk Branch: master Commit: 7737ef94ed2b7940ffe3aa98e93d064d008962f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7737ef94ed2b79… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Nov 14 11:50:48 2013 +0100 typo in man page corrected --- checkman/nfsmounts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/nfsmounts b/checkman/nfsmounts index 649163e..3adcc16 100644 --- a/checkman/nfsmounts +++ b/checkman/nfsmounts @@ -5,7 +5,7 @@ license: GPL distribution: check_mk description: This check probes the availability of NFS mounts. The Linux agent sends the - status of all NFS mounts, if the command line utility {maxwait} is available + status of all NFS mounts, if the command line utility {waitmax} is available (it is is used to avoid hanging if the NFS server is not responding). The probe is done by trying a {stat -f} (system call {statfs(2)}) on the mount point. If that lasts longer then 2 seconds, then the server is considered

10 years, 10 months

Check_MK Git: check_mk: FIX display http[s] links in plugin output

by Andreas Boesl

Module: check_mk Branch: master Commit: 113fd6d31c23df777e689467692891f068ab01f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=113fd6d31c23df… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 14 13:39:36 2013 +0100 FIX display http[s] links in plugin output --- .werks/35 | 8 ++++++++ ChangeLog | 1 + web/htdocs/lib.py | 5 ++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/35 b/.werks/35 new file mode 100644 index 0000000..0b2b55e --- /dev/null +++ b/.werks/35 @@ -0,0 +1,8 @@ +Title: display http[s] links in plugin output +Level: 1 +Component: multisite +Version: 1.2.3i7 +Date: 1384432725 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index c5aa1c1..96b7217 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * 0204 FIX: Reduced I/O on logins with access time recording or failed login counts... * 0206 FIX: Fixed logwatch permission check when using liveproxy... * 0210 FIX: LDAP: Fixed problem syncing contactgroups of a user with umlauts in CN + * 0035 FIX: display http[s] links in plugin output WATO: * 0053 New rule for configuring the display_name of a service... diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 0119beb..1606408 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import grp, pprint, os, errno, gettext, marshal, fcntl, __builtin__ +import grp, pprint, os, errno, gettext, marshal, re, fcntl, __builtin__ #Workarround when the file is included outsite multisite try: @@ -255,6 +255,9 @@ def format_plugin_output(output, row = None): css, h = paint_host_list(row["site"], hosts) output = output[:a] + "running on " + h + output[e+1:] + output = re.sub("http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*,]|(?:%[0-9a-fA-F][0-9a-fA-F]))+", + lambda p: '<a href="%(group)s">%(group)s</a>' % { "group": p.group(0) }, output) + return output def format_exception():

10 years, 10 months

Check_MK Git: check_mk: Reenabled exception in notify_mobilant.py

by Mathias Kettner

Module: check_mk Branch: master Commit: 936a362e0ff73d521166f9c65b0af6bc17126382 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=936a362e0ff73d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 14 12:12:11 2013 +0100 Reenabled exception in notify_mobilant.py --- doc/treasures/notify_mobilant.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/notify_mobilant.py b/doc/treasures/notify_mobilant.py index 8ef09a9..734313b 100755 --- a/doc/treasures/notify_mobilant.py +++ b/doc/treasures/notify_mobilant.py @@ -67,6 +67,6 @@ try: else: sys.stderr.write("Error sending SMS to %s: %s\n" % (to, exitcodes.get(response, "Invalid exit code %s" % response))) sys.stderr.write("URL was %s\n" % url) -except 1: # Exception, e: +except Exception, e: sys.stderr.write("Error sending SMS to %s. Exception: %s%s\n" % e)

10 years, 10 months

Check_MK Git: check_mk: Added notification script for sending SMS via mobilant.com

by Mathias Kettner

Module: check_mk Branch: master Commit: 05238d7848b2eed5830746a83c337a99e8a7089f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05238d7848b2ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 14 12:07:35 2013 +0100 Added notification script for sending SMS via mobilant.com in doc/treasures there is now a notify_mobilant.py. This can send SMS via Internet/HTTP using the commercial SMS sending service mobilant.com. You need to edit the script and enter your mobilant key. Please refer to instructions directly in the script. --- .werks/5 | 11 ++++++ ChangeLog | 1 + doc/treasures/notify_mobilant.py | 72 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/.werks/5 b/.werks/5 new file mode 100644 index 0000000..c15d0a0 --- /dev/null +++ b/.werks/5 @@ -0,0 +1,11 @@ +Title: Added notification script for sending SMS via mobilant.com +Level: 1 +Component: notifications +Version: 1.2.3i7 +Date: 1384427169 +Class: feature + +in doc/treasures there is now a notify_mobilant.py. This can send +SMS via Internet/HTTP using the commercial SMS sending service +mobilant.com. You need to edit the script and enter your mobilant +key. Please refer to instructions directly in the script. diff --git a/ChangeLog b/ChangeLog index afc0415..70621f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ * 0094 FIX: Hide SNMPv3 credentials in WATO... Notifications: + * 0005 Added notification script for sending SMS via mobilant.com... * 0032 FIX: mail notification plugin: replace windows forbidden characters in mail images Reporting & Availability: diff --git a/doc/treasures/notify_mobilant.py b/doc/treasures/notify_mobilant.py new file mode 100755 index 0000000..8ef09a9 --- /dev/null +++ b/doc/treasures/notify_mobilant.py @@ -0,0 +1,72 @@ +#!/usr/bin/python +# Send SMS via Mobilant # encoding: utf-8 +# +# This notification script can be put below share/check_mk/notifications. It sends +# SMS via mobilant.com. Please add your personal configuration directly in this +# script. The target phone number is take from the contact's pager address. +# You can override this by specifying it as a parameter + +import sys, os, urllib + +key = "8F37ksjf8kJ8k37f729Btlllsw8" # Enter your mobilant web key here! + +# This does not need to be changed +to = os.environ.get("NOTIFY_CONTACTPAGER") +fromname = "Check_MK" + + +if len(sys.argv) > 1: + to = sys.argv[1] + +if not to: + sys.stderr.write("NOTIFY_CONTACTPAGER is not set.\n") + sys.exit(1) + + +max_len = 160 +message = os.environ['NOTIFY_HOSTNAME'] + " " + +if os.environ['NOTIFY_WHAT'] == 'SERVICE': + message += os.environ['NOTIFY_SERVICESTATE'][:2] + " " + avail_len = max_len - len(message) + message += os.environ['NOTIFY_SERVICEDESC'][:avail_len] + " " + avail_len = max_len - len(message) + message += os.environ['NOTIFY_SERVICEOUTPUT'][:avail_len] + +else: + message += "is " + os.environ['NOTIFY_HOSTSTATE'] + + +url = "http://gw.mobilant.com/?" + urllib.urlencode([ + ( "key", key ), + ( "to", to ), + ( "message", message ), + ( "route", "gold" ), + ( "from", fromname ) +]) + +exitcodes = { + "10" : u"Empfängernummer nicht korrekt, Parameter: to", + "20" : u"Absenderkennung nicht korrekt, Parameter: from", + "30" : u"Nachrichtentext nicht korrekt, Parameter: message", + "31" : u"Messagetyp nicht korrekt, Parameter: messagetype", + "40" : u"SMS Route nicht korrekt, Parameter: route", + "50" : u"Identifikation fehlgeschlagen, Parameter: key", + "60" : u"nicht genügend Guthaben", + "70" : u"Netz wird nicht abgedeckt, Parameter: route", + "71" : u"Feature nicht möglich, Parameter: route", + "80" : u"Übergabe an SMS-C, fehlgeschlagen", + "100" : u"SMS wurde angenommen und, versendet", +} + +try: + handle = urllib.urlopen(url) + response = handle.read().strip() + if response == "100": + sys.stdout.write("Successfully sent SMS to %s\n" % to) + else: + sys.stderr.write("Error sending SMS to %s: %s\n" % (to, exitcodes.get(response, "Invalid exit code %s" % response))) + sys.stderr.write("URL was %s\n" % url) +except 1: # Exception, e: + sys.stderr.write("Error sending SMS to %s. Exception: %s%s\n" % e) +

10 years, 10 months

Check_MK Git: check_mk: FIX table statehist: no more missing entries if only one logfile exists

by Andreas Boesl

Module: check_mk Branch: master Commit: 9dfc7be3661b1149e65d6497f208f1c5e240733d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9dfc7be3661b11… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 14 11:55:05 2013 +0100 FIX table statehist: no more missing entries if only one logfile exists --- .werks/34 | 8 ++++++++ ChangeLog | 1 + livestatus/src/TableStateHistory.cc | 19 ++++++++++++------- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.werks/34 b/.werks/34 new file mode 100644 index 0000000..4a38c90 --- /dev/null +++ b/.werks/34 @@ -0,0 +1,8 @@ +Title: table statehist: no more missing entries if only one logfile exists +Level: 1 +Component: livestatus +Version: 1.2.3i7 +Date: 1384426471 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index afc0415..7a65497 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ Livestatus: * 0067 livedump: new option to mark the mode at the beginning of the dump and documentation fixes... * 0023 FIX: table statehist: code cleanup / minor performance improvements + * 0034 FIX: table statehist: no more missing entries if only one logfile exists 1.2.3i6: diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 56ef676..a399e9e 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -351,6 +351,7 @@ void TableStateHistory::answerQuery(Query *query) // Switch to last logfile (we have at least one) _it_logs = g_store->logCache()->logfiles()->end(); --_it_logs; + _logfiles_t::iterator newest_log = _it_logs; // Now find the log where 'since' starts. while (_it_logs != g_store->logCache()->logfiles()->begin() && _it_logs->first >= _since) { @@ -368,14 +369,18 @@ void TableStateHistory::answerQuery(Query *query) // Determine initial logentry LogEntry* entry; _entries = _it_logs->second->getEntriesFromQuery(query, g_store->logCache(), _since, _until, CLASSMASK_STATEHIST); - _it_entries = _entries->end(); - // Check last entry. If it's younger than _since -> use this logfile too - if (--_it_entries != _entries->begin()) { - entry = _it_entries->second; - if (entry->_time >= _since) { - _it_entries = _entries->begin(); + if (_it_logs != newest_log) { + _it_entries = _entries->end(); + // Check last entry. If it's younger than _since -> use this logfile too + if (--_it_entries != _entries->begin()) { + entry = _it_entries->second; + if (entry->_time >= _since) { + _it_entries = _entries->begin(); + } } - } + } else + _it_entries = _entries->begin(); + // From now on use getPreviousLogentry() / getNextLogentry() HostServiceKey key;

10 years, 10 months

Check_MK Git: check_mk: FIX Hide SNMPv3 credentials in WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: 9b98a8766ff331c914820de12884e8001dca54cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b98a8766ff331… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 14 11:13:53 2013 +0100 FIX Hide SNMPv3 credentials in WATO The authentication password and the privacy pass phrase are now not longer shown as plaintext in WATO. --- .werks/94 | 6 +++--- ChangeLog | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.werks/94 b/.werks/94 index 2a832f5..ab6fbf1 100644 --- a/.werks/94 +++ b/.werks/94 @@ -1,9 +1,9 @@ -Title: Hidding snmpv3 credentials in wato +Title: Hide SNMPv3 credentials in WATO Level: 1 Component: wato Version: 1.2.3i7 Date: 1384423412 Class: fix -The Authentication passoword and the Privacy pass pharase are now not longer shown as -plaintext for all admins with wato access. +The authentication password and the privacy pass phrase are now not longer shown as +plaintext in WATO. diff --git a/ChangeLog b/ChangeLog index cb576f5..afc0415 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,7 +39,7 @@ * 0033 FIX: WATO forms: incorrect handling of checkbox state * 0205 FIX: Allowing star chars in variable names to fix role/permission editing... * 0207 FIX: Explicit communities were not written to config files in all cases - * 0094 FIX: Hidding snmpv3 credentials in wato... + * 0094 FIX: Hide SNMPv3 credentials in WATO... Notifications: * 0032 FIX: mail notification plugin: replace windows forbidden characters in mail images

10 years, 10 months

← Newer
1
...
13
14
15
16
17
18
19
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2013