Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

4374 FIX check_sql: Fixed exception in verbose mode when querying MSSQL

by Lars Michelsen

Module: check_mk Branch: master Commit: c41f52f60f19ea2dde18fbe0d1eb9e942185e671 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c41f52f60f19ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 17 09:22:39 2017 +0100 4374 FIX check_sql: Fixed exception in verbose mode when querying MSSQL The check raised a "TypeError: sequence item 0: expected string, int found" exception. Change-Id: Ic4bdbedb1704b576ff4a5a40a1cbce4080599930 --- .werks/4374 | 9 +++++++++ active_checks/check_sql | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4374 b/.werks/4374 new file mode 100644 index 0000000..c81c79b --- /dev/null +++ b/.werks/4374 @@ -0,0 +1,9 @@ +Title: check_sql: Fixed exception in verbose mode when querying MSSQL +Level: 1 +Component: checks +Compatible: compat +Version: 1.5.0i1 +Date: 1487319719 +Class: fix + +The check raised a "TypeError: sequence item 0: expected string, int found" exception. diff --git a/active_checks/check_sql b/active_checks/check_sql index a2079bf..f01e189 100755 --- a/active_checks/check_sql +++ b/active_checks/check_sql @@ -224,6 +224,7 @@ try: sys.stderr.write("Input Values: %s\n" % opt_input) else: sys.stderr.write("SQL Statement: %s\n" % opt_sql) + if opt_procedure: outvar = cursor.var(cx_Oracle.STRING) #opt_input.append("outvar") @@ -250,7 +251,7 @@ except Exception, e: if opt_verbose: - sys.stderr.write("SQL Result:\n %s\n" % " ".join(result)) + sys.stderr.write("SQL Result:\n %r\n" % result) try:

7 years, 7 months

4375 FIX check_sql: Fixed reporting configuration issues to monitoring core

by Lars Michelsen

Module: check_mk Branch: master Commit: c07e8e2638f3b9db2acb45e80d1501a95c1b901f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c07e8e2638f3b9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 17 09:30:52 2017 +0100 4375 FIX check_sql: Fixed reporting configuration issues to monitoring core The plugin was writing it's textual output to stderr in case of errors or configuration problems which is not processed by the core. So the plugin output could be empty. Change-Id: I50014f348063dd3be349312809362de6d04f727d --- .werks/4375 | 11 +++++++++++ active_checks/check_sql | 48 +++++++++++++++++++++--------------------------- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/.werks/4375 b/.werks/4375 new file mode 100644 index 0000000..5391b3f --- /dev/null +++ b/.werks/4375 @@ -0,0 +1,11 @@ +Title: check_sql: Fixed reporting configuration issues to monitoring core +Level: 1 +Component: checks +Compatible: compat +Version: 1.5.0i1 +Date: 1487320186 +Class: fix + +The plugin was writing it's textual output to stderr in case of errors or +configuration problems which is not processed by the core. So the plugin +output could be empty. diff --git a/active_checks/check_sql b/active_checks/check_sql index f01e189..daa74aa 100755 --- a/active_checks/check_sql +++ b/active_checks/check_sql @@ -77,6 +77,12 @@ def saverfloat(f): return float(f) +def bail_out(exit_code, output): + state_txt = [ "OK", "WARN", "CRIT", "UNKNOWN" ][exit_code] + sys.stdout.write("%s - %s\n" % (state_txt, output)) + sys.exit(exit_code) + + short_options = 'hou:i:p:d:n:H:P:w:c:v' long_options = [ 'help', 'user=', 'password=', 'dbms=', 'name=', 'warning=', 'critical=', 'hostname=', @@ -85,10 +91,8 @@ long_options = [ try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) - except getopt.GetoptError, e: - sys.stderr.write("UNKOWN - Error in command options: %s\n" % e) - sys.exit(3) + bail_out("Error in command options: %s" % e) opt_debug = False @@ -140,14 +144,12 @@ try: opt_sql_tmp = ' '.join(map(str,args)) opt_sql = opt_sql_tmp.replace(r"\n", "\n").replace('\;', ";") else: - sys.stderr.write("UNKNOWN - no query or SQL statement/procedure name given\n") - sys.exit(3) + bail_out(3, "No query or SQL statement/procedure name given") except Exception, e: if opt_debug: raise - sys.stderr.write("UNKNOWN - Error while processing input: %s\n" % e) - sys.exit(3) + bail_out(3, "Error while processing input: %s" % e) try: @@ -202,19 +204,18 @@ try: db_connection = ibm_db_dbi.Connection(ibm_db_conn) else: - sys.stderr.write("UNKNOWN - dbms not found\n") - sys.exit(3) + bail_out(3, "DBMS '%s' not supported" % opt_dbms) cursor = db_connection.cursor() except Exception, e: if opt_debug: raise + if len(e.args) > 1: - sys.stderr.write("UNKNOWN - Error while connecting to database: [%d] %s\n" % (e.args[0], e.args[1])) + bail_out(3, "Error while connecting to database: [%d] %s" % (e.args[0], e.args[1])) else: - sys.stderr.write("UNKNOWN - Error while connecting to database: %s\n" % e) - sys.exit(3) + bail_out(3, "Error while connecting to database: %s" % e) try: @@ -243,11 +244,12 @@ try: except Exception, e: if opt_debug: raise + if len(e.args) > 1: - sys.stderr.write("UNKNOWN - Error while executing SQL statement/procedure: [%d] %s\n" % (e.args[0], e.args[1])) + bail_out(3, "Error while executing SQL statement/procedure: [%d] %s" % + (e.args[0], e.args[1])) else: - sys.stderr.write("UNKNOWN - Error while executing SQL statement/procedure: %s\n" % e) - sys.exit(3) + bail_out(3, "Error while executing SQL statement/procedure: %s" % e) if opt_verbose: @@ -255,12 +257,8 @@ if opt_verbose: try: - #if len(result) > 1: - # sys.stderr.write("UNKNOWN - SQL statement/procedure returned more than one line\n") - # sys.exit(3) if result == None or len(result) == 0: - sys.stderr.write("UNKNOWN - SQL statement/procedure returned no data\n") - sys.exit(3) + bail_out(3, "SQL statement/procedure returned no data") number = float(result[0]) @@ -289,16 +287,12 @@ try: if number in [ 0, 1, 2, 3 ]: state = int(number) else: - sys.stderr.write("UNKNOWN - <%s> is not a state, and no levels given\n" % str(number)) - sys.exit(3) + bail_out(3, "<%d> is not a state, and no levels given" % number) except Exception, e: if opt_debug: raise - sys.stderr.write("UNKNOWN - Error while processing result of SQL statement: %s\n" % e) - sys.exit(3) + bail_out(3, "Error while processing result of SQL statement: %s" % e) -state_readable = ["OK", "WARN", "CRIT", "UNKNOWN" ][state] -sys.stdout.write("%s - %s%s\n" % (state_readable, text, perf)) -sys.exit(state) +bail_out(state, "%s%s" % (text, perf))

7 years, 7 months

Updated bug entries #2549

by Lars Michelsen

Module: check_mk Branch: master Commit: ad2c6274d2b781547696c12a81b0516a2752b903 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad2c6274d2b781… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 17 08:49:05 2017 +0100 Updated bug entries #2549 Change-Id: I1397ee795c248380c43275334593f50fc1f88595 --- .bugs/2549 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2549 b/.bugs/2549 index c8e87f8..fea4313 100644 --- a/.bugs/2549 +++ b/.bugs/2549 @@ -1,12 +1,15 @@ Title: Import of ical files into timeperiod does not honor multiday events correctly Component: wato -State: open +Class: bug +State: done Date: 2016-12-14 09:31:57 Targetversion: 1.2.8 -Class: bug Wenn für Time Periods eine iCal-Datei mit einem Mehrtagestermin importiert wird (also z.B. DTSTART=20161212T000000 und DTEND=20161215T235959) dann wird nur der erste Tag als Eintrag in der Time Period generiert. Hier sollten analog zu Wiederholungsterminen mehrere Tage in der Time Period angelegt werden. + +2017-02-17 08:48:56: changed state open -> done +Just fixed that.

7 years, 7 months

Improved bulk edit description

by Lars Michelsen

Module: check_mk Branch: master Commit: a23c9f10d80354b8abb4ec6be7e289138ef0f37c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a23c9f10d80354… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 16 17:42:02 2017 +0100 Improved bulk edit description Change-Id: I78e4aad77a951dc6fe3d12501791e06d7db76a89 --- .bugs/2520 | 9 +++++++-- web/htdocs/wato.py | 13 ++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.bugs/2520 b/.bugs/2520 index 15adeba..521ffb5 100644 --- a/.bugs/2520 +++ b/.bugs/2520 @@ -10,5 +10,10 @@ it will be not removed. The host tag is stiull assigned to the hosts. Inheritance of folder host tags does not work if you try to remove the host tags. -Workaround: -Please edit single hosts and remove the wrong host tag. This will remove the host tag from the host. +---- + +It is working as expected. What you need to know is that the "bulk edit" +dialog can not be used for removing set attributes. You need to use +the dialog "bulk cleanup" to remove attributes from hosts in bulk. + +I improved the description on top of the bulk edit page. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cce72d4..9783755 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4220,11 +4220,14 @@ def mode_bulk_edit(phase): html.del_all_vars(prefix="attr_") html.del_all_vars(prefix="bulk_change_") - html.p("%s%s" % (_("You have selected %d hosts for bulk edit. You can now change " - "host attributes for all selected hosts at once. ") % len(hosts), - _("If a select is set to don't change then currenty not all selected " - "hosts share the same setting for this attribute. " - "If you leave that selection, all hosts will keep their individual settings."))) + html.p("%s%s %s" % ( + _("You have selected %d hosts for bulk edit. You can now change " + "host attributes for all selected hosts at once. ") % len(hosts), + _("If a select is set to don't change then currenty not all selected " + "hosts share the same setting for this attribute. " + "If you leave that selection, all hosts will keep their individual settings."), + _("In case you want to unset attributes on multiple hosts, you need to " + "use the bulk cleanup action instead of bulk edit."))) html.begin_form("edit_host", method = "POST") html.prevent_password_auto_completion()

7 years, 7 months

4371 FIX Dashboards: Folder filtered globe dashlets now link to filtered views

by Lars Michelsen

Module: check_mk Branch: master Commit: cd31cb314cb69243e96edbade58237759115df81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd31cb314cb692… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 16 16:36:30 2017 +0100 4371 FIX Dashboards: Folder filtered globe dashlets now link to filtered views Change-Id: Idbae0ad71c30e2771c34598bf60e10970913fea7 --- .werks/4371 | 10 ++++++++++ web/plugins/dashboard/builtin.py | 12 ++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.werks/4371 b/.werks/4371 new file mode 100644 index 0000000..8f7cc1c --- /dev/null +++ b/.werks/4371 @@ -0,0 +1,10 @@ +Title: Dashboards: Folder filtered globe dashlets now link to filtered views +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487259167 + + diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index be8640f..8fc50cc 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -42,7 +42,11 @@ builtin_dashboards["main"] = { "position" : (1, 1), "refresh" : 60, "show_title" : True, - "context" : {}, + 'context' : { + 'wato_folder': { + 'wato_folder': '', + } + }, 'single_infos' : [], }, { @@ -51,7 +55,11 @@ builtin_dashboards["main"] = { "position" : (31, 1), "refresh" : 60, "show_title" : True, - "context" : {}, + 'context' : { + 'wato_folder': { + 'wato_folder': '', + } + }, 'single_infos' : [], }, {

7 years, 7 months

Updated bug entries #2496, #2498, #2507, #2506, #2517

by Lars Michelsen

Module: check_mk Branch: master Commit: 1c337e5bd06853d04e3a861d45d2013d3027f0a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c337e5bd06853… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 16 17:26:48 2017 +0100 Updated bug entries #2496, #2498, #2507, #2506, #2517 Change-Id: Ief9183af0a18b9b42e8f205479163181647772f3 --- .bugs/2496 | 7 +++++-- .bugs/2498 | 8 +++++++- .bugs/2506 | 8 ++++++-- .bugs/2507 | 8 ++++++-- .bugs/2517 | 9 +++++++-- 5 files changed, 31 insertions(+), 9 deletions(-) diff --git a/.bugs/2496 b/.bugs/2496 index 6e1fd3b..9332ae4 100644 --- a/.bugs/2496 +++ b/.bugs/2496 @@ -1,11 +1,14 @@ Title: Folders snaping -> some subfolder -> dashboards -> Globestatistik -> Link in number wrong Component: multisite -State: open +Class: bug +State: done Date: 2016-06-27 11:53:50 Targetversion: 1.2.8 -Class: bug On a dashboards that shows just a subfolder of WATO the statistics in the globes print the correct numbers. But a click on such a number seems to drop the WATO folder filter so the resulting view is global - not for the selected folder. + +2017-02-16 16:36:44: changed state open -> done +Fixed. diff --git a/.bugs/2498 b/.bugs/2498 index 4f60f1f..e8a5e1f 100644 --- a/.bugs/2498 +++ b/.bugs/2498 @@ -2,7 +2,7 @@ Title: WATO-Snapshots should warn if data in local/ is too much Component: wato State: open Date: 2016-07-06 11:43:10 -Targetversion: 1.2.8 +Targetversion: 1.5.0 Class: bug We had the case that a user pu approx 4GB of tmp data below local/. @@ -11,3 +11,9 @@ took very long and lead to a Apache timeout (proxy error...). We need to validate the data in local/ somehow. Maybe make size limit? Or positively check all directories? + +---- + +Solution: We are planning to create some "todo / config and performance hints" +page that shows a list of things to tune to have a good setup. This page could +make such a local/ directory size check. diff --git a/.bugs/2506 b/.bugs/2506 index d9b93e3..2dee555 100644 --- a/.bugs/2506 +++ b/.bugs/2506 @@ -1,12 +1,16 @@ Title: Rule Disabled Services only work with positive result Component: wato -State: open +Class: bug +State: works4me Date: 2016-08-03 13:19:26 Targetversion: 1.2.8 -Class: bug You want to disable all Services like MSSQL.* and use one rule with a positive outcome. All services will be disabled. After that rule you add another one and try to get explizit services again like MSSQL Production$. That shoudl work with a negative outcome. It will not work. All combinations do not get the result, that was wished. Disable all services and include only some of them. + +2017-02-16 17:06:32: changed state open -> works4me +Works as expected. The first rule needs to be the "include" rule and the second one +the "exclude" rule. diff --git a/.bugs/2507 b/.bugs/2507 index feca946..b58c7ca 100644 --- a/.bugs/2507 +++ b/.bugs/2507 @@ -1,9 +1,9 @@ Title: clustered services does not filter by hostname Component: wato -State: open +Class: bug +State: works4me Date: 2016-08-10 13:13:00 Targetversion: 1.2.8 -Class: bug Wenn in "Clustered services" eine Regel erstellt wird, welche nur nach einem bestimmten Service auf einem bestimmten Host matchen sollte, greift diese dennoch auf allen Hosts, welche im Cluster sind und den genannten Service haben. Bsp: Host A hat den Service 1 @@ -18,3 +18,7 @@ Die erste Regel fügt den Inhalt der Services 1 von beiden Hosts zu einem Servic Die zweite Regel tut was sie soll, da auf Host A der Service nicht zur Verfügung steht. Der Service des Host B wird allerdings weiterhin als Host B zugeordnet angezeigt und der Service von Host A wird korrekt als "Already configured clustered services" definiert. + +2017-02-16 17:24:48: changed state open -> works4me +Can not reproduce, works as expected. Please let me know how to reproduce in case +this is still an issue. diff --git a/.bugs/2517 b/.bugs/2517 index 56413c9..2bbb7ef 100644 --- a/.bugs/2517 +++ b/.bugs/2517 @@ -1,9 +1,9 @@ Title: Migration from Ubuntu to RedHat with omd backup failed Component: multisite -State: open +Class: bug +State: done Date: 2016-08-17 13:54:17 Targetversion: 1.2.8 -Class: bug If you create a backup of an existing site with omd backup on a Ubuntu server and do a restore on a RedHat machine with omd restore, then the site will not be startet. Apache configuration is @@ -11,3 +11,8 @@ wrong, because during the restore the lokale Apache configuration is not reset t Workaround: Replace the include section of modules with default section of another site. + +2017-02-16 17:26:31: changed state open -> done +This has been fixed with current versions. The files have been made +more portable so that you don't need to change the module paths +anymore.

7 years, 7 months

Handle spaces in paths more gracefully

by Sven Panne

Module: check_mk Branch: master Commit: ca717be305c4a8c69b3a1c2cb097f2c0bdb83291 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca717be305c4a8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 16 17:29:03 2017 +0100 Handle spaces in paths more gracefully Change-Id: I7827a2e16dbc0ea02a8aee5dc74b860459d2df88 --- Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index fa17f03..eb97640 100644 --- a/Makefile +++ b/Makefile @@ -408,18 +408,22 @@ config.status: ar-lib compile config.guess config.sub install-sh missing depcomp echo "update config.status by reconfiguring in the same conditions" ; \ ./config.status --recheck; \ else \ - if test -d $(abspath ../boost/local) ; then \ + if test -d ../boost/local ; then \ BOOST_OPT="--with-boost=$(abspath ../boost/local)" ; \ - elif test -d $(abspath ../cmk-omd/packages/boost/local) ; then \ + elif test -d ../cmk-omd/packages/boost/local ; then \ BOOST_OPT="--with-boost=$(abspath ../cmk-omd/packages/boost/local)" ; \ elif test ! -d /usr/include/boost -a -d /usr/include/boost141/boost ; then \ BOOST_OPT="CPPFLAGS=-I/usr/include/boost141" ; \ else \ - BOOST_OPT="" ; \ + BOOST_OPT="DUMMY1=" ; \ fi ; \ - RRD_OPT="$(shell test -d ../rrdtool/rrdtool-1.5.4/src/.libs && echo LDFLAGS="-L$(realpath ../rrdtool/rrdtool-1.5.4/src/.libs)")" ; \ - echo "configure CXXFLAGS=\"$(CXX_FLAGS)\" $$BOOST_OPT $$RRD_OPT" ; \ - ./configure CXXFLAGS="$(CXX_FLAGS)" $$BOOST_OPT $$RRD_OPT ; \ + if test -d "../rrdtool/rrdtool-1.5.4/src/.libs"; then \ + RRD_OPT="LDFLAGS=-L$(realpath ../rrdtool/rrdtool-1.5.4/src/.libs)" ; \ + else \ + RRD_OPT="DUMMY2=" ; \ + fi ; \ + echo "configure CXXFLAGS=\"$(CXX_FLAGS)\" \"$$BOOST_OPT\" \"$$RRD_OPT\"" ; \ + ./configure CXXFLAGS="$(CXX_FLAGS)" "$$BOOST_OPT" "$$RRD_OPT" ; \ fi configure: $(CONFIGURE_DEPS)

7 years, 7 months

Updated bug entries #2489, #2466, #2463, #2327

by Lars Michelsen

Module: check_mk Branch: master Commit: 3233a146838399bdfd160cc3eac5156773eb57ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3233a146838399… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 16 16:25:26 2017 +0100 Updated bug entries #2489, #2466, #2463, #2327 Change-Id: I30722452d732b4dc3b05a329ede5800b11b20a34 --- .bugs/2327 | 2 +- .bugs/2463 | 7 +++++-- .bugs/2466 | 7 ++++++- .bugs/2489 | 7 +++++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.bugs/2327 b/.bugs/2327 index f1da348..e4158e9 100644 --- a/.bugs/2327 +++ b/.bugs/2327 @@ -3,7 +3,7 @@ Component: checks State: open Date: 2016-02-10 16:31:17 Targetversion: future -Class: bug +Class: nastiness Some special agents use the Version: field of the <<<check_mk>>> section for sending their e.g. firmware version or something different. But this version is only meant for diff --git a/.bugs/2463 b/.bugs/2463 index 26afb67..9ccacef 100644 --- a/.bugs/2463 +++ b/.bugs/2463 @@ -1,11 +1,14 @@ Title: Hosts without site attribute are monitored by all sites Component: core -State: open +Class: bug +State: done Date: 2016-08-03 11:10:47 Targetversion: 1.2.8 -Class: bug When creating a host manually or with "hole" script, these hosts have no site attribute set. When this is synced to a slave site, the host is monitored by both sites. We should detect that and only monitor those hosts on standalone sites or WATO master sites. + +2017-02-16 16:16:35: changed state open -> done +This should be fixed in current versions. diff --git a/.bugs/2466 b/.bugs/2466 index d0505b5..5820bb3 100644 --- a/.bugs/2466 +++ b/.bugs/2466 @@ -2,7 +2,7 @@ Title: Unicode characters in HTTP variables crash the GUI in different places Component: multisite State: open Date: 2016-08-03 17:14:34 -Targetversion: 1.2.8 +Targetversion: 1.5.0 Class: bug When a unicode character is added to URL variables read with html.vars() and this @@ -11,3 +11,8 @@ is added to the HTML output which may already be unicode, this results into an e For example this URL: http://localhost/stable/check_mk/view.py?asdx=asd&view_name=allhosts%F0%9F%… We should solve this in a general place, for example html.var(). + +--- + +Solution: Cleanup html.var() to always return Unicode strings instead of byte strings. +In this stept html.var_utf8() and html.get_unicode_input() can be replaced. diff --git a/.bugs/2489 b/.bugs/2489 index e281d4e..2749a60 100644 --- a/.bugs/2489 +++ b/.bugs/2489 @@ -1,9 +1,9 @@ Title: Bulk edit for hosts seems to contain checkbox state when it should not Component: wato -State: open +Class: bug +State: done Date: 2016-04-18 14:38:33 Targetversion: 1.2.8 -Class: bug Wenn man mehrere Hosts für einen bulk edit markiert hatte und die Änderungen mit „Save & Finish“ übernommen hat und dann andere Hosts markiert @@ -29,3 +29,6 @@ index 31a6deb..0d0d10f 100644 # Helper function for showing bulk actions. This is needed at the bottom # of the table of hosts and - if there are more than just a few - also # at the top of the table. + +2017-02-16 16:23:57: changed state open -> done +Can not reproduce this with current version. Seems to be fixed now.

7 years, 7 months

4369 FIX Fixed broken host edit page on distributed WATO slave sites ( when WATO is enabled)

by Lars Michelsen

Module: check_mk Branch: master Commit: aaee6123ae48654f27f22e9a2c8e887f18e88e41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aaee6123ae4865… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 16 14:55:05 2017 +0100 4369 FIX Fixed broken host edit page on distributed WATO slave sites (when WATO is enabled) Change-Id: I1ea87bf8f2878b97af99222f8d9ad0d52f8d95a1 --- .werks/4369 | 10 ++++++++++ web/htdocs/htmllib.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4369 b/.werks/4369 new file mode 100644 index 0000000..ffb2e2d --- /dev/null +++ b/.werks/4369 @@ -0,0 +1,10 @@ +Title: Fixed broken host edit page on distributed WATO slave sites (when WATO is enabled) +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487253287 + + diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 535f391..9ad8d56 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1302,7 +1302,7 @@ class RequestHandler(object): def var_utf8(self, varname, deflt = None): val = self.vars.get(varname, deflt) - if val != None and type(val) != unicode: + if type(val) == str: return val.decode("utf-8") else: return val

7 years, 7 months

4370 FIX Distributed WATO: Remote site properties "WATO enabled" and " Automatic sync" were not applied on slaves

by Lars Michelsen

Module: check_mk Branch: master Commit: 6ffbbd102cef053fe4a8bb324a7a9c2bd54a4f1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ffbbd102cef05… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 16 15:08:17 2017 +0100 4370 FIX Distributed WATO: Remote site properties "WATO enabled" and "Automatic sync" were not applied on slaves Change-Id: I6fc34d0241aeb0fd0a0d5f37b8665f148dcc186c --- .werks/4370 | 10 ++++++++++ web/htdocs/watolib.py | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/4370 b/.werks/4370 new file mode 100644 index 0000000..244e68b --- /dev/null +++ b/.werks/4370 @@ -0,0 +1,10 @@ +Title: Distributed WATO: Remote site properties "WATO enabled" and "Automatic sync" were not applied on slaves +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487254080 + + diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 65e01d2..cab353d 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3197,9 +3197,9 @@ def save_global_settings(vars, site_specific=False): # The global setting wato_enabled is not registered in the configuration domains # since the user must not change it directly. It is set by D-WATO on slave sites. if "wato_enabled" in vars: - per_domain.setdefault("multisite", {})["wato_enabled"] = vars["wato_enabled"] + per_domain.setdefault(ConfigDomainGUI, {})["wato_enabled"] = vars["wato_enabled"] if "userdb_automatic_sync" in vars: - per_domain.setdefault("multisite", {})["userdb_automatic_sync"] = vars["userdb_automatic_sync"] + per_domain.setdefault(ConfigDomainGUI, {})["userdb_automatic_sync"] = vars["userdb_automatic_sync"] for domain in ConfigDomain.enabled_domains(): if site_specific:

7 years, 7 months

← Newer
1
...
17
18
19
20
21
22
23
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017