Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 3cf51ac9f6639d756925a2fa5007b8d684afccca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cf51ac9f6639d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 30 16:36:21 2016 +0100 Fetched livestatus from downstream. Change-Id: I23b24754ca9fb57ba2db26d39a2e62dec89a724b --- livestatus/src/ContactGroupsColumn.h | 4 +- livestatus/src/CustomTimeperiodColumn.h | 7 +- livestatus/src/CustomVarsExplicitColumn.h | 2 +- livestatus/src/DownCommColumn.h | 6 +- livestatus/src/DynamicColumn.cc | 8 +- livestatus/src/DynamicColumn.h | 8 +- .../src/DynamicEventConsoleReplicationColumn.cc | 8 +- .../src/DynamicEventConsoleReplicationColumn.h | 4 +- livestatus/src/DynamicLogwatchFileColumn.h | 10 +- livestatus/src/HostListStateColumn.h | 5 +- livestatus/src/HostSpecialIntColumn.h | 6 +- livestatus/src/LogwatchListColumn.h | 4 +- livestatus/src/MetricsColumn.h | 4 +- livestatus/src/OffsetIntColumn.h | 6 +- livestatus/src/OffsetTimeperiodColumn.cc | 7 +- livestatus/src/OffsetTimeperiodColumn.h | 3 +- livestatus/src/ServiceListColumn.h | 4 +- livestatus/src/ServiceListStateColumn.h | 6 +- livestatus/src/ServiceSpecialIntColumn.h | 6 +- livestatus/src/StatusSpecialIntColumn.h | 6 +- livestatus/src/TableComments.cc | 14 +- livestatus/src/TableContacts.cc | 10 +- livestatus/src/TableDowntimes.cc | 12 +- livestatus/src/TableEventConsoleReplication.cc | 2 +- livestatus/src/TableHostGroups.cc | 36 +++--- livestatus/src/TableHosts.cc | 142 ++++++++++----------- livestatus/src/TableLog.cc | 8 +- livestatus/src/TableServiceGroups.cc | 30 ++--- livestatus/src/TableServices.cc | 85 ++++++------ livestatus/src/TableStateHistory.cc | 28 ++-- livestatus/src/TableStatus.cc | 2 +- livestatus/src/TableTimeperiods.cc | 2 +- 32 files changed, 252 insertions(+), 233 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3cf51ac9f6…

7 years, 5 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 21483af8128948faccf9808ede988a77eac314ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21483af8128948… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 30 15:31:44 2016 +0100 Fetched livestatus from downstream. Change-Id: Ie7f3a735a4dcae457e241085664c9ad819d39985 --- livestatus/src/ColumnsColumn.h | 7 +- livestatus/src/ContactGroupsColumn.h | 5 +- livestatus/src/ContactGroupsMemberColumn.h | 6 +- livestatus/src/ContactsColumn.h | 6 +- livestatus/src/CustomVarsColumn.cc | 6 +- livestatus/src/CustomVarsColumn.h | 3 +- livestatus/src/CustomVarsDictColumn.cc | 7 +- livestatus/src/CustomVarsDictColumn.h | 3 +- livestatus/src/CustomVarsExplicitColumn.h | 5 +- livestatus/src/CustomVarsNamesColumn.cc | 7 +- livestatus/src/CustomVarsNamesColumn.h | 3 +- livestatus/src/CustomVarsValuesColumn.cc | 7 +- livestatus/src/CustomVarsValuesColumn.h | 3 +- livestatus/src/DoubleColumn.h | 5 +- livestatus/src/DoublePointerColumn.h | 2 +- livestatus/src/DownCommColumn.h | 6 +- livestatus/src/HostContactsColumn.h | 6 +- livestatus/src/HostGroupsColumn.h | 6 +- livestatus/src/HostListColumn.h | 12 +-- livestatus/src/HostSpecialDoubleColumn.h | 6 +- livestatus/src/ListColumn.h | 5 +- livestatus/src/LogwatchListColumn.h | 5 +- livestatus/src/MetricsColumn.h | 11 ++- livestatus/src/OffsetDoubleColumn.h | 6 +- livestatus/src/OffsetPerfdataColumn.h | 5 +- livestatus/src/OffsetSStringColumn.h | 6 +- livestatus/src/OffsetStringColumn.h | 6 +- livestatus/src/OffsetStringHostMacroColumn.h | 5 +- livestatus/src/OffsetStringMacroColumn.h | 5 +- livestatus/src/OffsetStringServiceMacroColumn.h | 5 +- livestatus/src/ServiceContactsColumn.h | 5 +- livestatus/src/ServiceGroupsColumn.h | 6 +- livestatus/src/ServiceListColumn.h | 6 +- livestatus/src/ServiceSpecialDoubleColumn.h | 6 +- livestatus/src/StringColumn.h | 5 +- livestatus/src/StringPointerColumn.h | 2 +- livestatus/src/TableColumns.cc | 8 +- livestatus/src/TableCommands.cc | 4 +- livestatus/src/TableComments.cc | 4 +- livestatus/src/TableContactGroups.cc | 6 +- livestatus/src/TableContacts.cc | 20 ++--- livestatus/src/TableDowntimes.cc | 4 +- livestatus/src/TableEventConsole.h | 6 +- livestatus/src/TableHostGroups.cc | 17 ++-- livestatus/src/TableHosts.cc | 114 ++++++++++++------------ livestatus/src/TableLog.cc | 20 ++--- livestatus/src/TableServiceGroups.cc | 17 ++-- livestatus/src/TableServices.cc | 92 ++++++++++--------- livestatus/src/TableStateHistory.cc | 24 ++--- livestatus/src/TableTimeperiods.cc | 4 +- 50 files changed, 302 insertions(+), 238 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=21483af812…

