Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

by Florian Kromer

Module: check_mk Branch: master Commit: f006f1b8cc1637d255da156a31223907faf604ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f006f1b8cc1637… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon Jan 7 15:36:58 2019 +0100 Reserved 10 Werk IDS Change-Id: I5fd6946756ebaf3404d48c4b5e795be5661c204f --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 225a4ef..bd076fe 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7031 +7041

5 years, 5 months

Addition to #6829: mounts check now ignore squashfs aswell

by Lars Michelsen

Module: check_mk Branch: master Commit: d789edf94baea6da5dc1bb38074d03d4b92e66ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d789edf94baea6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jan 6 00:59:19 2019 +0100 Addition to #6829: mounts check now ignore squashfs aswell Change-Id: I333bae55bddca88ecc15e040896ecd5895c96d3f --- .werks/6829 | 6 ++++-- agents/check_mk_agent.linux | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.werks/6829 b/.werks/6829 index 50917ac..aeaae43 100644 --- a/.werks/6829 +++ b/.werks/6829 @@ -1,4 +1,4 @@ -Title: squashfs is a read-only filesystem and is therefore not monitored +Title: df mounts: Skip squashfs filesystems Level: 1 Component: checks Compatible: compat @@ -7,4 +7,6 @@ Version: 1.6.0i1 Date: 1539336597 Class: fix - +The filesystem squashfs is a read-only filesystem and is therefore not monitored. +This makes the df and mounts checks ignore e.g. the mounts that are created for +snaps in newer Ubuntu versions. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 13e9f56..4f81e61 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -427,7 +427,7 @@ fi # Check mount options. Filesystems may switch to 'ro' in case # of a read error. echo '<<<mounts>>>' -grep ^/dev < /proc/mounts +grep ^/dev < /proc/mounts | grep -v " squashfs " # processes including username, without kernel processes echo '<<<ps>>>'

5 years, 5 months

dell_powerconnect_temp: remove duplicate inventory function

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 9ebf77f1715a62d4fa9ab93393d39f650a63d230 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ebf77f1715a62… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Jan 7 10:03:07 2019 +0100 dell_powerconnect_temp: remove duplicate inventory function Change-Id: Id1e525e8de2f19541a40ae53fc8304e2c8752ef5 --- checks/dell_powerconnect_temp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/checks/dell_powerconnect_temp b/checks/dell_powerconnect_temp index 3606c98..d913109 100644 --- a/checks/dell_powerconnect_temp +++ b/checks/dell_powerconnect_temp @@ -36,11 +36,6 @@ factory_settings["dell_powerconnect_temp_default_values"] = { } -def inventory_dell_powerconnect_temp(checkname, info): - for _temp, _state in info: - return [("Ambient", {})] - - def parse_dell_powerconnect_temp(info): try: temp_str, dev_status = info[0]

5 years, 5 months

Added Response subclass for simplified cookie setting.

by Sven Panne

Module: check_mk Branch: master Commit: 99b45efd9626ff2031ef685126c7e84f65d92ed0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99b45efd9626ff… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jan 7 11:10:28 2019 +0100 Added Response subclass for simplified cookie setting. Change-Id: I430b33bafeb2d440de6e7876caf4d5a5fec065b1 --- cmk/gui/htmllib.py | 6 ++---- cmk/gui/http.py | 15 +++++++++++++++ cmk/gui/login.py | 14 +++----------- tests/unit/cmk/gui/conftest.py | 5 ++--- tests/unit/cmk/gui/old/classes.py | 5 ++--- tests/unit/cmk/gui/test_http.py | 17 ++++------------- web/app/index.wsgi | 6 +----- 7 files changed, 29 insertions(+), 39 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 9bc06f2..6d43700 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -1089,8 +1089,7 @@ class html(HTMLGenerator): # TODO: Make private self.mobile = bool(self.var("mobile")) # Persist the explicitly set state in a cookie to have it maintained through further requests - self.response.set_cookie( - "mobile", str(int(self.mobile)), secure=html.request.is_ssl_request, httponly=True) + self.response.set_http_cookie("mobile", str(int(self.mobile))) elif self.request.has_cookie("mobile"): self.mobile = self.request.cookie("mobile", "0") == "1" @@ -1552,8 +1551,7 @@ class html(HTMLGenerator): cookie_lang = self.request.cookie("language") if cookie_lang != lang: if lang is not None: - self.response.set_cookie( - "language", lang, secure=self.request.is_ssl_request, httponly=True) + self.response.set_http_cookie("language", lang) else: self.del_language_cookie() diff --git a/cmk/gui/http.py b/cmk/gui/http.py index d031099..0aafcad 100644 --- a/cmk/gui/http.py +++ b/cmk/gui/http.py @@ -30,6 +30,7 @@ import re import six import werkzeug.http +import werkzeug.wrappers import cmk.gui.log as log from cmk.gui.i18n import _ @@ -245,3 +246,17 @@ class Request(object): def uploaded_file(self, varname, default=None): return self.uploads.get(varname, default) + + +class Response(werkzeug.wrappers.Response): + # NOTE: Currently we rely on a *relavtive* Location header in redirects! + autocorrect_location_header = False + + def __init__(self, is_secure, *args, **kwargs): + super(Response, self).__init__(*args, **kwargs) + self._is_secure = is_secure + + def set_http_cookie(self, key, value, secure=None): + if secure is None: + secure = self._is_secure + super(Response, self).set_cookie(key, value, secure=secure, httponly=True) diff --git a/cmk/gui/login.py b/cmk/gui/login.py index b62321e..bc186f4 100644 --- a/cmk/gui/login.py +++ b/cmk/gui/login.py @@ -176,19 +176,11 @@ def create_auth_session(username): def set_auth_cookie(username): - html.response.set_cookie( - auth_cookie_name(), - auth_cookie_value(username), - secure=html.request.is_ssl_request, - httponly=True) + html.response.set_http_cookie(auth_cookie_name(), auth_cookie_value(username)) def set_session_cookie(username, session_id): - html.response.set_cookie( - session_cookie_name(), - session_cookie_value(username, session_id), - secure=html.request.is_ssl_request, - httponly=True) + html.response.set_http_cookie(session_cookie_name(), session_cookie_value(username, session_id)) def session_cookie_name(): @@ -538,7 +530,7 @@ def page_logout(): if not html.request.has_cookie('logout'): html.response.headers[ 'WWW-Authenticate'] = 'Basic realm="OMD Monitoring Site %s"' % config.omd_site() - html.response.set_cookie('logout', '1', secure=html.request.is_ssl_request) + html.response.set_http_cookie('logout', '1') raise FinalizeRequest(httplib.UNAUTHORIZED) else: html.response.delete_cookie('logout') diff --git a/tests/unit/cmk/gui/conftest.py b/tests/unit/cmk/gui/conftest.py index 80c6342..076e5ff 100644 --- a/tests/unit/cmk/gui/conftest.py +++ b/tests/unit/cmk/gui/conftest.py @@ -1,11 +1,10 @@ import pytest import _pytest from werkzeug.test import create_environ -from werkzeug.wrappers import Response import cmk.gui.config as config import cmk.gui.htmllib as htmllib -from cmk.gui.http import Request +from cmk.gui.http import Request, Response from cmk.gui.globals import html monkeypatch = _pytest.monkeypatch.MonkeyPatch() @@ -16,4 +15,4 @@ monkeypatch.setattr(config, "omd_site", lambda: "NO_SITE") def register_builtin_html(): """This fixture registers a global htmllib.html() instance just like the regular GUI""" environ = dict(create_environ(), REQUEST_URI='') - html.set_current(htmllib.html(Request(environ), Response())) + html.set_current(htmllib.html(Request(environ), Response(is_secure=False))) diff --git a/tests/unit/cmk/gui/old/classes.py b/tests/unit/cmk/gui/old/classes.py index 2d2fa72..84da527 100644 --- a/tests/unit/cmk/gui/old/classes.py +++ b/tests/unit/cmk/gui/old/classes.py @@ -3,16 +3,15 @@ # > py.test -s -k test_html_generator.py from werkzeug.test import create_environ -from werkzeug.wrappers import Response -from cmk.gui.http import Request +from cmk.gui.http import Request, Response import cmk.gui.htmllib as htmllib # A Class which can be used to simulate HTML generation in varios tests in tests/web/ class HTMLTester(htmllib.html): def __init__(self): environ = dict(create_environ(), REQUEST_URI='') - super(HTMLTester, self).__init__(Request(environ), Response()) + super(HTMLTester, self).__init__(Request(environ), Response(is_secure=False)) def context_button_test(obj, title, url, icon=None, hot=False, id_=None, bestof=None, hover_title=None, id_in_best=False): diff --git a/tests/unit/cmk/gui/test_http.py b/tests/unit/cmk/gui/test_http.py index 180bca0..c35858d 100644 --- a/tests/unit/cmk/gui/test_http.py +++ b/tests/unit/cmk/gui/test_http.py @@ -40,29 +40,20 @@ def test_request_processing(register_builtin_html): # html.parse_field_storage(["field1", "field2"], handle_uploads_as_file_obj = False) -def test_response_set_cookie(register_builtin_html): - html.response.set_cookie("auth_SITE", "user:123456:abcdefg", httponly=True) +def test_response_set_http_cookie(register_builtin_html): + html.response.set_http_cookie("auth_SITE", "user:123456:abcdefg") assert html.response.headers.getlist("Set-Cookie")[-1] == \ "auth_SITE=user:123456:abcdefg; HttpOnly; Path=/" -def test_response_set_cookie_secure(register_builtin_html, monkeypatch): - html.response.set_cookie("auth_SITE", "user:123456:abcdefg", secure=True, httponly=True) +def test_response_set_http_cookie_secure(register_builtin_html, monkeypatch): + html.response.set_http_cookie("auth_SITE", "user:123456:abcdefg", secure=True) assert html.response.headers.getlist("Set-Cookie")[-1] == \ "auth_SITE=user:123456:abcdefg; Secure; HttpOnly; Path=/" -def test_response_set_cookie_expires(register_builtin_html, monkeypatch): - monkeypatch.setattr(time, "time", lambda: 0) - - html.response.set_cookie("auth_SITE", "user:123456:abcdefg", expires=60, httponly=True) - - assert html.response.headers.getlist("Set-Cookie")[-1] == \ - "auth_SITE=user:123456:abcdefg; Expires=Thu, 01-Jan-1970 00:01:00 GMT; HttpOnly; Path=/" - - def test_response_del_cookie(register_builtin_html, monkeypatch): monkeypatch.setattr(time, "time", lambda: 0) diff --git a/web/app/index.wsgi b/web/app/index.wsgi index 7f1fb36..f09e1da 100644 --- a/web/app/index.wsgi +++ b/web/app/index.wsgi @@ -28,8 +28,6 @@ import httplib import os import traceback -import werkzeug.wrappers - import livestatus import cmk.utils.paths @@ -69,9 +67,7 @@ class Application(object): self._environ = environ self._start_response = start_response self._request = cmk.gui.http.Request(environ) - self._response = werkzeug.wrappers.Response() - # NOTE: Currently we rely on a *relavtive* Location header in redirects! - self._response.autocorrect_location_header = False + self._response = cmk.gui.http.Response(is_secure=self._request.is_ssl_request) # Create an object that contains all data about the request and # helper functions for creating valid HTML. Parse URI and

