Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

Moved final offset into Column base class, part 3.

by Sven Panne

Module: check_mk Branch: master Commit: 027832805b9b286fa2a33b338dd5ce02666da9f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=027832805b9b28… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 6 09:58:08 2017 +0200 Moved final offset into Column base class, part 3. Change-Id: If91bb01eb763a4f5cc95d66b9549fd46ef0dbd49 --- livestatus/src/AttributeListAsIntColumn.h | 2 +- livestatus/src/AttributeListColumn.h | 2 +- livestatus/src/Column.h | 4 +- livestatus/src/CustomTimeperiodColumn.cc | 5 +- livestatus/src/CustomTimeperiodColumn.h | 14 +-- livestatus/src/FixedIntColumn.h | 2 +- livestatus/src/HostListStateColumn.h | 2 +- livestatus/src/HostSpecialIntColumn.h | 2 +- livestatus/src/IntColumn.h | 5 +- livestatus/src/IntPointerColumn.h | 2 +- livestatus/src/OffsetBoolColumn.cc | 5 +- livestatus/src/OffsetBoolColumn.h | 8 +- livestatus/src/OffsetDoubleColumn.h | 4 +- livestatus/src/OffsetIntColumn.cc | 5 +- livestatus/src/OffsetIntColumn.h | 10 +- livestatus/src/ServiceListStateColumn.h | 2 +- livestatus/src/ServiceSpecialIntColumn.h | 2 +- livestatus/src/StatusSpecialIntColumn.h | 2 +- livestatus/src/TableComments.cc | 26 ++-- livestatus/src/TableContacts.cc | 12 +- livestatus/src/TableDowntimes.cc | 24 ++-- livestatus/src/TableEventConsole.h | 2 +- livestatus/src/TableHosts.cc | 195 ++++++++++++++---------------- livestatus/src/TableLog.cc | 14 +-- livestatus/src/TableServices.cc | 133 ++++++++++---------- livestatus/src/TableStateHistory.cc | 83 ++++++------- livestatus/src/TimeColumn.h | 2 +- livestatus/src/TimeperiodColumn.cc | 2 +- 28 files changed, 264 insertions(+), 307 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=027832805b…

6 years, 11 months

Bug regarding deprecated rules and down hosts

by Marcel Arentz

Module: check_mk Branch: master Commit: 4099b18875c5435a6f02c844e9e6455bbe42b88c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4099b18875c543… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Oct 6 11:28:47 2017 +0200 Bug regarding deprecated rules and down hosts Change-Id: I13462deadf5daabb7f16349ccc4f0a3418ddc6db --- .bugs/2971 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.bugs/2971 b/.bugs/2971 new file mode 100644 index 0000000..8e05192 --- /dev/null +++ b/.bugs/2971 @@ -0,0 +1,16 @@ +Title: Activate Changes fails after update if some host with an deprecated check is down +Component: checks +State: open +Date: 2017-10-06 11:12:29 +Targetversion: 1.4.0 +Class: bug + +To reproduce the bug: +- Create site with version 1.2.8 or earlier +- Configure a host with a postfix service (postfix_mailq) +- Cut the connection to the host (services will be stale) +- update to 1.4.0 +- create a rule for the postfix service (Number of mails in outgoing mail queue) +- Activate Changes + +It seems, that the autochecks.mk is not updated, if the agent_data of a host is not reachable.

6 years, 11 months

Move away from using-declarations.

by Sven Panne

