Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64557 discussions

Check_MK Git: check_mk: FIX Users are not logged out anymore during changing their own passwords

by Lars Michelsen

Module: check_mk Branch: master Commit: a502ab9cb2a725edb42202940dc511be8b10d8a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a502ab9cb2a725… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 20 15:08:28 2013 +0100 FIX Users are not logged out anymore during changing their own passwords The login cookie is now automatically updated with the new valid value. --- .werks/423 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 12 +++++------- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.werks/423 b/.werks/423 new file mode 100644 index 0000000..ecb7a53 --- /dev/null +++ b/.werks/423 @@ -0,0 +1,10 @@ +Title: Users are not logged out anymore during changing their own passwords +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387548439 +Targetversion: future + +The login cookie is now automatically updated with the new valid value. diff --git a/ChangeLog b/ChangeLog index 288b58e..5eb042e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ * 0436 FIX: Fix broken Site status switching via sidebar snapin... * 0420 FIX: LDAP: Roles/Groups are now synced even if case of DNs do not match... * 0421 FIX: UserDB: Fixed lost passwords when changing users in large user databases... + * 0423 FIX: Users are not logged out anymore during changing their own passwords... WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9cdcc1e..afa3a2a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -105,7 +105,7 @@ import sys, pprint, socket, re, subprocess, time, datetime, \ shutil, tarfile, StringIO, math, fcntl, pickle, random -import config, table, multitar, userdb, hooks, weblib +import config, table, multitar, userdb, hooks, weblib, login from lib import * from valuespec import * import forms @@ -12689,15 +12689,13 @@ def page_user_profile(): else: users[config.user_id]['serial'] += 1 + # Set the new cookie to prevent logout for the current user + login.set_auth_cookie(config.user_id, users[config.user_id]['serial']) + userdb.save_users(users) success = True - if password: - html.javascript( - "if(top) top.location.reload(); " - "else document.location.reload();") - else: - html.reload_sidebar() + html.reload_sidebar() except MKUserError, e: html.add_user_error(e.varname, e.message)

10 years, 9 months

Check_MK Git: check_mk: Udpated description of Werk

by Mathias Kettner

Module: check_mk Branch: master Commit: 16603db35bf681560f466a568339606dd22d59aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16603db35bf681… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 20 15:39:15 2013 +0100 Udpated description of Werk --- .werks/437 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.werks/437 b/.werks/437 index f785a45..bea4eab 100644 --- a/.werks/437 +++ b/.werks/437 @@ -5,17 +5,19 @@ Version: 1.2.5i1 Date: 1387549981 Class: feature -Do you know the plugin output invalid output from agent, invalid check parameters or ...? -The option for debugging such failed checks has been converted from an absolute -path to a simple Checkbox. The target path for the log file is now hardcoded -and will be printed by the failed check in the plugin output. +Do you know the plugin output invalid output from agent, invalid check +parameters or ...? The option for debugging such failed checks has +been converted from an absolute path to a simple Checkbox. The target path +for the log file is now hardcoded and will be printed by the failed check +in the plugin output. The advantage is that when using OMD the option +will work on all sites of a distributed environment and will log to +<tt>var/log/check_mk/crashed-checks.log</tt> within the site. -Existing configuration will not be touched, though, and honor the configured +Existing configurations will not be touched, though, and honor the configured path - as long as you do not change the option via WATO. <tt>main.mk</tt> still allows the old way: F+:main.mk - # Hard code path to log file debug_log = "/var/log/foo.log"

10 years, 9 months

Check_MK Git: check_mk: Convert WATO rule for debug_log into simple Checkbox

by Mathias Kettner

Module: check_mk Branch: master Commit: a1e2bf836bdcd87dd7eeb534a9ba90094fd83b5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1e2bf836bdcd8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 20 15:36:17 2013 +0100 Convert WATO rule for debug_log into simple Checkbox Do you know the plugin output invalid output from agent, invalid check parameters or ...? The option for debugging such failed checks has been converted from an absolute path to a simple Checkbox. The target path for the log file is now hardcoded and will be printed by the failed check in the plugin output. Existing configuration will not be touched, though, and honor the configured path - as long as you do not change the option via WATO. <tt>main.mk</tt> still allows the old way: F+:main.mk # Hard code path to log file debug_log = "/var/log/foo.log" # Simply enable and use standard path debug_log = True # Disable debug_log = None # New way to disable debug_log = False F-: --- .werks/437 | 30 ++++++++++++++++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 18 +++++++++++------ modules/check_mk_base.py | 12 +++++++++-- web/htdocs/wato.py | 19 +++++++++++++----- web/plugins/wato/check_mk_configuration.py | 19 +++++++++++------- 6 files changed, 79 insertions(+), 20 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a1e2bf836b…

10 years, 9 months

Check_MK Git: check_mk: Better description for werk 112

by Mathias Kettner

Module: check_mk Branch: master Commit: 8571428fdd4ec9739c4f34a9689ef7ec48c28895 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8571428fdd4ec9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 20 15:07:59 2013 +0100 Better description for werk 112 --- .werks/112 | 9 ++++++++- ChangeLog | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.werks/112 b/.werks/112 index 31e4e7c..9bed400 100644 --- a/.werks/112 +++ b/.werks/112 @@ -1,8 +1,15 @@ -Title: Explicit mapping of clustered services can now be done with Wato. +Title: Explicit mapping of clustered services can now be done with WATO Level: 1 Component: wato Version: 1.2.5i1 Date: 1387534743 Class: feature +Up to now WATO assumed that one host can be assigned at most to one cluster. +Now you can have one node in multiple clusters. With the new WATO ruleset +Explicit mapping of Clustered Services you can now specify explicitely, +to which of the clusters services of a node should be mapped. +If you are used to use <tt>main.mk</tt> then you might know +<tt>clustered_services_of['myhost']</tt>, which does exactly the same, +but is not accessible via WATO. diff --git a/ChangeLog b/ChangeLog index 288b58e..4f2caca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,7 +103,7 @@ NOTE: Please refer to the migration notes! * 0244 New features for WATO page Backup & Restore... * 0382 Active HTTP check now supports multiline regexp matching... - * 0112 Explicit mapping of clustered services can now be done with Wato. + * 0112 Explicit mapping of clustered services can now be done with WATO... * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... * 0241 FIX: Improved sorting of WATO folders in dropdown menu... * 0019 FIX: Fixed wording in WATO rule for MSSQL check

10 years, 9 months

Check_MK Git: check_mk: Setup: define log_dir in defaults ($var_dir/log)

by Mathias Kettner

Module: check_mk Branch: master Commit: a39f99e06fcc323826f5eb1783c95c14e3cde738 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a39f99e06fcc32… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 20 14:55:25 2013 +0100 Setup: define log_dir in defaults ($var_dir/log) --- defaults | 1 + scripts/setup.sh | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/defaults b/defaults index 59db1c7..a3edcbe 100644 --- a/defaults +++ b/defaults @@ -9,6 +9,7 @@ check_manpages_dir = 'checkman' agents_dir = 'agents' modules_dir = 'modules' var_dir = 'var' +log_dir = 'var/log' autochecksdir = 'var/autochecks' precompiled_hostchecks_dir = 'var/precompiled' counters_directory = 'var/counters' diff --git a/scripts/setup.sh b/scripts/setup.sh index 41d1c64..a928ebe 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -250,8 +250,8 @@ ask_dir checkmandir /usr/share/doc/$NAME/checks $HOMEBASEDIR/doc/checks $OMD_ROO "Directory for manuals for the various checks. The manuals can be viewed with check_mk -M <CHECKNAME>" -ask_dir vardir /var/lib/$NAME $HOMEBASEDIR/var $OMD_ROOT/var/check_mk "working directory of check_mk" \ - "check_mk will create caches files, automatically created checks and +ask_dir vardir /var/lib/$NAME $HOMEBASEDIR/var $OMD_ROOT/var/check_mk "working directory of Check_MK" \ + "Check_MK will create log files, automatically created checks and other files into this directory. The setup will create several subdirectories and makes them writable by the Nagios process" @@ -481,8 +481,9 @@ check_manpages_dir = '$checkmandir' modules_dir = '$modulesdir' locale_dir = '$localedir' agents_dir = '$agentsdir' -var_dir = '$vardir' lib_dir = '$libdir' +var_dir = '$vardir' +log_dir = '$vardir/log' snmpwalks_dir = '$vardir/snmpwalks' autochecksdir = '$vardir/autochecks' precompiled_hostchecks_dir = '$vardir/precompiled' @@ -812,15 +813,17 @@ do sed -ri 's@^export MK_LIBDIR="(.*)"@export MK_LIBDIR="'"$agentslibdir"'"@' $agent sed -ri 's@^export MK_CONFDIR="(.*)"@export MK_CONFDIR="'"$agentsconfdir"'"@' $agent done && - mkdir -p $DESTDIR$vardir/{autochecks,counters,precompiled,cache,logwatch,web,wato,notify} && + mkdir -p $DESTDIR$vardir/{autochecks,counters,precompiled,cache,logwatch,web,wato,notify,log} && if [ -z "$DESTDIR" ] && id "$nagiosuser" > /dev/null 2>&1 && [ $UID = 0 ] ; then chown -R $nagiosuser $DESTDIR$vardir/{counters,cache,logwatch,notify} - chown $nagiosuser $DESTDIR$vardir/web + chown $nagiosuser $DESTDIR$vardir/{web,log} 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/log && + chmod -R g+w $DESTDIR$vardir/log && chgrp -R $wwwgroup $DESTDIR$vardir/wato && chmod -R g+w $DESTDIR$vardir/wato mkdir -p $DESTDIR$vardir/tmp &&

