Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

Windows agent: use RAII for local memory buffers

by Jukka Aro

Module: check_mk Branch: master Commit: 3f4127142fe96bad603b08bbbe68f08c36bde130 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f4127142fe96b… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Jan 10 16:06:28 2018 +0100 Windows agent: use RAII for local memory buffers Wrap locally allocated memory to RAII-managed handles in order to avoid explicitly having to free the local memory buffer. Change-Id: Idd52a6ad29d4d0802d58e66f1987b48a02c116aa --- agents/windows/build_version | 2 +- agents/windows/sections/SectionPS.cc | 10 +-- agents/windows/sections/SectionServices.cc | 112 ++++++++++++++--------------- agents/windows/types.h | 13 ++++ agents/windows/win_error.cc | 7 +- 5 files changed, 78 insertions(+), 66 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3f4127142f…

6 years, 8 months

5477 Rule-based recurring downtimes can have and end now.

by Sven Panne

Module: check_mk Branch: master Commit: 33216e7e4261f9805f05b408cdd59e17f2ebbca6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33216e7e4261f9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 10 14:14:29 2018 +0100 5477 Rule-based recurring downtimes can have and end now. Prevously, you could only specify a point in time when a rule-based recurring downtime starts. You can now optionally specify an additional point in time when no new downtimes will be started for such a rule, i.e. effectively disabling that rule from that point onwards. Note that specifying such an end point is not possible for ad-hoc downtimes, i.e. the ones entered directly without rules. This is caused by the underlying Nagios-compatible external commands which don't know such a field. Simply extending the commands by adding such a field is not a reliable option: In multi-site environments you can have a mix of monitoring cores and don't know which site uses which core. Change-Id: I37a4e2d280da782d42e1b3ebabb1836c1cd70fa4 --- .werks/5477 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.werks/5477 b/.werks/5477 new file mode 100644 index 0000000..66c122d --- /dev/null +++ b/.werks/5477 @@ -0,0 +1,20 @@ +Title: Rule-based recurring downtimes can have and end now. +Level: 1 +Component: core +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1515590636 +Class: feature + +Prevously, you could only specify a point in time when a rule-based +recurring downtime starts. You can now optionally specify an additional +point in time when no new downtimes will be started for such a rule, i.e. +effectively disabling that rule from that point onwards. + +Note that specifying such an end point is not possible for ad-hoc downtimes, +i.e. the ones entered directly without rules. This is caused by the +underlying Nagios-compatible external commands which don't know such a +field. Simply extending the commands by adding such a field is not a +reliable option: In multi-site environments you can have a mix of monitoring +cores and don't know which site uses which core.

6 years, 8 months

Add new host/ service painters to display the notification postponement reasons of the Microcore

by Lars Michelsen

