Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

Windows agent: fix config host restriction comment

by Jukka Aro

Module: check_mk Branch: master Commit: b9cb3180cbe6f7199834cb5b56af3e6b6a38a993 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9cb3180cbe6f7… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Feb 15 16:03:10 2018 +0100 Windows agent: fix config host restriction comment Use the correct entry 'host' instead of 'only_on'. --- agents/windows/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/Configuration.h b/agents/windows/Configuration.h index 34f2a9e..edccb02 100644 --- a/agents/windows/Configuration.h +++ b/agents/windows/Configuration.h @@ -36,7 +36,7 @@ class Environment; [global] # Process this logfile only on the following hosts -only_on = zhamzr12 +host = zhamzr12 # Restrict access to certain IP addresses only_from = 127.0.0.1 192.168.56.0/24

6 years, 4 months

Windows agent: add unit tests for readConfigFile

by Jukka Aro

Module: check_mk Branch: master Commit: 193d1f8f00677aab5f5c90844adcf07ddcae8313 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=193d1f8f00677a… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Feb 16 14:33:42 2018 +0100 Windows agent: add unit tests for readConfigFile --- agents/windows/Makefile.am | 1 + agents/windows/test/ConfigurationTest.cc | 331 +++++++++++++++++++++++++++++++ 2 files changed, 332 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=193d1f8f00…

6 years, 4 months

Windows agent: extract simpleini in chroot

by Jukka Aro

Module: check_mk Branch: master Commit: c8630508abda11afc9442f4077acbcd89966bc8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8630508abda11… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Feb 16 15:28:38 2018 +0100 Windows agent: extract simpleini in chroot The simpleini library is necessary for building Windows agent. It is used for parsing ini files. --- agents/windows/chroot_version | 2 +- agents/windows/extract-simpleini | 27 +++++++++++++++++++++++++++ agents/windows/make-chroot | 3 +++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/agents/windows/chroot_version b/agents/windows/chroot_version index ec63514..f599e28 100644 --- a/agents/windows/chroot_version +++ b/agents/windows/chroot_version @@ -1 +1 @@ -9 +10 diff --git a/agents/windows/extract-simpleini b/agents/windows/extract-simpleini new file mode 100755 index 0000000..ee11a90 --- /dev/null +++ b/agents/windows/extract-simpleini @@ -0,0 +1,27 @@ +#!/bin/bash +# The script extracts the simpleini library necessary for building the Windows +# agent. + +set -e +sha1=2af65fc +[[ -z $CHROOT_BUILD_DIR ]] && exit 1 + +# Load the variables $archs and $common from build.sh: +. $CHROOT_BUILD_DIR/agents/windows/build.sh + +cd $CHROOT_BUILD_DIR/agents/windows +mkdir simpleini +cd simpleini +tar xzf /$CHROOT_BUILD_DIR/omd/packages/simpleini/simpleini-${sha1}.tar.gz +cd .. + +# 1) Copy the library contents to the shared mingw-w64 path. +# Actually, only the header is needed but the other stuff won't harm. +cp -r simpleini /usr/share/mingw-w64/include/ + +# 2) Link the shared simpleini path to 32 & 64 bit mingw-g++ default include paths: +for arch in 32 64 ; do + ln -sf ../../share/mingw-w64/include/simpleini /usr/${archs[$arch]}${common}/include/simpleini +done + +rm -rf simpleini diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index e7a5d15..1ee2e51 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -175,6 +175,9 @@ $SCRIPT_DIR/do-chroot 'dpkg --add-architecture i386 && apt-get update && apt-get # Build Google Test and Google Mock $SCRIPT_DIR/do-chroot "$CHROOT_BUILD_DIR/agents/windows/test/build-googletest" +# Extract necessary boost headers +$SCRIPT_DIR/do-chroot "$CHROOT_BUILD_DIR/agents/windows/extract-simpleini" + cp "$BASE/agents/windows/$VERSIONFILE" "$CHROOT_PATH/" echo "+ CLEANING UP"

6 years, 4 months

Win-agent: parse ini file with simpleini library

by Jukka Aro

Module: check_mk Branch: master Commit: 57fb1517debd6a69c1a9215bac5dfeea36829068 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57fb1517debd6a… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Feb 19 09:39:32 2018 +0100 Win-agent: parse ini file with simpleini library * Remember to sort keys and values back into load order as the order plays a role with e.g. config host restriction. * Drop line numbers from parse error messages as simpleini does not provide them. * Add more unit tests for readConfigFile: * print * invalid entry * failed to interpret --- agents/windows/Configuration.cc | 179 ++++++++++++++++++++----------- agents/windows/Configuration.h | 13 +-- agents/windows/Makefile.am | 2 +- agents/windows/build_version | 2 +- agents/windows/test/ConfigurationTest.cc | 110 +++++++++++++++++-- 5 files changed, 222 insertions(+), 84 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=57fb1517de…

6 years, 4 months