Module: check_mk Branch: master Commit: 008785553548a60923b3fb44fb55eb5fb5eb5f93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=008785553548a6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 5 16:50:48 2017 +0200 Move away from using-declarations. * Explicit is better than implicit. * Actually less LoC. * No need to maintain those declarations. * Headers and implementation files are more similar. Change-Id: If85de2a6ef7be661ddf1641938242f2f9013e93f --- livestatus/src/AttributeListAsIntColumn.cc | 10 ++---- livestatus/src/AttributeListColumn.cc | 26 ++++++--------- livestatus/src/BlobColumn.cc | 5 +-- livestatus/src/Column.cc | 19 ++++------- livestatus/src/CommentColumn.cc | 13 +++----- livestatus/src/ContactGroupsColumn.cc | 14 +++----- livestatus/src/ContactGroupsMemberColumn.cc | 8 ++--- livestatus/src/ContactsColumn.cc | 17 ++++------ livestatus/src/DoubleColumn.cc | 14 +++----- livestatus/src/DowntimeColumn.cc | 13 +++----- livestatus/src/DynamicColumn.cc | 15 ++++----- .../src/DynamicEventConsoleReplicationColumn.cc | 37 ++++++++++------------ livestatus/src/DynamicLogwatchFileColumn.cc | 16 ++++------ livestatus/src/HostContactsColumn.cc | 8 ++--- livestatus/src/HostFileColumn.cc | 22 ++++++------- livestatus/src/HostGroupsColumn.cc | 12 +++---- livestatus/src/HostListColumn.cc | 14 +++----- livestatus/src/HostSpecialIntColumn.cc | 2 -- livestatus/src/IntColumn.cc | 14 +++----- livestatus/src/ListColumn.cc | 12 +++---- livestatus/src/Logger.cc | 2 +- livestatus/src/LogwatchListColumn.cc | 6 ++-- livestatus/src/NegatingFilter.cc | 3 +- livestatus/src/OffsetStringMacroColumn.cc | 18 +++++------ livestatus/src/Query.cc | 4 +-- livestatus/src/ServiceContactsColumn.cc | 8 ++--- livestatus/src/ServiceGroupsColumn.cc | 12 +++---- livestatus/src/ServiceListColumn.cc | 20 +++++------- livestatus/src/StatsColumn.cc | 18 +++++------ livestatus/src/StatusSpecialIntColumn.cc | 2 -- livestatus/src/Store.cc | 22 ++++++------- livestatus/src/Table.cc | 4 +-- livestatus/src/TableEventConsole.cc | 2 +- livestatus/src/TableStateHistory.cc | 13 ++++---- livestatus/src/TimeColumn.cc | 17 ++++------ livestatus/src/TimeperiodColumn.cc | 6 ++-- livestatus/src/VariadicFilter.cc | 6 ++-- livestatus/src/module.cc | 9 +++--- 38 files changed, 177 insertions(+), 286 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0087855535…

6 years, 11 months

Fixed (harmless) typo.

by Sven Panne

Module: check_mk Branch: master Commit: 2a6dba7e845bef0502ed6144f23f64b6f6f1dffa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a6dba7e845bef… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 5 16:09:36 2017 +0200 Fixed (harmless) typo. Change-Id: I43d278d274b36e190323da5e83f9d7370c4c2bb6 --- livestatus/src/CustomTimeperiodColumn.cc | 2 +- livestatus/src/ServiceListColumn.cc | 2 +- livestatus/src/TimeperiodColumn.cc | 2 +- livestatus/src/TimeperiodsCache.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/CustomTimeperiodColumn.cc b/livestatus/src/CustomTimeperiodColumn.cc index 3c6986f..3ea8750 100644 --- a/livestatus/src/CustomTimeperiodColumn.cc +++ b/livestatus/src/CustomTimeperiodColumn.cc @@ -40,7 +40,7 @@ int32_t CustomTimeperiodColumn::getValue( g_timeperiods_cache->inTimeperiod(cvm->variable_value)); } } - return 1; // assume 7X24 + return 1; // assume 24X7 } customvariablesmember *CustomTimeperiodColumn::getCVM(Row row) const { diff --git a/livestatus/src/ServiceListColumn.cc b/livestatus/src/ServiceListColumn.cc index 679f418..713f0d5 100644 --- a/livestatus/src/ServiceListColumn.cc +++ b/livestatus/src/ServiceListColumn.cc @@ -98,5 +98,5 @@ int ServiceListColumn::inCustomTimeperiod(service *svc, g_timeperiods_cache->inTimeperiod(cvm->variable_value)); } } - return 1; // assume 7X24 + return 1; // assume 24X7 } diff --git a/livestatus/src/TimeperiodColumn.cc b/livestatus/src/TimeperiodColumn.cc index 55e2a28..43e1e5f 100644 --- a/livestatus/src/TimeperiodColumn.cc +++ b/livestatus/src/TimeperiodColumn.cc @@ -43,6 +43,6 @@ int32_t TimeperiodColumn::getValue(Row row, if (auto tp = columnData<timeperiod>(row)) { return g_timeperiods_cache->inTimeperiod(tp) ? 1 : 0; } - // no timeperiod set -> Nagios assumes 7x24 + // no timeperiod set -> Nagios assumes 24X7 return 0; } diff --git a/livestatus/src/TimeperiodsCache.cc b/livestatus/src/TimeperiodsCache.cc index 6742ee2..9969419 100644 --- a/livestatus/src/TimeperiodsCache.cc +++ b/livestatus/src/TimeperiodsCache.cc @@ -96,7 +96,7 @@ bool TimeperiodsCache::inTimeperiod(const string &tpname) const { return inTimeperiod(tp); } } - return true; // unknown timeperiod is assumed to be 7X24 + return true; // unknown timeperiod is assumed to be 24X7 } bool TimeperiodsCache::inTimeperiod(const timeperiod *tp) const {

6 years, 11 months

5363 Exporting graph data in JSON format via GUI is now possible

by Lars Michelsen

Module: check_mk Branch: master Commit: 2fa420517aaafab38cb5caadbeb376fcd21a0759 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fa420517aaafa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 5 16:11:30 2017 +0200 5363 Exporting graph data in JSON format via GUI is now possible When viewing a graph in the GUI it is now possible to open the context menu and click on "Export as JSON" to get the data that is shown in the graph as JSON output. Change-Id: Ib734272b43ba2da640b63be1d5d6c5bccf0aee55 --- .werks/5363 | 12 ++++++++++++ web/htdocs/js/checkmk.js | 8 ++++++++ web/htdocs/visuals.py | 17 +++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/.werks/5363 b/.werks/5363 new file mode 100644 index 0000000..d1b562d --- /dev/null +++ b/.werks/5363 @@ -0,0 +1,12 @@ +Title: Exporting graph data in JSON format via GUI is now possible +Level: 2 +Component: multisite +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1507210788 +Class: feature + +When viewing a graph in the GUI it is now possible to open the context menu +and click on "Export as JSON" to get the data that is shown in the graph as +JSON output. diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 6de3b29..33b35d6 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -3262,6 +3262,14 @@ function pagetype_add_to_container(page_type, page_name) }); } +function graph_export() +{ + var request = { + "specification": popup_data[2] + }; + location.href = "graph_export.py?request=" + encodeURIComponent(JSON.stringify(request)); +} + //#. //# .-HoverMenu----------------------------------------------------------. //# | _ _ __ __ | diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 731be69..19308f4 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1538,6 +1538,7 @@ def ajax_popup_add(): add_type = html.var("add_type") html.open_ul() + pagetypes.render_addto_popup(add_type) for visual_type_name, visual_type in visual_types.items(): @@ -1564,6 +1565,22 @@ def ajax_popup_add(): html.write(title) html.close_a() html.close_li() + + # TODO: Find a good place for this special case. This needs to be modularized. + if add_type == "pnpgraph": + html.open_li() + html.open_span() + html.write("%s:" % _("Export")) + html.close_span() + html.close_li() + + html.open_li() + html.open_a(href="javascript:graph_export()") + html.img(src="images/icon_download.png") + html.write(_("Export as JSON")) + html.close_a() + html.close_li() + html.close_ul()

6 years, 11 months

IWYU fixes.

by Sven Panne

Module: check_mk Branch: master Commit: 8d4f8ab21b0aea3d9d88ad2c2baf7ebbd98a2a70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d4f8ab21b0aea… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 5 15:07:47 2017 +0200 IWYU fixes. Change-Id: I57fa636b6cc69d4127bba786494d04fe8ea9ecef --- livestatus/src/OffsetStringMacroColumn.cc | 1 + livestatus/src/OffsetStringMacroColumn.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/livestatus/src/OffsetStringMacroColumn.cc b/livestatus/src/OffsetStringMacroColumn.cc index d619de4..bd161de 100644 --- a/livestatus/src/OffsetStringMacroColumn.cc +++ b/livestatus/src/OffsetStringMacroColumn.cc @@ -26,6 +26,7 @@ #include <cstdlib> #include <cstring> #include <memory> +#include "Column.h" #include "Filter.h" #include "Logger.h" #include "Renderer.h" diff --git a/livestatus/src/OffsetStringMacroColumn.h b/livestatus/src/OffsetStringMacroColumn.h index 7165b89..d74aaf4 100644 --- a/livestatus/src/OffsetStringMacroColumn.h +++ b/livestatus/src/OffsetStringMacroColumn.h @@ -28,7 +28,7 @@ #include "config.h" // IWYU pragma: keep #include <memory> #include <string> -#include "OffsetStringColumn.h" +#include "StringColumn.h" #include "contact_fwd.h" #include "nagios.h" #include "opids.h"

6 years, 11 months

Windows agent: update CONTENTS

by Jukka Aro

Module: check_mk Branch: master Commit: 37763c79b7b8fe8fa4250b2beaadc10cbe45747d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37763c79b7b8fe… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Oct 5 14:59:25 2017 +0200 Windows agent: update CONTENTS Clear outdated / removed and add missing files. Change-Id: I1599a3df7698accfe47fa33ede7e9ce06b940465 --- agents/windows/CONTENTS | 83 +++++++++++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/agents/windows/CONTENTS b/agents/windows/CONTENTS index 9f32e66..3326f14 100644 --- a/agents/windows/CONTENTS +++ b/agents/windows/CONTENTS @@ -1,58 +1,73 @@ + # This file is read by the WATO page "Unpackaged Agents". It assigns # titles to the various files in this directory or hides them. - -baked_container.msi (hide) -check_mk_agent-64.exe Agent for Windows 64 Bit -check_mk_agent.cc (hide) -check_mk_agent.exe Agent for Windows 32 Bit -check_mk_agent.msi (hide) -check_mk.example.ini Example agent configuration file -crash.cc (hide) -crash.exe (hide) -install_agent-64.exe (hide) -install_agent.exe (hide) -nowin.cc (hide) -nowin.exe (hide) -check_mk_agent.cc (hide) +.depend (hide) +ChronoUtils.h (hide) +Configurable.cc (hide) +Configurable.h (hide) Configuration.cc (hide) Configuration.h (hide) -crash.cc (hide) +CrashHandler.cc (hide) +CrashHandler.h (hide) Crypto.cc (hide) Crypto.h (hide) Environment.cc (hide) Environment.h (hide) +EventLog.cc (hide) +EventLog.h (hide) +EventLogVista.cc (hide) +EventLogVista.h (hide) +ExternalCmd.cc (hide) +ExternalCmd.h (hide) +IEventLog.cc (hide) +IEventLog.h (hide) ListenSocket.cc (hide) ListenSocket.h (hide) -logging.cc (hide) -logging.h (hide) -nowin.cc (hide) +Logger.cc (hide) +Logger.h (hide) +Makefile (hide) +OHMMonitor.cc (hide) +OHMMonitor.h (hide) OutputProxy.cc (hide) OutputProxy.h (hide) -pdhtest.cc (hide) PerfCounter.cc (hide) PerfCounter.h (hide) +PerfCounterCommon.cc (hide) +PerfCounterCommon.h (hide) PerfCounterPdh.cc (hide) PerfCounterPdh.h (hide) -perftest.cc (hide) +RotatingFileHandler.cc (hide) +RotatingFileHandler.h (hide) +Section.cc (hide) +Section.h (hide) +SectionManager.cc (hide) +SectionManager.h (hide) SettingsCollector.cc (hide) SettingsCollector.h (hide) -stringutil.cc (hide) -stringutil.h (hide) Thread.cc (hide) Thread.h (hide) +WinApi.cc (hide) +WinApi.h (hide) +WinApiAdaptor.h (hide) +baked_container.msi (hide) +check_mk.example.ini Example agent configuration file +check_mk_agent-64.exe Agent for Windows 64 Bit +check_mk_agent.cc (hide) +check_mk_agent.exe Agent for Windows 32 Bit +check_mk_agent.msi (hide) +config.h (hide) +do-chroot (hide) +dynamic_func.h (hide) +make-agent (hide) +make-chroot (hide) +pdhtest.cc (hide) +perftest.cc (hide) +stringutil.cc (hide) +stringutil.h (hide) +types.cc (hide) types.h (hide) +win_error.cc (hide) +win_error.h (hide) wmiHelper.cc (hide) wmiHelper.h (hide) wmitest.cc (hide) -OHMMonitor.h (hide) -OHMMonitor.cc (hide) -EventLog.h (hide) -EventLog.cc (hide) -ExternalCmd.h (hide) -ExternalCmd.cc (hide) -crashhandling.cc (hide) -crashhandling.h (hide) -.depend (hide) -do-chroot (hide) -make-chroot (hide) -make-agent (hide)

6 years, 11 months

Clear unnecessary files from Windows agent

by Jukka Aro

Module: check_mk Branch: master Commit: 19d07a6f32609e3ea4807c68eee4b878ffae764f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19d07a6f32609e… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Oct 5 14:32:16 2017 +0200 Clear unnecessary files from Windows agent Remove unnecessary executable files a well as exe-based nsis-installers. Also clear corresponding source files, make targets and dependencies for chroot. Change-Id: I86e1048539ed4b14a3f12d54b56ca75ab795814b --- agents/windows/Makefile | 28 +--------- agents/windows/build_version | 2 +- agents/windows/chroot_version | 2 +- agents/windows/crash.cc | 32 ------------ agents/windows/endless.bat | 2 - agents/windows/installer-64.nsi | 110 ---------------------------------------- agents/windows/installer.nsi | 110 ---------------------------------------- agents/windows/make-agent | 2 +- agents/windows/make-chroot | 1 - agents/windows/nowin.cc | 46 ----------------- 10 files changed, 4 insertions(+), 331 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=19d07a6f32…

6 years, 11 months

Unbreak NEB plugin.

by Sven Panne

Module: check_mk Branch: master Commit: 08502f1be472d3cd835b71d39168555167895811 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08502f1be472d3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 5 13:50:11 2017 +0200 Unbreak NEB plugin. Change-Id: I4a4bf3c319318852d66035b8eed4aa4a8517e524 --- livestatus/src/Column.cc | 14 +++++++++----- livestatus/src/OffsetStringHostMacroColumn.h | 6 ++++-- livestatus/src/OffsetStringMacroColumn.cc | 8 ++++++++ livestatus/src/OffsetStringMacroColumn.h | 14 +++++++++----- livestatus/src/OffsetStringServiceMacroColumn.h | 6 ++++-- livestatus/src/TableHosts.cc | 12 ++++++------ livestatus/src/TableServices.cc | 13 +++++++------ 7 files changed, 47 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=08502f1be4…

6 years, 11 months

Graph tunings can now be applied to only specific destinations (views, dashlets, ...)

by Lars Michelsen

Module: check_mk Branch: master Commit: 91e22dd23dabce6e77082caa27cb3e77b615c25c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91e22dd23dabce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 5 13:49:39 2017 +0200 Graph tunings can now be applied to only specific destinations (views, dashlets, ...) Change-Id: I455d26e6c62417176cbb7ced88255b91ae3df16e --- web/htdocs/metrics.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index dec841d..ef9616a 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -156,6 +156,22 @@ scalar_colors = { } +class GraphDestinations(object): + dashlet = "dashlet" + view = "view" + report = "report" + notification = "notification" + + @classmethod + def choices(self): + return [ + (GraphDestinations.dashlet, _("Dashlet")), + (GraphDestinations.view, _("View")), + (GraphDestinations.report, _("Report")), + (GraphDestinations.notification, _("Notification")), + ] + + #. # .--Helpers-------------------------------------------------------------. # | _ _ _ | @@ -1577,7 +1593,8 @@ def host_service_graph_dashlet_cmk(graph_identification, custom_graph_render_opt graph_render_options) try: - graph_recipes = graph_identification_types.create_graph_recipes(graph_identification) + graph_recipes = graph_identification_types.create_graph_recipes(graph_identification, + destination=GraphDestinations.dashlet) if graph_recipes: graph_recipe = graph_recipes[0] else:

6 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2017