Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

tests: make tests work in CI environment

by Lars Michelsen

Module: check_mk Branch: master Commit: f5de4c0c2b6d9627905e45adc53d4364a2200e93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5de4c0c2b6d96… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jul 30 14:50:03 2016 +0200 tests: make tests work in CI environment --- tests/livestatus/test_livestatus.py | 53 ++++++++++++++++++++++++++ tests/testlib/__init__.py | 72 ++++++++++++++++++++++++++++++++--- tests/web/test_login.py | 13 +++++-- 3 files changed, 129 insertions(+), 9 deletions(-) diff --git a/tests/livestatus/test_livestatus.py b/tests/livestatus/test_livestatus.py new file mode 100644 index 0000000..3d3cf1e6 --- /dev/null +++ b/tests/livestatus/test_livestatus.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python +# encoding: utf-8 + +import pytest +from testlib import site, web + +(a)pytest.fixture(scope="module") +def default_cfg(web): + try: + web.add_host("livestatus-test-host", attributes={ + "ipaddress": "127.0.0.1", + }) + + web.discover_services("livestatus-test-host") + + web.activate_changes() + finally: + web.delete_host("livestatus-test-host") + + +# Simply detects all tables by querying the columns table and then +# queries each of those tables without any columns and filters +def test_tables(default_cfg, site): + existing_tables = set([]) + + for row in site.live.query_table_assoc("GET columns\n"): + existing_tables.add(row["table"]) + + assert len(existing_tables) > 5 + + for table in existing_tables: + result = site.live.query("GET %s\n" % table) + assert type(result) == list + + +def test_host_table(default_cfg, site): + rows = site.live.query("GET hosts") + assert type(rows) == list + assert len(rows) >= 2 # header + min 1 host + + +def test_service_table(default_cfg, site): + rows = site.live.query("GET services\nFilter: host_name = livestatus-test-host\n" + "Columns: description\n") + assert type(rows) == list + assert len(rows) >= 20 # header + min 1 service + + descriptions = [ r[0] for r in rows ] + + assert "Check_MK" in descriptions + assert "Check_MK Discovery" in descriptions + assert "CPU load" in descriptions + assert "Memory" in descriptions diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 73bfc89..2f21681 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -2,11 +2,13 @@ # encoding: utf-8 import os +import pwd import time import pytest import platform import re import requests +import socket import pipes import subprocess import livestatus @@ -143,10 +145,22 @@ class Site(object): self.reuse = reuse self.url = "http://127.0.0.1/%s/check_mk/" % self.id + self._gather_livestatus_port() + + + @property + def livestatus_port(self): + if self._livestatus_port == None: + raise Exception("Livestatus TCP not opened yet") + return self._livestatus_port + @property def live(self): - return livestatus.SingleSiteConnection("unix:%s/tmp/run/live" % self.root) + live = livestatus.SingleSiteConnection("tcp:127.0.0.1:%d" % + self.livestatus_port) + live.set_timeout(2) + return live def execute(self, cmd, *args, **kwargs): @@ -197,7 +211,8 @@ class Site(object): def start(self): if not self.is_running(): assert omd(["start", self.id]) == 0 - assert self.is_running() == True + if not self.is_running(): + raise Exception("The site %s is not running completely after starting" % self.id) def exists(self): @@ -212,6 +227,52 @@ class Site(object): assert omd(["config", self.id, "set", key, val]) == 0 + def get_config(self, key): + p = self.execute(["omd", "config", "show", key], stdout=subprocess.PIPE) + return p.communicate()[0].strip() + + + def prepare_for_tests(self): + self.init_wato() + + + def init_wato(self): + web = WebSession(self) + web.login() + web.get(self.url + "wato.py") + assert os.path.exists(self.root + "/etc/check_mk/conf.d/wato/rules.mk"), \ + "Failed to initialize WATO data structures" + + + # This opens a currently free TCP port and remembers it in the object for later use + # Not free of races, but should be sufficient. + def open_livestatus_tcp(self): + if self.is_running(): + return + + self.set_config("LIVESTATUS_TCP", "on") + self.set_config("LIVESTATUS_TCP_PORT", str(self._livestatus_port)) + + + def _gather_livestatus_port(self): + if self.reuse and self.exists(): + port = int(self.get_config("LIVESTATUS_TCP_PORT")) + else: + port = 9123 + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + while sock.connect_ex(('127.0.0.1', port)) == 0: + port += 1 + + self._livestatus_port = port + + + # Problem: The group change only affects new sessions of the test_user + #def add_test_user_to_site_group(self): + # test_user = pwd.getpwuid(os.getuid())[0] + + # if os.system("sudo usermod -a -G %s %s" % (self.id, test_user)) >> 8 != 0: + # raise Exception("Failed to add test user \"%s\" to site group") + @pytest.fixture(scope="session") @@ -233,10 +294,9 @@ def site(request): edition=site_edition()) site.cleanup_if_wrong_version() site.create() + site.open_livestatus_tcp() site.start() - - # Hack: Make livestatus port read/writable for all to make tests possible without TCP ports - site.execute(["chmod", "0666", "%s/tmp/run/live" % site.root ]) + site.prepare_for_tests() def fin(): site.rm_if_not_reusing() @@ -367,6 +427,8 @@ class WebSession(requests.Session): secret_path = "%s/var/check_mk/web/cmkautomation/automation.secret" % self.site.root p = self.site.execute(["cat", secret_path], stdout=subprocess.PIPE) secret = p.communicate()[0].rstrip() + if secret == "": + raise Exception("Failed to read secret from %s" % secret_path) return { "_username" : "cmkautomation", diff --git a/tests/web/test_login.py b/tests/web/test_login.py index 5e03191..9804dee 100644 --- a/tests/web/test_login.py +++ b/tests/web/test_login.py @@ -2,11 +2,16 @@ # encoding: utf-8 import pytest -from testlib import site, web +from testlib import site, WebSession -# The web fixture of testlib is doing the login automatically. Check access to a page -# and then logout and check for disabled access. -def test_01_login_and_logout(site, web): +def test_01_login_and_logout(site): + web = WebSession(site) + + r = web.get(site.url + "wato.py") + assert "Global Settings" not in r.text + + web.login() + web.set_language("en") r = web.get(site.url + "wato.py") assert "Global Settings" in r.text