5 years, 5 months

7019 FIX NagVis: Updated to 1.9.11

by Lars Michelsen

Module: check_mk Branch: master Commit: e645e23bd3a3eab929683611b99400cefae7dc51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e645e23bd3a3ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 7 12:14:41 2019 +0100 7019 FIX NagVis: Updated to 1.9.11 Change-Id: I04ddc582db19c399804cd5cdb345fad0f279e93f --- .werks/7019 | 11 +++++++++++ omd/packages/nagvis/nagvis-1.9.10.tar.gz | Bin 1791966 -> 0 bytes omd/packages/nagvis/nagvis-1.9.11.tar.gz | Bin 0 -> 1792155 bytes omd/packages/nagvis/nagvis.make | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/7019 b/.werks/7019 new file mode 100644 index 0000000..6fae2af --- /dev/null +++ b/.werks/7019 @@ -0,0 +1,11 @@ +Title: NagVis: Updated to 1.9.11 +Level: 1 +Component: packages +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1546859627 + + diff --git a/omd/packages/nagvis/nagvis-1.9.10.tar.gz b/omd/packages/nagvis/nagvis-1.9.10.tar.gz deleted file mode 100644 index 6cf44ce..0000000 Binary files a/omd/packages/nagvis/nagvis-1.9.10.tar.gz and /dev/null differ diff --git a/omd/packages/nagvis/nagvis-1.9.11.tar.gz b/omd/packages/nagvis/nagvis-1.9.11.tar.gz new file mode 100644 index 0000000..ddd7b70 Binary files /dev/null and b/omd/packages/nagvis/nagvis-1.9.11.tar.gz differ diff --git a/omd/packages/nagvis/nagvis.make b/omd/packages/nagvis/nagvis.make index c0714d9..fd0fa1e 100644 --- a/omd/packages/nagvis/nagvis.make +++ b/omd/packages/nagvis/nagvis.make @@ -1,5 +1,5 @@ NAGVIS = nagvis -NAGVIS_VERS = 1.9.10 +NAGVIS_VERS = 1.9.11 NAGVIS_DIR = $(NAGVIS)-$(NAGVIS_VERS) NAGVIS_BUILD := $(BUILD_HELPER_DIR)/$(NAGVIS_DIR)-build

5 years, 5 months

Fixed NagVis administration after introducing CSP

by Lars Michelsen