10 years, 9 months

Check_MK Git: check_mk: Fixed merge conflict

by Lars Michelsen

Module: check_mk Branch: master Commit: 6bd10a50f5571ac0346157ff2a1b756e9a024f83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bd10a50f5571a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 20 14:18:27 2013 +0100 Fixed merge conflict --- web/htdocs/wato.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3456d49..9cdcc1e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2450,18 +2450,6 @@ def mode_inventory(phase, firsttime): table.sort() active_checks = {} new_target = "folder" -<<<<<<< HEAD - for st, ct, checkgroup, item, paramstring, params, descr, state, output, perfdata in table: - if (html.has_var("_cleanup") or html.has_var("_fixall")) \ - and st in [ "vanished", "obsolete" ]: - pass - elif (html.has_var("_activate_all") or html.has_var("_fixall")) \ - and st == "new": - active_checks[(ct, item)] = paramstring - else: - varname = "_%s_%s" % (ct, html.varencode(item)) - if html.var(varname, "") != "": -======= if html.var("_refresh"): counts, failed_hosts = check_mk_automation(host[".siteid"], "inventory", [ "@scan", "refresh", hostname ]) @@ -2486,7 +2474,6 @@ def mode_inventory(phase, firsttime): if html.var(varname, "") != "": active_checks[(ct, item)] = paramstring if st == "clustered": ->>>>>>> 29799d8... FIX Fixed numbers shown in log entries of bulk inventory active_checks[(ct, item)] = paramstring if st == "clustered": active_checks[(ct, item)] = paramstring

10 years, 9 months

Check_MK Git: check_mk: FIX Fixed numbers shown in log entries of bulk inventory

by Lars Michelsen

Module: check_mk Branch: master Commit: a876d72c81a9b3e469fbcfb625adaadd8452987e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a876d72c81a9b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 20 14:17:05 2013 +0100 FIX Fixed numbers shown in log entries of bulk inventory For all hosts inventorized in one single bulk operation the counts in the created log entry were equal. This were the summarized number of services found, kept, removed or new ones. Now the numbers show the individual counts again. Conflicts: ChangeLog web/htdocs/wato.py --- .werks/422 | 13 +++++++++++++ ChangeLog | 1 + modules/automation.py | 23 +++++++++++------------ web/htdocs/wato.py | 45 ++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 65 insertions(+), 17 deletions(-) diff --git a/.werks/422 b/.werks/422 new file mode 100644 index 0000000..63b37dc --- /dev/null +++ b/.werks/422 @@ -0,0 +1,13 @@ +Title: Fixed numbers shown in log entries of bulk inventory +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387545192 +Targetversion: future + +For all hosts inventorized in one single bulk operation the counts in +the created log entry were equal. This were the summarized number of +services found, kept, removed or new ones. Now the numbers show the +individual counts again. diff --git a/ChangeLog b/ChangeLog index 2c247b6..288b58e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -129,6 +129,7 @@ * 0419 FIX: LDAP: The default user profile roles are only assigned to users without roles... * 0249 FIX: Backup & Restore: fixed bug when uploading legacy snapshots... * 0250 FIX: Fixed error on creating very large WATO snapshots... + * 0422 FIX: Fixed numbers shown in log entries of bulk inventory... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/modules/automation.py b/modules/automation.py index f54b76d..66e5d5d 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -118,19 +118,18 @@ def automation_inventory(args): how = args[0] hostnames = args[1:] - count_added = 0 - count_removed = 0 - count_kept = 0 - count_new = 0 - + counts = {} failed_hosts = {} k = globals().keys() if how == "refresh": for hostname in hostnames: - count_removed += remove_autochecks_of(hostname) # checktype could be added here + counts.setdefault(hostname, [0, 0, 0, 0]) # added, removed, kept, new + counts[hostname][1] += remove_autochecks_of(hostname) # checktype could be added here reread_autochecks() for hostname in hostnames: + counts.setdefault(hostname, [0, 0, 0, 0]) # added, removed, kept, new + try: # Compute current state of new and existing checks table = automation_try_inventory([hostname], leave_no_tcp=True, with_snmp_scan=with_snmp_scan) @@ -144,32 +143,32 @@ def automation_inventory(args): if state_type == "new": if how in [ "new", "fixall", "refresh" ]: - count_added += 1 + counts[hostname][0] += 1 new_items.append((ct, item, paramstring)) elif state_type == "old": # keep currently existing valid services in any case new_items.append((ct, item, paramstring)) - count_kept += 1 + counts[hostname][2] += 1 elif state_type in [ "obsolete", "vanished" ]: # keep item, if we are currently only looking for new services # otherwise fix it: remove ignored and non-longer existing services if how not in [ "fixall", "remove" ]: new_items.append((ct, item, paramstring)) - count_kept += 1 + counts[hostname][2] += 1 else: - count_removed += 1 + counts[hostname][1] += 1 automation_write_autochecks_file(hostname, new_items) - count_new += len(new_items) + counts[hostname][3] += len(new_items) except Exception, e: if opt_debug: raise failed_hosts[hostname] = str(e) - return (count_added, count_removed, count_kept, count_new), failed_hosts + return counts, failed_hosts def automation_try_inventory(args, leave_no_tcp=False, with_snmp_scan=False): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f30546b..3456d49 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2450,6 +2450,7 @@ def mode_inventory(phase, firsttime): table.sort() active_checks = {} new_target = "folder" +<<<<<<< HEAD for st, ct, checkgroup, item, paramstring, params, descr, state, output, perfdata in table: if (html.has_var("_cleanup") or html.has_var("_fixall")) \ and st in [ "vanished", "obsolete" ]: @@ -2460,6 +2461,32 @@ def mode_inventory(phase, firsttime): else: varname = "_%s_%s" % (ct, html.varencode(item)) if html.var(varname, "") != "": +======= + + if html.var("_refresh"): + counts, failed_hosts = check_mk_automation(host[".siteid"], "inventory", [ "@scan", "refresh", hostname ]) + count_added, count_removed, count_kept, count_new = counts[hostname] + message = _("Refreshed check configuration of host [%s] with %d services") % \ + (hostname, count_added) + log_pending(LOCALRESTART, hostname, "refresh-autochecks", message) + + else: + table = check_mk_automation(host[".siteid"], "try-inventory", cache_options + [hostname]) + table.sort() + active_checks = {} + for st, ct, checkgroup, item, paramstring, params, descr, state, output, perfdata in table: + if (html.has_var("_cleanup") or html.has_var("_fixall")) \ + and st in [ "vanished", "obsolete" ]: + pass + elif (html.has_var("_activate_all") or html.has_var("_fixall")) \ + and st == "new": + active_checks[(ct, item)] = paramstring + else: + varname = "_%s_%s" % (ct, html.varencode(item)) + if html.var(varname, "") != "": + active_checks[(ct, item)] = paramstring + if st == "clustered": +>>>>>>> 29799d8... FIX Fixed numbers shown in log entries of bulk inventory active_checks[(ct, item)] = paramstring if st == "clustered": active_checks[(ct, item)] = paramstring @@ -2893,24 +2920,32 @@ def mode_bulk_inventory(phase): if html.var("do_scan"): arguments = [ "@scan" ] + arguments counts, failed_hosts = check_mk_automation(site_id, "inventory", arguments) - #counts = ( 1, 2, 3, 4 ) - result = repr([ 'continue', num_hosts, 0 ] + list(counts)) + "\n" + # sum up host individual counts to have a total count + sum_counts = [ 0, 0, 0, 0 ] + result_txt = '' for hostname in hostnames: + sum_counts[0] += counts[hostname][0] + sum_counts[1] += counts[hostname][1] + sum_counts[2] += counts[hostname][2] + sum_counts[3] += counts[hostname][3] host = folder[".hosts"][hostname] if hostname in failed_hosts: - result += _("Failed to inventorize %s: %s ") % (hostname, failed_hosts[hostname]) + result_txt += _("Failed to inventorize %s: %s ") % (hostname, failed_hosts[hostname]) if not host.get("inventory_failed"): host["inventory_failed"] = True save_hosts(folder) else: - result += _("Inventorized %s \n") % hostname + result_txt += _("Inventorized %s \n") % hostname mark_affected_sites_dirty(folder, hostname, sync=False, restart=True) log_pending(AFFECTED, hostname, "bulk-inventory", - _("Inventorized host: %d added, %d removed, %d kept, %d total services") % counts) + _("Inventorized host: %d added, %d removed, %d kept, %d total services") % + tuple(counts[hostname])) if "inventory_failed" in host: del host["inventory_failed"] save_hosts(folder) # Could be optimized, but difficult here + result = repr([ 'continue', num_hosts, 0 ] + sum_counts) + "\n" + result_txt + except Exception, e: result = repr([ 'failed', num_hosts, num_hosts, 0, 0, 0, 0, ]) + "\n" if site_id:

10 years, 9 months

Check_MK Git: check_mk: FIX UserDB: Fixed lost passwords when changing users in large user databases

by Lars Michelsen

Module: check_mk Branch: master Commit: 2331d5dc8a487116a8a384b5af6afa6c50fe32e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2331d5dc8a4871… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 20 13:27:45 2013 +0100 FIX UserDB: Fixed lost passwords when changing users in large user databases This issue affects local users whose passwords are stored in the local htpasswd file. When saving users after modification, the htpasswd file might corrupt and invalidate all passwords of all users. This has been fixed now. --- .werks/421 | 13 +++++++++++++ ChangeLog | 1 + web/plugins/userdb/htpasswd.py | 5 ++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/421 b/.werks/421 new file mode 100644 index 0000000..ba5364c --- /dev/null +++ b/.werks/421 @@ -0,0 +1,13 @@ +Title: UserDB: Fixed lost passwords when changing users in large user databases +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387542360 +Targetversion: future + +This issue affects local users whose passwords are stored in the local htpasswd +file. When saving users after modification, the htpasswd file might corrupt and +invalidate all passwords of all users. This has been fixed now. + diff --git a/ChangeLog b/ChangeLog index 2f8830e..d2cb01b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,7 @@ * 0394 FIX: LDAP: Auth expiration plugin now checks users for being disabled (in AD)... * 0436 FIX: Fix broken Site status switching via sidebar snapin... * 0420 FIX: LDAP: Roles/Groups are now synced even if case of DNs do not match... + * 0421 FIX: UserDB: Fixed lost passwords when changing users in large user databases... WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/plugins/userdb/htpasswd.py b/web/plugins/userdb/htpasswd.py index f65b8ab..883e3f1 100644 --- a/web/plugins/userdb/htpasswd.py +++ b/web/plugins/userdb/htpasswd.py @@ -107,7 +107,8 @@ def htpasswd_save(users): # users from htpasswd are lost. If you start managing users with # WATO, you should continue to do so or stop doing to for ever... # Locked accounts get a '!' before their password. This disable it. - out = create_user_file(defaults.htpasswd_file, "w") + filename = defaults.htpasswd_file + '.new' + out = create_user_file(filename, "w") for id, user in users.items(): # only process users which are handled by htpasswd connector if user.get('connector', 'htpasswd') != 'htpasswd': @@ -119,6 +120,8 @@ def htpasswd_save(users): else: locksym = "" out.write("%s:%s%s\n" % (id, locksym, user["password"])) + out.close() + os.rename(filename, filename[:-4]) multisite_user_connectors.append({ 'id': 'htpasswd',

10 years, 9 months

Check_MK Git: check_mk: FIX Fixed error on creating very large WATO snapshots

by Andreas Boesl

