Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

7060 FIX oracle_sessions: show graphs in the cre if no absolute levels are set

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 659de9a4a71d787537cbd2abee2766edf20926af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=659de9a4a71d78… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Feb 21 09:32:45 2019 +0100 7060 FIX oracle_sessions: show graphs in the cre if no absolute levels are set If no absolute levels were given the graphs could not be shown in the raw edition, because the pnp template assumed that the levels are always present. Change-Id: I3fc7c57bb600e07d0d7426e58382a1e4b3c72821 --- .werks/7060 | 13 +++++++++++++ pnp-templates/check_mk-oracle_sessions.php | 16 +++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.werks/7060 b/.werks/7060 new file mode 100644 index 0000000..765eb0e --- /dev/null +++ b/.werks/7060 @@ -0,0 +1,13 @@ +Title: oracle_sessions: show graphs in the cre if no absolute levels are set +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1550737544 + +If no absolute levels were given the graphs could not be shown in the +raw edition, because the pnp template assumed that the levels are +always present. diff --git a/pnp-templates/check_mk-oracle_sessions.php b/pnp-templates/check_mk-oracle_sessions.php index e278eb6..f245ed3 100644 --- a/pnp-templates/check_mk-oracle_sessions.php +++ b/pnp-templates/check_mk-oracle_sessions.php @@ -23,8 +23,14 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +$warn = $WARN[1]; +$crit = $CRIT[1]; + $title = str_replace("_", " ", $servicedesc); -$opt[1] = "--vertical-label 'active sessions' -l0 -u $CRIT[1] --title \"$title\" "; +$opt[1] = "--vertical-label 'active sessions' -l0 --title \"$title\" "; +if (is_numeric($crit)) { + $opt[1] .= "-u $crit "; +} $def[1] = "DEF:sessions=$RRDFILE[1]:$DS[1]:MAX "; $def[1] .= "AREA:sessions#00ff48: "; @@ -32,6 +38,10 @@ $def[1] .= "LINE:sessions#008f38: "; $def[1] .= "GPRINT:sessions:LAST:\"last\: %3.0lf\" "; $def[1] .= "GPRINT:sessions:AVERAGE:\"avg\: %3.0lf\" "; $def[1] .= "GPRINT:sessions:MAX:\"max\: %3.0lf\" "; -$def[1] .= "HRULE:$WARN[1]#ffcf00:\"Warning at $WARN[1]\" "; -$def[1] .= "HRULE:$CRIT[1]#ff0000:\"Critical at $CRIT[1]\" "; +if (is_numeric($warn)) { + $def[1] .= "HRULE:$warn#ffcf00:\"Warning at $warn\" "; +} +if (is_numeric($crit)) { + $def[1] .= "HRULE:$crit#ff0000:\"Critical at $crit\" "; +} ?>

5 years, 7 months

Extract more helper functions

by Lars Michelsen

Module: check_mk Branch: master Commit: 339b1dd3f8ec6e6f13f99ec5db5ee9c396e31b7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=339b1dd3f8ec6e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 21:46:58 2019 +0100 Extract more helper functions Change-Id: I39dc89b9fc32e6e3ab7e1f97bd111ef6d16db07d --- agents/special/agent_vsphere | 256 +++++++++++++++++++++++-------------------- 1 file changed, 139 insertions(+), 117 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=339b1dd3f8…

5 years, 7 months

Extract stuff from huge global loop

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f5038e2fac3eb2e8347aa8bdf665cd09cec9fc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f5038e2fac3eb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 21:16:40 2019 +0100 Extract stuff from huge global loop * Put to fetch_data() function for the moment * Cleanup query_server() return to two elements. Will be cleaned up to a single object when ESXConnection() is ported to requests Change-Id: I7aaa98f40895c24a22d25164b14f835d7478454f --- agents/special/agent_vsphere | 1005 +++++++++++++++++++++--------------------- 1 file changed, 502 insertions(+), 503 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7f5038e2fa…

5 years, 7 months

Extracted more code from fetch_data()

by Lars Michelsen

Module: check_mk Branch: master Commit: baa1fe6e8360b7de312a92c2be03e0e528f21eb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=baa1fe6e8360b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 22:03:02 2019 +0100 Extracted more code from fetch_data() That's it for the moment. - Fixed all redefined-outer-name issues in agent_vsphere - Cleaned up a huge amount of implicit dependencies - Split code into unerstandable parts Change-Id: If3f62fd0c494fc945d2127e1f16a4722a942884e --- agents/special/agent_vsphere | 451 +++++++++++++++++++++++-------------------- 1 file changed, 240 insertions(+), 211 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=baa1fe6e83…

5 years, 7 months

retrieve_systeminfo returns gathered result now instead of modifying global structure

by Lars Michelsen

Module: check_mk Branch: master Commit: 757ab199804361becbda209ab3a25d984bdb8547 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=757ab199804361… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 20:10:11 2019 +0100 retrieve_systeminfo returns gathered result now instead of modifying global structure Change-Id: I3e1d81ae0a4805d890c1eee2e6dee792ca00ad0d --- agents/special/agent_vsphere | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index d2be352..527887c 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -1019,13 +1019,15 @@ def connect_to_server(): def retrieve_systeminfo(): - # Retrieve basic data, which requires no login + """Retrieve basic data, which requires no login""" + system_info = {} payload = telegram_list["systeminfo"] _reply_code, _reply_msg, _reply_headers, reply_data = query_server(payload) for entry in systemfields: element = get_pattern("<%(entry)s.*>(.*)</%(entry)s>" % {"entry": entry}, reply_data) if element: - systeminfo[entry] = element[0] + system_info[entry] = element[0] + return system_info def login(): @@ -1281,8 +1283,6 @@ systemfields = [ "osType", ] -systeminfo = {} - if opt_tracefile: tracefile_dir = os.path.dirname(opt_tracefile) or "." if os.path.exists(tracefile_dir): @@ -1302,7 +1302,7 @@ host_cookie_path = Path( try: server_handle = connect_to_server() - retrieve_systeminfo() + systeminfo = retrieve_systeminfo() if not systeminfo: sys.stderr.write("Unable to get data from Web API" + "\n")

5 years, 7 months

Refactored HTTP connection and login to ESXConnection class

by Lars Michelsen

Module: check_mk Branch: master Commit: f460253bf5a27674f36ef23d07300c776d829105 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f460253bf5a276… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 21:04:44 2019 +0100 Refactored HTTP connection and login to ESXConnection class Change-Id: I42d2ea479fbed893b8f7ab7b9dd7d792164020f2 --- agents/special/agent_vsphere | 370 ++++++++++++++++++++++--------------------- 1 file changed, 189 insertions(+), 181 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f460253bf5…

5 years, 7 months

generictests/run.py: Consider integer discovery parameters

by Moritz Kiemer

Module: check_mk Branch: master Commit: 09877eab47c5faf4fb3ffc51eb0026d59bb30e2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09877eab47c5fa… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Feb 20 14:28:08 2019 +0100 generictests/run.py: Consider integer discovery parameters Change-Id: I865f584a7e29e7f955ca8601b37ba17ab6cc7e2d --- tests/unit/checks/generictests/run.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/unit/checks/generictests/run.py b/tests/unit/checks/generictests/run.py index e2ed0ed..82be247 100644 --- a/tests/unit/checks/generictests/run.py +++ b/tests/unit/checks/generictests/run.py @@ -45,6 +45,8 @@ def get_info_argument(dataset, subcheck, fallback_parsed=None): def get_merged_parameters(check, provided_p): default_p = check.default_parameters() + if isinstance(provided_p, int): + return provided_p if not provided_p: return default_p if isinstance(provided_p, str):

5 years, 7 months

raritan_pdu_*: add some regression tests

by Moritz Kiemer

Module: check_mk Branch: master Commit: eda540f98c1ad486d758eae9f65128e259496c26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eda540f98c1ad4… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Feb 20 14:29:57 2019 +0100 raritan_pdu_*: add some regression tests Change-Id: Id33caebd546e8c4485e904fa278ccae6ffa52632 --- .../datasets/raritan_pdu_ocprot_regression.py | 63 ++++++++++++++++++++++ .../datasets/raritan_pdu_outletcount_regression.py | 16 ++++++ .../datasets/raritan_pdu_plugs_regression.py | 22 ++++++++ 3 files changed, 101 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/raritan_pdu_ocprot_regression.py b/tests/unit/checks/generictests/datasets/raritan_pdu_ocprot_regression.py new file mode 100644 index 0000000..ee4cb2c --- /dev/null +++ b/tests/unit/checks/generictests/datasets/raritan_pdu_ocprot_regression.py @@ -0,0 +1,63 @@ + + +checkname = 'raritan_pdu_ocprot' + + +info = [[[u'1.1.1', u'4', u'0'], + [u'1.1.15', u'1', u'0'], + [u'1.2.1', u'4', u'0'], + [u'1.2.15', u'1', u'0'], + [u'1.3.1', u'4', u'70'], + [u'1.3.15', u'1', u'0'], + [u'1.4.1', u'4', u'0'], + [u'1.4.15', u'1', u'0'], + [u'1.5.1', u'4', u'0'], + [u'1.5.15', u'1', u'0'], + [u'1.6.1', u'4', u'0'], + [u'1.6.15', u'1', u'0']], + [[u'1'], + [u'0'], + [u'1'], + [u'0'], + [u'1'], + [u'0'], + [u'1'], + [u'0'], + [u'1'], + [u'0'], + [u'1'], + [u'0']]] + + +discovery = {'': [(u'C1', 'raritan_pdu_ocprot_current_default_levels'), + (u'C2', 'raritan_pdu_ocprot_current_default_levels'), + (u'C3', 'raritan_pdu_ocprot_current_default_levels'), + (u'C4', 'raritan_pdu_ocprot_current_default_levels'), + (u'C5', 'raritan_pdu_ocprot_current_default_levels'), + (u'C6', 'raritan_pdu_ocprot_current_default_levels')]} + + +checks = {'': [(u'C1', + (14.0, 15.0), + [(0, 'Overcurrent protector is closed', []), + (0, 'Current: 0.0 A', [('current', 0.0, 14.0, 15.0, None, None)])]), + (u'C2', + (14.0, 15.0), + [(0, 'Overcurrent protector is closed', []), + (0, 'Current: 0.0 A', [('current', 0.0, 14.0, 15.0, None, None)])]), + (u'C3', + (14.0, 15.0), + [(0, 'Overcurrent protector is closed', []), + (0, 'Current: 7.0 A', [('current', 7.0, 14.0, 15.0, None, None)])]), + (u'C4', + (14.0, 15.0), + [(0, 'Overcurrent protector is closed', []), + (0, 'Current: 0.0 A', [('current', 0.0, 14.0, 15.0, None, None)])]), + (u'C5', + (14.0, 15.0), + [(0, 'Overcurrent protector is closed', []), + (0, 'Current: 0.0 A', [('current', 0.0, 14.0, 15.0, None, None)])]), + (u'C6', + (14.0, 15.0), + [(0, 'Overcurrent protector is closed', []), + (0, 'Current: 0.0 A', [('current', 0.0, 14.0, 15.0, None, None)])])]} \ No newline at end of file diff --git a/tests/unit/checks/generictests/datasets/raritan_pdu_outletcount_regression.py b/tests/unit/checks/generictests/datasets/raritan_pdu_outletcount_regression.py new file mode 100644 index 0000000..f2f581c --- /dev/null +++ b/tests/unit/checks/generictests/datasets/raritan_pdu_outletcount_regression.py @@ -0,0 +1,16 @@ + + +checkname = 'raritan_pdu_outletcount' + + +info = [['36']] + + +discovery = {'': [(None, None)]} + + +checks = {'': [(None, + {}, + [(0, + 'Outlet Count is 36', + [('outletcount', 36, None, None, 0, None)])])]} \ No newline at end of file diff --git a/tests/unit/checks/generictests/datasets/raritan_pdu_plugs_regression.py b/tests/unit/checks/generictests/datasets/raritan_pdu_plugs_regression.py new file mode 100644 index 0000000..cfda104 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/raritan_pdu_plugs_regression.py @@ -0,0 +1,22 @@ + + +checkname = 'raritan_pdu_plugs' + + +info = [[u'1', u'', u'7'], + [u'36', u'FooName', u'7']] + + +discovery = {'': [(u'1', 7), + (u'36', 7), + ]} + + +checks = { + '': [ + (u'1', 7, [(0, u'Status: on', [])]), + (u'36', 7, [(0, u'FooName, Status: on', [])]), + (u'1', 'on', [(0, u'Status: on', [])]), + (u'36', 5, [(2, u'FooName, Status: on', [])]), + ] +}

5 years, 7 months

Move some nested helper functions to top level namespace

by Lars Michelsen

Module: check_mk Branch: master Commit: 6f2ead2d3c420a245af6c7e49fba86a6e594dd4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f2ead2d3c420a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 17:57:37 2019 +0100 Move some nested helper functions to top level namespace Change-Id: I44fdefd971b4de038e1ceb5eb33080f750474076 --- agents/special/agent_vsphere | 163 ++++++++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 80 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6f2ead2d3c…

5 years, 7 months

move global scope variables to a single place

by Lars Michelsen

Module: check_mk Branch: master Commit: a97d96eeb229f369889040c929cd5635f4cef775 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a97d96eeb229f3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 18:00:17 2019 +0100 move global scope variables to a single place Change-Id: I8e4aaf04fc179ef72821b48cd4ab1cad4cd61a46 --- agents/special/agent_vsphere | 316 +++++++++++++++++++++---------------------- 1 file changed, 156 insertions(+), 160 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a97d96eeb2…

5 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019