7 years, 12 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 5278edc84bc8de29fc9ff6164dc0cf1a261510f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5278edc84bc8de… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 29 16:18:05 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/CustomVarsDictColumn.cc | 2 +- livestatus/src/Renderer.cc | 48 ++++--- livestatus/src/Renderer.h | 214 ++++++++++++++++++-------------- livestatus/src/RendererBrokenCSV.cc | 12 +- livestatus/src/RendererBrokenCSV.h | 12 +- livestatus/src/RendererCSV.cc | 15 +-- livestatus/src/RendererCSV.h | 12 +- livestatus/src/RendererJSON.cc | 19 +-- livestatus/src/RendererJSON.h | 12 +- livestatus/src/RendererPython.cc | 19 +-- livestatus/src/RendererPython.h | 12 +- livestatus/src/RendererPython3.cc | 19 +-- livestatus/src/RendererPython3.h | 12 +- 13 files changed, 235 insertions(+), 173 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5278edc84b…

7 years, 12 months

Minor cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: 0666196e085bd13e182b0e45e8221748ea42563b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0666196e085bd1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 29 14:53:18 2016 +0200 Minor cleanup --- tests/testlib/__init__.py | 5 ++--- tests/web/test_login.py | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 5b1d9e9..73bfc89 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -364,9 +364,8 @@ class WebSession(requests.Session): # def _automation_credentials(self): - p = self.site.execute(["cat", "%s/var/check_mk/web/cmkautomation/automation.secret" % - self.site.root ], - stdout=subprocess.PIPE) + secret_path = "%s/var/check_mk/web/cmkautomation/automation.secret" % self.site.root + p = self.site.execute(["cat", secret_path], stdout=subprocess.PIPE) secret = p.communicate()[0].rstrip() return { diff --git a/tests/web/test_login.py b/tests/web/test_login.py index 5e1de88..5e03191 100644 --- a/tests/web/test_login.py +++ b/tests/web/test_login.py @@ -4,14 +4,12 @@ import pytest from testlib import site, web -# The web fixture of testlib is doing the login automatically -def test_01_login(site, web): +# The web fixture of testlib is doing the login automatically. Check access to a page +# and then logout and check for disabled access. +def test_01_login_and_logout(site, web): r = web.get(site.url + "wato.py") assert "Global Settings" in r.text - -def test_02_logout(site, web): web.logout() - r = web.get(site.url + "wato.py") assert "Global Settings" not in r.text

