Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65204 discussions

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: cdff7fa5771bda16dd4a417241f1ecb4f039194b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdff7fa5771bda… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 14:35:23 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: FIX: correctly quote ! and \ in active checks for Nagios

by Mathias Kettner

Module: check_mk Branch: master Commit: 7572e5a666e3026311c499e68581025d65668cbf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7572e5a666e302… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 9 14:17:06 2013 +0200 FIX: correctly quote ! and \ in active checks for Nagios Conflicts: ChangeLog --- ChangeLog | 4 ++++ modules/check_mk_base.py | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7deb2c..6e7c1c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,10 @@ * Configuration of an alternativ host check command * Inventory: Display link symbol for ps ruleset +1.2.2p1: + Core: + * FIX: correctly quote ! and \ in active checks for Nagios + 1.2.2: Core: * Added $HOSTURL$ and $SERVICEURL$ to notification macros which contain an diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 46a7b57..46b61f7 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1449,9 +1449,10 @@ def get_age_human_readable(secs): return "%d days" % days # Quote string for use as arguments on the shell (for usage -# in command definitions as $ARG1$) +# in command definitions as $ARG1$). Please note that also +# quoting for ! and \ vor Nagios itself takes place here. def quote_shell_string(s): - return "'" + s.replace("'", "'\"'\"'") + "'" + return "'" + s.replace('\\', '\\\\').replace("'", "'\"'\"'").replace('!', '\\!') + "'" # Check if a timeperiod is currently active. We have no other way than

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: f485b4e668c0242bb30e8b0c894e3a9634e3bc07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f485b4e668c024… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 09:52:35 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Hosttags and auxiliary tags can now be grouped in topics

by Lars Michelsen

Module: check_mk Branch: master Commit: ea9dd09754035c6f814ab234731b34636b6482ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea9dd09754035c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 09:52:26 2013 +0200 Hosttags and auxiliary tags can now be grouped in topics --- ChangeLog | 1 + web/htdocs/wato.css | 4 + web/htdocs/wato.py | 160 +++++++++++++++++++++++++++++++++++++++------------ 3 files changed, 127 insertions(+), 38 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ea9dd09754…

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: ed7d53bd751ac4a84477195ce7fcd24c37cb7942 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed7d53bd751ac4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 8 17:58:11 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

11 years, 7 months

Check_MK Git: check_mk: predictive levels: fixed bug when existing predictive levels get new options

by Andreas Boesl

Module: check_mk Branch: master Commit: 0fa387256715d677d33b54452d31f18e8db8d8dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fa387256715d6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 8 17:28:13 2013 +0200 predictive levels: fixed bug when existing predictive levels get new options (fixed horrible wording) --- ChangeLog | 1 + modules/prediction.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36ead63..01155b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * windows_agent: check_mk.ini: new option "port" - specifies agent port * winperf_processor: introduce averaging, support predictive levels * cpu_util.include: fixed bug when params are set to None + * predictive levels: fixed bug when existing predictive levels get new options Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/modules/prediction.py b/modules/prediction.py index 7817081..109a4f1 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -253,7 +253,7 @@ def get_predictive_levels(dsname, params, cf, levels_factor=1.0): try: last_info = eval(file(info_file).read()) for k, v in params.items(): - if last_info[k] != v: + if last_info.get(k) != v: if opt_debug: sys.stderr.write("Prediction parameters have changed.\n") last_info = None

11 years, 7 months

Check_MK Git: check_mk: predictive levels: fixed bug when new options existing predictive levels

by Andreas Boesl

Module: check_mk Branch: master Commit: bc734fb6222b4acc42a57be666fca5bd3a97c293 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc734fb6222b4a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 8 17:28:13 2013 +0200 predictive levels: fixed bug when new options existing predictive levels + are introduced --- ChangeLog | 2 ++ modules/prediction.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36ead63..04bf241 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,8 @@ * windows_agent: check_mk.ini: new option "port" - specifies agent port * winperf_processor: introduce averaging, support predictive levels * cpu_util.include: fixed bug when params are set to None + * predictive levels: fixed bug when new options existing predictive levels + are introduced Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/modules/prediction.py b/modules/prediction.py index 7817081..109a4f1 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -253,7 +253,7 @@ def get_predictive_levels(dsname, params, cf, levels_factor=1.0): try: last_info = eval(file(info_file).read()) for k, v in params.items(): - if last_info[k] != v: + if last_info.get(k) != v: if opt_debug: sys.stderr.write("Prediction parameters have changed.\n") last_info = None

11 years, 7 months

Check_MK Git: check_mk: cpu_util.include: fixed bug when params are set to None

by Andreas Boesl

Module: check_mk Branch: master Commit: c50d8e401830e01cea7fbc1ea97164c24670fabd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c50d8e401830e0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 8 17:25:33 2013 +0200 cpu_util.include: fixed bug when params are set to None --- ChangeLog | 1 + checks/cpu_util.include | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15bb0a1..36ead63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ * if64_tplink: special new check for TP Link switches with broken SNMP output * windows_agent: check_mk.ini: new option "port" - specifies agent port * winperf_processor: introduce averaging, support predictive levels + * cpu_util.include: fixed bug when params are set to None Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/checks/cpu_util.include b/checks/cpu_util.include index a6e2661..fe21bb8 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -40,7 +40,9 @@ def check_cpu_util(util, params, this_time = None): if this_time == None: this_time = time.time() - if type(params) == tuple: + if params == None: + params = {} + elif type(params) == tuple: params = { "levels" : params, } @@ -63,6 +65,7 @@ def check_cpu_util(util, params, this_time = None): warn, crit = levels # only for perfdata else: warn, crit = None, None + state, extrainfo, extraperf = check_levels(check_against, counter, levels) if extrainfo: infotext += ", " + extrainfo

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: ff098d47c069537dc4a5c43fa8b1483ea84cfe9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff098d47c06953… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 8 12:34:57 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Remove lots of trailing spaces

by Mathias Kettner

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits