Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

by Sven Panne

Module: check_mk Branch: master Commit: b6681ac92dd35f973fce539bd380874a30908d91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6681ac92dd35f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 20 14:44:15 2017 +0200 Overhauled ListColumn handling. The previous isEmpty() and makeContains() methods were not flexible enough to handle upcoming features like regexp matching, so they were replaced by a more general mechanism: Every ListColumn now knows how to calculate their contents as a stream of strings. As a first approximation, we simply use a vector for this stream, we can later improve performance by replacing that with a range or iterators. Several bugs regarding AuthUser were fixed on the way: Often the AuthUser was just used for rendering a column, but omitted for filtering. Change-Id: I773150c8e6e7f5c29951d762314b56eb504b766c --- livestatus/src/CommentColumn.cc | 39 +++++-------------- livestatus/src/CommentColumn.h | 10 ++--- livestatus/src/ContactGroupsColumn.cc | 51 ++++++------------------ livestatus/src/ContactGroupsColumn.h | 28 +++----------- livestatus/src/ContactGroupsMemberColumn.cc | 17 ++++++-- livestatus/src/ContactGroupsMemberColumn.h | 19 +++++---- livestatus/src/ContactsColumn.cc | 60 ----------------------------- livestatus/src/ContactsColumn.h | 55 -------------------------- livestatus/src/DowntimeColumn.cc | 35 ++++------------- livestatus/src/DowntimeColumn.h | 8 ++-- livestatus/src/HostContactsColumn.cc | 16 ++++++-- livestatus/src/HostContactsColumn.h | 19 +++++---- livestatus/src/HostGroupsColumn.cc | 49 ++++++----------------- livestatus/src/HostGroupsColumn.h | 11 ++---- livestatus/src/ListColumn.cc | 5 +-- livestatus/src/ListColumn.h | 19 +++++---- livestatus/src/ListFilter.cc | 29 +++++++------- livestatus/src/ListFilter.h | 9 +---- livestatus/src/Makefile.am | 1 - livestatus/src/ServiceContactsColumn.cc | 16 ++++++-- livestatus/src/ServiceContactsColumn.h | 19 +++++---- livestatus/src/ServiceGroupsColumn.cc | 50 ++++++------------------ livestatus/src/ServiceGroupsColumn.h | 11 ++---- livestatus/src/TableEventConsole.cc | 1 + livestatus/src/TableEventConsole.h | 31 +++------------ livestatus/src/TableHosts.cc | 2 +- livestatus/src/TableServices.cc | 2 +- 27 files changed, 182 insertions(+), 430 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b6681ac92d…

6 years, 11 months

5401 FIX Fixed password auto completion prevention for current Chrome versions

by Lars Michelsen