Module: check_mk Branch: master Commit: 3ece33ae4f513330877462eaa8cf1d7ecb8d6e35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ece33ae4f5133… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 20 13:16:01 2013 +0100 FIX Fixed error on creating very large WATO snapshots The snapshot creating process could crash when the data in the snapshots exceeds several gigabytes. --- .werks/250 | 10 ++++++++++ ChangeLog | 1 + modules/automation.py | 27 ++++++++++++++++++--------- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/.werks/250 b/.werks/250 new file mode 100644 index 0000000..1e14255 --- /dev/null +++ b/.werks/250 @@ -0,0 +1,10 @@ +Title: Fixed error on creating very large WATO snapshots +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387541661 +Targetversion: future + +The snapshot creating process could crash when the data in the snapshots exceeds several gigabytes. diff --git a/ChangeLog b/ChangeLog index 9f0ec40..969a8a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,6 +127,7 @@ * 0418 FIX: LDAP: Fixed broken role sync plugin with OpenLDAP... * 0419 FIX: LDAP: The default user profile roles are only assigned to users without roles... * 0249 FIX: Backup & Restore: fixed bug when uploading legacy snapshots... + * 0250 FIX: Fixed error on creating very large WATO snapshots... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/modules/automation.py b/modules/automation.py index cc86a98..f54b76d 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -768,7 +768,7 @@ def automation_create_snapshot(args): filename_work = "%s/%s.work" % (work_dir, snapshot_name) filename_status = "%s/%s.status" % (work_dir, snapshot_name) filename_pid = "%s/%s.pid" % (work_dir, snapshot_name) - filename_subtar = "%s/%s.subtar" % (work_dir, snapshot_name) + filename_subtar = "" current_domain = "" file(filename_target, "w").close() @@ -788,7 +788,7 @@ def automation_create_snapshot(args): statusfile.write("%s:%s\n" % status) lock_status_file.release() - # Set intitial status info + # Set initial status info statusinfo = {} for name in data.get("domains", {}).keys(): statusinfo[name] = "TODO" @@ -819,7 +819,7 @@ def automation_create_snapshot(args): def cleanup(): for filename in [filename_work, filename_status, filename_pid, filename_subtar]: - if os.path.exists(filename): + if filename and os.path.exists(filename): os.unlink(filename) def check_should_abort(): @@ -863,6 +863,9 @@ def automation_create_snapshot(args): tarinfo.size = len(snapshot_type) tar_in_progress.addfile(tarinfo, cStringIO.StringIO(snapshot_type)) + # Close tar in progress, all other files are included via command line tar + tar_in_progress.close() + # Process domains (sorted) subtar_update_thread = thread.start_new_thread(update_subtar_size, (1,)) domains = map(lambda x: x, data.get("domains").items()) @@ -876,22 +879,28 @@ def automation_create_snapshot(args): paths = map(lambda x: x[1] == "" and "." or x[1], paths) - command = "cd %s ; tar czf %s --force-local -C %s %s" % (prefix, filename_subtar, prefix, " ".join(paths)) + # Create tar.gz subtar + filename_subtar = "%s.tar.gz" % name + command = "cd %s ; tar czf %s --ignore-failed-read --force-local -C %s %s" % (work_dir, filename_subtar, prefix, " ".join(paths)) proc = subprocess.Popen(command, shell=True) proc.wait() - tarinfo = get_basic_tarinfo("%s.tar.gz" %name) - tarinfo.size = os.stat(filename_subtar).st_size + subtar_size = os.stat("%s/%s" % (work_dir, filename_subtar)).st_size + + # Append tar.gz subtar to snapshot + command = "cd %s ; tar --append --file=%s %s ; rm %s" % (work_dir, filename_work, filename_subtar, filename_subtar) + proc = subprocess.Popen(command, shell=True) + proc.wait() current_domain = "" - tar_in_progress.addfile(tarinfo, file(filename_subtar)) - update_status_file(name, "Finished / Size: %d" % tarinfo.size) + update_status_file(name, "Finished / Size: %d" % subtar_size) current_domain = None - tar_in_progress.close() shutil.move(filename_work, filename_target) cleanup() except Exception, e: raise MKAutomationError(str(e)) + +

10 years, 9 months

Check_MK Git: check_mk: uptime.include: fixed cleanups

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 8b93187a8fd2888880863096fdedfd7e177ae1cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b93187a8fd288… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Dec 20 11:56:22 2013 +0100 uptime.include: fixed cleanups --- checks/uptime.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/uptime.include b/checks/uptime.include index 0d7a43c..0effeb6 100644 --- a/checks/uptime.include +++ b/checks/uptime.include @@ -31,7 +31,7 @@ # "max" : ( 86400 * 7, 86400 * 14), # Maximum required uptime (warn, crit) # } -def check_uptime_sec(params, uptime_sec): +def check_uptime_seconds(params, uptime_sec): seconds = uptime_sec % 60 rem = uptime_sec / 60 minutes = rem % 60

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits