Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: 01cdef18a6648420b7ddb7a5cb4b28c808574562 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01cdef18a66484… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 8 13:32:19 2017 +0100 Updated bug entries #3031 Change-Id: I98e8be364c92862902f4c63a9867aaf33155e713 --- .bugs/3031 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.bugs/3031 b/.bugs/3031 new file mode 100644 index 0000000..1b83785 --- /dev/null +++ b/.bugs/3031 @@ -0,0 +1,7 @@ +Title: Monitoring core on a slave site needs to restart when a mkp update installs new files +Component: core +State: open +Date: 2017-11-08 13:31:01 +Targetversion: 1.4.0 +Class: bug +

6 years, 10 months

Reserved 20 bug IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 401b875cb591f0ac962cd48c7894ffa6fe21c234 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=401b875cb591f0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 8 13:30:45 2017 +0100 Reserved 20 bug IDS Change-Id: I7362c0da4fa13e793f4a6be910362acccc727dd4 --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 91931d1..08022a4 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -3031 +3051

6 years, 10 months

5353 FIX citrix_sessions: fixes a case where no session number was returned

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 336b0b70895ffc681a9ed6d43117e7f12eff99de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=336b0b70895ffc… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Nov 8 09:42:16 2017 +0100 5353 FIX citrix_sessions: fixes a case where no session number was returned In some circumstances citrix_sessions did not return values for XenServers. This werk fixes this problem in the citrix_xenapp PowerShell script so that always a valid session number is returned. Change-Id: I5bfa63026504562e4c86ecbae8e9d685379423bd --- .werks/5353 | 13 +++++++++++++ agents/windows/plugins/citrix_xenapp.ps1 | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/5353 b/.werks/5353 new file mode 100644 index 0000000..478d447 --- /dev/null +++ b/.werks/5353 @@ -0,0 +1,13 @@ +Title: citrix_sessions: fixes a case where no session number was returned +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1510130037 +Class: fix + +In some circumstances citrix_sessions did not return values for +XenServers. This werk fixes this problem in the citrix_xenapp +PowerShell script so that always a valid session number is +returned. diff --git a/agents/windows/plugins/citrix_xenapp.ps1 b/agents/windows/plugins/citrix_xenapp.ps1 index f915d64..7de1f68 100644 --- a/agents/windows/plugins/citrix_xenapp.ps1 +++ b/agents/windows/plugins/citrix_xenapp.ps1 @@ -6,10 +6,10 @@ $load = Get-XAServerLoad -ServerName $env:computername | Select-Object -ExpandPr $load ### Citrix XenApp Sessions -$disc = (Get-XASession -ServerName $env:computername |Where {$_.State -eq "Disconnected" }).count -$activ = (Get-XASession -ServerName $env:computername |Where {$_.State -eq "Active" }).count +$disc = @(Get-XASession -ServerName $env:computername |Where {$_.State -eq "Disconnected" }).count +$activ = @(Get-XASession -ServerName $env:computername |Where {$_.State -eq "Active" }).count $all = ($disc + $activ) "<<<citrix_sessions>>>" "sessions {0}" -f $all "active_sessions {0}" -f $activ -"inactive_sessions {0}" -f $disc \ No newline at end of file +"inactive_sessions {0}" -f $disc

6 years, 10 months

Refactored SNMP cache file handling: stores oid info and data each in one file per host

by Simon Betz

Module: check_mk Branch: master Commit: e4e6bae2f7444ab8c585d0c084b468d5e243db30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4e6bae2f7444a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 19 16:49:19 2017 +0200 Refactored SNMP cache file handling: stores oid info and data each in one file per host Change-Id: Iabdb456d998f21b0d702381789acbc289a672c33 --- checks/logwatch | 2 +- cmk_base/agent_data.py | 30 ++++----- cmk_base/automations/check_mk.py | 6 +- cmk_base/checking.py | 3 + cmk_base/crash_reporting.py | 4 +- cmk_base/discovery.py | 62 ++++++++----------- cmk_base/inventory.py | 3 + cmk_base/snmp.py | 129 ++++++++++++++++++++++++++++----------- lib/paths.py | 4 ++ lib/store.py | 1 + 10 files changed, 150 insertions(+), 94 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e4e6bae2f7…

6 years, 10 months

5196 FIX Bumped Livestatus stack size to give regex matching more breathing room.

by Sven Panne

Module: check_mk Branch: master Commit: 97d128b93188f4b528662327a385ed9f856e10b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97d128b93188f4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 8 09:27:19 2017 +0100 5196 FIX Bumped Livestatus stack size to give regex matching more breathing room. The current implementation of regular expression matching can use a non-trivial amount of memory (mainly stack), and our previous memory limit was a bit tight. This has been improved, so regular expression matching should work more reliably. Note that this increases the overall amount of memory allocated for Check_MK, but for normal installations the increase should be negligible. Change-Id: Iff55bc95ba8a316174a4830a68939b5a16be04df --- .werks/5196 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.werks/5196 b/.werks/5196 new file mode 100644 index 0000000..645d68f --- /dev/null +++ b/.werks/5196 @@ -0,0 +1,17 @@ +Title: Bumped Livestatus stack size to give regex matching more breathing room. +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1510129352 +Class: fix + +The current implementation of regular expression matching can use a +non-trivial amount of memory (mainly stack), and our previous memory limit +was a bit tight. This has been improved, so regular expression matching +should work more reliably. + +Note that this increases the overall amount of memory allocated for +Check_MK, but for normal installations the increase should be negligible. +

6 years, 10 months

df: Rudimentary test for discovery

by Konstantin Büttner

Module: check_mk Branch: master Commit: 7a2f088b80a20367bfae7a62ee9eb40dbe255b5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a2f088b80a203… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Nov 7 14:04:05 2017 +0100 df: Rudimentary test for discovery Change-Id: I40a50491a8a09088ee7dbd66a7bb60c58686db6f --- tests/checks/test_df.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/checks/test_df.py b/tests/checks/test_df.py new file mode 100644 index 0000000..10386e5 --- /dev/null +++ b/tests/checks/test_df.py @@ -0,0 +1,11 @@ +import pytest + +pytestmark = pytest.mark.check + +(a)pytest.mark.parametrize("info,result", [ + ([], []) +]) +def test_df_discovery_with_parse(check_manager, info, result): + check = check_manager.get_check("df") + assert check.run_discovery(check.run_parse(info)) == result +

6 years, 10 months

shellcheck: Changed output

by Lars Michelsen

