Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

Refactoring: added error message to auto refactor.

by Roland Halbig

Module: check_mk Branch: master Commit: ef6432d363a4718487a8fc358bb6a50f02029ff9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef6432d363a471… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 15 11:05:49 2016 +0100 Refactoring: added error message to auto refactor. Change-Id: I50260431f678af5479fe3bf6f7f6bd2d3215d5cf --- tests/web/auto_refactor.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/web/auto_refactor.py b/tests/web/auto_refactor.py index 80938a4..f5b0063 100644 --- a/tests/web/auto_refactor.py +++ b/tests/web/auto_refactor.py @@ -129,8 +129,13 @@ def replace_tags(html, indent = 0): if not skip_next and inbetween[counter].strip(' ') not in ['', '\n']: html = append_to_html(html, indent, "html.write(%s)" % inbetween[counter]) - return html + "\n(/new)" + rest - + try: + return html + "\n(/new)" + rest + except: + print "html:\n", html + print "__________________________________________" + print "rest:\n", rest + return html + "\n(/new)" + rest import re html = sys.argv[1]

7 years, 9 months

htmllib: Corrected test file.

by Roland Halbig

Module: check_mk Branch: master Commit: 33f287dfd490c0a4a9d59aaf6088c7776386e7b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33f287dfd490c0… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 15 11:00:49 2016 +0100 htmllib: Corrected test file. Change-Id: I7036feaf0bf17b654238ad547febf255b8a96f21 --- tests/web/test_html.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/web/test_html.py b/tests/web/test_html.py index f2eb8a6..1d41741 100644 --- a/tests/web/test_html.py +++ b/tests/web/test_html.py @@ -52,7 +52,7 @@ def test_class_HTML(): assert len(B) == len(b) assert unicode(B) == unicode(b) - + assert "1" + B + "2" + C == "1" + b + "2" + c assert (A + B) == (a + b) assert HTML().join([A, B]) == A + B @@ -101,9 +101,9 @@ def test_class_HTML(): 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) + # Not supported any more! + # assert (A < B) == (a < b), "%s %s" % (A < B, a < b) + # assert (A > B) == (a > b) assert A != B

7 years, 9 months

Fix pylint error because of invalid cmk.debug call

by Mathias Kettner

Module: check_mk Branch: master Commit: 8a64375361b0029548ef81f897ea383d766940e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a64375361b002… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 10:31:48 2016 +0100 Fix pylint error because of invalid cmk.debug call Change-Id: I988b50d0143aa4c82bbee025e7a68975c50b9635 --- modules/notify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index abc0cf6..c35b0e3 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -810,7 +810,7 @@ def rbn_groups_contacts(groups): return [] except Exception, e: - if cmk.config.debug: + if cmk.debug.enabled(): raise return []

7 years, 9 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 5c0bb488b3461d608df97590f781dc68df06a596 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c0bb488b3461d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 15 08:48:07 2016 +0100 Fetched livestatus from downstream. Change-Id: Iffd43eedea4a200cffe268fe3a897f4796a24acc --- livestatus/src/AndingFilter.cc | 7 +++-- livestatus/src/AttributeListAsIntColumn.cc | 12 +++++--- livestatus/src/AttributeListAsIntColumn.h | 4 ++- livestatus/src/AttributeListColumn.cc | 11 +++++--- livestatus/src/AttributeListColumn.h | 5 ++-- livestatus/src/Column.cc | 4 +-- livestatus/src/Column.h | 3 +- livestatus/src/CustomVarsDictColumn.cc | 10 ++++--- livestatus/src/CustomVarsDictColumn.h | 5 ++-- livestatus/src/CustomVarsNamesColumn.cc | 10 ++++--- livestatus/src/CustomVarsNamesColumn.h | 5 ++-- livestatus/src/CustomVarsValuesColumn.cc | 10 ++++--- livestatus/src/CustomVarsValuesColumn.h | 5 ++-- livestatus/src/DoubleColumn.cc | 7 +++-- livestatus/src/DoubleColumn.h | 4 +-- livestatus/src/HostListColumn.cc | 9 ++++-- livestatus/src/HostListColumn.h | 5 ++-- livestatus/src/IntColumn.cc | 6 ++-- livestatus/src/IntColumn.h | 4 +-- livestatus/src/ListColumn.cc | 11 +++++--- livestatus/src/ListColumn.h | 4 +-- livestatus/src/Makefile.am | 1 + livestatus/src/NegatingFilter.cc | 44 ++++++++++++++++++++++++++++++ livestatus/src/NegatingFilter.h | 25 ++++++++++------- livestatus/src/OffsetStringMacroColumn.cc | 11 ++++---- livestatus/src/OffsetStringMacroColumn.h | 5 ++-- livestatus/src/OringFilter.cc | 5 ++-- livestatus/src/Query.cc | 20 +++++++------- livestatus/src/Query.h | 5 ++-- livestatus/src/ServiceListColumn.cc | 9 ++++-- livestatus/src/ServiceListColumn.h | 5 ++-- livestatus/src/StringColumn.cc | 9 ++++-- livestatus/src/StringColumn.h | 5 ++-- livestatus/src/TableEventConsoleStatus.cc | 4 +-- livestatus/src/TableStateHistory.cc | 4 +-- livestatus/src/TimeColumn.cc | 7 +++-- livestatus/src/TimeColumn.h | 4 +-- livestatus/src/VariadicFilter.cc | 22 ++++++--------- livestatus/src/VariadicFilter.h | 13 ++++----- 39 files changed, 212 insertions(+), 127 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5c0bb488b3…