7 years, 5 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 5aaed18b33715c33941c1d049de1b4ef4a39fb4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5aaed18b33715c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 30 14:31:25 2016 +0100 Fetched livestatus from downstream. Change-Id: Ic9699ce31a694c91a71e3fd80bf582f7bb4da721 --- livestatus/src/BlobColumn.h | 5 +++-- livestatus/src/DoublePointerColumn.h | 1 + livestatus/src/DynamicColumn.cc | 3 ++- livestatus/src/DynamicColumn.h | 4 +++- livestatus/src/DynamicEventConsoleReplicationColumn.cc | 17 ++++++++++------- livestatus/src/DynamicEventConsoleReplicationColumn.h | 1 + livestatus/src/DynamicLogwatchFileColumn.cc | 7 ++++--- livestatus/src/DynamicLogwatchFileColumn.h | 5 +++-- livestatus/src/FixedIntColumn.h | 6 +++--- livestatus/src/HostFileColumn.cc | 6 ++++-- livestatus/src/HostFileColumn.h | 3 ++- livestatus/src/IntPointerColumn.h | 5 +++-- livestatus/src/StringPointerColumn.h | 6 ++++-- livestatus/src/TableEventConsoleReplication.cc | 2 +- livestatus/src/TableHosts.cc | 6 +++--- livestatus/src/TableServices.cc | 6 ++---- livestatus/src/TimePointerColumn.h | 4 ++-- 17 files changed, 51 insertions(+), 36 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5aaed18b33…

7 years, 5 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: d4c1d7fd0cd1388f7fab99761d8c298b2b7d574d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4c1d7fd0cd138… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 30 13:31:17 2016 +0100 Fetched livestatus from downstream. Change-Id: I9721886abf25b7be69f269cf452bdfdebaa39d3b --- livestatus/src/BlobColumn.h | 2 +- livestatus/src/Column.h | 2 +- livestatus/src/ColumnsColumn.h | 4 +-- livestatus/src/ContactGroupsMemberColumn.h | 2 +- livestatus/src/CustomTimeperiodColumn.h | 4 +-- livestatus/src/CustomVarsColumn.cc | 2 +- livestatus/src/CustomVarsExplicitColumn.h | 2 +- livestatus/src/DoubleColumn.h | 2 +- livestatus/src/DownCommColumn.h | 2 +- livestatus/src/FixedIntColumn.h | 4 +-- livestatus/src/HostContactsColumn.h | 5 ++-- livestatus/src/HostGroupsColumn.h | 2 +- livestatus/src/HostListColumn.h | 4 +-- livestatus/src/HostListStateColumn.h | 4 +-- livestatus/src/HostSpecialDoubleColumn.h | 2 +- livestatus/src/HostSpecialIntColumn.h | 4 +-- livestatus/src/IntColumn.h | 3 +-- livestatus/src/IntPointerColumn.h | 2 +- livestatus/src/ListColumn.h | 2 +- livestatus/src/LogwatchListColumn.h | 2 +- livestatus/src/MetricsColumn.h | 4 +-- livestatus/src/NullColumn.h | 2 +- livestatus/src/OffsetIntColumn.h | 2 +- livestatus/src/ServiceContactsColumn.h | 2 +- livestatus/src/ServiceGroupsColumn.h | 2 +- livestatus/src/ServiceListColumn.h | 2 +- livestatus/src/ServiceListStateColumn.h | 5 ++-- livestatus/src/ServiceSpecialDoubleColumn.h | 2 +- livestatus/src/ServiceSpecialIntColumn.h | 4 +-- livestatus/src/StatusSpecialIntColumn.h | 4 +-- livestatus/src/StringColumn.h | 2 +- livestatus/src/TableColumns.cc | 13 ++++----- livestatus/src/TableContactGroups.cc | 2 +- livestatus/src/TableEventConsole.h | 2 +- livestatus/src/TableHostGroups.cc | 42 +++++++++++++++-------------- livestatus/src/TableServiceGroups.cc | 22 +++++++-------- livestatus/src/TableServices.cc | 30 +++++++++++---------- livestatus/src/TableStatus.cc | 3 ++- 38 files changed, 102 insertions(+), 99 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d4c1d7fd0c…

7 years, 5 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: fa34d74bf809f09997434f12efbdbe907edf40c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa34d74bf809f0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 30 13:18:31 2016 +0100 Fetched livestatus from downstream. Change-Id: If6e5dc772f7807ebca2f52db91946033529e765a --- livestatus/src/OffsetDoubleColumn.h | 7 +- livestatus/src/OffsetIntColumn.h | 5 +- livestatus/src/OffsetPerfdataColumn.h | 2 +- livestatus/src/OffsetSStringColumn.h | 3 +- livestatus/src/OffsetStringColumn.h | 9 +- livestatus/src/OffsetStringHostMacroColumn.h | 2 +- livestatus/src/OffsetStringServiceMacroColumn.h | 2 +- livestatus/src/OffsetTimeColumn.h | 10 +- livestatus/src/OffsetTimeperiodColumn.cc | 4 +- livestatus/src/OffsetTimeperiodColumn.h | 4 +- livestatus/src/TableCommands.cc | 4 +- livestatus/src/TableComments.cc | 32 +++-- livestatus/src/TableContactGroups.cc | 4 +- livestatus/src/TableContacts.cc | 25 ++-- livestatus/src/TableDowntimes.cc | 31 +++-- livestatus/src/TableHostGroups.cc | 10 +- livestatus/src/TableHosts.cc | 18 +-- livestatus/src/TableLog.cc | 45 ++++--- livestatus/src/TableServiceGroups.cc | 10 +- livestatus/src/TableServices.cc | 156 +++++++++++++----------- livestatus/src/TableStateHistory.cc | 58 ++++----- livestatus/src/TableTimeperiods.cc | 6 +- 22 files changed, 245 insertions(+), 202 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fa34d74bf8…

7 years, 5 months

4237 FIX Fixed rendering of old timestamps

by Sven Panne

Module: check_mk Branch: master Commit: b957ed5e0b293ffd091898603ff1d8a7fa4d025d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b957ed5e0b293f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 30 11:41:18 2016 +0100 4237 FIX Fixed rendering of old timestamps Some old timestamps have been rendered as absolute times, although they should have been relative. This has been fixed. Change-Id: I61c2184b4733656330f2ab388657e2a254051208 --- .werks/4237 | 11 +++++++++++ ChangeLog | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/4237 b/.werks/4237 new file mode 100644 index 0000000..2780465 --- /dev/null +++ b/.werks/4237 @@ -0,0 +1,11 @@ +Title: Fixed rendering of old timestamps +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1483094408 +Class: fix + +Some old timestamps have been rendered as absolute times, although they +should have been relative. This has been fixed. + diff --git a/ChangeLog b/ChangeLog index 9ff9e1a..cefd524 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 4222 FIX: Services of host page: Fixed encoding issue for hosts with umlauts in alias * 4223 FIX: Fixed possible g_host_attribute related AttributeError exception * 4224 FIX: Improved exception handling during WATO slave site activation + * 4237 FIX: Fixed rendering of old timestamps... Notifications: * 4197 FIX: Fix sending notification to global fallback email address

7 years, 5 months

Reserved 20 Werk IDS

by Sven Panne

Module: check_mk Branch: master Commit: 3763355b6d172b4bc70f4a68f2d6535dfd89fc1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3763355b6d172b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 30 11:39:43 2016 +0100 Reserved 20 Werk IDS Change-Id: Ie855d0c8235c112c73ace377c7e8c5e04787bd84 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index b437f2c..c245dbe 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4237 +4257

7 years, 5 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 9d510212634411ebf4ea391bebdad902d8cc3fc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d510212634411… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 30 11:31:45 2016 +0100 Fetched livestatus from downstream. Change-Id: Ib4c5ae2a042e17c1f25f4243d05f9a1aa0fb7010 --- livestatus/src/AttributeListAsIntColumn.cc | 9 ++-- livestatus/src/AttributeListColumn.cc | 9 ++-- livestatus/src/Column.cc | 41 +++++--------- livestatus/src/Column.h | 8 ++- livestatus/src/ContactGroupsColumn.cc | 2 +- livestatus/src/ContactsColumn.cc | 3 +- livestatus/src/CustomTimeperiodColumn.cc | 11 ++-- livestatus/src/CustomVarsColumn.cc | 4 +- livestatus/src/CustomVarsExplicitColumn.cc | 11 ++-- livestatus/src/DownCommColumn.cc | 3 +- livestatus/src/HostFileColumn.cc | 15 +++--- livestatus/src/HostGroupsColumn.cc | 8 +-- livestatus/src/HostListColumn.cc | 9 ++-- livestatus/src/HostListStateColumn.cc | 9 ++-- livestatus/src/HostSpecialDoubleColumn.cc | 21 +++----- livestatus/src/HostSpecialIntColumn.cc | 39 ++++++-------- livestatus/src/ListFilter.cc | 4 +- livestatus/src/LogwatchListColumn.cc | 15 +++--- livestatus/src/MetricsColumn.cc | 7 +-- livestatus/src/OffsetDoubleColumn.cc | 11 ++-- livestatus/src/OffsetIntColumn.cc | 9 ++-- livestatus/src/OffsetSStringColumn.cc | 9 ++-- livestatus/src/OffsetStringColumn.cc | 9 ++-- livestatus/src/OffsetStringHostMacroColumn.cc | 2 +- livestatus/src/OffsetStringServiceMacroColumn.cc | 5 +- livestatus/src/OffsetTimeColumn.cc | 9 ++-- livestatus/src/OffsetTimeperiodColumn.cc | 24 +++------ livestatus/src/ServiceGroupsColumn.cc | 8 +-- livestatus/src/ServiceListColumn.cc | 9 ++-- livestatus/src/ServiceListStateColumn.cc | 9 ++-- livestatus/src/ServiceSpecialDoubleColumn.cc | 69 +++++++++++------------- livestatus/src/ServiceSpecialIntColumn.cc | 16 +++--- 32 files changed, 171 insertions(+), 246 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9d51021263…

7 years, 5 months

veeam_tapejobs: Treat last result Warning as such

by Konstantin Büttner

Module: check_mk Branch: master Commit: cd57398912d60b595c5b0a0d51d96d2de6c0a118 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd57398912d60b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Dec 29 15:59:06 2016 +0100 veeam_tapejobs: Treat last result Warning as such Change-Id: Ie2a10be7d1514733f82327981a97d752ced2f725 --- checks/veeam_tapejobs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/veeam_tapejobs b/checks/veeam_tapejobs index 51a2dec..7024268 100644 --- a/checks/veeam_tapejobs +++ b/checks/veeam_tapejobs @@ -78,6 +78,8 @@ def check_veeam_tapejobs(item, params, parsed): clear_item_state("running_since") if last_result == "Success": return 0, "Last backup successful" + statetext + elif last_result == "Warning": + return 1, "Last backup result: " + last_result + statetext else: return 2, "Last backup result: " + last_result + statetext

7 years, 5 months

Fixed 'Relative' display option for very old timestamps.

by Sven Panne

Module: check_mk Branch: master Commit: 7796352c6439c3db3e157007b5a6a80d1708d2f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7796352c6439c3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 29 14:48:41 2016 +0100 Fixed 'Relative' display option for very old timestamps. Change-Id: I146c0cf436a936a47061a4746f230b1a21efc20c --- web/plugins/views/painters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 808a6e2..0fd1852 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -192,7 +192,7 @@ def paint_age(timestamp, has_been_checked, bold_if_younger_than, mode=None, what dateformat = painter_options.get("ts_date") age = time.time() - timestamp if mode == "abs" or \ - (mode == "mixed" and age >= 48 * 3600 or age < -48 * 3600): + (mode == "mixed" and abs(age) >= 48 * 3600): return "age", time.strftime(dateformat + " %H:%M:%S", time.localtime(timestamp)) warn_txt = ''

7 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016