5855 FIX Updated NagVis to 1.9.5

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e3666a2afbe2bce4949cfbb8119fe28835ae33a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e3666a2afbe2b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 21 09:34:11 2018 +0100 5855 FIX Updated NagVis to 1.9.5 Change-Id: Iafa029f71ef5b3142cbe6b48df48ec17c30af125 --- .werks/5855 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/5855 b/.werks/5855 new file mode 100644 index 0000000..ca0e13e --- /dev/null +++ b/.werks/5855 @@ -0,0 +1,10 @@ +Title: Updated NagVis to 1.9.5 +Level: 1 +Component: packages +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519202037 +Class: fix + +

6 years, 4 months

Updated nagvis to 1.9.5

by Lars Michelsen

Module: check_mk Branch: master Commit: aaa5de98bee72deeda8cd425f1a46fa56c02c033 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aaa5de98bee72d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 21 09:33:55 2018 +0100 Updated nagvis to 1.9.5 Change-Id: Ibfaf20ef6271d7c50b5a046255a4f09d920e117d --- omd/packages/nagvis/Makefile | 2 +- omd/packages/nagvis/nagvis-1.9.4.tar.gz | Bin 1788604 -> 0 bytes omd/packages/nagvis/nagvis-1.9.5.tar.gz | Bin 0 -> 1788889 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/nagvis/Makefile b/omd/packages/nagvis/Makefile index 4a441dc..e9faa89 100644 --- a/omd/packages/nagvis/Makefile +++ b/omd/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.9.4 +VERSION = 1.9.5 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/omd/packages/nagvis/nagvis-1.9.4.tar.gz b/omd/packages/nagvis/nagvis-1.9.4.tar.gz deleted file mode 100644 index fc461a1..0000000 Binary files a/omd/packages/nagvis/nagvis-1.9.4.tar.gz and /dev/null differ diff --git a/omd/packages/nagvis/nagvis-1.9.5.tar.gz b/omd/packages/nagvis/nagvis-1.9.5.tar.gz new file mode 100644 index 0000000..01d4ed8 Binary files /dev/null and b/omd/packages/nagvis/nagvis-1.9.5.tar.gz differ

6 years, 4 months

Resetting check config variable structure before loading the checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 400e8af85dfa0bd4ca0044b32c8f01dd0862886c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=400e8af85dfa0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 15:22:18 2018 +0100 Resetting check config variable structure before loading the checks Change-Id: I1a47cd0f8cee18598f503539c8fd3ced82cec9e0 --- cmk_base/checks.py | 3 +++ tests/cmk_base/test_checks.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmk_base/checks.py b/cmk_base/checks.py index 12668b6..dcdda9e 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -103,6 +103,9 @@ def get_plugin_paths(*dirs): # If a check or check.include is both found in local/ and in the # normal structure, then only the file in local/ must be read! def load_checks(filelist): + # Initialize some data structures which are populated while loading the checks + _check_variables.clear() + loaded_files = set() check_variable_defaults = {} ignored_variable_types = [ type(lambda: None), type(os) ] diff --git a/tests/cmk_base/test_checks.py b/tests/cmk_base/test_checks.py index fca7e8d..731befa 100644 --- a/tests/cmk_base/test_checks.py +++ b/tests/cmk_base/test_checks.py @@ -206,7 +206,7 @@ check_info["test_check_2"] = { # Test whether or not factory settings and checkgroup parameters work -def test_test_check_factory_settings(request, test_cfg, site, web): +def test_check_factory_settings(request, test_cfg, site, web): test_check_path = "local/share/check_mk/checks/test_check_3" def cleanup():

6 years, 4 months

5853 FIX Fixed escaped HTML entities in view columns

by Lars Michelsen