Module: check_mk Branch: master Commit: a9660a60679af9bd7863720d38d1f2b1fc526677 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9660a60679af9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 7 13:10:56 2017 +0100 shellcheck: Changed output Change-Id: I6458282982505475c932a61fc2ef9b8f8e692a2a --- tests/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 87a546e..671f257 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -52,11 +52,11 @@ test-shellcheck: shellcheck \ $(OUTPUT_ARGS) \ $$(grep -l '^#!/.*sh' $$CMK_DIR/agents/* $$CMK_DIR/agents/plugins/* $$CMK_DIR/agents/special/* 2>/dev/null) \ - "$$ENTERPRISE_DIR/agents/mk-remote-alert-handler" | tee $$REDIRECT + "$$ENTERPRISE_DIR/agents/mk-remote-alert-handler" test-shellcheck-ci: - OUTPUT_ARGS="-f checkstyle" \ + OUTPUT_ARGS="-f gcc" \ REDIRECT="$$WORKDIR/results.xml" \ $(MAKE) test-shellcheck || true

6 years, 10 months

Add some static code checking for shell scripts (agents / plugins)

by Lars Michelsen

Module: check_mk Branch: master Commit: e7a8d5baaf322368d079acd3c91467edf16d985e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7a8d5baaf3223… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 7 13:05:42 2017 +0100 Add some static code checking for shell scripts (agents / plugins) Change-Id: I65a6044723e99df223772caf4ff97b1fc4359e6c --- tests/Makefile | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index ae97b53..87a546e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,12 +1,14 @@ SHELL=/bin/bash -e help: - @echo "test - Run integration and git tests" - @echo "test-pylint - Run pylint based tests" - @echo "test-pylint-ci - Run pylint based tests within Jenkins" - @echo "test-bandit - Run bandit (security) tests" - @echo "test-bandit-ci - Run bandit (security) tests within Jenkins" - @echo "setup - Install dependencies" + @echo "test - Run integration and git tests" + @echo "test-pylint - Run pylint based tests" + @echo "test-pylint-ci - Run pylint based tests from Jenkins" + @echo "test-bandit - Run bandit (security) tests" + @echo "test-bandit-ci - Run bandit (security) tests from Jenkins" + @echo "test-shellcheck - Run shellcheck tests" + @echo "test-shellcheck-ci - Run shellcheck tests from Jenkins" + @echo "setup - Install dependencies" test: py.test @@ -44,10 +46,27 @@ test-bandit-ci: $(MAKE) test-bandit || true +test-shellcheck: + @CMK_DIR="$(realpath ..)" ; \ + ENTERPRISE_DIR="$(realpath ../enterprise)" ; \ + shellcheck \ + $(OUTPUT_ARGS) \ + $$(grep -l '^#!/.*sh' $$CMK_DIR/agents/* $$CMK_DIR/agents/plugins/* $$CMK_DIR/agents/special/* 2>/dev/null) \ + "$$ENTERPRISE_DIR/agents/mk-remote-alert-handler" | tee $$REDIRECT + + +test-shellcheck-ci: + OUTPUT_ARGS="-f checkstyle" \ + REDIRECT="$$WORKDIR/results.xml" \ + $(MAKE) test-shellcheck || true + + + setup: sudo apt-get install \ python-pip \ chrpath + cabal-install sudo pip install --upgrade pip sudo pip install --upgrade --ignore-installed -r requirements.txt $(MAKE) -C pylint setup

6 years, 10 months

Windows agent: fix memory leaks at from_string

by Jukka Aro

Module: check_mk Branch: master Commit: b3cdb8bb1de08328784956c326a56ea6238ca165 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3cdb8bb1de083… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Nov 3 14:41:25 2017 +0100 Windows agent: fix memory leaks at from_string When string conversion failed, heap-allocated objects were not deleted. Change-Id: I0d65731c33b5683596fc6ac57b94b3348a750766 --- agents/windows/build_version | 2 +- agents/windows/types.cc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 47efd9a..424f6c4 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2994 +2996 diff --git a/agents/windows/types.cc b/agents/windows/types.cc index 4fe4e5d..03d6219 100644 --- a/agents/windows/types.cc +++ b/agents/windows/types.cc @@ -88,6 +88,7 @@ mrpe_entry *from_string<mrpe_entry *>(const WinApiAdaptor &winapi, } if (command_line.empty()) { + delete result; throw StringConversionError( "Invalid command specification for mrpe:\r\n" "Format: SERVICEDESC COMMANDLINE"); @@ -96,6 +97,7 @@ mrpe_entry *from_string<mrpe_entry *>(const WinApiAdaptor &winapi, if (winapi.PathIsRelative(command_line.c_str())) { Environment *env = Environment::instance(); if (env == nullptr) { + delete result; throw StringConversionError("No environment"); } snprintf(result->command_line, sizeof(result->command_line), "%s\\%s", @@ -146,6 +148,7 @@ winperf_counter *from_string<winperf_counter *>(const WinApiAdaptor &winapi, result->id = PerfCounterObject::resolve_counter_name(winapi, base_id.c_str()); if (result->id == -1) { + delete result; throw StringConversionError( "No matching performance counter id found for " + value); }

6 years, 10 months

Moved group_patterns preparation out of loop

by Simon Betz

Module: check_mk Branch: master Commit: 7cb86acd7818d0b515941efa31e636a97e10935d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cb86acd7818d0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Nov 7 10:24:49 2017 +0100 Moved group_patterns preparation out of loop Change-Id: Ic85ce86844f043cbf60f03e3c6a085cfe74aa028 --- checks/if.include | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/checks/if.include b/checks/if.include index afbc61b..2331844 100644 --- a/checks/if.include +++ b/checks/if.include @@ -303,6 +303,8 @@ def inventory_if_common(info, has_nodeinfo = False): return True return False + group_patterns = _prepare_if_group_patterns_from_conf() + for settings in settings_sets: uses_description = settings.get('use_desc', if_inventory_uses_description) uses_alias = settings.get('use_alias', if_inventory_uses_alias) @@ -316,10 +318,7 @@ def inventory_if_common(info, has_nodeinfo = False): # Allow main check to set no port type (e.g. hitachi_hnas_fc_if) porttypes.append("") - pre_inventory_groups = [] - group_patterns = _prepare_if_group_patterns_from_conf() - local_seen = set() have_groups = {}

6 years, 10 months

← Newer
1
...
24
25
26
27
28
29
30
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017