Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: fixed problem with ldap userid encoding

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 74afccbe5ecad9c20d26cf69bb92ccf81298a0a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74afccbe5ecad9… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Oct 9 16:52:32 2013 +0200 fixed problem with ldap userid encoding --- ChangeLog | 1 + web/htdocs/userdb.py | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1367601..2d238bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * FIX: add missing service icons to view "All Services with this descr..." * FIX: ldap attribute plugins: fixed crash when parameters are None * FIX: avoid duplicate output of log message in log tables + * FIX: fixed problem with ldap userid encoding WATO: * Rule "State and count of processes": New configuration options: diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 13281b9..51814ee 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -399,8 +399,13 @@ def save_users(profiles): # Write out the users serials serials_file = '%s/auth.serials' % os.path.dirname(defaults.htpasswd_file) out = create_user_file(serials_file, "w") + def encode_utf8(value): + if type(value) == unicode: + value = value.encode("utf-8") + return value + for user_id, user in profiles.items(): - out.write('%s:%d\n' % (user_id, user.get('serial', 0))) + out.write('%s:%d\n' % (encode_utf8(user_id), user.get('serial', 0))) out.close() # Write user specific files

10 years, 11 months

Check_MK Git: check_mk: Moved inline SNMP function away to other GIT

by Mathias Kettner

Module: check_mk Branch: master Commit: 71a8d79ae52f49cc85fbaf7cad0a03c54b748adc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71a8d79ae52f49… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 9 16:18:10 2013 +0200 Moved inline SNMP function away to other GIT --- modules/check_mk.py | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 2f7bdc0..34a57a0 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -659,42 +659,6 @@ def is_snmpv2c_host(hostname): def is_usewalk_host(hostname): return in_binary_hostlist(hostname, usewalk_hosts) -def inline_snmp_get_oid(hostname, oid): - s = init_snmp_host(hostname) - - if oid[-2:] == ".*": - oid_prefix = oid[:-2] - func = s.getnext - what = 'GETNEXT' - else: - oid_prefix = oid - func = s.get - what = 'GET' - - if opt_debug: - sys.stdout.write("Executing SNMP %s of %s on %s\n" % (what, oid_prefix, hostname)) - - var_list = netsnmp.VarList(netsnmp.Varbind(oid)) - res = s.get(var_list) - - for var in var_list: - value = var.val - - if what == "GETNEXT" and not var.tag.startswith(oid_prefix + "."): - # In case of .*, check if prefix is the one we are looking for - value = None - - elif value == 'NULL' or var.type in [ 'NOSUCHINSTANCE', 'NOSUCHOBJECT' ]: - value = None - - elif value is not None: - value = strip_snmp_value(value) - - if opt_verbose and opt_debug: - sys.stdout.write("=> [%r] %s\n" % (value, var.type)) - - return value - # .--Classic SNMP--------------------------------------------------------. # | ____ _ _ ____ _ _ __ __ ____ | # | / ___| | __ _ ___ ___(_) ___ / ___|| \ | | \/ | _ \ |

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1022

by Lars Michelsen

Module: check_mk Branch: master Commit: 70987a9ad452d6e4b73409e742fc4915ca9d8656 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70987a9ad452d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 9 14:07:32 2013 +0200 Updated bug entries #1022 --- .bugs/1022 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/1022 b/.bugs/1022 new file mode 100644 index 0000000..9fb587c --- /dev/null +++ b/.bugs/1022 @@ -0,0 +1,8 @@ +Title: GUI Notification highlighting is inconspicuous +Component: multisite +State: open +Date: 2013-10-09 14:05:50 +Targetversion: 1.4.0 +Class: cleanup + +We need a better highlighting for new messages. The small number is not enough.

10 years, 11 months

Check_MK Git: check_mk: FIX: Trying to prevent auth. php errors while file is being updated

by Lars Michelsen