Module: check_mk Branch: master Commit: 3d630be10c11344a14182c2cb61e920862992917 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d630be10c1134… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 14:26:25 2018 +0100 5853 FIX Fixed escaped HTML entities in view columns When creating a PDF report which contains a view element. The columns in this view could contain HTML escaped special characters like "&quot;". These signs are now displayed correctly in the PDF export. Change-Id: Icafe74d682d18daa979e9bb26c46e2dd48ed17fb --- .werks/5853 | 13 +++++++++++++ web/htdocs/htmllib.py | 7 +++++++ web/htdocs/views.py | 1 + 3 files changed, 21 insertions(+) diff --git a/.werks/5853 b/.werks/5853 new file mode 100644 index 0000000..e2c1aa6 --- /dev/null +++ b/.werks/5853 @@ -0,0 +1,13 @@ +Title: Fixed escaped HTML entities in view columns +Level: 1 +Component: reporting +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i4 +Date: 1519133099 + +When creating a PDF report which contains a view element. The columns +in this view could contain HTML escaped special characters like "&quot;". +These signs are now displayed correctly in the PDF export. diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index e114929..025b97a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -136,6 +136,13 @@ class Escaper(object): .replace(">", ">") + def unescape_attributes(self, value): + return value.replace("&", "&")\ + .replace(""", "\"")\ + .replace("<", "<")\ + .replace(">", ">") + + # render HTML text. # We only strip od some tags and allow some simple tags # such as <h1>, <b> or <i> to be part of the string. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 410c71a..cf1e5da 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -805,6 +805,7 @@ class Cell(object): else: txt = img_filename + txt = html.unescape_attributes(txt) txt = html.strip_tags(txt) return css_classes, txt

6 years, 4 months

Added pathlib2 and scandir packages.

by Sven Panne

Module: check_mk Branch: master Commit: abe0178e2fc11a20482b8720390d7bddaef38d57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abe0178e2fc11a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 20 15:17:38 2018 +0100 Added pathlib2 and scandir packages. Change-Id: I85c5c2070c4a99b19439592eb7a0b64f63a2b038 --- omd/packages/python-modules/Makefile | 2 ++ omd/packages/python-modules/src/pathlib2-2.3.0.tar.gz | Bin 0 -> 34291 bytes omd/packages/python-modules/src/scandir-1.7.tar.gz | Bin 0 -> 32812 bytes 3 files changed, 2 insertions(+) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 618a45f..67e3f94 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -112,6 +112,8 @@ MODULES += tinkerforge-2.1.15.tar.gz MODULES += paramiko-2.1.2.tar.gz MODULES += typing-3.6.4.tar.gz +MODULES += scandir-1.7.tar.gz +MODULES += pathlib2-2.3.0.tar.gz .PHONY: build check-freetds install skel clean diff --git a/omd/packages/python-modules/src/pathlib2-2.3.0.tar.gz b/omd/packages/python-modules/src/pathlib2-2.3.0.tar.gz new file mode 100644 index 0000000..06366cd Binary files /dev/null and b/omd/packages/python-modules/src/pathlib2-2.3.0.tar.gz differ diff --git a/omd/packages/python-modules/src/scandir-1.7.tar.gz b/omd/packages/python-modules/src/scandir-1.7.tar.gz new file mode 100644 index 0000000..e068774 Binary files /dev/null and b/omd/packages/python-modules/src/scandir-1.7.tar.gz differ

6 years, 4 months

Add management board tests involving the management board config ruleset

by Lars Michelsen

Module: check_mk Branch: master Commit: f8394eac725173c83f83eb28673d66190549c6af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8394eac725173… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 12:57:21 2018 +0100 Add management board tests involving the management board config ruleset Change-Id: I1c9d29706f9b2f640d7a5afd796d752f5cc79625 --- tests/cmk_base/test_mgmt_board.py | 100 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/tests/cmk_base/test_mgmt_board.py b/tests/cmk_base/test_mgmt_board.py index ee43b27..3d55a1d 100644 --- a/tests/cmk_base/test_mgmt_board.py +++ b/tests/cmk_base/test_mgmt_board.py @@ -144,3 +144,103 @@ def test_mgmt_inherit_protocol(web): assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" assert config.management_credentials_of("mgmt-host") == "FOLDER" + + +def test_mgmt_config_ruleset(web): + web.set_ruleset("management_board_config", { + "ruleset": { + "": [ # "" -> folder + { + 'conditions': { + 'host_specs': ['@all'], + 'host_tags': [] + }, + 'options': {}, + 'value': ("snmp", "RULESET"), + }, + ], + } + }) + + web.add_folder("folder1") + + web.add_host("mgmt-host", folder="folder1", attributes={ + "ipaddress": "127.0.0.1", + "management_protocol": "snmp", + }) + + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "RULESET" + + +def test_mgmt_config_ruleset_overidden_by_explicit_setting(web): + web.set_ruleset("management_board_config", { + "ruleset": { + "": [ # "" -> folder + { + 'conditions': { + 'host_specs': ['@all'], + 'host_tags': [] + }, + 'options': {}, + 'value': ("snmp", "RULESET"), + }, + ], + } + }) + + web.add_folder("folder1", attributes={ + "management_snmp_community": "FOLDER", + }) + + web.add_host("mgmt-host", folder="folder1", attributes={ + "ipaddress": "127.0.0.1", + "management_protocol": "snmp", + }) + + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "FOLDER" + + +def test_mgmt_config_ruleset_order(web): + web.set_ruleset("management_board_config", { + "ruleset": { + "": [ # "" -> folder + { + 'conditions': { + 'host_specs': ['@all'], + 'host_tags': [] + }, + 'options': {}, + 'value': ("snmp", "RULESET1"), + }, + { + 'conditions': { + 'host_specs': ['@all'], + 'host_tags': [] + }, + 'options': {}, + 'value': ("snmp", "RULESET2"), + }, + ], + } + }) + + web.add_folder("folder1") + + web.add_host("mgmt-host", folder="folder1", attributes={ + "ipaddress": "127.0.0.1", + "management_protocol": "snmp", + }) + + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "RULESET1"

6 years, 4 months

← Newer
1
...
6
7
8
9
10
11
12
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018