7 years, 12 months

Not using TCP for livestatus

by Lars Michelsen

Module: check_mk Branch: master Commit: f9c6e3407e6c73920a977fb81f2836f69372e025 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9c6e3407e6c73… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 29 14:39:35 2016 +0200 Not using TCP for livestatus --- tests/testlib/__init__.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 7eec516..5b1d9e9 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -146,7 +146,7 @@ class Site(object): @property def live(self): - return livestatus.SingleSiteConnection("tcp:127.0.0.1:9123") + return livestatus.SingleSiteConnection("unix:%s/tmp/run/live" % self.root) def execute(self, cmd, *args, **kwargs): @@ -197,7 +197,7 @@ class Site(object): def start(self): if not self.is_running(): assert omd(["start", self.id]) == 0 - assert self.is_running() + assert self.is_running() == True def exists(self): @@ -232,16 +232,12 @@ def site(request): site = Site(site_id=site_id(), version=site_version(), edition=site_edition()) site.cleanup_if_wrong_version() - - existed = site.exists() site.create() - - if not existed: - site.set_config("LIVESTATUS_TCP", "on") - site.set_config("LIVESTATUS_TCP_PORT", "9123") # Need multiple? Make it configurable! - site.start() + # Hack: Make livestatus port read/writable for all to make tests possible without TCP ports + site.execute(["chmod", "0666", "%s/tmp/run/live" % site.root ]) + def fin(): site.rm_if_not_reusing() request.addfinalizer(fin)

7 years, 12 months

tests: added helper functions to use the Web API and livestatus queries; Added basic tests for the WATO Web API

by Lars Michelsen