Module: check_mk Branch: master Commit: cdf1163ceae6469172f7d60d7c6a1daed3c3443e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdf1163ceae646… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 9 12:10:17 2013 +0200 FIX: Trying to prevent auth.php errors while file is being updated --- ChangeLog | 3 ++- web/plugins/userdb/hook_auth.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e29eb9c..1367601 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,7 +27,6 @@ * FIX: add missing service icons to view "All Services with this descr..." * FIX: ldap attribute plugins: fixed crash when parameters are None * FIX: avoid duplicate output of log message in log tables - * Added title of tests to LDAP diagnose table WATO: * Rule "State and count of processes": New configuration options: @@ -35,6 +34,8 @@ * FIX: The rule "State and count of processes" is no longer available in "Parameters for inventorized check". This rule was solely intented for "Manual checks" configuration + * FIX: Trying to prevent auth.php errors while file is being updated + * Added title of tests to LDAP diagnose table 1.2.3i2: Core: diff --git a/web/plugins/userdb/hook_auth.py b/web/plugins/userdb/hook_auth.py index 977a8ac..a1c36ec 100644 --- a/web/plugins/userdb/hook_auth.py +++ b/web/plugins/userdb/hook_auth.py @@ -90,7 +90,9 @@ def create_php_file(callee, users, role_permissions, folder_permissions): for username in users: users[username].setdefault('language', config.default_language) - file(g_auth_base_dir + '/auth.php', 'w').write('''<?php + # First write a temp file and then do a move to prevent syntax errors + # when reading half written files during creating that new file + file(g_auth_base_dir + '/auth.php.tmp', 'w').write('''<?php // Created by Multisite UserDB Hook (%s) global $mk_users, $mk_roles, $mk_folders; $mk_users = %s; @@ -183,6 +185,8 @@ function may($username, $need_permission) { ?> ''' % (callee, format_php(users), format_php(role_permissions), format_php(folder_permissions))) + # Now really replace the file + os.rename(g_auth_base_dir + '/auth.php.tmp', g_auth_base_dir + '/auth.php'); def create_auth_file(callee, users): make_nagios_directory(g_auth_base_dir)

10 years, 11 months

Check_MK Git: check_mk: Added title of tests to LDAP diagnose table

by Lars Michelsen

Module: check_mk Branch: master Commit: 4a2e6c1e222c64b386c45df2ea3cccf7041975b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a2e6c1e222c64… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 9 10:57:37 2013 +0200 Added title of tests to LDAP diagnose table --- ChangeLog | 1 + web/htdocs/wato.py | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f9a4e4..e29eb9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * FIX: add missing service icons to view "All Services with this descr..." * FIX: ldap attribute plugins: fixed crash when parameters are None * FIX: avoid duplicate output of log message in log tables + * Added title of tests to LDAP diagnose table WATO: * Rule "State and count of processes": New configuration options: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index daed091..61992b4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5546,18 +5546,18 @@ def mode_ldap_config(phase): return (False, msg) tests = [ - test_connect, - test_user_base_dn, - test_user_count, - test_group_base_dn, - test_group_count, + (_('Connect'), test_connect), + (_('User Base-DN'), test_user_base_dn), + (_('Count Users'), test_user_count), + (_('Group Base-DN'), test_group_base_dn), + (_('Count Groups'), test_group_count), ] for address in userdb.ldap_servers(): html.write('<h3>%s: %s</h3>' % (_('Server'), address)) table.begin('test', searchable = False) - for test in tests: + for title, test in tests: table.row() try: state, msg = test(address) @@ -5570,6 +5570,7 @@ def mode_ldap_config(phase): else: img = '<img src="images/icon_failed.gif" alt="%s" />' % _('Failed') + table.cell(_("Test"), title) table.cell(_("State"), img) table.cell(_("Details"), msg)

10 years, 11 months

Check_MK Git: check_mk: cisco_cpu: fix it to work together with inline SNMP

by Mathias Kettner

Module: check_mk Branch: master Commit: 439354d7a5d1c4a89525e05a64a60ced129b5415 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=439354d7a5d1c4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 8 21:09:28 2013 +0200 cisco_cpu: fix it to work together with inline SNMP --- checks/cisco_cpu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/cisco_cpu b/checks/cisco_cpu index a5912e4..d1343f3 100644 --- a/checks/cisco_cpu +++ b/checks/cisco_cpu @@ -28,7 +28,7 @@ cisco_cpu_default_levels = (80.0, 90.0) def check_cisco_cpu(item, params, info): util = float(info[0][0]) - infotext = "%2.1f%% utilization in last 5minutes" % util + infotext = "%2.1f%% utilization in the last 5 minutes" % util warn, crit = params perfdata = [("util", util, warn, crit, 0, 100)] if util >= crit: @@ -45,6 +45,6 @@ check_info["cisco_cpu"] = { "has_perfdata" : True, "group" : "cpu_utilization", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.5.1"), - "snmp_info" : ( ".1.3.6.1.4.1.9.9.109.1.1.1.1.5", [ 1 ]), + "snmp_info" : ( ".1.3.6.1.4.1.9.9.109.1.1.1.1", [ 5 ]), }

10 years, 11 months

Check_MK Git: check_mk: liveproxyd: dump state every 5 seconds now

by Mathias Kettner

Module: check_mk Branch: master Commit: bf7cc501fdadf4d0d97f21af453d962685a2cc53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf7cc501fdadf4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 8 20:34:05 2013 +0200 liveproxyd: dump state every 5 seconds now --- doc/treasures/liveproxy/liveproxyd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index 9739b79..da924c1 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -6,7 +6,7 @@ import os, sys, getopt, signal, time, socket, select, traceback VERSION="1.2.3i1" sites = {} -dump_interval = None +dump_interval = 5 # dump state once every five seconds # .--Proxy---------------------------------------------------------------. # | ____ |

10 years, 11 months

Check_MK Git: check_mk: liveproxyd: verbose print exception in logfile

by Mathias Kettner

Module: check_mk Branch: master Commit: 18942064c6f5f3418ac17c1afcfc98dd85311e44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18942064c6f5f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 8 20:27:15 2013 +0200 liveproxyd: verbose print exception in logfile --- doc/treasures/liveproxy/liveproxyd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index 11e9001..9739b79 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -1,7 +1,7 @@ #!/usr/bin/python # encoding: utf-8 -import os, sys, getopt, signal, time, socket, select +import os, sys, getopt, signal, time, socket, select, traceback VERSION="1.2.3i1" @@ -93,7 +93,7 @@ def liveproxyd_run(): if opt_debug: raise - log("Ignoring exception: %s" % e) + log("Ignoring exception: %s: %s" % (e, traceback.format_exc())) def initiate_connections(): # Create new channels to target sites. Nonblocking! @@ -404,8 +404,8 @@ def receive_response(sitename, channel): try: chunk = channel["socket"].recv(65536) if not chunk: - raise Exception("Connect closed by foreign host") - + raise Exception("Connection closed by foreign host") + response = old_response + chunk channel["response"] = response

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0980

by Mathias Kettner

Module: check_mk Branch: master Commit: bc516fb05776116ba3f4bed2524fcef96128f5a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc516fb0577611… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 8 20:36:49 2013 +0200 Updated bug entries #0980 --- .bugs/980 | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/.bugs/980 b/.bugs/980 new file mode 100644 index 0000000..303d566 --- /dev/null +++ b/.bugs/980 @@ -0,0 +1,30 @@ +Title: Hooks users-saved called duplicate when doing WATO sync +Component: wato +State: open +Date: 2013-10-08 18:24:47 +Targetversion: 1.2.3i3 +Class: nastiness + +When doing a replicated WATO sync, then the hook users-saved is +being called twice. We should elimiate that. Especially because +there might be involved lengthy LDAP syncs + + +[Tue Oct 08 09:23:05 2013] [warn] [client 127.0.0.1] AUTOMATION +[Tue Oct 08 09:23:05 2013] [warn] [client 127.0.0.1] PUSH SNAPSHOT +[Tue Oct 08 09:23:05 2013] [warn] [client 127.0.0.1] GOT TARCONTENT +[Tue Oct 08 09:23:05 2013] [warn] [client 127.0.0.1] TAR EXTRACTED +[Tue Oct 08 09:23:05 2013] [warn] [client 127.0.0.1] CALLING HOOK snapshot-pushed +[Tue Oct 08 09:23:17 2013] [warn] [client 127.0.0.1] CALLING HOOK users-saved +[Tue Oct 08 09:23:18 2013] [warn] [client 127.0.0.1] FINISHED HOOK users-saved +[Tue Oct 08 09:23:18 2013] [warn] [client 127.0.0.1] FINISHED HOOK snapshot-pushed +[Tue Oct 08 09:23:18 2013] [warn] [client 127.0.0.1] HOOKS CALLED +[Tue Oct 08 09:23:18 2013] [warn] [client 127.0.0.1] CALLING HOOK pre-activate-changes +[Tue Oct 08 09:23:18 2013] [warn] [client 127.0.0.1] FINISHED HOOK pre-activate-changes +[Tue Oct 08 09:23:18 2013] [warn] [client 127.0.0.1] CALLING HOOK pre-activate-changes +[Tue Oct 08 09:23:30 2013] [warn] [client 127.0.0.1] CALLING HOOK users-saved +[Tue Oct 08 09:23:31 2013] [warn] [client 127.0.0.1] FINISHED HOOK users-saved +[Tue Oct 08 09:23:31 2013] [warn] [client 127.0.0.1] FINISHED HOOK pre-activate-changes +[Tue Oct 08 09:23:31 2013] [warn] [client 127.0.0.1] CALLING HOOK activate-changes +[Tue Oct 08 09:23:32 2013] [warn] [client 127.0.0.1] FINISHED HOOK activate-changes +[Tue Oct 08 09:23:32 2013] [warn] [client 127.0.0.1] RESTARTED

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1063

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 576e16948d488aa7eed96cc908f51c5c6edd6653 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=576e16948d488a… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Oct 8 17:27:18 2013 +0200 Updated bug entries #1063 --- .bugs/1063 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/1063 b/.bugs/1063 new file mode 100644 index 0000000..6293746 --- /dev/null +++ b/.bugs/1063 @@ -0,0 +1,8 @@ +Title: manpage for check_form_submit is missing +Component: checks +State: open +Date: 2013-10-08 17:26:07 +Targetversion: 1.2.3i3 +Class: nastiness + +manpage for check_form_submit needs to be written

10 years, 11 months

← Newer
1
...
29
30
31
32
33
34
35
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013