Module: check_mk Branch: master Commit: 470c98da31f317c073f714aac84c63cbff1a3e39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=470c98da31f317… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 7 11:50:50 2019 +0100 Fixed NagVis administration after introducing CSP Change-Id: I5e44efd3d79b805d00c91fe141896ab194be455b --- omd/packages/apache-omd/skel/etc/apache/conf.d/security.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/omd/packages/apache-omd/skel/etc/apache/conf.d/security.conf b/omd/packages/apache-omd/skel/etc/apache/conf.d/security.conf index 01e185a..8f1d5c1 100644 --- a/omd/packages/apache-omd/skel/etc/apache/conf.d/security.conf +++ b/omd/packages/apache-omd/skel/etc/apache/conf.d/security.conf @@ -29,7 +29,8 @@ Header always append Content-Security-Policy "base-uri 'self'" # Form submissions are limited to current scheme/url/port - Header always append Content-Security-Policy "form-action 'self'" + # "javascript: 'unsafe-inline'" have been added for NagVis (Options > ... forms) + Header always append Content-Security-Policy "form-action 'self' javascript: 'unsafe-inline'" # Disallow plugins like flash or java Header always append Content-Security-Policy "object-src 'none'"

5 years, 5 months

agent_aws: Fixed wrong data type

by Simon Betz

Module: check_mk Branch: master Commit: 1c07ad139fd4fd1931e5767a90893612be394a58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c07ad139fd4fd… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 7 11:09:43 2019 +0100 agent_aws: Fixed wrong data type Change-Id: I21e0feb365c803b5ea04053079c40771ec2c0008 --- agents/special/agent_aws | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 0ba90ec..d6b66f8 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -580,14 +580,14 @@ class EBSSummary(AWSSection): volumes = {r['VolumeId']: r for r in response['Volumes']} except KeyError, e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) - volumes = [] + volumes = {} response = self._client.describe_volume_status() try: volume_states = {r['VolumeId']: r for r in response['VolumeStatuses']} except KeyError, e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) - volume_states = [] + volume_states = {} raw_result = [] for volume_id in set(volumes.keys()).union(set(volume_states.keys())):

5 years, 5 months

omd: Fixed autostart check during "omd start" as root

by Lars Michelsen

Module: check_mk Branch: master Commit: c83bc4a23210ee91d800ad255b47b6063de50a59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c83bc4a23210ee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jan 5 12:33:01 2019 +0100 omd: Fixed autostart check during "omd start" as root Change-Id: I4251c69f17b357fea326f9ee05025dfdba11ff84 --- omd/packages/omd/omdlib/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/omd/packages/omd/omdlib/main.py b/omd/packages/omd/omdlib/main.py index 105fd66..02dddaf 100644 --- a/omd/packages/omd/omdlib/main.py +++ b/omd/packages/omd/omdlib/main.py @@ -3339,6 +3339,8 @@ def main_init_action(site, command, args, options=None): if site.is_disabled(): continue + site.load_config() + # Handle non autostart sites if command in [ "start", "restart", "reload" ] or \ ( "auto" in options and command == "status" ):

5 years, 5 months

Fixed sidebar reload flag not being reset on WATO sites after a site modification

by Lars Michelsen

Module: check_mk Branch: master Commit: 50710a488a5911ccdd1022bf89d38101e53f39f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50710a488a5911… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jan 5 13:03:38 2019 +0100 Fixed sidebar reload flag not being reset on WATO sites after a site modification Change-Id: Icbed8d763ec6e5b58269d38512e2d8ba0c9e770d --- cmk/gui/watolib.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index 4fedbee..2697e23 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -467,6 +467,7 @@ def init_watolib_datastructures(): if config.wato_use_git: prepare_git_commit() + reset_need_sidebar_reload() update_config_based_host_attributes() @@ -10497,16 +10498,22 @@ def validate_all_hosts(hostnames, force_all=False): return {} +# TODO: Cleanup this global state g_need_sidebar_reload = None +def reset_need_sidebar_reload(): + global g_need_sidebar_reload + g_need_sidebar_reload = None + + def need_sidebar_reload(): global g_need_sidebar_reload - g_need_sidebar_reload = id(html) + g_need_sidebar_reload = True def is_sidebar_reload_needed(): - return g_need_sidebar_reload == id(html) + return g_need_sidebar_reload def folder_preserving_link(add_vars):

5 years, 5 months

Fix missed pick from 7dafc031e04

by Lars Michelsen

Module: check_mk Branch: master Commit: ce70b15b98446f4f03ae3b835a146bf9b6c62c7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce70b15b98446f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 28 21:08:37 2018 +0100 Fix missed pick from 7dafc031e04 Change-Id: Ide6a1db757cae0daa7ec5e922eed86a81975b67c --- cmk/gui/watolib.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index d41909e..4fedbee 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -69,6 +69,7 @@ import requests from pathlib2 import Path import six +import cmk import cmk.utils.daemon as daemon import cmk.utils.paths import cmk.utils.defines @@ -4592,7 +4593,8 @@ def do_site_login(site_id, name, password): '_login': '1', '_username': name, '_password': password, - '_origtarget': 'automation_login.py', + '_origtarget': 'automation_login.py?_version=%s&_edition_short=%s' % (cmk.__version__, + cmk.edition_short()), '_plain_error': '1', } response = get_url(

5 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019