Module: check_mk Branch: master Commit: ad44d82d4fa4334923d546f38dd1561abde66a65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad44d82d4fa433… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 29 14:08:27 2016 +0200 tests: added helper functions to use the Web API and livestatus queries; Added basic tests for the WATO Web API --- tests/testlib/__init__.py | 115 ++++++++++++++++++++++++++++++++++++++++- tests/web/test_wato_webapi.py | 61 ++++++++++++++++++++-- 2 files changed, 170 insertions(+), 6 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 9bf649d..7eec516 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -9,6 +9,7 @@ import re import requests import pipes import subprocess +import livestatus try: import simplejson as json @@ -143,7 +144,14 @@ class Site(object): self.url = "http://127.0.0.1/%s/check_mk/" % self.id + @property + def live(self): + return livestatus.SingleSiteConnection("tcp:127.0.0.1:9123") + + def execute(self, cmd, *args, **kwargs): + assert type(cmd) == list, "The command must be given as list" + cmd = [ "sudo", "su", "-l", self.id, "-c", pipes.quote(" ".join([ pipes.quote(p) for p in cmd ])) ] cmd_txt = " ".join(cmd) @@ -200,6 +208,11 @@ class Site(object): return omd(["status", "--bare", self.id]) == 0 + def set_config(self, key, val): + assert omd(["config", self.id, "set", key, val]) == 0 + + + @pytest.fixture(scope="session") def site(request): @@ -219,7 +232,14 @@ def site(request): site = Site(site_id=site_id(), version=site_version(), edition=site_edition()) site.cleanup_if_wrong_version() + + existed = site.exists() site.create() + + if not existed: + site.set_config("LIVESTATUS_TCP", "on") + site.set_config("LIVESTATUS_TCP_PORT", "9123") # Need multiple? Make it configurable! + site.start() def fin(): @@ -347,7 +367,21 @@ class WebSession(requests.Session): # Web-API for managing hosts, services etc. # + def _automation_credentials(self): + p = self.site.execute(["cat", "%s/var/check_mk/web/cmkautomation/automation.secret" % + self.site.root ], + stdout=subprocess.PIPE) + secret = p.communicate()[0].rstrip() + + return { + "_username" : "cmkautomation", + "_secret" : secret, + } + + def _api_request(self, url, data): + data.update(self._automation_credentials()) + req = self.post(url, data) response = json.loads(req.text) @@ -361,11 +395,90 @@ class WebSession(requests.Session): result = self._api_request(self.url + "webapi.py?action=add_host", { "request": json.dumps({ "hostname" : hostname, + "folder" : folder, "attributes" : attributes or {}, }), }) - assert result["result"] == None + assert result == None + + host = self.get_host(hostname) + + assert host["hostname"] == hostname + assert host["path"] == "" + assert host["attributes"] == attributes + + + def get_host(self, hostname): + result = self._api_request(self.url + "webapi.py?action=get_host", { + "request": json.dumps({ + "hostname" : hostname, + }), + }) + + assert type(result) == dict + assert "hostname" in result + assert "path" in result + assert "attributes" in result + + return result + + + def get_all_hosts(self, effective_attributes=0): + result = self._api_request(self.url + "webapi.py?action=get_all_hosts", { + "request": json.dumps({ + "effective_attributes": effective_attributes, + }), + }) + + assert type(result) == dict + return result + + + def delete_host(self, hostname): + result = self._api_request(self.url + "webapi.py?action=delete_host", { + "request": json.dumps({ + "hostname" : hostname, + }), + }) + + assert result == None + + hosts = self.get_all_hosts(hostname) + assert hostname not in hosts + + + def discover_services(self, hostname, mode=None): + request = { + "hostname" : hostname, + } + + if mode != None: + request["mode"] = mode + + result = self._api_request(self.url + "webapi.py?action=discover_services", { + "request": json.dumps(request), + }) + + assert type(result) == unicode + assert result.startswith("Service discovery successful") + + + def activate_changes(self, mode=None, foreign_changes=None): + request = {} + + if mode != None: + request["mode"] = mode + + if foreign_changes != None: + request["foreign_changes"] = foreign_changes + + result = self._api_request(self.url + "webapi.py?action=activate_changes", { + "request": json.dumps(request), + }) + + assert result == None + @pytest.fixture(scope="module") diff --git a/tests/web/test_wato_webapi.py b/tests/web/test_wato_webapi.py index c49490f..207ad31 100644 --- a/tests/web/test_wato_webapi.py +++ b/tests/web/test_wato_webapi.py @@ -4,12 +4,63 @@ import pytest from testlib import site, web -def test_01_global_settings(site, web): +def test_global_settings(site, web): r = web.get(site.url + "wato.py") assert "Global Settings" in r.text -def test_02_add_host(web): - web.add_host("test-host", attributes={ - "ipaddress": "127.0.0.1", - }) +def test_add_host(web): + try: + # Also tests get_host + web.add_host("test-host", attributes={ + "ipaddress": "127.0.0.1", + }) + finally: + web.delete_host("test-host") + + +def test_get_all_hosts_basic(web): + try: + web.add_host("test-host-list", attributes={ + "ipaddress": "127.0.0.1", + }) + + hosts = web.get_all_hosts() + assert "test-host-list" in hosts + finally: + web.delete_host("test-host-list") + + +def test_delete_host(web): + try: + web.add_host("test-host-delete", attributes={ + "ipaddress": "127.0.0.1", + }) + finally: + web.delete_host("test-host-delete") + + +def test_discover_servics(web): + try: + web.add_host("test-host-discovery", attributes={ + "ipaddress": "127.0.0.1", + }) + + web.discover_services("test-host-discovery") + finally: + web.delete_host("test-host-discovery") + + +def test_activate_changes(web, site): + try: + web.add_host("test-host-activate", attributes={ + "ipaddress": "127.0.0.1", + }) + + web.activate_changes() + + result = site.live.query("GET hosts\nColumns: name\nFilter: name = test-host-activate\n") + assert result == [["test-host-activate"]] + finally: + web.delete_host("test-host-activate") + web.activate_changes()

