Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 27fd503c17b3500690b2a53a26e3b5e8ce8a3917 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27fd503c17b350… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 17:00:42 2016 +0200 Removed test stuff --- modules/check_mk.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 174bc90..26a4b10 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -48,8 +48,6 @@ import inspect # These variable will be substituted at 'make dist' time check_mk_version = '(inofficial)' -LKAHFIA@H%@%A:O OHOH - # .--Prelude-------------------------------------------------------------. # | ____ _ _ | # | | _ \ _ __ ___| |_ _ __| | ___ |

8 years, 7 months

pylint: Fixed clearing pylint log file at start of build system run

by Lars Michelsen

Module: check_mk Branch: master Commit: 21a0251b54666290d1f78cef5958cf59721a66e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21a0251b546662… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 14:38:09 2016 +0200 pylint: Fixed clearing pylint log file at start of build system run --- pylint/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pylint/Makefile b/pylint/Makefile index 3aaacfd..b854e2c 100644 --- a/pylint/Makefile +++ b/pylint/Makefile @@ -26,7 +26,7 @@ build: export TERM="linux" ; \ export PYLINT_ARGS="--output-format=cmk_parseable" ; \ export PYLINT_OUTPUT="$$WORKDIR/pylint.log" ; \ - echo -n > pylint.log ; \ + echo -n > $$WORKDIR/pylint.log ; \ $(MAKE) all setup:

8 years, 7 months

Added check for up-to-date pylint version

by Lars Michelsen

Module: check_mk Branch: master Commit: b6caac944c843375e6e12e653ae8ec1bb4446348 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6caac944c8433… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 14:29:28 2016 +0200 Added check for up-to-date pylint version --- pylint/Makefile | 4 ++++ pylint/pylint_cmk.py | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/pylint/Makefile b/pylint/Makefile index e11f349..3aaacfd 100644 --- a/pylint/Makefile +++ b/pylint/Makefile @@ -6,6 +6,7 @@ help: @echo "misc - Check other files (mkeventd, active checks, agent plugins)" @echo @echo "build - Run all checks from build system" + @echo "setup - Install required tools" all: modules web checks misc @@ -27,3 +28,6 @@ build: export PYLINT_OUTPUT="$$WORKDIR/pylint.log" ; \ echo -n > pylint.log ; \ $(MAKE) all + +setup: + sudo pip install --upgrade pylint diff --git a/pylint/pylint_cmk.py b/pylint/pylint_cmk.py index 1ce6a07..d23f2ac 100644 --- a/pylint/pylint_cmk.py +++ b/pylint/pylint_cmk.py @@ -226,9 +226,17 @@ class CMKParseableTextReporter(CMKFixFileMixin, ParseableTextReporter): name = "cmk_parseable" +def verify_pylint_version(): + import pylint + if tuple(map(int, pylint.__version__.split("."))) < (1, 5, 5): + raise Exception("You need to use at least pylint 1.5.5. Run \"make setup\" in " + "pylint directory to get the current version.") + # Is called by pylint to load this plugin def register(linter): + verify_pylint_version() + sys.path = glob.glob("/omd/versions/default/lib/python/*.egg") \ + [ "/omd/versions/default/lib/python" ] \ + sys.path

8 years, 7 months

pylint: summarizing exit codes of pylint executions

by Lars Michelsen

Module: check_mk Branch: master Commit: 2916d8d3afc17063bc5facead0e0e51f232abb55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2916d8d3afc170… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 15:02:50 2016 +0200 pylint: summarizing exit codes of pylint executions --- modules/check_mk.py | 2 ++ pylint/Makefile | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 26a4b10..5e7504f 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -48,6 +48,8 @@ import inspect # These variable will be substituted at 'make dist' time check_mk_version = '(inofficial)' +IFAWHLOO%H*@R%@IQPRQ@ + # .--Prelude-------------------------------------------------------------. # | ____ _ _ | # | | _ \ _ __ ___| |_ _ __| | ___ | diff --git a/pylint/Makefile b/pylint/Makefile index b854e2c..b9954d9 100644 --- a/pylint/Makefile +++ b/pylint/Makefile @@ -8,19 +8,25 @@ help: @echo "build - Run all checks from build system" @echo "setup - Install required tools" -all: modules web checks misc +all: + EXIT_CODE=0 ; \ + $(MAKE) modules ; EXIT_CODE=$$(($$EXIT_CODE | $$?)) ; \ + $(MAKE) web ; EXIT_CODE=$$(($$EXIT_CODE | $$?)) ; \ + $(MAKE) checks ; EXIT_CODE=$$(($$EXIT_CODE | $$?)) ; \ + $(MAKE) misc ; EXIT_CODE=$$(($$EXIT_CODE | $$?)) ; \ + exit $$EXIT_CODE modules: - ./pylint-modules || true + ./pylint-modules web: - ./pylint-web || true + ./pylint-web checks: - ./pylint-checks || true + ./pylint-checks misc: - ./pylint-misc || true + ./pylint-misc build: export TERM="linux" ; \

8 years, 7 months

Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c8229741878da3f7e2f4512b923739a2c03fd61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c8229741878da… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 16:54:59 2016 +0200 Testcommit --- modules/check_mk.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 26a4b10..174bc90 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -48,6 +48,8 @@ import inspect # These variable will be substituted at 'make dist' time check_mk_version = '(inofficial)' +LKAHFIA@H%@%A:O OHOH + # .--Prelude-------------------------------------------------------------. # | ____ _ _ | # | | _ \ _ __ ___| |_ _ __| | ___ |

8 years, 7 months

Cleaned up debug code

by Lars Michelsen

Module: check_mk Branch: master Commit: 431b30c5256b1fa528ac481d1d35a6cbfce479d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=431b30c5256b1f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 15:15:55 2016 +0200 Cleaned up debug code --- modules/check_mk.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 5e7504f..26a4b10 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -48,8 +48,6 @@ import inspect # These variable will be substituted at 'make dist' time check_mk_version = '(inofficial)' -IFAWHLOO%H*@R%@IQPRQ@ - # .--Prelude-------------------------------------------------------------. # | ____ _ _ | # | | _ \ _ __ ___| |_ _ __| | ___ |

8 years, 7 months

3128 mem.win: graphs now display the available memory

by Sebastian Herbord

Module: check_mk Branch: master Commit: 62b92eca23c127ee4a43e4cfa861eb6027500916 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62b92eca23c127… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Apr 29 15:51:27 2016 +0200 3128 mem.win: graphs now display the available memory --- .werks/3128 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/.werks/3128 b/.werks/3128 new file mode 100644 index 0000000..0ad351b --- /dev/null +++ b/.werks/3128 @@ -0,0 +1,10 @@ +Title: mem.win: graphs now display the available memory +Level: 1 +Component: checks +Class: feature +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461937818 + + diff --git a/ChangeLog b/ChangeLog index 45b7b6f..b31bbdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ * 3524 fileinfo, fileinfo.groups: both checks are now cluster ready... * 3445 mssql_versions: With up-to-date agent plugin it is now writing out the used edition * 3446 mssql_version: Outputs info about cluster state and cluster name + * 3128 mem.win: graphs now display the available memory * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 3149b31..9a823aa 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5781,6 +5781,32 @@ graph_info.append({ }) graph_info.append({ + "title" : _("RAM used"), + "metrics" : [ + ("mem_used", "area"), + ], + "scalars" : [ + ("mem_used:max#000000", "Maximum"), + ("mem_used:warn", "Warning"), + ("mem_used:crit", "Critical"), + ], + "range" : (0, "mem_used:max"), +}) + +graph_info.append({ + "title" : _("Commit Charge"), + "metrics" : [ + ("pagefile_used", "area"), + ], + "scalars" : [ + ("pagefile_used:max#000000", "Maximum"), + ("pagefile_used:warn", "Warning"), + ("pagefile_used:crit", "Critical"), + ], + "range" : (0, "pagefile_used:max"), +}) + +graph_info.append({ "title" : _("Filesystem Writeback"), "metrics" : [ ("mem_lnx_dirty", "area"),

8 years, 7 months

3449 The host alias can now be used in BI aggregates

by Lars Michelsen

Module: check_mk Branch: master Commit: 81a5c71d0f5ae7aee67ca4ed8e965f4f696c1aa5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81a5c71d0f5ae7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 14:17:11 2016 +0200 3449 The host alias can now be used in BI aggregates When matching for hosts in BI aggregations it is now possible to match hosts with regular expressions by their host alias instead of the host name. Additionally it is now possible to use the host alias in the titles of the aggregations. Instead of using $1$ for matchin the host name or the host alias, you can now use the variables $HOSTNAME$ or $HOSTALIAS$ to use them in your BI rules. --- .werks/3449 | 16 +++ ChangeLog | 1 + web/htdocs/bi.py | 268 ++++++++++++++++++++++++++---------------------- web/plugins/wato/bi.py | 165 +++++++++++++++-------------- 4 files changed, 251 insertions(+), 199 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=81a5c71d0f…

8 years, 7 months

3430 FIX apc_inrow_temp: fixed wrong data handling if data is not available or incomplete

by Simon Betz

Module: check_mk Branch: master Commit: 7b7a5bfa499fa7beef068a957a201ae096a2835c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b7a5bfa499fa7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 29 12:00:21 2016 +0200 3430 FIX apc_inrow_temp: fixed wrong data handling if data is not available or incomplete --- .werks/3430 | 10 ++++++++++ ChangeLog | 1 + checks/apc_inrow_temp | 13 +++++++------ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.werks/3430 b/.werks/3430 new file mode 100644 index 0000000..d403339 --- /dev/null +++ b/.werks/3430 @@ -0,0 +1,10 @@ +Title: apc_inrow_temp: fixed wrong data handling if data is not available or incomplete +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461923920 + + diff --git a/ChangeLog b/ChangeLog index 7e42481..087f07a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -199,6 +199,7 @@ * 3444 FIX: mssql: Reworked agent plugin to use less WMI calls * 3525 FIX: Nagios Core: fixed bug, incomplete cleanup of process tree on service check timeout... * 3241 FIX: Fixed broken apt plugin + * 3430 FIX: apc_inrow_temp: fixed wrong data handling if data is not available or incomplete Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/apc_inrow_temp b/checks/apc_inrow_temp index 4ed7bb7..45bd65e 100644 --- a/checks/apc_inrow_temp +++ b/checks/apc_inrow_temp @@ -39,12 +39,13 @@ factory_settings["apc_inrow_temp_default_levels"] = { def parse_apc_inrow_temp(info): parsed = {} - for what, what_item in zip(info[0], - ["Rack Inlet", "Supply Air", "Return Air", - "Entering Fluid", "Leaving Fluid" - ]): - if what != "" or what != "-1": - parsed[what_item] = float(what) / 10 + if info: + for what, what_item in zip(info[0], + ["Rack Inlet", "Supply Air", "Return Air", + "Entering Fluid", "Leaving Fluid" + ]): + if what not in [ "", "-1" ]: + parsed.setdefault(what_item, float(what) / 10) return parsed

8 years, 7 months

Fixed pylint issues in agent plugins

by Lars Michelsen

Module: check_mk Branch: master Commit: 52e69842a7c38ddcd1072b34ba2aba534938f8b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52e69842a7c38d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 28 18:07:57 2016 +0200 Fixed pylint issues in agent plugins --- agents/plugins/mk_logwatch | 10 +++++++--- agents/plugins/plesk_backups | 2 ++ agents/plugins/plesk_domains | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 96f548f..5d949c8 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -111,20 +111,24 @@ def read_config(): config = [] for line in config_lines: - rewrite = False if line[0].isspace(): # pattern line if not have_filenames: raise Exception("Missing logfile names") + level, pattern = line.split(None, 1) + cont_list = [] # List of continuation patterns + rewrite_list = [] # List of rewrite patterns + if level == 'A': cont_list.append(parse_cont_pattern(pattern)) elif level == 'R': rewrite_list.append(pattern) else: level, compiled = parse_pattern(level, pattern, line) - cont_list = [] # List of continuation patterns - rewrite_list = [] # List of rewrite patterns + cont_list = [] + rewrite_list = [] patterns.append((level, compiled, cont_list, rewrite_list)) + else: # filename line patterns = [] config.append((parse_filenames(line), patterns)) diff --git a/agents/plugins/plesk_backups b/agents/plugins/plesk_backups index 9febfad..9da5a3b 100755 --- a/agents/plugins/plesk_backups +++ b/agents/plugins/plesk_backups @@ -34,6 +34,8 @@ import MySQLdb, sys, datetime, time, os from ftplib import FTP def connect(): + # Fix pylint issues in case MySQLdb is not present + # pylint: disable=no-member try: return MySQLdb.connect( host = 'localhost', diff --git a/agents/plugins/plesk_domains b/agents/plugins/plesk_domains index b862c74..4237bc7 100755 --- a/agents/plugins/plesk_domains +++ b/agents/plugins/plesk_domains @@ -40,7 +40,7 @@ try: passwd = file('/etc/psa/.psa.shadow').read().strip(), charset = 'utf8', ) -except MySQLdb.Error, e: +except MySQLdb.Error, e: # pylint: disable=no-member sys.stderr.write("MySQL-Error %d: %s\n" % (e.args[0], e.args[1])) sys.exit(1)

8 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016