Module: check_mk Branch: master Commit: ad07f9b6b126f05f94b8cf58dce2d73c6ee10207 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad07f9b6b126f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 9 17:37:52 2018 +0100 Add new host/service painters to display the notification postponement reasons of the Microcore Change-Id: If97eab3df61c85da4b10d63c1efee0cd23de05b2 --- web/plugins/views/builtin.py | 6 ++++-- web/plugins/views/painters.py | 47 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 2ce574a..9f1536d 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1129,8 +1129,9 @@ multisite_builtin_views.update({ ('host_notifper', None), ('host_in_notifper', None), ('host_notification_number', None), - ('host_next_notification', None), ('host_last_notification', None), + ('host_next_notification', None), + ('host_notification_postponement_reason', None), # 5. Configuration ('host_check_interval', None), @@ -1331,8 +1332,9 @@ multisite_builtin_views.update({ ('svc_notifper', None), ('svc_in_notifper', None), ('svc_notification_number', None), - ('svc_next_notification', None), ('svc_last_notification', None), + ('svc_next_notification', None), + ('svc_notification_postponement_reason', None), # 5. Configuration ('svc_check_interval', None), diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 083c03a..ad3ffd4 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -857,6 +857,46 @@ multisite_painters["svc_next_notification"] = { "paint" : lambda row: paint_future_time(row["service_next_notification"]), } +def paint_notification_postponement_reason(what, row): + # Needs to be in sync with the possible reasons. Can not be translaated otherwise. + reasons = { + "delayed notification": + _("Delay notification"), + "periodic notification": + _("Periodic notification"), + "currently in downtime": + _("In downtime"), + "host of this service is currently in downtime": + _("Host is in downtime"), + "problem acknowledged and periodic notifications are enabled": + _("Problem is acknowledged, but is configured to be periodic"), + "notifications are disabled, but periodic notifications are enabled": + _("Notifications are disabled, but is configured to be periodic"), + "not in notification period": + _("Is not in notification period"), + "host of this service is not up": + _("Host is down"), + "last host check not recent enough": + _("Last host check is not recent enough"), + "last service check not recent enough": + _("Last service check is not recent enough"), + "all parents are down": + _("All parents are down"), + "at least one parent is up, but no check is recent enough": + _("Last service check is not recent enough"), + } + + return "", \ + reasons.get(row[what + "_notification_postponement_reason"], + row[what + "_notification_postponement_reason"]) + +multisite_painters["svc_notification_postponement_reason"] = { + "title" : _("Notification postponement reason"), + "short" : _("Notif. postponed"), + "columns" : [ "service_notification_postponement_reason" ], + "paint" : lambda row: paint_notification_postponement_reason("service", row), +} + multisite_painters["svc_last_notification"] = { "title" : _("The time of the last service notification"), "short" : _("last notification"), @@ -1345,6 +1385,13 @@ multisite_painters["host_next_notification"] = { "paint" : lambda row: paint_future_time(row["host_next_notification"]), } +multisite_painters["host_notification_postponement_reason"] = { + "title" : _("Notification postponement reason"), + "short" : _("Notif. postponed"), + "columns" : [ "host_notification_postponement_reason" ], + "paint" : lambda row: paint_notification_postponement_reason("host", row), +} + multisite_painters["host_last_notification"] = { "title" : _("The time of the last host notification"), "short" : _("last notification"),

6 years, 8 months

5630 Host/Service detail views: Display notification related painters together at end of runtime data painters

by Lars Michelsen

Module: check_mk Branch: master Commit: ad4cbb9cf39c100396376e0eac08cfe41c53317e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad4cbb9cf39c10… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 9 17:14:57 2018 +0100 5630 Host/Service detail views: Display notification related painters together at end of runtime data painters Change-Id: Ib1dc6ed6fae7958bf253a8c0d3fe8b95d7615f25 --- .werks/5630 | 10 ++++++++++ web/plugins/views/builtin.py | 28 ++++++++++++++++------------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/.werks/5630 b/.werks/5630 new file mode 100644 index 0000000..fdeeb7a --- /dev/null +++ b/.werks/5630 @@ -0,0 +1,10 @@ +Title: Host/Service detail views: Display notification related painters together at end of runtime data painters +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1515514463 +Class: feature + + diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 1dd492d..2ce574a 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1108,7 +1108,6 @@ multisite_builtin_views.update({ ('host_pnpgraph', None), ('host_perf_data', None), ('host_in_downtime', None), - ('host_in_notifper', None), # 2b. Serivce statistics ('num_services', None), @@ -1120,18 +1119,21 @@ multisite_builtin_views.update({ # 3. Runtime data, timestamps ('host_attempt', None), - ('host_notification_number', None), ('host_state_age', None), ('host_check_age', None), ('host_next_check', None), - ('host_next_notification', None), - ('host_last_notification', None), ('host_check_latency', None), ('host_check_duration', None), - # 4. Configuration - ('host_check_interval', None), + # 4. Notification ('host_notifper', None), + ('host_in_notifper', None), + ('host_notification_number', None), + ('host_next_notification', None), + ('host_last_notification', None), + + # 5. Configuration + ('host_check_interval', None), ('host_contact_groups', None), ('host_contacts', None), ('host_group_memberlist', None), @@ -1314,24 +1316,26 @@ multisite_builtin_views.update({ ('svc_pnpgraph', None), ('svc_metrics', None), ('svc_in_downtime', None), - ('svc_in_notifper', None), # 3. Runtime data, timestamps ('svc_attempt', None), - ('svc_notification_number', None), ('svc_state_age', None), ('svc_check_age', None), ('svc_check_cache_info', None), ('svc_next_check', None), - ('svc_next_notification', None), - ('svc_last_notification', None), ('svc_last_time_ok', None), ('svc_check_latency', None), ('svc_check_duration', None), - # 4. Configuration - ('svc_check_interval', None), + # 4. Notifications ('svc_notifper', None), + ('svc_in_notifper', None), + ('svc_notification_number', None), + ('svc_next_notification', None), + ('svc_last_notification', None), + + # 5. Configuration + ('svc_check_interval', None), ('svc_contact_groups', None), ('svc_contacts', None), ('svc_group_memberlist', None),

6 years, 8 months

5631 New host/ service painter to display the notification postponement reason of the Microcore

by Lars Michelsen

Module: check_mk Branch: master Commit: 8d30763e98054a4f84cf6963edf6b6e793af9682 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d30763e98054a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 10 14:19:18 2018 +0100 5631 New host/service painter to display the notification postponement reason of the Microcore The Check_MK Microcore has a mechanic that delays notifications for different reasons. For example service notifications are delayed when the service is in downtime or when the host of the service is down. With the new painters "Notification postponement reason" Check_MK is now showing the reason why a pending notification for a host/service is not yet sent to the user. This painter has been added to the host and service detail pages by default. The users could already check the notification logic and see the current postponement reasons using the cmc.log, but this needs command line access and is not very comfortable when having a larger installation which produces a lot of log entries. Change-Id: I8ab97dabe5d432932a3168baec6470ceabcade59 --- .werks/5631 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.werks/5631 b/.werks/5631 new file mode 100644 index 0000000..f3690b5 --- /dev/null +++ b/.werks/5631 @@ -0,0 +1,20 @@ +Title: New host/service painter to display the notification postponement reason of the Microcore +Level: 1 +Component: multisite +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1515590026 +Class: feature + +The Check_MK Microcore has a mechanic that delays notifications for different reasons. For example +service notifications are delayed when the service is in downtime or when the host of the service +is down. + +With the new painters "Notification postponement reason" Check_MK is now showing the reason why +a pending notification for a host/service is not yet sent to the user. This painter has been +added to the host and service detail pages by default. + +The users could already check the notification logic and see the current postponement reasons +using the cmc.log, but this needs command line access and is not very comfortable when having a +larger installation which produces a lot of log entries.

6 years, 8 months

5323 Notification mail: Added variables which will be replaced by the entities choosen below ' Create separate notification bulks based on'

by Simon Betz

Module: check_mk Branch: master Commit: bdcca5e8bad5b600637f5e2d432cb308c95bc11f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdcca5e8bad5b6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 19 14:56:53 2017 +0200 5323 Notification mail: Added variables which will be replaced by the entities choosen below 'Create separate notification bulks based on' If bulking is enabled in notification mail the following variables will be replaced if the related entity is choosen below <i>Create separate notification bulks based on</i>. These are <ul> <li>Folder: <code>$FOLDER$</code></li> <li>Hostname: <code>$HOSTNAME$</code></li> <li>Service description: <code>$SERVICEDESC$</code></li> <li>Service level: <code>$SERVICE_LEVEL$</code></li> <li>Check type: <code>$CHECKCOMMAND$</code></li> <li>Host/Service state: <code>$STATE$</code></li> <li>Event console contact: <code>$EC_CONTACT$</code></li> </ul> Change-Id: I01a444e0a2de47963be67ff303417178aab7497d --- .werks/5323 | 21 +++++++++++++++++++++ cmk_base/notify.py | 22 +++++++++------------- notifications/asciimail | 16 ++++++++++++++++ notifications/mail | 16 ++++++++++++++++ 4 files changed, 62 insertions(+), 13 deletions(-) diff --git a/.werks/5323 b/.werks/5323 new file mode 100644 index 0000000..bcc5d96 --- /dev/null +++ b/.werks/5323 @@ -0,0 +1,21 @@ +Title: Notification mail: Added variables which will be replaced by the entities choosen below 'Create separate notification bulks based on' +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1508416809 +Class: feature + +If bulking is enabled in notification mail the following variables +will be replaced if the related entity is choosen below +<i>Create separate notification bulks based on</i>. These are +<ul> +<li>Folder: <code>$FOLDER$</code></li> +<li>Hostname: <code>$HOSTNAME$</code></li> +<li>Service description: <code>$SERVICEDESC$</code></li> +<li>Service level: <code>$SERVICE_LEVEL$</code></li> +<li>Check type: <code>$CHECKCOMMAND$</code></li> +<li>Host/Service state: <code>$STATE$</code></li> +<li>Event console contact: <code>$EC_CONTACT$</code></li> +</ul> diff --git a/cmk_base/notify.py b/cmk_base/notify.py index dd5622c..61bb1de 100644 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -1444,8 +1444,12 @@ def do_bulk_notify(plugin, params, plugin_context, bulk): bulk_path = (contact, plugin, str(bulk["interval"]), str(bulk["count"])) bulkby = bulk["groupby"] + if "bulk_subject" in bulk: + plugin_context["PARAMETER_BULK_SUBJECT"] = bulk["bulk_subject"] + if "host" in bulkby: bulk_path += ("host", plugin_context["HOSTNAME"]) + elif "folder" in bulkby: bulk_path += ("folder", find_wato_folder(plugin_context)) @@ -1453,27 +1457,19 @@ def do_bulk_notify(plugin, params, plugin_context, bulk): bulk_path += ("service", plugin_context.get("SERVICEDESC", "")) if "sl" in bulkby: - sl = plugin_context.get(what + "_SL", "") - bulk_path += ("sl", sl) + bulk_path += ("sl", plugin_context.get(what + "_SL", "")) if "check_type" in bulkby: - command = plugin_context.get(what + "CHECKCOMMAND", "").split("!")[0] - bulk_path += ("check_type", command) + bulk_path += ("check_type", plugin_context.get(what + "CHECKCOMMAND", "").split("!")[0]) if "state" in bulkby: - state = plugin_context.get(what + "STATE", "") - bulk_path += ("state", state) + bulk_path += ("state", plugin_context.get(what + "STATE", "")) if "ec_contact" in bulkby: - ec_contact = plugin_context.get("EC_CONTACT", "") - bulk_path += ("ec_contact", ec_contact) + bulk_path += ("ec_contact", plugin_context.get("EC_CONTACT", "")) if "ec_comment" in bulkby: - ec_comment = plugin_context.get("EC_COMMENT", "") - bulk_path += ("ec_comment", ec_comment) - - if "bulk_subject" in bulk: - plugin_context["PARAMETER_BULK_SUBJECT"] = bulk["bulk_subject"] + bulk_path += ("ec_comment", plugin_context.get("EC_COMMENT", "")) # User might have specified _FOO instead of FOO bulkby_custom = bulk.get("groupby_custom", []) diff --git a/notifications/asciimail b/notifications/asciimail index cd2f6e1..886f401 100755 --- a/notifications/asciimail +++ b/notifications/asciimail @@ -215,12 +215,24 @@ def read_bulk_contexts(): return parameters, contexts +def find_wato_folder(context): + # Same as in notify.py + for tag in context.get("HOSTTAGS", "").split(): + if tag.startswith("/wato/"): + return tag[6:].rstrip("/") + return "" + + def get_bulk_notification_subject(contexts, hosts): hosts = list(hosts) bulk_subject = None + folder = None + bulk_context = {} for context in contexts: if context.get("PARAMETER_BULK_SUBJECT"): + bulk_context = context bulk_subject = context["PARAMETER_BULK_SUBJECT"] + folder = find_wato_folder(context) break if bulk_subject: @@ -230,10 +242,14 @@ def get_bulk_notification_subject(contexts, hosts): else: subject = "Check_MK: $COUNT_NOTIFICATIONS$ notifications for $COUNT_HOSTS$ hosts" + if "$FOLDER$" in subject and folder is not None: + subject = subject.replace("$FOLDER$", folder) if "$COUNT_NOTIFICATIONS$" in subject: subject = subject.replace("$COUNT_NOTIFICATIONS$", str(len(contexts))) if "$COUNT_HOSTS$" in subject: subject = subject.replace("$COUNT_HOSTS$", str(len(hosts))) + + subject = substitute_context(subject, bulk_context) return subject diff --git a/notifications/mail b/notifications/mail index 464704d..5404d7a 100755 --- a/notifications/mail +++ b/notifications/mail @@ -949,12 +949,24 @@ def read_bulk_contexts(): return parameters, contexts +def find_wato_folder(context): + # Same as in notify.py + for tag in context.get("HOSTTAGS", "").split(): + if tag.startswith("/wato/"): + return tag[6:].rstrip("/") + return "" + + def get_bulk_notification_subject(contexts, hosts): hosts = list(hosts) bulk_subject = None + folder = None + bulk_context = {} for context in contexts: if context.get("PARAMETER_BULK_SUBJECT"): + bulk_context = context bulk_subject = context["PARAMETER_BULK_SUBJECT"] + folder = find_wato_folder(context) break if bulk_subject: @@ -964,10 +976,14 @@ def get_bulk_notification_subject(contexts, hosts): else: subject = "Check_MK: $COUNT_NOTIFICATIONS$ notifications for $COUNT_HOSTS$ hosts" + if "$FOLDER$" in subject and folder is not None: + subject = subject.replace("$FOLDER$", folder) if "$COUNT_NOTIFICATIONS$" in subject: subject = subject.replace("$COUNT_NOTIFICATIONS$", str(len(contexts))) if "$COUNT_HOSTS$" in subject: subject = subject.replace("$COUNT_HOSTS$", str(len(hosts))) + + subject = substitute_context(subject, bulk_context) return subject

6 years, 8 months

Windows agent: clean types.h and types.cc

by Jukka Aro

Module: check_mk Branch: master Commit: ecd8e24d164d0a8198fdcefaaf17ec39b50d4242 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecd8e24d164d0a… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Jan 10 09:58:50 2018 +0100 Windows agent: clean types.h and types.cc * Removed unused code. * Move section-specific declarations (and some definitions) to the corresponding sections. Leave only such declarations in types.h that are really needed across the agent. * Favour 'using' over 'typedef'. * Clean some unnecessary includes. Change-Id: I86b276e2f29276dbe36540ec56320d49cabfb6a1 --- agents/windows/Configurable.h | 1 + agents/windows/Configuration.h | 1 - agents/windows/EventLogVista.cc | 1 - agents/windows/ExternalCmd.cc | 1 - agents/windows/OHMMonitor.cc | 1 - agents/windows/SectionManager.cc | 33 ++++ agents/windows/SectionManager.h | 11 ++ agents/windows/Thread.cc | 1 + agents/windows/Thread.h | 2 +- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 191 +++++++++++++-------- agents/windows/sections/SectionEventlog.h | 45 ++++- agents/windows/sections/SectionLogwatch.cc | 1 - agents/windows/sections/SectionLogwatch.h | 77 ++++++++- agents/windows/sections/SectionMRPE.cc | 60 +++++++ agents/windows/sections/SectionMRPE.h | 14 ++ agents/windows/sections/SectionPS.cc | 1 - agents/windows/sections/SectionPluginGroup.h | 29 ++++ agents/windows/sections/SectionSpool.cc | 2 +- agents/windows/types.cc | 170 ------------------- agents/windows/types.h | 237 +-------------------------- 21 files changed, 396 insertions(+), 485 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ecd8e24d16…

6 years, 8 months

Windows agent: reduce logfile hint fields

by Jukka Aro

Module: check_mk Branch: master Commit: d469af8664f1d6a7ac902804ab39128e47ffb490 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d469af8664f1d6… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Jan 10 12:43:10 2018 +0100 Windows agent: reduce logfile hint fields Logfile hints are used to store offset information read from logstate.txt. The hints were using the struct logwatch_textfile that contains extra fields for this purpose and forced the use of a bogus vector for patterns that never exist, among others. Reduce the number of fields by introducing a reduced version of the struct (logwatch_hint) that only contains the necessary fields. Change-Id: I135d97616e90d80ea9685eb5ae2b6b406fb5ddcb --- agents/windows/build_version | 2 +- agents/windows/sections/SectionLogwatch.cc | 28 ++++++-------- agents/windows/sections/SectionLogwatch.h | 43 +++++++++++++++++----- .../windows/test/sections/SectionLogwatchTest.cc | 25 ++++--------- 4 files changed, 54 insertions(+), 44 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index b5a790b..ee6ce07 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3052 +3054 diff --git a/agents/windows/sections/SectionLogwatch.cc b/agents/windows/sections/SectionLogwatch.cc index 1dc5bae..c399b13 100644 --- a/agents/windows/sections/SectionLogwatch.cc +++ b/agents/windows/sections/SectionLogwatch.cc @@ -116,7 +116,7 @@ void addConditionPattern(globline_container &globline, const char *state, } // namespace -logwatch_textfile parseLogwatchStateLine(const std::string &line) { +logwatch_hint parseLogwatchStateLine(const std::string &line) { /* Example: line = "M://log1.log|98374598374|0|16"; */ const auto tokens = tokenize(line, "\\|"); @@ -127,14 +127,9 @@ logwatch_textfile parseLogwatchStateLine(const std::string &line) { } try { - return {tokens[0], - std::move(std::vector<std::string>{tokens[0]}), - std::stoull(tokens[1]), - std::stoull(tokens[2]), - std::stoull(tokens[3]), - false, - false, - condition_patterns_t()}; + return {tokens[0], std::move(std::vector<std::string>{tokens[0]}), + std::stoull(tokens[1]), std::stoull(tokens[2]), + std::stoull(tokens[3])}; } catch (const std::invalid_argument &) { throw StateParseError{std::string("Invalid state line: ") + line}; } @@ -571,10 +566,10 @@ logwatch_textfile &SectionLogwatch::addNewLogwatchTextfile( } const auto cend = _hints.cend(); - const auto it = std::find_if( - _hints.cbegin(), cend, [full_filename](const logwatch_textfile &hint) { - return hint.paths.front() == full_filename; - }); + const auto it = std::find_if(_hints.cbegin(), cend, + [full_filename](const logwatch_hint &hint) { + return hint.paths.front() == full_filename; + }); bool found_hint = it != cend; // previously the file size was taken from the hint file. Why is the file @@ -677,10 +672,9 @@ logwatch_textfile &SectionLogwatch::addNewRotatedLogfile( assert(filenames.size() > 0); const auto cend = _hints.cend(); - auto hint_iter = std::find_if(_hints.cbegin(), _hints.cend(), - [&pattern](const logwatch_textfile &hint) { - return hint.name == pattern; - }); + auto hint_iter = std::find_if( + _hints.cbegin(), _hints.cend(), + [&pattern](const logwatch_hint &hint) { return hint.name == pattern; }); bool found_hint = hint_iter != cend; std::vector<std::string> paths{filenames}; diff --git a/agents/windows/sections/SectionLogwatch.h b/agents/windows/sections/SectionLogwatch.h index c873b9d..2c2d87f 100644 --- a/agents/windows/sections/SectionLogwatch.h +++ b/agents/windows/sections/SectionLogwatch.h @@ -66,10 +66,10 @@ struct logwatch_textfile { , nocontext(nocontext_) , rotated(rotated_) , patterns(std::ref(patterns_)) {} - logwatch_textfile(const logwatch_textfile&) = delete; - logwatch_textfile &operator=(const logwatch_textfile&) = delete; - logwatch_textfile(logwatch_textfile&&) = default; - logwatch_textfile &operator=(logwatch_textfile&&) = default; + logwatch_textfile(const logwatch_textfile &) = delete; + logwatch_textfile &operator=(const logwatch_textfile &) = delete; + logwatch_textfile(logwatch_textfile &&) = default; + logwatch_textfile &operator=(logwatch_textfile &&) = default; std::string name; // name used for section headers. this is the // filename for regular logs and the pattern @@ -86,6 +86,32 @@ struct logwatch_textfile { patterns; // glob patterns applying for this file }; +// A hint instance containing information about the stored offsets for a +// monitored logfile. +struct logwatch_hint { + logwatch_hint(const std::string &name_, + const std::vector<std::string> &paths_, + unsigned long long file_id_, unsigned long long file_size_, + unsigned long long offset_) + : name(name_) + , paths(paths_) + , file_id(file_id_) + , file_size(file_size_) + , offset(offset_) {} + logwatch_hint(const logwatch_hint &) = delete; + logwatch_hint &operator=(const logwatch_hint &) = delete; + logwatch_hint(logwatch_hint &&) = default; + logwatch_hint &operator=(logwatch_hint &&) = default; + + std::string name; // name used for section headers. this is the + // filename for regular logs and the pattern + // for rotated logs + std::vector<std::string> paths; + unsigned long long file_id; // used to detect if a file has been replaced + unsigned long long file_size; // size of the file + unsigned long long offset{0}; // current fseek offset in the file +}; + // Single element of a globline: // C:/tmp/Testfile*.log struct glob_token { @@ -115,9 +141,8 @@ globline_container from_string<globline_container>(const WinApiAdaptor &winapi, inline std::ostream &operator<<(std::ostream &os, const globline_container &g) { os << "\n[tokens]\n"; for (const auto &token : g.tokens) { - os << "<pattern: " << token.pattern - << ", nocontext: " << std::boolalpha << token.nocontext - << ", from_start: " << token.from_start + os << "<pattern: " << token.pattern << ", nocontext: " << std::boolalpha + << token.nocontext << ", from_start: " << token.from_start << ", rotated: " << token.rotated << ", found_match: " << token.found_match << ">\n"; } @@ -156,7 +181,7 @@ public: } }; -logwatch_textfile parseLogwatchStateLine(const std::string &line); +logwatch_hint parseLogwatchStateLine(const std::string &line); class SectionLogwatch : public Section { struct ProcessTextfileResponse { @@ -238,7 +263,7 @@ private: GlobListConfigurable _globlines; std::vector<logwatch_textfile> _textfiles; - std::vector<logwatch_textfile> _hints; + std::vector<logwatch_hint> _hints; bool _offsets_loaded{false}; bool _initialised{false}; }; diff --git a/agents/windows/test/sections/SectionLogwatchTest.cc b/agents/windows/test/sections/SectionLogwatchTest.cc index 03b4f42..19a0d5a 100644 --- a/agents/windows/test/sections/SectionLogwatchTest.cc +++ b/agents/windows/test/sections/SectionLogwatchTest.cc @@ -12,12 +12,10 @@ bool operator==(const condition_pattern &c1, const condition_pattern &c2) { return c1.state == c2.state && c1.glob_pattern == c2.glob_pattern; } -bool operator==(const logwatch_textfile &t1, const logwatch_textfile &t2) { +bool operator==(const logwatch_hint &t1, const logwatch_hint &t2) { return t1.name == t2.name && t1.paths == t2.paths && t1.file_id == t2.file_id && t1.file_size == t2.file_size && - t1.offset == t2.offset && t1.missing == t2.missing && - t1.nocontext == t2.nocontext && t1.rotated == t2.rotated && - t1.encoding == t2.encoding && t1.patterns.get() == t2.patterns.get(); + t1.offset == t2.offset; } bool operator==(const glob_token &t1, const glob_token &t2) { @@ -32,14 +30,9 @@ bool operator==(const globline_container &g1, const globline_container &g2) { TEST_F(wa_SectionLogwatchTest, parseLogwatchStateLine_valid) { char line[] = "M:\\log1.log|98374598374|0|16"; - const logwatch_textfile expected{"M:\\log1.log", - std::vector<std::string>{"M:\\log1.log"}, - 98374598374, - 0, - 16, - false, - false, - condition_patterns_t()}; + const logwatch_hint expected{"M:\\log1.log", + std::vector<std::string>{"M:\\log1.log"}, + 98374598374, 0, 16}; ASSERT_EQ(expected, parseLogwatchStateLine(line)); } @@ -71,11 +64,9 @@ TEST_F(wa_SectionLogwatchTest, parseLogwatchStateLine_invalid_separator) { TEST_F(wa_SectionLogwatchTest, parseLogwatchStateLine_negative) { char line[] = "M:\\log1.log|-1|-1|-1"; const auto maxValue = std::numeric_limits<unsigned long long>::max(); - const logwatch_textfile expected{ - "M:\\log1.log", std::vector<std::string>{"M:\\log1.log"}, - maxValue, maxValue, - maxValue, false, - false, condition_patterns_t()}; + const logwatch_hint expected{"M:\\log1.log", + std::vector<std::string>{"M:\\log1.log"}, + maxValue, maxValue, maxValue}; ASSERT_EQ(expected, parseLogwatchStateLine(line)); }

6 years, 8 months

5269 cmk-update-agent: New show-config mode

by Andreas Umbreit

Module: check_mk Branch: master Commit: 60434c50d05ddda2c334ad696a2b9ba28e823b3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60434c50d05ddd… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Jan 5 13:33:48 2018 +0100 5269 cmk-update-agent: New show-config mode With this werk, a new debugging-feature gets added to the cmk-update-agent(.exe) executable. You can now display the current configuration and state saved within the cmk-update-agent.cfg and cmk-update-agent.state files. Please note that the configuration file is prioritized over the state file and only effective configurations will be shown. E.g. a saved Check_MK server from state file will be shadowed by a configured server from cfg file and hence it will not be shown by the show-config mode. You can invoke the show-config mode by running "cmk-update-agent(.exe) show-config" Change-Id: I4ee4715a298e824e6c271fc010113ec3a46b721b --- .werks/5269 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.werks/5269 b/.werks/5269 new file mode 100644 index 0000000..0855389 --- /dev/null +++ b/.werks/5269 @@ -0,0 +1,15 @@ +Title: cmk-update-agent: New show-config mode +Level: 2 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1515154865 +Class: feature + +With this werk, a new debugging-feature gets added to the cmk-update-agent(.exe) executable. + +You can now display the current configuration and state saved within the cmk-update-agent.cfg and cmk-update-agent.state files. +Please note that the configuration file is prioritized over the state file and only effective configurations will be shown. E.g. a saved Check_MK server from state file will be shadowed by a configured server from cfg file and hence it will not be shown by the show-config mode. + +You can invoke the show-config mode by running "cmk-update-agent(.exe) show-config"

6 years, 8 months

Remove comment from isc_dhcpd

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 73b1f75e0eaf214ef6df5d233fff94bddb9e0548 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73b1f75e0eaf21… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Jan 10 10:05:19 2018 +0100 Remove comment from isc_dhcpd Change-Id: I8c243a4b628810017d8f500d57cecb47363dded1 --- checks/isc_dhcpd | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/checks/isc_dhcpd b/checks/isc_dhcpd index e20119a..06f8f60 100644 --- a/checks/isc_dhcpd +++ b/checks/isc_dhcpd @@ -45,6 +45,7 @@ isc_dhcpd_default_levels = (15.0, 5.0) # 10.0.1.53 # 10.0.1.57 + def parse_isc_dhcpd(info): def ip_to_number(ip): number = 0 @@ -83,20 +84,6 @@ def parse_isc_dhcpd(info): return parsed -# The upper example after parsing: -# {'leases': ['10.0.1.16', -# '10.0.1.24', -# '10.0.1.26', -# '10.0.1.27', -# '10.0.1.34', -# '10.0.1.36', -# '10.0.1.45', -# '10.0.1.50', -# '10.0.1.53', -# '10.0.1.57'], -# 'pids': [3670], -# 'pools': [('10.0.1.1'), ('10.0.1.254')]} - def inventory_isc_dhcpd(parsed): return [(item, "isc_dhcpd_default_levels") for item in parsed["pools"]]

6 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018