7 years, 12 months

Fetched Livestatus from upstream plus associated fixes.

by Sven Panne

Module: check_mk Branch: master Commit: 860a43cbfeff6a659d10e3f10d887699e9ba8f83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=860a43cbfeff6a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 29 10:09:49 2016 +0200 Fetched Livestatus from upstream plus associated fixes. --- livestatus/src/Makefile.am | 2 + livestatus/src/Query.cc | 39 +++++++++------ livestatus/src/Query.h | 1 + livestatus/src/Renderer.cc | 11 ++++- livestatus/src/Renderer.h | 24 +-------- livestatus/src/RendererBrokenCSV.cc | 81 ++++++++++++++++++++++++++++++ livestatus/src/RendererBrokenCSV.h | 93 +++++++++++++++++++++++++++++++++++ livestatus/src/RendererCSV.cc | 19 +++---- livestatus/src/RendererCSV.h | 5 +- livestatus/src/RendererPython.cc | 2 +- livestatus/src/RendererPython3.cc | 86 ++++++++++++++++++++++++++++++++ livestatus/src/RendererPython3.h | 67 +++++++++++++++++++++++++ livestatus/src/StringUtils.cc | 1 - 13 files changed, 375 insertions(+), 56 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=860a43cbfe…

7 years, 12 months

Started adding test for API calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 5e7c71360f1d1f7211c6c04a53934cb9db73a143 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e7c71360f1d1f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 29 10:13:18 2016 +0200 Started adding test for API calls --- tests/testlib/__init__.py | 28 ++++++++++++++++++++++++++++ tests/web/test_wato_webapi.py | 15 +++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 3d9c599..9bf649d 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -10,6 +10,10 @@ import requests import pipes import subprocess +try: + import simplejson as json +except ImportError: + import json def repo_path(): return os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__)))) @@ -339,6 +343,30 @@ class WebSession(requests.Session): assert "action=\"login.py\"" in r.text + # + # Web-API for managing hosts, services etc. + # + + def _api_request(self, url, data): + req = self.post(url, data) + response = json.loads(req.text) + + assert response["result_code"] == 0, \ + "An error occured: %s" % response["result"] + + return response["result"] + + + def add_host(self, hostname, folder="/", attributes=None): + result = self._api_request(self.url + "webapi.py?action=add_host", { + "request": json.dumps({ + "hostname" : hostname, + "attributes" : attributes or {}, + }), + }) + + assert result["result"] == None + @pytest.fixture(scope="module") def web(site): diff --git a/tests/web/test_wato_webapi.py b/tests/web/test_wato_webapi.py new file mode 100644 index 0000000..c49490f --- /dev/null +++ b/tests/web/test_wato_webapi.py @@ -0,0 +1,15 @@ +#!/usr/bin/env python +# encoding: utf-8 + +import pytest +from testlib import site, web + +def test_01_global_settings(site, web): + r = web.get(site.url + "wato.py") + assert "Global Settings" in r.text + + +def test_02_add_host(web): + web.add_host("test-host", attributes={ + "ipaddress": "127.0.0.1", + })

7 years, 12 months

3728 Automatically creating automation user for Check_MK internal use with WATO default config

by Lars Michelsen