7 years, 9 months

Pylint: Use livestatus module from git repo

by Lars Michelsen

Module: check_mk Branch: master Commit: 178946aaa78b1f58e95c9dde21df23732451d099 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=178946aaa78b1f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 14 17:29:23 2016 +0100 Pylint: Use livestatus module from git repo Change-Id: Iae40ea57ebd36b1e3bf5ed6902530dddddea9417 --- tests/conftest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/conftest.py b/tests/conftest.py index 7d9818c..d09731b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -28,6 +28,7 @@ def add_python_paths(): # make the repo directory available (cmk lib) sys.path.insert(0, cmk_path()) sys.path.insert(0, cmc_path()) + sys.path.insert(0, cmk_path() + "/livestatus/api/python") print("Import path: %s" % " ".join(sys.path))

7 years, 9 months

tests: also .f12 livestatus module

by Lars Michelsen

Module: check_mk Branch: master Commit: a68fa651990d643667b9e557f6798c263f09a01b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a68fa651990d64… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 14 17:22:30 2016 +0100 tests: also .f12 livestatus module Change-Id: Ibca4df0b2348561f0bdb85628255df35f532e597 --- tests/testlib/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 3c8e5f2..201934e 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -259,6 +259,7 @@ class Site(object): cmk_path() + "/inventory", cmk_path() + "/notifications", cmk_path() + "/livestatus", + cmk_path() + "/livestatus/api/python", cmc_path() + "/bin", cmc_path() + "/modules",

7 years, 9 months

4149 FIX Fix notifications from Event Console if host has more than one contact

by Mathias Kettner

Module: check_mk Branch: master Commit: da78acd34914ad09f561e1e304cb321f77dc50e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da78acd34914ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 15:29:15 2016 +0100 4149 FIX Fix notifications from Event Console if host has more than one contact Notifications from the Event Console would never be sent if the contact information had to be fetched from the host (not coded in the rule itself) and the host had more than one contact. Change-Id: I227649bcc62934b6637ef51b00c11ead8727efe1 --- .werks/4149 | 11 +++++++++++ ChangeLog | 1 + bin/mkeventd | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4149 b/.werks/4149 new file mode 100644 index 0000000..4ee2ae2 --- /dev/null +++ b/.werks/4149 @@ -0,0 +1,11 @@ +Title: Fix notifications from Event Console if host has more than one contact +Level: 2 +Component: ec +Compatible: compat +Version: 1.4.0i3 +Date: 1481725686 +Class: fix + +Notifications from the Event Console would never be sent if the +contact information had to be fetched from the host (not coded in +the rule itself) and the host had more than one contact. diff --git a/ChangeLog b/ChangeLog index 34f6ee7..963671d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -132,6 +132,7 @@ * 4148 EC: reorder entries in Performance snapin, add overflows and load * 4097 FIX: Event console: Make writing of status file more robust... * 4147 FIX: Always show rule analyser result on Generate, not only after previous Try out... + * 4149 FIX: Fix notifications from Event Console if host has more than one contact... Livestatus: * 3651 FIX: Fixed potential segfault with Nagios core when accessing log/commands table via Livestatus.... diff --git a/bin/mkeventd b/bin/mkeventd index 4e85f67..38c5ac2 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -4029,7 +4029,7 @@ def add_rbn_contact_information(context, host, contact_groups, contact_groups_no verbose(" Using these groups: %r" % groups) context.update({ - "CONTACTS" : " ".join(contacts), + "CONTACTS" : ",".join(contacts), "CONTACTNAME" : "check-mk-notify", "SERVICECONTACTGROUPNAMES" : ",".join(groups), })

7 years, 9 months

Added some inline comments

by Mathias Kettner

Module: check_mk Branch: master Commit: d15566ff7cac093b4c4e694881f978f439ac6d61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d15566ff7cac09… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 15:32:19 2016 +0100 Added some inline comments Change-Id: Ib7387b397c50b816cc27cda6809ef4015d17996a --- bin/mkeventd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/mkeventd b/bin/mkeventd index 38c5ac2..58f8147 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -4066,7 +4066,10 @@ def fetch_contacts_of_group_from_livestatus(group_name): return None # No group match or other failure +# None, None -> Host could not be found +# [], [] -> Host found but has no contacts/contactgroups def fetch_contacts_and_groups_of_host_from_livestatus(host): + # TODO: Matching von Hostnamen muss identisch sein zu dem im CMC try: answer = livestatus_query("GET hosts\nFilter: host_name = %s\n" "Columns: contacts contact_groups\nOutputFormat: python\n" % host)

7 years, 9 months

EC: fix descriptive texts in ValueSpec of overflow configuration

by Mathias Kettner

Module: check_mk Branch: master Commit: 7a2cfabdeb0788a2205b754293e10828983c2ce6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a2cfabdeb0788… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 14:43:11 2016 +0100 EC: fix descriptive texts in ValueSpec of overflow configuration Change-Id: Id250185e3b5a9bdc864c91fc290671664c3dda45 --- web/plugins/wato/mkeventd.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index a21b1fa..b3b95b6 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -2496,12 +2496,12 @@ if mkeventd_enabled: default_value = 1000, unit = _("open events"), )), - ("action", vs_ec_event_limit_actions("notify all contacts")), + ("action", vs_ec_event_limit_actions("notify contacts of the host")), ], optional_keys = [], )), ("by_rule", Dictionary( - title = _("Host limit"), + title = _("Rule limit"), help = _("You can limit the number of open events created by a single " "rule here. This is meant to " "prevent you from too generous rules creating a lot of events.<br>" @@ -2518,7 +2518,7 @@ if mkeventd_enabled: default_value = 1000, unit = _("open events"), )), - ("action", vs_ec_event_limit_actions("notify all rule contacts or without contact info")), + ("action", vs_ec_event_limit_actions("notify contacts in rule or fallback contacts")), ], optional_keys = [], )), @@ -2538,7 +2538,7 @@ if mkeventd_enabled: default_value = 10000, unit = _("open events"), )), - ("action", vs_ec_event_limit_actions("notify without contact info")), + ("action", vs_ec_event_limit_actions("notify all fallback contacts")), ], optional_keys = [], )),

7 years, 9 months

Cleanup livestatus.py, Add helper class LocalConnection()

by Mathias Kettner

Module: check_mk Branch: master Commit: 666df69e07543e5b0c55a00f2bfe08606f379f19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=666df69e07543e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 16:08:09 2016 +0100 Cleanup livestatus.py, Add helper class LocalConnection() LocalConnection() can be used for instant query to site local core: LocalConnection().query_value("GET hosts\nFilter: name = foo\nColumns: contacts") Change-Id: I4f2042299354943b0e9e200d12ef4f56ef620f08 --- livestatus/api/python/livestatus.py | 125 ++++++++++++++++++++++++++++-------- 1 file changed, 99 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=666df69e07…

7 years, 9 months

← Newer
1
...
19
20
21
22
23
24
25
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016