Module: check_mk Branch: master Commit: d57c728c295fdbfdf4758f96b4468e4cd267b56d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d57c728c295fdb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 23 12:00:08 2017 +0200 5401 FIX Fixed password auto completion prevention for current Chrome versions Change-Id: I3c583ee458d9748011ee505f18b9205c2fb0345d --- .werks/5401 | 11 +++++++++++ web/htdocs/valuespec.py | 3 ++- web/htdocs/wato.py | 4 +++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/5401 b/.werks/5401 new file mode 100644 index 0000000..b415a13 --- /dev/null +++ b/.werks/5401 @@ -0,0 +1,11 @@ +Title: Fixed password auto completion prevention for current Chrome versions +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1508752658 + + diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 762c49a..b29f9df 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3852,7 +3852,7 @@ class LDAPDistinguishedName(TextUnicode): class Password(TextAscii): def __init__(self, **kwargs): self._is_stored_plain = kwargs.get("is_stored_plain", True) - self._autocomplete = kwargs.get("autocomplete", False) + kwargs.setdefault("autocomplete", False) if self._is_stored_plain: plain_help = _("The password entered here is stored in plain text within the " @@ -3867,6 +3867,7 @@ class Password(TextAscii): TextAscii.__init__(self, attrencode = True, **kwargs) + def render_input(self, varprefix, value): self.classtype_info() if value == None: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index baf2155..ee7de23 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2573,11 +2573,13 @@ def mode_diag_host(phase): html.open_table() html.open_tr() html.open_td() + html.begin_form('diag_host', method = "POST") + html.prevent_password_auto_completion() + forms.header(_('Host Properties')) forms.section(legend = False) - html.prevent_password_auto_completion() # The diagnose page shows both snmp variants at the same time # We need to analyse the preconfigured community and set either the

6 years, 11 months

Make a more secure check for existing chroot user

by Jukka Aro

Module: check_mk Branch: master Commit: 770ce6172598994a608be2b4584f2c2c2f2d5688 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=770ce617259899… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Oct 23 08:26:02 2017 +0200 Make a more secure check for existing chroot user Only match the exact username within word boundaries. Prevents accidental matches with substrings especially with our two-character usernames that can match almost whatever in /etc/passwd. Change-Id: I2053e484462f7a6de1891f0076003658dbc3ec46 --- agents/windows/make-chroot | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index 1236f0c..df319a9 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -148,8 +148,9 @@ if [ ! -h $CHROOT_PATH/usr/bin/python ] ; then ln -sf python2.7 $CHROOT_PATH/usr/bin/python fi -# Add user for building windows agent without root privileges -if ! grep -q $SUDO_USER "$CHROOT_PATH/etc/passwd" ; then +# Add user for building windows agent without root privileges. +# Check that user does not exist before since SUDO_USER may be root, as well. +if ! grep -q "\<${SUDO_USER}\>" "$CHROOT_PATH/etc/passwd" ; then ./do-chroot "useradd -lmo -u $(id -u $SUDO_USER) -s /bin/bash $SUDO_USER" fi

6 years, 11 months

Prevent useradd failure in chroot

by Jukka Aro

Module: check_mk Branch: master Commit: 89e209457d6dd364f80ddcd81e95d0aa87e20183 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89e209457d6dd3… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Oct 20 16:52:23 2017 +0200 Prevent useradd failure in chroot Make sure user does not exist before calling useradd. Necessary as some builds are executed as root. Change-Id: I5b9de11068a5650c50ff3993a7f552f346cf9e7b --- agents/windows/make-chroot | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index 32b067f..1236f0c 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -149,7 +149,9 @@ if [ ! -h $CHROOT_PATH/usr/bin/python ] ; then fi # Add user for building windows agent without root privileges -./do-chroot "useradd -lmo -u $(id -u $SUDO_USER) -s /bin/bash $SUDO_USER" +if ! grep -q $SUDO_USER "$CHROOT_PATH/etc/passwd" ; then + ./do-chroot "useradd -lmo -u $(id -u $SUDO_USER) -s /bin/bash $SUDO_USER" +fi # "Disable" apt privilege dropping in chroot sed -ri 's/^_apt:x:[0-9]+:/_apt:x:0:/g' $CHROOT_PATH/etc/passwd

6 years, 11 months

df.include/size_trend.include: provide function for size trend computation

by Tom Baerwinkel

6 years, 11 months

4753 Inactive browser windows/tabs are not updated until focused again

by Lars Michelsen

Module: check_mk Branch: master Commit: 0309afc0c256986a1a0425fc2032b676cddca8d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0309afc0c25698… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 31 08:14:19 2017 +0200 4753 Inactive browser windows/tabs are not updated until focused again This change should be a performance improvement to reduce the load of the sites webserver. While a Check_MK GUI page is opened in the browser several parts are updating themselfs in the background, for example sidebar snapins, dashlets and views. A lot of users open several instances of the GUI in different browser tabs (or windows) and leave them inactive in the background. They open different tabs and keep the others in background or even leave their computer running and just lock their user session. In such situation the browser keeps updating the page elements even when no one looks at the information. We have now implemented a mechanism to detect whether or not a page is visible or hidden to the user. In later case the updates are stopped until the user opens the page again, then the updates are immediately done. This change should be seamless for the user in most cases because the updates are immediately done when the user focuses the page again, but it might happen that you see a "grayed out" page for a short time. This grayed out page visualizes that the information is outdated. If you should see this for several seconds there is something wrong. But you can always tell your browser to reload the page which should resolve this. Change-Id: I6a6f2483aa9fb440f52cbf12c2c5f04ae732c4bf --- .werks/4753 | 33 +++++++++++++++++ web/htdocs/check_mk.css | 11 ++++++ web/htdocs/htmllib.py | 1 + web/htdocs/js/checkmk.js | 91 ++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/js/dashboard.js | 7 ++++ web/htdocs/js/sidebar.js | 7 ++++ 6 files changed, 150 insertions(+) diff --git a/.werks/4753 b/.werks/4753 new file mode 100644 index 0000000..141dc47 --- /dev/null +++ b/.werks/4753 @@ -0,0 +1,33 @@ +Title: Inactive browser windows/tabs are not updated until focused again +Level: 2 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1496242418 +Class: feature + +This change should be a performance improvement to reduce the load of the +sites webserver. + +While a Check_MK GUI page is opened in the browser several parts are updating +themselfs in the background, for example sidebar snapins, dashlets and views. + +A lot of users open several instances of the GUI in different browser tabs +(or windows) and leave them inactive in the background. They open different +tabs and keep the others in background or even leave their computer running +and just lock their user session. + +In such situation the browser keeps updating the page elements even when no +one looks at the information. + +We have now implemented a mechanism to detect whether or not a page is +visible or hidden to the user. In later case the updates are stopped until +the user opens the page again, then the updates are immediately done. + +This change should be seamless for the user in most cases because the updates +are immediately done when the user focuses the page again, but it might happen +that you see a "grayed out" page for a short time. This grayed out page +visualizes that the information is outdated. If you should see this for several +seconds there is something wrong. But you can always tell your browser to +reload the page which should resolve this. diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index bfa3ed4..fced2d8 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -67,6 +67,17 @@ body a, body a:link, body a:visited { color: white; } +body.hidden:after { + content: ""; + background-color: rgba(0, 0, 0, .5); + display: block; + width: 100%; + height: 100%; + position: absolute; + top: 0; + left: 0; +} + /* Default font size for the complete Multisite GUI */ button, input, td, th, select, textarea { font-size: 9pt; diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d9c8e79..f5f3cb1 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -2001,6 +2001,7 @@ class html(HTMLGenerator, RequestHandler): json.dumps(self.keybindings)) if self.final_javascript_code: self.javascript(self.final_javascript_code) + self.javascript("initialize_visibility_detection();") self.close_body() self.close_html() diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 1790116..afcbab8 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1149,6 +1149,13 @@ function stop_reload_timer() function do_reload(url) { + // Reschedule the reload in case the browser window / tab is not visible + // for the user. Retry after short time. + if (!is_window_active()) { + setTimeout(function(){ do_reload(url); }, 250); + return; + } + // Nicht mehr die ganze Seite neu laden, wenn es ein DIV "data_container" gibt. // In dem Fall wird die aktuelle URL aus "window.location.href" geholt, für den Refresh // modifiziert, der Inhalt neu geholt und in das DIV geschrieben. @@ -3705,3 +3712,87 @@ function hide_job_detail_msg() if (msg) msg.parentNode.removeChild(msg); } + +//#. +//# .--Visibility----------------------------------------------------------. +//# | __ ___ _ _ _ _ _ _ | +//# | \ \ / (_)___(_) |__ (_) (_) |_ _ _ | +//# | \ \ / /| / __| | '_ \| | | | __| | | | | +//# | \ V / | \__ \ | |_) | | | | |_| |_| | | +//# | \_/ |_|___/_|_.__/|_|_|_|\__|\__, | | +//# | |___/ | +//# +----------------------------------------------------------------------+ +//# | Code for detecting the visibility of the current browser window/tab | +//# '----------------------------------------------------------------------' + +var g_visibility_detection_enabled = true; + +// Whether or not the current browser window/tab is visible to the user +function is_window_active() +{ + return !has_class(document.body, "hidden"); +} + +function initialize_visibility_detection() +{ + var hidden_attr_name = "hidden"; + + // Standards: + if (hidden_attr_name in document) + document.addEventListener("visibilitychange", on_visibility_change); + else if ((hidden_attr_name = "mozHidden") in document) + document.addEventListener("mozvisibilitychange", on_visibility_change); + else if ((hidden_attr_name = "webkitHidden") in document) + document.addEventListener("webkitvisibilitychange", on_visibility_change); + else if ((hidden_attr_name = "msHidden") in document) + document.addEventListener("msvisibilitychange", on_visibility_change); + + // This feature will not support IE 9 and lower or other incompatible + // browsers. By enabling the code below we could add the support, but + // we need to be sure that these assignments don't conflict with other + // already registered event handlers. + //else if ("onfocusin" in document) { + // // IE 9 and lower: + // document.onfocusin = document.onfocusout = onchange; + //} + //else { + // // All others: + // window.onpageshow = window.onpagehide + // = window.onfocus = window.onblur = onchange; + //} + + window.addEventListener("beforeunload", disable_visibility_detection); + + function disable_visibility_detection(evt) { + g_visibility_detection_enabled = false; + } + + function on_visibility_change(evt) { + var v = "visible", h = "hidden", + evtMap = { + focus:v, focusin:v, pageshow:v, blur:h, focusout:h, pagehide:h + }; + + if (!g_visibility_detection_enabled) + return; + + remove_class(document.body, "visible"); + remove_class(document.body, "hidden"); + + evt = evt || window.event; + + var new_class; + if (evt.type in evtMap) { + new_class = evtMap[evt.type]; + } else { + new_class = this[hidden_attr_name] ? "hidden" : "visible"; + } + + //console.log([evt.type, new_class, document.hidden, location.href]); + add_class(document.body, new_class); + } + + // set the initial state (but only if browser supports the Page Visibility API) + if (document[hidden_attr_name] !== undefined) + on_visibility_change({type: document[hidden_attr_name] ? "blur" : "focus"}); +} diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 4b7cb11..658442b 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -312,6 +312,13 @@ function calculate_dashboard() { } function dashboard_scheduler(initial) { + // Stop reload of the dashlets in case the browser window / tab is not visible + // for the user. Retry after short time. + if (!is_window_active()) { + setTimeout(function(){ dashboard_scheduler(initial); }, 250); + return; + } + var timestamp = Date.parse(new Date()) / 1000; var newcontent = ""; for(var i = 0; i < refresh_dashlets.length; i++) { diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index eaab460..5882a8c 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -694,6 +694,13 @@ function sidebar_scheduler() { else g_seconds_to_update -= 1; + // Stop reload of the snapins in case the browser window / tab is not visible + // for the user. Retry after short time. + if (!is_window_active()) { + setTimeout(function(){ sidebar_scheduler(); }, 250); + return; + } + var newcontent = ""; var to_be_updated = [];

6 years, 11 months

Cleanup special case in notification logging: Use LOG core command for nagios too

by Lars Michelsen

Module: check_mk Branch: master Commit: 9b9e72c3a966658d5a9ac9f1ee3dc06d3744ff30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b9e72c3a96665… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 20 13:24:40 2017 +0200 Cleanup special case in notification logging: Use LOG core command for nagios too Change-Id: I0c2a70a08cae904a47c8cdf59860f457dc9f03cc --- cmk_base/notify.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/cmk_base/notify.py b/cmk_base/notify.py index 95035de..dd7955b 100644 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -1808,13 +1808,5 @@ def core_notification_log(plugin, plugin_context): log_message = "%s NOTIFICATION: %s;%s;%s;%s;%s" % ( what, contact, spec, state, plugin or "plain email", output) - if config.monitoring_core == "cmc": - livestatus_send_command("LOG;" + log_message.encode("utf-8")) - else: - # Nagios and friends do not support logging via an - # external command. We write the files into a help file - # in var/check_mk/notify. If the users likes he can - # replace that file with a symbolic link to the nagios - # log file. But note: Nagios logging might not atomic. - file(notification_core_log, "a").write("[%d] %s\n" % (time.time(), log_message.encode("utf-8"))) + livestatus_send_command("LOG;" + log_message.encode("utf-8"))

6 years, 11 months

notify.log: Refactored livestatus communication

by Lars Michelsen

Module: check_mk Branch: master Commit: 5d7b6f1b67b10d83877cc8a8e5cdad81c609d9e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d7b6f1b67b10d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 20 13:30:42 2017 +0200 notify.log: Refactored livestatus communication * Use standard livestatus python API * Marked helper function as private one Change-Id: I9587a2818550d4b61d100a83a1f5247414b7c362 --- cmk_base/notify.py | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/cmk_base/notify.py b/cmk_base/notify.py index dd7955b..5e697b0 100644 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -1742,20 +1742,6 @@ def substitute_context(template, context): # | Some generic helper functions | # '----------------------------------------------------------------------' -def livestatus_send_command(command): - try: - message = "COMMAND [%d] %s\n" % (time.time(), command) - sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - sock.connect(cmk.paths.livestatus_unix_socket) - sock.send(message) - sock.close() - except Exception, e: - if cmk.debug.enabled(): - raise - notify_log("WARNING: cannot send livestatus command: %s" % e) - notify_log("Command was: %s" % command) - - def format_exception(): import traceback, StringIO, sys txt = StringIO.StringIO() @@ -1809,4 +1795,14 @@ def core_notification_log(plugin, plugin_context): log_message = "%s NOTIFICATION: %s;%s;%s;%s;%s" % ( what, contact, spec, state, plugin or "plain email", output) - livestatus_send_command("LOG;" + log_message.encode("utf-8")) + _send_livestatus_command("LOG;%s" % log_message) + + +def _send_livestatus_command(command): + try: + livestatus.LocalConnection().command("[%d] %s" % (time.time(), command.encode("utf-8"))) + except Exception, e: + if cmk.debug.enabled(): + raise + notify_log("WARNING: cannot send livestatus command: %s" % e) + notify_log("Command was: %s" % command)

6 years, 11 months

df.include: extract a function for trend computation

by Tom Baerwinkel

Module: check_mk Branch: master Commit: cd9a21c5eb67b7a653526dc27b98acf232cf4419 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd9a21c5eb67b7… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Oct 10 09:58:11 2017 +0200 df.include: extract a function for trend computation Change-Id: Ib1d7da1b70c54c1e97e54cc997059a6edfde8437 --- checks/df.include | 290 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 150 insertions(+), 140 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cd9a21c5eb…

6 years, 11 months

make-chroot: check for sudo environment

by Lars Michelsen

Module: check_mk Branch: master Commit: 10903724665cde140a73bb4cd8141a2dc1c74687 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10903724665cde… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 20 13:20:58 2017 +0200 make-chroot: check for sudo environment Change-Id: I33fba713b4cb3bae92ba4625191b1fa56a3060bc --- agents/windows/make-chroot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index dd95603..32b067f 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -17,6 +17,10 @@ if [ -z $CHROOT_PATH ]; then exit 1 fi +if [ -z $SUDO_USER ]; then + echo "ERROR: $0 must be executed with sudo" + exit 1 +fi cleanup_chroot() { PIDS=$(lsof -Fp $CHROOT_PATH 2>/dev/null | cut -dp -f2)

6 years, 11 months

← Newer
1
...
8
9
10
11
12
13
14
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2017