Module: check_mk Branch: master Commit: 45ec371fe2d1d86ffc94a5500d4319fa717645b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45ec371fe2d1d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 29 10:18:23 2016 +0200 3728 Automatically creating automation user for Check_MK internal use with WATO default config We are adding now a default automation user named <i>cmkautomation</i> to Check_MK with the WATO default configuration. This user will currently only be added to new sites, but may be added to existing sites in future, too. The user has the administrative role to be able to access all hosts and do all actions. The authentication secret is randomly created for each site. In distributed setups the authentication secret will be synchronized from the central site. The idea of this user is, that components of Check_MK can automatically authenticate with the Web GUI using an always existing user. This is currently not used, but may be used for the internal cron job, fetching of graphs and performing checks against the GUI. If you don't like this user, you are free to disable or delete it. But this may lead to issues in future when we start using the user for internal things. --- .werks/3728 | 22 ++++++++++++++++++++++ ChangeLog | 1 + web/htdocs/userdb.py | 21 ++++++++++++++++++++- web/htdocs/wato.py | 2 ++ 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/.werks/3728 b/.werks/3728 new file mode 100644 index 0000000..0cd165b --- /dev/null +++ b/.werks/3728 @@ -0,0 +1,22 @@ +Title: Automatically creating automation user for Check_MK internal use with WATO default config +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i1 +Date: 1469780006 +Class: feature + +We are adding now a default automation user named <i>cmkautomation</i> to Check_MK with the +WATO default configuration. This user will currently only be added to new sites, but may be +added to existing sites in future, too. + +The user has the administrative role to be able to access all hosts and do all actions. The +authentication secret is randomly created for each site. In distributed setups the authentication +secret will be synchronized from the central site. + +The idea of this user is, that components of Check_MK can automatically authenticate with +the Web GUI using an always existing user. This is currently not used, but may be used for +the internal cron job, fetching of graphs and performing checks against the GUI. + +If you don't like this user, you are free to disable or delete it. But this may lead to issues +in future when we start using the user for internal things. diff --git a/ChangeLog b/ChangeLog index ef2e826..9646aaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -432,6 +432,7 @@ * 3154 added ability to retrieve passwords for active checks from a password store * 3667 Search expressions in host search can now be given as regexes... * 3724 Password input fields: Added note about plain text storing (if done so) + * 3728 Automatically creating automation user for Check_MK internal use with WATO default config... * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index f81b872..043df3c 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -836,7 +836,26 @@ def save_users(profiles): def rewrite_users(): - users = load_users(lock = True) + users = load_users(lock=True) + save_users(users) + + +def create_cmk_automation_user(): + secret = gen_id() + + users = load_users(lock=True) + users["cmkautomation"] = { + 'alias' : u'Check_MK internal - Used for site local authentication', + 'contactgroups' : [], + 'automation_secret' : secret, + 'password' : encrypt_password(secret), + 'roles' : ['admin'], + 'locked' : False, + 'serial' : 0, + 'email' : '', + 'pager' : '', + 'notifications_enabled' : False, + } save_users(users) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d3c2b44..feb30a3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14293,6 +14293,8 @@ def create_sample_config(): save_mkeventd_sample_config() + userdb.create_cmk_automation_user() + def has_agent_bakery(): return 'bake_agents' in globals()

7 years, 12 months

3727 FIX fc_port: Fixed broken interpretation of counter values leading to wrong measurements

by Lars Michelsen

