Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 81e833c40a55de2814efc5bb933af307b5a7a166 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81e833c40a55de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 18 13:41:04 2016 +0200 Minor docu fix for esx_vsphere_licenses --- checkman/esx_vsphere_licenses | 2 +- checks/esx_vsphere_licenses | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/checkman/esx_vsphere_licenses b/checkman/esx_vsphere_licenses index 62aebf4..2f8255c 100644 --- a/checkman/esx_vsphere_licenses +++ b/checkman/esx_vsphere_licenses @@ -1,4 +1,4 @@ -title: ESX vsphere licenses +title: ESX VSphere Licenses agents: windows catalog: app/vmware license: GPL diff --git a/checks/esx_vsphere_licenses b/checks/esx_vsphere_licenses index 58e4177..b0399ad 100644 --- a/checks/esx_vsphere_licenses +++ b/checks/esx_vsphere_licenses @@ -25,11 +25,11 @@ # Boston, MA 02110-1301 USA. # Example output from agent: -#esx_vsphere_licenses:sep(9)>>> -#VMware vSphere 5 Standard 100 130 -#VMware vSphere 5 Enterprise 86 114 -#VMware vSphere 5 Enterprise 22 44 # Licenses may appear multiple times (keys different) -#vCenter Server 5 Standard 1 1 +# esx_vsphere_licenses:sep(9)>>> +# VMware vSphere 5 Standard 100 130 +# VMware vSphere 5 Enterprise 86 114 +# VMware vSphere 5 Enterprise 22 44 # Licenses may appear multiple times (keys different) +# vCenter Server 5 Standard 1 1 def parse_esx_vsphere_licenses(info): parsed = {}

7 years, 11 months

Fixed len bug in HTML class

by Roland Halbig

Module: check_mk Branch: master Commit: 9ee4837bda32ceea1b16e82410c4305d27c76d13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ee4837bda32ce… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Oct 18 13:06:22 2016 +0200 Fixed len bug in HTML class --- web/htdocs/htmllib.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index f7d2126..32ede4b 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -185,6 +185,11 @@ class HTML(object): return self.value >= other + def __len__(self): + return len(self.value) + + + __builtin__.HTML = HTML

7 years, 11 months

Adding data folder to gitignore

by Roland Halbig

Module: check_mk Branch: master Commit: 4b17b5f5cd69db33c7bec5f4b1db4c48763c8774 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b17b5f5cd69db… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Oct 18 11:43:57 2016 +0200 Adding data folder to gitignore --- .gitignore | 2 + tests/web/data/testtable___2.html | 33 ------------- tests/web/data/testtable___None.html | 95 ------------------------------------ 3 files changed, 2 insertions(+), 128 deletions(-) diff --git a/.gitignore b/.gitignore index f913546..fbe4307 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ RemoteSystemsTempFiles .DS_Store .cache tags + +tests/web/data/* diff --git a/tests/web/data/testtable___2.html b/tests/web/data/testtable___2.html deleted file mode 100644 index 13fc3ac..0000000 --- a/tests/web/data/testtable___2.html +++ /dev/null @@ -1,33 +0,0 @@ - -<h3> - TEST - </h3> - - <table class="data oddeven"> - <tr> - <th> - Number - </th> - <th> - Cubical - </th> - </tr> - <tr class="data odd 0"> - <td> - 0 - </td> - <td> - 0 - </td> - </tr> - <tr class="data even 0"> - <td> - 1 - </td> - <td> - 1 - </td> - </tr> - </table> -<div class=success>This table is limited to show only 2 of 10 rows. Click <a href=".py?limit=none">here</a> to disable the limitation.</div> - diff --git a/tests/web/data/testtable___None.html b/tests/web/data/testtable___None.html deleted file mode 100644 index b62ffb6..0000000 --- a/tests/web/data/testtable___None.html +++ /dev/null @@ -1,95 +0,0 @@ - -<h3> - TEST - </h3> - - <table class="data oddeven"> - <tr> - <th> - Number - </th> - <th> - Cubical - </th> - </tr> - <tr class="data odd 0"> - <td> - 0 - </td> - <td> - 0 - </td> - </tr> - <tr class="data even 0"> - <td> - 1 - </td> - <td> - 1 - </td> - </tr> - <tr class="data odd 0"> - <td> - 2 - </td> - <td> - 8 - </td> - </tr> - <tr class="data even 0"> - <td> - 3 - </td> - <td> - 27 - </td> - </tr> - <tr class="data odd 0"> - <td> - 4 - </td> - <td> - 64 - </td> - </tr> - <tr class="data even 0"> - <td> - 5 - </td> - <td> - 125 - </td> - </tr> - <tr class="data odd 0"> - <td> - 6 - </td> - <td> - 216 - </td> - </tr> - <tr class="data even 0"> - <td> - 7 - </td> - <td> - 343 - </td> - </tr> - <tr class="data odd 0"> - <td> - 8 - </td> - <td> - 512 - </td> - </tr> - <tr class="data even 0"> - <td> - 9 - </td> - <td> - 729 - </td> - </tr> - </table>

7 years, 11 months

Fixed string concatenation bug

by Roland Halbig

Module: check_mk Branch: master Commit: ce587a5af53d1308e33032fb1fe7e8e1c13cc345 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce587a5af53d13… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Oct 18 11:42:06 2016 +0200 Fixed string concatenation bug --- tests/web/data/testtable___2.html | 33 +++++++++++++ tests/web/data/testtable___None.html | 95 ++++++++++++++++++++++++++++++++++++ tests/web/test_html.py | 64 ++++++++++++++++++++++++ web/htdocs/htmllib.py | 9 ++++ 4 files changed, 201 insertions(+) diff --git a/tests/web/data/testtable___2.html b/tests/web/data/testtable___2.html new file mode 100644 index 0000000..13fc3ac --- /dev/null +++ b/tests/web/data/testtable___2.html @@ -0,0 +1,33 @@ + +<h3> + TEST + </h3> + + <table class="data oddeven"> + <tr> + <th> + Number + </th> + <th> + Cubical + </th> + </tr> + <tr class="data odd 0"> + <td> + 0 + </td> + <td> + 0 + </td> + </tr> + <tr class="data even 0"> + <td> + 1 + </td> + <td> + 1 + </td> + </tr> + </table> +<div class=success>This table is limited to show only 2 of 10 rows. Click <a href=".py?limit=none">here</a> to disable the limitation.</div> + diff --git a/tests/web/data/testtable___None.html b/tests/web/data/testtable___None.html new file mode 100644 index 0000000..b62ffb6 --- /dev/null +++ b/tests/web/data/testtable___None.html @@ -0,0 +1,95 @@ + +<h3> + TEST + </h3> + + <table class="data oddeven"> + <tr> + <th> + Number + </th> + <th> + Cubical + </th> + </tr> + <tr class="data odd 0"> + <td> + 0 + </td> + <td> + 0 + </td> + </tr> + <tr class="data even 0"> + <td> + 1 + </td> + <td> + 1 + </td> + </tr> + <tr class="data odd 0"> + <td> + 2 + </td> + <td> + 8 + </td> + </tr> + <tr class="data even 0"> + <td> + 3 + </td> + <td> + 27 + </td> + </tr> + <tr class="data odd 0"> + <td> + 4 + </td> + <td> + 64 + </td> + </tr> + <tr class="data even 0"> + <td> + 5 + </td> + <td> + 125 + </td> + </tr> + <tr class="data odd 0"> + <td> + 6 + </td> + <td> + 216 + </td> + </tr> + <tr class="data even 0"> + <td> + 7 + </td> + <td> + 343 + </td> + </tr> + <tr class="data odd 0"> + <td> + 8 + </td> + <td> + 512 + </td> + </tr> + <tr class="data even 0"> + <td> + 9 + </td> + <td> + 729 + </td> + </tr> + </table> diff --git a/tests/web/test_html.py b/tests/web/test_html.py new file mode 100644 index 0000000..b416d60 --- /dev/null +++ b/tests/web/test_html.py @@ -0,0 +1,64 @@ +#!/usr/bin/python +# call using +# > py.test -s -k test_HTML_generator.py + +# enable imports from web directory +from testlib import cmk_path +import sys +sys.path.insert(0, "%s/web/htdocs" % cmk_path()) + +# external imports +import re + +# internal imports +from htmllib import HTML + + + + +def test_class_HTML(): + + a = "One" + b = "two" + c = "Three" + + A = HTML(a) + B = HTML(b) + C = HTML(c) + + assert (A + B) == (a + b) + print A + + A += B + assert isinstance(A, HTML), A + + a += b + assert A == a, A + + assert A == a + + assert ("%s" % A) == a + + assert B + C != C + B + + assert HTML(A) == A, "%s %s" % (HTML(A), A) + assert HTML(a) == A, "%s %s" % (HTML(a), A) + + assert (A < B) == (a < b), "%s %s" % (A < B, a < b) + + assert (A > B) == (a > b) + + assert A != B + + assert isinstance(HTML(HTML(A)), HTML) + assert isinstance(HTML(HTML(A)).value, str) + + assert isinstance(A, HTML) + A += (" JO PICASSO! ") + assert isinstance(A, HTML) + + assert isinstance(A + "TEST" , str) + + assert isinstance("TEST%s" % A, str) + + assert "test" + C == "test" + c diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 5577b10..f7d2126 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -113,6 +113,7 @@ class HTML(object): def __init__(self, value): + super(HTML, self).__init__() if isinstance(value, HTML): self.value = value.value else: @@ -130,10 +131,18 @@ class HTML(object): return self.value + other + def __radd__(self, other): + if isinstance(other, HTML): + return other.value + self.value + else: + return other + self.value + + def __iadd__(self, other): self.value = self.__add__(other) return self + def __lt__(self, other): if isinstance(other, HTML): return self.value < other.value

7 years, 11 months

fixed error handling

by Simon Betz

Module: check_mk Branch: master Commit: 040c66e91d7fd69821620101681a853f6a68acaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=040c66e91d7fd6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 18 11:21:50 2016 +0200 fixed error handling --- agents/plugins/apache_status | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index 1d5e390..ce44405 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -137,7 +137,7 @@ for server in servers: request = urllib2.Request(url, headers={"Accept" : "text/plain"}) fd = urllib2.urlopen(request) except urllib2.URLError, e: - if 'SSL23_GET_SERVER_HELLO:unknown protocol' in str(e): + if 'unknown protocol' in str(e): # HACK: workaround misconfigurations where port 443 is used for # serving non ssl secured http url = 'http://%s%s/server-status?auto' % (address, portspec)

7 years, 11 months

Avoid error message in case of empty spool directory.

by Sven Panne

Module: check_mk Branch: master Commit: fecceec38dc6e2a27ebefc84a5892b2d158d1f58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fecceec38dc6e2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Oct 18 10:45:28 2016 +0200 Avoid error message in case of empty spool directory. --- agents/check_mk_agent.linux | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 9844231..6a5eaeb 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -1033,6 +1033,7 @@ then for file in * do + test "$file" = "*" && break # output every file in this directory. If the file is prefixed # with a number, then that number is the maximum age of the # file in seconds. If the file is older than that, it is ignored.

7 years, 11 months

htmllib tests: Fixed internationalization calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a8d32ef0ba3af3d5ee02ac27f9ec10df370fd48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a8d32ef0ba3af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 18 10:00:13 2016 +0200 htmllib tests: Fixed internationalization calls --- tests/web/classes.py | 6 ------ tests/web/test_htmllib_integration.py | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/web/classes.py b/tests/web/classes.py index 20ba026..08b6d28 100644 --- a/tests/web/classes.py +++ b/tests/web/classes.py @@ -14,12 +14,6 @@ import re from htmllib import html from htmllib import HTMLGenerator, HTMLCheck_MK -# Hack to fix localized calls -try: - _ -except: - _ = lambda x: x - # .--Deprecated Renderer-------------------------------------------------. # | ____ _ _ | # | | _ \ ___ _ __ _ __ ___ ___ __ _| |_ ___ __| | | diff --git a/tests/web/test_htmllib_integration.py b/tests/web/test_htmllib_integration.py index 323d941..6cafec6 100644 --- a/tests/web/test_htmllib_integration.py +++ b/tests/web/test_htmllib_integration.py @@ -10,6 +10,8 @@ sys.path.insert(0, "%s/web/htdocs" % cmk_path()) # external imports import re +import i18n + # internal imports from htmllib import html from htmllib import HTMLGenerator, HTMLCheck_MK

7 years, 11 months

Hopefully finally fixed test dependencies now

by Lars Michelsen

Module: check_mk Branch: master Commit: 92782a57f5ce5e229de319ded310d38f2372f109 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92782a57f5ce5e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 18 09:45:20 2016 +0200 Hopefully finally fixed test dependencies now --- tests/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 03b00eb..a3b6524 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -23,10 +23,11 @@ setup: python-pip \ python-lxml pip install --upgrade pip - pip install \ + pip install --upgrade \ pytest \ requests \ beautifulsoup4 \ pytest-stepwise \ - dill + dill \ + html5lib $(MAKE) -C pylint setup

7 years, 11 months

Fake localization function in html class tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 32a69d8c856c31ba405810bd0e09843b219e6917 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32a69d8c856c31… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 18 09:47:41 2016 +0200 Fake localization function in html class tests --- tests/web/classes.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/web/classes.py b/tests/web/classes.py index 08b6d28..20ba026 100644 --- a/tests/web/classes.py +++ b/tests/web/classes.py @@ -14,6 +14,12 @@ import re from htmllib import html from htmllib import HTMLGenerator, HTMLCheck_MK +# Hack to fix localized calls +try: + _ +except: + _ = lambda x: x + # .--Deprecated Renderer-------------------------------------------------. # | ____ _ _ | # | | _ \ ___ _ __ _ __ ___ ___ __ _| |_ ___ __| | |

7 years, 11 months

pylintrc: Fixed legacy config file syntax

by Lars Michelsen

Module: check_mk Branch: master Commit: 396ec3fa7e59b6bc19605c048694dc94489ec2ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=396ec3fa7e59b6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 18 09:00:19 2016 +0200 pylintrc: Fixed legacy config file syntax --- tests/pylint/pylintrc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index ac5fefd..1fc0b23 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -9,7 +9,6 @@ errors-only=yes [MESSAGES CONTROL] # C0111 missing module docstring # C0326 bad-whitespace -disable=C0111,C0326 # unsubscriptable-object # unsupported-membership-test # unpacking-non-sequence @@ -18,7 +17,7 @@ disable=C0111,C0326 # checks are useless with Check_MK. # unpacking-non-sequence # Not a problem for us -disable=unsubscriptable-object,unsupported-membership-test,unpacking-non-sequence,assignment-from-none +disable=C0111,bad-whitespace,unsubscriptable-object,unsupported-membership-test,unpacking-non-sequence,assignment-from-none # W0612: Unused variable # TODO: enable this and prepare code for it! #enable=W0612

7 years, 11 months

← Newer
1
...
12
13
14
15
16
17
18
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016