lists.checkmk.com
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
List overview
Download
Checkmk git commits
July 2018
----- 2024 -----
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
checkmk-commits@lists.checkmk.com
10 participants
467 discussions
Start a n
N
ew thread
Revert "6318 FIX check_mk_agent.{linux, solaris, openwrt}: Quote command line in asynchronous MRPE call to prevent globbing and word splitting "
by Simon Betz
Module: check_mk Branch: master Commit: 649b42291dadca0f8944ff95b1a9f82892d6a646 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=649b42291dadca…
Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 26 08:11:34 2018 +0200 Revert "6318 FIX check_mk_agent.{linux,solaris,openwrt}: Quote command line in asynchronous MRPE call to prevent globbing and word splitting" This reverts commit e1b633ad0fe84f3a1c2ce7923349bc0661d0034f. --- .werks/6318 | 10 ---------- agents/check_mk_agent.linux | 4 ++-- agents/check_mk_agent.openwrt | 4 ++-- agents/check_mk_agent.solaris | 4 ++-- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/.werks/6318 b/.werks/6318 deleted file mode 100644 index 8f11e7b..0000000 --- a/.werks/6318 +++ /dev/null @@ -1,10 +0,0 @@ -Title: check_mk_agent.{linux,solaris,openwrt}: Quote command line in asynchronous MRPE call to prevent globbing and word splitting -Level: 1 -Component: checks -Compatible: compat -Edition: cre -Version: 1.6.0i1 -Date: 1532418648 -Class: fix - - diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 93ca7e4..8b7d8c4 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -264,9 +264,9 @@ function run_cached () { if [ -z "$USE_CACHEFILE" ] && [ ! -e "$CACHEFILE.new" ] ; then # When the command fails, the output is throws away ignored if [ $mrpe -eq 1 ] ; then - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME \"$CMDLINE\" && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /bin/bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /bin/bash >/dev/null 2>&1 & else - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; \"$CMDLINE\" && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /bin/bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /bin/bash >/dev/null 2>&1 & fi fi } diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index fdea879..463e56a 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -167,9 +167,9 @@ run_cached () { # When the command fails, the output is throws away ignored if [ $mrpe -eq 1 ] ; then # TODO: This won't work: run_mrpe is not exported. And do we have bash at all? - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME \"$CMDLINE\" && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & else - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; \"$CMDLINE\" && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & fi fi } diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 0aefef3..7afe5b5 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -123,9 +123,9 @@ function run_cached () { # Cache file outdated and new job not yet running? Start it if [ -z "$USE_CACHEFILE" ] && [ ! -e "$CACHEFILE.new" ] ; then if [ $mrpe -eq 1 ] ; then - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME \"$CMDLINE\" && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /usr/bin/bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /usr/bin/bash >/dev/null 2>&1 & else - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; \"$CMDLINE\" && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /usr/bin/bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /usr/bin/bash >/dev/null 2>&1 & fi fi }
6 years, 3 months
1
0
0
0
Don't change input variable parsed
by Moritz Kiemer
Module: check_mk Branch: master Commit: e7aa4f286a0e20bb49822ac164d8deaee132da3e URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7aa4f286a0e20…
Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jul 17 13:04:03 2018 +0200 Don't change input variable parsed Change-Id: I4d3732adbb78fe4ad0997f9c3b2392427c5ddc72 --- checks/ucs_bladecenter_psu | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/checks/ucs_bladecenter_psu b/checks/ucs_bladecenter_psu index a02426c..d8196ae 100644 --- a/checks/ucs_bladecenter_psu +++ b/checks/ucs_bladecenter_psu @@ -129,13 +129,17 @@ def check_ucs_bladecenter_psu_switch_power(item, params, parsed): return 3, "Switch power info not available" # Convert fields - for old, new in [ ("Current", "current"), - ("PowerAvg", "power"), - ("Voltage", "voltage") ]: - psu[new] = (float(psu[old]), None) - del psu[old] + KEY_MAP = {"Current": "current", + "PowerAvg": "power", + "Voltage": "voltage"} - return check_elphase(item, params, {item: psu}) + psu_new = {} + for k, v in psu.iteritems(): + if k in KEY_MAP: + k, v = KEY_MAP[k], (float(v), None) + psu_new[k] = v + + return check_elphase(item, params, {item: psu_new}) check_info["ucs_bladecenter_psu.switch_power"] = { 'inventory_function': inventory_ucs_bladecenter_psu_switch_power,
6 years, 3 months
1
0
0
0
FIX 6383 db2_bp_hitratios: Fixed conversion to float if any value contains a comma instead of a dot
by Simon Betz
Module: check_mk Branch: master Commit: f730fabe1820b4f9c67911cdfdb1f93e8c97b0c5 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f730fabe1820b4…
Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jul 25 16:52:15 2018 +0200 FIX 6383 db2_bp_hitratios: Fixed conversion to float if any value contains a comma instead of a dot Change-Id: Ia9e466fdd833b31bfef8ab8e49814ec6be64ac40 --- .werks/6383 | 10 ++++++++++ checks/db2_bp_hitratios | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/6383 b/.werks/6383 new file mode 100644 index 0000000..e6380c7 --- /dev/null +++ b/.werks/6383 @@ -0,0 +1,10 @@ +Title: db2_bp_hitratios: Fixed conversion to float if any value contains a comma instead of a dot +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1532530045 +Class: fix + + diff --git a/checks/db2_bp_hitratios b/checks/db2_bp_hitratios index 7948f10..674d62c 100644 --- a/checks/db2_bp_hitratios +++ b/checks/db2_bp_hitratios @@ -81,7 +81,7 @@ def check_db2_bp_hitratios(item, no_params, parsed): hr_info = dict(zip(headers[1:], line[1:])) # skip BP_NAME for key in headers[1:]: value = hr_info[key] - value = value.replace("-","0") + value = value.replace("-","0").replace(",", ".") key = key.replace("_RATIO_PERCENT","") map_key_to_text = { "TOTAL_HIT": "Total",
6 years, 3 months
1
0
0
0
Removed superseded hack for integration tests
by Lars Michelsen
Module: check_mk Branch: master Commit: f00821f40c9a8f36450e7d959f045fed6fd28be8 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f00821f40c9a8f…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 17:20:38 2018 +0200 Removed superseded hack for integration tests Change-Id: I281a8d16c315217f8318b1c0d55efbb7ec08c04a --- tests/testlib/__init__.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 80af2ee..9220024 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -578,13 +578,6 @@ class Site(object): execute("sudo chrpath -r /omd/v/%s/lib %s/bin/python" % (self.version.version_directory(), self.version.version_path())) - self._add_version_path_to_index_py() - - - def _add_version_path_to_index_py(self): - os.system("sudo sed -i '0,/^$/s|^$|import sys ; sys.path.insert(0, \"%s/lib/python\")\\n|' " \ - "%s/share/check_mk/web/htdocs/index.py" % (self.version.version_path(), self.version.version_path())) - def _update_with_f12_files(self): paths = [ @@ -641,8 +634,6 @@ class Site(object): print("Executing .f12 in \"%s\" DONE" % path) sys.stdout.flush() - self._add_version_path_to_index_py() - def _enabled_liveproxyd_debug_logging(self): self.makedirs("etc/check_mk/liveproxyd.d/wato")
6 years, 3 months
1
0
0
0
CMK-624: fixed white text in pages footer
by Marcel Arentz
Module: check_mk Branch: master Commit: c6e94cce21b79d48ff1d6e00772d4a77cc02938e URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6e94cce21b79d…
Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Jul 25 10:06:55 2018 +0200 CMK-624: fixed white text in pages footer Change-Id: I818c933dd3d69e91c8c8ed1573367e1399ef57e9 --- web/htdocs/themes/facelift/theme.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index 808dac3..108a5a6 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -204,7 +204,7 @@ table.vs_duallist a.control, table.vs_duallist body.main .popup_menu span.contro body.main img.treeangle { filter: invert(100%); } -body.main .popup_menu a, body.main .popup_menu span, body.main table.footer .popup_menu a, body.main table.footer .popup_menu span, body.main .popup_menu span { +body.main .popup_menu a, body.main .popup_menu span, body.main table.footer, body.main table.footer .popup_menu a, body.main table.footer .popup_menu span, body.main .popup_menu span { color: #1A243D; } table {
6 years, 3 months
1
0
0
0
CMK-622: Fixed dropdown in Reporting and tree of folders snapin
by Marcel Arentz
Module: check_mk Branch: master Commit: ee38927e88ffab8000e1dd77bb9486dec2bbe1b4 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee38927e88ffab…
Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Jul 25 09:31:57 2018 +0200 CMK-622: Fixed dropdown in Reporting and tree of folders snapin Also fixed font size of dropdown of tree of folders. Change-Id: I90e3a42e16be0a659cf69857795957c70cb12658 --- web/htdocs/themes/facelift/theme.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index 0673689..808dac3 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -107,8 +107,9 @@ input, input[type=text], input[type=password], select, textarea, div.snapin sele select[multiple=multiple] { resize: none !important; } -div.snapin select { - width: 100% !important; } +div.snapin select, #mk_side_search_field { + width: 100% !important; + height: 100% !important; } div.snapin textarea { width: 100% !important; } @@ -995,7 +996,7 @@ table.cmc_stats, table.mkeventd_performance, table.performance { padding: 8px; height: auto; color: #333; - font-size: 14px; + font-size: 11px; clear: both; margin: 8px 0px 16px; }
6 years, 3 months
1
0
0
0
6381 FIX apc_inrow_system_events, liebert_system_events: Fixed handling of empty agent output
by Simon Betz
Module: check_mk Branch: master Commit: c5cc541fd228da1e93378b9b7104a6da2207755c URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5cc541fd228da…
Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jul 25 14:51:47 2018 +0200 6381 FIX apc_inrow_system_events, liebert_system_events: Fixed handling of empty agent output If no events are reported for these two checks, the agent section is empty and Check_MK marked the related services as 'vanished'. An empty section is valid and these two checks can handle them correctly. Change-Id: I15cc693853f46a8122ac908e14f78b71a9de8250 --- .werks/6381 | 13 +++++++++++++ checks/apc_inrow_system_events | 1 + checks/liebert_system_events | 1 + 3 files changed, 15 insertions(+) diff --git a/.werks/6381 b/.werks/6381 new file mode 100644 index 0000000..07bc5df --- /dev/null +++ b/.werks/6381 @@ -0,0 +1,13 @@ +Title: apc_inrow_system_events, liebert_system_events: Fixed handling of empty section +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1532522903 +Class: fix + +If no events are reported for these two checks, the agent section +is empty and Check_MK marked the related services as 'vanished'. +An empty section is valid and these two checks can handle them +correctly. diff --git a/checks/apc_inrow_system_events b/checks/apc_inrow_system_events index 1362f80..a36bd21 100644 --- a/checks/apc_inrow_system_events +++ b/checks/apc_inrow_system_events @@ -56,4 +56,5 @@ check_info["apc_inrow_system_events"] = { "snmp_info" : (".1.3.6.1.4.1.318.1.1.13.3.1.2.1", ["3"]), #airIRAlarmDescription "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), "group" : "apc_system_events", + "handle_empty_info" : True, } diff --git a/checks/liebert_system_events b/checks/liebert_system_events index 532b0c6..6bfec7f 100644 --- a/checks/liebert_system_events +++ b/checks/liebert_system_events @@ -64,4 +64,5 @@ check_info['liebert_system_events'] = { ]), 'snmp_scan_function' : scan_liebert, 'includes' : [ 'liebert.include' ], + 'handle_empty_info' : True, }
6 years, 3 months
1
0
0
0
Simplify pylintrc now that we have rrdtool in our virtual environment.
by Sven Panne
Module: check_mk Branch: master Commit: 2c7553192790df30a5493580acc69d3aeb2b4ee7 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c7553192790df…
Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 25 13:36:47 2018 +0200 Simplify pylintrc now that we have rrdtool in our virtual environment. Change-Id: I8f7a62b06311a4d356c9739f93498d7576595623 --- tests/pylint/pylintrc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index ca3f8cc..03943b2 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -139,14 +139,6 @@ disable= # wrong-spelling-in-comment, # wrong-spelling-in-docstring, -[TYPECHECK] -# rrdtool -# Can not check methods / attributes of the rrdtool C module. Skipping related errors -# like the following: -# [E1101(no-member), create_rrd] Module 'rrdtool' has no 'create' member -# TODO: Add rrdtool to virtualenv and drop this -ignored-modules = rrdtool - [REPORTS] output-format=cmk_colorized msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
6 years, 3 months
1
0
0
0
Fix invalid set_http_header() calls
by Lars Michelsen
Module: check_mk Branch: master Commit: 0e766f0759e9df5c7d39f5c9c009acf738b88a98 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e766f0759e9df…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 15:46:04 2018 +0200 Fix invalid set_http_header() calls This method has been refactored. The issue should've been found by pylint, but it is trapped by the __getattr__ magic of the htmllib which is used for dynamically creating the html tag building functions. Change-Id: I5b13b7bed651c1e6388be71e2815becf8d398bdd --- cmk/gui/crash_reporting.py | 4 ++-- cmk/gui/key_mgmt.py | 4 ++-- cmk/gui/login.py | 2 +- cmk/gui/wato/__init__.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmk/gui/crash_reporting.py b/cmk/gui/crash_reporting.py index a9cd960..7598edd 100644 --- a/cmk/gui/crash_reporting.py +++ b/cmk/gui/crash_reporting.py @@ -486,6 +486,6 @@ def page_download_crash_report(): (html.urlencode(host), html.urlencode(service), time.strftime("%Y-%m-%d_%H-%M-%S")) tardata = get_crash_report_archive_as_string(site, host, service) - html.set_http_header('Content-Disposition', 'Attachment; filename=%s' % filename) - html.set_http_header('Content-Type', 'application/x-tar') + html.response.set_http_header('Content-Disposition', 'Attachment; filename=%s' % filename) + html.response.set_http_header('Content-Type', 'application/x-tar') html.write(tardata) diff --git a/cmk/gui/key_mgmt.py b/cmk/gui/key_mgmt.py index 4477918..d796a75 100644 --- a/cmk/gui/key_mgmt.py +++ b/cmk/gui/key_mgmt.py @@ -450,9 +450,9 @@ class PageDownloadKey(object): def _send_download(self, keys, key_id): key = keys[key_id] - html.set_http_header("Content-Disposition","Attachment; filename=%s" % + html.response.set_http_header("Content-Disposition","Attachment; filename=%s" % self._file_name(key_id, key)) - html.set_http_header("Content-type", "application/x-pem-file") + html.response.set_http_header("Content-type", "application/x-pem-file") html.write(key["private_key"]) html.write(key["certificate"]) diff --git a/cmk/gui/login.py b/cmk/gui/login.py index 1c65e1b..f342f03 100644 --- a/cmk/gui/login.py +++ b/cmk/gui/login.py @@ -503,7 +503,7 @@ def page_logout(): else: # Implement HTTP logout with cookie hack if not html.request.has_cookie('logout'): - html.set_http_header('WWW-Authenticate', 'Basic realm="OMD Monitoring Site %s"' % config.omd_site()) + html.response.set_http_header('WWW-Authenticate', 'Basic realm="OMD Monitoring Site %s"' % config.omd_site()) html.response.set_cookie('logout', '1') raise FinalizeRequest(401) else: diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 47f034e..637ae62 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -14182,7 +14182,7 @@ class PageDownloadAgentOutput(AgentOutputPage): file_name = self.file_name(self._host.site_id(), self._host.name(), self._ty) html.set_output_format("text") - html.set_http_header("Content-Disposition", "Attachment; filename=%s" % file_name) + html.response.set_http_header("Content-Disposition", "Attachment; filename=%s" % file_name) preview_filepath = os.path.join(self._job.get_work_dir(), file_name) html.write(file(preview_filepath).read())
6 years, 3 months
1
0
0
0
6367 FIX Fixed HTML fragments shown in hover title of perfometers
by Lars Michelsen
Module: check_mk Branch: master Commit: 01e5d6bedaada8ec6d3a1c9c87e70d520a09e34a URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01e5d6bedaada8…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 25 13:19:02 2018 +0200 6367 FIX Fixed HTML fragments shown in hover title of perfometers Change-Id: I4d655716504f7a033fbee2e4c273daa2ce22887c --- .werks/6367 | 11 +++++++++++ cmk/gui/plugins/views/perfometer.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6367 b/.werks/6367 new file mode 100644 index 0000000..5ec6455 --- /dev/null +++ b/.werks/6367 @@ -0,0 +1,11 @@ +Title: Fixed HTML fragments shown in hover title of perfometers +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532517527 + + diff --git a/cmk/gui/plugins/views/perfometer.py b/cmk/gui/plugins/views/perfometer.py index ee7b9bd..418d713 100644 --- a/cmk/gui/plugins/views/perfometer.py +++ b/cmk/gui/plugins/views/perfometer.py @@ -249,7 +249,7 @@ def paint_perfometer(row): disabled = True return " ".join(classes), \ - html.render_a(content=content, href=url, title=title, + html.render_a(content=content, href=url, title=html.strip_tags(title), class_=["disabled" if disabled else None])
6 years, 3 months
1
0
0
0
← Newer
1
...
6
7
8
9
10
11
12
...
47
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
Results per page:
10
25
50
100
200