Module: check_mk Branch: master Commit: 19ded57967c427fcb2e101502a5e23c1bfa849a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19ded57967c427… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 29 09:47:10 2016 +0200 3727 FIX fc_port: Fixed broken interpretation of counter values leading to wrong measurements --- .werks/3727 | 10 ++++++++++ ChangeLog | 1 + checks/fc_port | 20 +++++++++----------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.werks/3727 b/.werks/3727 new file mode 100644 index 0000000..c208919 --- /dev/null +++ b/.werks/3727 @@ -0,0 +1,10 @@ +Title: fc_port: Fixed broken interpretation of counter values leading to wrong measurements +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1469778404 + + diff --git a/ChangeLog b/ChangeLog index 5873df9..ef2e826 100644 --- a/ChangeLog +++ b/ChangeLog @@ -318,6 +318,7 @@ * 3556 FIX: agent_vsphere.pysphere: The ESX 4.1 compatible agent version no longer validates the ssl certificate * 3709 FIX: cisco_wlc, cisco_wlc_clients: fixed scan function and incomplete listing of interfaces * 3672 FIX: Agent sections cached by the agent could cause stale services... + * 3727 FIX: fc_port: Fixed broken interpretation of counter values leading to wrong measurements Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/fc_port b/checks/fc_port index 1cde4c6..5f747e8 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -91,9 +91,7 @@ def fc_parse_counter(value): # The counters are sent via SNMP as OCTETSTR, which is converted to # a byte string by Check_MKs SNMP code. The counters seem to be # 64 bit big endian values, which are converted to integers here - if len(value) == len("00 00 00 0C 8F 70 DD 74"): - value = "".join(map(chr, [ eval("0x" + v) for v in value.split() ])) - return binstring_to_int(value) + return binstring_to_int("".join(map(chr, value))) def inventory_fc_port(info): @@ -313,41 +311,41 @@ check_info["fc_port"] = { "1.10.1.17", # connUnitPortName # 5 "1.10.1.23", # connUnitPortHWSTate: # 6 # hardware detected state of the port - "4.5.1.4", # connUnitPortStatCountTxObjects: # 7 + BINARY("4.5.1.4"), # connUnitPortStatCountTxObjects: # 7 # The number of frames/packets/IOs/etc that have been transmitted # by this port. Note: A Fibre Channel frame starts with SOF and # ends with EOF. FC loop devices should not count frames passed # through. This value represents the sum total for all other Tx - "4.5.1.5", # connUnitPortStatCountRxObjects: # 8 + BINARY("4.5.1.5"), # connUnitPortStatCountRxObjects: # 8 # The number of frames/packets/IOs/etc that have been received # by this port. Note: A Fibre Channel frame starts with SOF and # ends with EOF. FC loop devices should not count frames passed # through. This value represents the sum total for all other Rx - "4.5.1.6", # connUnitPortStatCountTxElements: # 9 + BINARY("4.5.1.6"), # connUnitPortStatCountTxElements: # 9 # The number of octets or bytes that have been transmitted # by this port. One second periodic polling of the port. This # value is saved and compared with the next polled value to # compute net throughput. Note, for Fibre Channel, ordered # sets are not included in the count. - "4.5.1.7", # connUnitPortStatCountRxElements: # 10 + BINARY("4.5.1.7"), # connUnitPortStatCountRxElements: # 10 # The number of octets or bytes that have been received. # by this port. One second periodic polling of the port. This # value is saved and compared with the next polled value to # compute net throughput. Note, for Fibre Channel, ordered # sets are not included in the count. - "4.5.1.8", # connUnitPortStatCountBBCreditZero: # 11 + BINARY("4.5.1.8"), # connUnitPortStatCountBBCreditZero: # 11 # Count of transitions in/out of BBcredit zero state. # The other side is not providing any credit. - "4.5.1.28", # connUnitPortStatCountClass3Discards: # 12 + BINARY("4.5.1.28"), # connUnitPortStatCountClass3Discards: # 12 # Count of Class 3 Frames that were discarded upon reception # at this port. There is no FBSY or FRJT generated for Class 3 # Frames. They are simply discarded if they cannot be delivered. - "4.5.1.40", # connUnitPortStatCountInvalidCRC: # 13 + BINARY("4.5.1.40"), # connUnitPortStatCountInvalidCRC: # 13 # Count of frames received with invalid CRC. This count is # part of the Link Error Status Block (LESB). (FC-PH 29.8). Loop # ports should not count CRC errors passing through when # monitoring. - "4.5.1.50", # connUnitPortStatCountEncodingDisparityErrors: # 14 + BINARY("4.5.1.50"), # connUnitPortStatCountEncodingDisparityErrors: # 14 # Count of disparity errors received at this port. ]), }

7 years, 12 months

Fixed broken BINARY() in checks which lead to caching implicitly

by Lars Michelsen

Module: check_mk Branch: master Commit: a7f79de5c9a8432bc009489f93ce8dc023759765 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7f79de5c9a843… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 29 09:41:52 2016 +0200 Fixed broken BINARY() in checks which lead to caching implicitly --- modules/snmp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/snmp.py b/modules/snmp.py index 9df943b..7c49ede 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -412,7 +412,7 @@ def check_snmp_fixed(item, targetvalue, info): def is_snmpwalk_cachable(column): - return type(column) == tuple + return type(column) == tuple and column[0] == "cached" def get_cached_snmpwalk(hostname, fetchoid):

7 years, 12 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2016