Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 1d79505078310467fd9cd4f1b90b408a72c98548 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d795050783104… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 16 13:53:03 2016 +0100 Fetched livestatus from downstream. Change-Id: I3b487788dd0a62ce6be66ffb0b1fc974e42965e0 --- livestatus/src/LogCache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index d93b434..3b84ad1 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -89,7 +89,7 @@ void LogCache::forgetLogfiles() { } void LogCache::updateLogfileIndex() { - Notice(_logger) << "updating log file index"; + Informational(_logger) << "updating log file index"; _last_index_update = system_clock::now(); // We need to find all relevant logfiles. This includes directory, the // current nagios.log and all files in the archive.

7 years, 9 months

fixed mutable init value

by Simon Betz

Module: check_mk Branch: master Commit: 7e8d6e0c10fbeaface7b68553ab4c33964d9c160 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e8d6e0c10fbea… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Dec 16 13:16:11 2016 +0100 fixed mutable init value Change-Id: Ia937fd2ab53d7574cd404ac5f7a307c72a2ee3d3 --- web/htdocs/bi.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 0da6942..466a90e 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1340,7 +1340,9 @@ def get_aggr_groups(aggr_def): aggr_groups = aggr_def[1] return aggr_groups -def get_aggr_ids(what = []): # AGGR_HOST / AGGR_MULTI +def get_aggr_ids(what = None): # AGGR_HOST / AGGR_MULTI + if what is None: + what = [] result = [] enabled_aggregations = get_enabled_aggregations() for idx, (aggr_type, aggr_def) in enumerate(enabled_aggregations):

7 years, 9 months

4166 New view command: archive events of hosts

by Simon Betz

Module: check_mk Branch: master Commit: e257db11bc491fc0159cc24296541784b90900d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e257db11bc491f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 15 14:35:51 2016 +0100 4166 New view command: archive events of hosts Change-Id: Ia85172e91714b0335cf79c72e8cdfdab08d3399b --- .werks/4166 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/mkeventd.py | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/.werks/4166 b/.werks/4166 new file mode 100644 index 0000000..4489cfb --- /dev/null +++ b/.werks/4166 @@ -0,0 +1,11 @@ +Title: New view command: archive events of hosts +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i3 +Date: 1481808898 +Class: feature + +In hosts or services views you can now archive all events +at once by using the view command archive events below +various commands. diff --git a/ChangeLog b/ChangeLog index fd8a9d5..68736f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -134,6 +134,7 @@ Event Console: * 4132 Monitoring notifications: Add EC_ORIG_HOST to notifiation context... * 4148 EC: reorder entries in Performance snapin, add overflows and load + * 4166 New view command: archive events of hosts... * 4151 Use notification fallback also for hosts not known to the monitoring... * 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... diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index c450b3d..bf8b8ed 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -564,6 +564,42 @@ if mkeventd_enabled: "executor" : command_executor_mkeventd, }) + + config.declare_permission("mkeventd.archive_events_of_hosts", + _("Archive events of hosts"), + _("Archive all open events of all hosts shown in host views"), + [ "user", "admin" ]) + + + def command_archive_events_of_hosts(cmdtag, spec, row): + if html.var("_archive_events_of_hosts"): + if cmdtag == "HOST": + tag = "host" + elif cmdtag == "SVC": + tag = "service" + else: + tag = None + + commands = [] + if tag and row.get('%s_check_command' % tag, "").startswith('check_mk_active-mkevents'): + data = sites.live().query("GET eventconsoleevents\n" +\ + "Columns: event_id\n" +\ + "Filter: host_name = %s" % \ + row['host_name']) + commands = [ "DELETE;%s;%s" % (entry[0], config.user.id) for entry in data ] + return commands, "archive all events of all hosts of" + + + multisite_commands.append({ + "tables" : [ "host", "service" ], + "permission" : "mkeventd.archive_events_of_hosts", + "title" : _("Archive events of hosts"), + "render" : lambda: html.button("_archive_events_of_hosts", _('Archive events')), + "action" : command_archive_events_of_hosts, + "executor" : command_executor_mkeventd, + }) + + #. # .--Sorters-------------------------------------------------------------. # | ____ _ |

7 years, 9 months

4002 BI: Major Rework of Code. Apache processes now share computated data

by Andreas Boesl

Module: check_mk Branch: master Commit: b40a49a69be9999e9c1e180eee0fc2d532f4e2cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b40a49a69be999… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 14 10:36:12 2016 +0100 4002 BI: Major Rework of Code. Apache processes now share computated data The apache processes no longer compute the BI trees only for personal usage. With this update they are now able to share their compilation results. If you encounter any bugs with this new mechanism you can switch back to the old implementation via the global settings option "Use legacy compilation for BI aggregations (slower). Change-Id: Iaa7bb34098d2578f54b43532522d3baba77eb1b8 --- .werks/4002 | 16 + ChangeLog | 1 + web/htdocs/bi.py | 1348 +++++++++++++++++++++++++++- web/htdocs/config.py | 2 +- web/plugins/config/bi.py | 13 +- web/plugins/wato/check_mk_configuration.py | 7 + 6 files changed, 1337 insertions(+), 50 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b40a49a69b…

7 years, 9 months

Fix handling of fallback contacts, add missing dict key "name"

by Mathias Kettner

Module: check_mk Branch: master Commit: f6634acd8d74806cbfcd33bd32c208051f3e5aea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6634acd8d7480… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 11:40:04 2016 +0100 Fix handling of fallback contacts, add missing dict key "name" Change-Id: I8a79bebcb1993c0616758cafd7d87e7bbdb15f08 --- modules/notify.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index c35b0e3..8672056 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -492,9 +492,13 @@ def rbn_fallback_contacts(): if notification_fallback_email: fallback_contacts.append(rbn_fake_email_contact(notification_fallback_email)) - for contact in contacts.values(): + for contact_name, contact in contacts.items(): if contact.get("fallback_contact", False) and contact.get("email"): - fallback_contacts.append(contact) + fallback_contact = { + "name" : contact_name, + } + fallback_contact.update(contact) + fallback_contacts.append(fallback_contact) return fallback_contacts

7 years, 9 months

4151 Use notification fallback also for hosts not known to the monitoring

by Mathias Kettner

Module: check_mk Branch: master Commit: 5821ca0b450f4cc1cbbc684a3ebed87157a65911 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5821ca0b450f4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 12:05:13 2016 +0100 4151 Use notification fallback also for hosts not known to the monitoring This can happen if you forward notifications from the Event Console. All contacts that are configured for notifications fallback and also the global fallback email address will be regarded as contacts in that case. Change-Id: I841a56ae239f88aced8f0f403f5a644cea8aa2a7 --- .werks/4151 | 12 ++++++++++++ ChangeLog | 1 + modules/notify.py | 3 +-- web/htdocs/wato.py | 15 +++++++++------ web/plugins/wato/globals_notification.py | 14 ++++++++------ 5 files changed, 31 insertions(+), 14 deletions(-) diff --git a/.werks/4151 b/.werks/4151 new file mode 100644 index 0000000..2783d59 --- /dev/null +++ b/.werks/4151 @@ -0,0 +1,12 @@ +Title: Use notification fallback also for hosts not known to the monitoring +Level: 2 +Component: ec +Compatible: compat +Version: 1.4.0i3 +Date: 1481886244 +Class: feature + +This can happen if you forward notifications from the Event Console. All +contacts that are configured for notifications fallback and also the +global fallback email address will be regarded as contacts in that +case. diff --git a/ChangeLog b/ChangeLog index 09d6409..8e72049 100644 --- a/ChangeLog +++ b/ChangeLog @@ -133,6 +133,7 @@ Event Console: * 4132 Monitoring notifications: Add EC_ORIG_HOST to notifiation context... * 4148 EC: reorder entries in Performance snapin, add overflows and load + * 4151 Use notification fallback also for hosts not known to the monitoring... * 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... diff --git a/modules/notify.py b/modules/notify.py index 8672056..efa0fa8 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -781,8 +781,7 @@ def rbn_object_contacts(context): if commasepped: return commasepped.split(",") else: - # TODO: Hier die Fallback-Contacts eintragen! - return [] + return [ contact["name"] for contact in rbn_fallback_contacts() ] def rbn_all_contacts(with_email=None): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a3e967d..fedbc9d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10334,7 +10334,7 @@ def mode_edit_user(phase): new_user["fallback_contact"] = html.get_checkbox("fallback_contact") if new_user["fallback_contact"] and not new_user["email"]: raise MKUserError("email", - _("You have enabled the fallback notifications but missed to configure a " + _("You have enabled the fallback notifications but missed to configure an " "email address. You need to configure your mail address in order " "to be able to receive fallback notifications.")) @@ -10607,11 +10607,14 @@ def mode_edit_user(phase): forms.section(_("Fallback notifications"), simple=True) html.checkbox("fallback_contact", False, label = _("Receive fallback notifications")) - html.help(_("When using rule based notifications and a notification is created which is " - "not handled by any rule, you can enable this user to receive those " - "notifications. As alternative you could configure a single email address " - "as the global setting <a href=\"wato.py?mode=edit_configvar&varname=notification_fallback_email\">" - "Fallback email address for rule based notifications</a>.")) + + html.help(_("In case none of your notification rules handles a certain event a notification " + "will be sent to this contact. This makes sure that in that case at least someone " + "gets notified. Furthermore this contact will be used for notifications to any host or service " + "that is not known to the monitoring. This can happen when you forward notifications " + "from the Event Console. Notification fallback can also configured in the global " + "setting <a href=\"wato.py?mode=edit_configvar&varname=notification_fallback_email\">" + "Fallback email address for notifications</a>.")) forms.header(_("Personal Settings"), isopen = False) select_language(user) diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index 8e67554..aab54b4 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -50,12 +50,14 @@ register_configvar(group, register_configvar(group, "notification_fallback_email", EmailAddress( - title = _("Fallback email address for rule based notifications"), - help = _("If you work with rule based notifications then you should configure an email " - "address here. In case of a hole in your notification rules a notification " - "will be sent to this address. This makes sure that in any case someone gets " - "notified. You can also configure single users to receive those fallback notifications, " - "by enabling the option in the user profile."), + title = _("Fallback email address for notifications"), + help = _("In case none of your notification rules handles a certain event a notification " + "will be sent to this address. This makes sure that in that case at least someone " + "gets notified. Furthermore this email address will be used in notifications as a " + "contact for any host or service " + "that is not known to the monitoring. This can happen when you forward notifications " + "from the Event Console. Notification fallback can also configured in single " + "user profiles."), empty_text = _("(No fallback email address configured!)"), make_clickable = False, ),

7 years, 9 months

4152 FIX Fix matching of hosts when forwarding notifications from Event Console

by Mathias Kettner

Module: check_mk Branch: master Commit: 552eadccaf38d7f00a13621595a84383c5323ee1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=552eadccaf38d7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 12:15:51 2016 +0100 4152 FIX Fix matching of hosts when forwarding notifications from Event Console Up to now the host name in the event was looked for in the monitoring data with an exact match. Now the same algorithm is being used as in the GUI: case insensitive comparison of the event host name with the monitoring host name, alias and IP address. Change-Id: Ifff8fd29e68d50a5bb48ac62ceba7bdd0ec19659 --- .werks/4152 | 12 ++ ChangeLog | 1 + bin/mkeventd | 427 ++++++++++++++++++++++++++++++++---------------------- modules/events.py | 6 + modules/notify.py | 8 +- 5 files changed, 275 insertions(+), 179 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=552eadccaf…

7 years, 9 months

veeam_backup_status.ps1_: Remove useless variable initializations

by Konstantin Büttner

Module: check_mk Branch: master Commit: ad5a0783697bfe0c810feb6e97fb9ac08709fad2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad5a0783697bfe… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Dec 16 11:31:50 2016 +0100 veeam_backup_status.ps1_: Remove useless variable initializations Change-Id: I7f60b9927fdbb03aec210fbd76204a8dd8d91310 --- agents/windows/plugins/veeam_backup_status.ps1_ | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/agents/windows/plugins/veeam_backup_status.ps1_ b/agents/windows/plugins/veeam_backup_status.ps1_ index 208740e..7fd893b 100644 --- a/agents/windows/plugins/veeam_backup_status.ps1_ +++ b/agents/windows/plugins/veeam_backup_status.ps1_ @@ -29,24 +29,18 @@ $myBackupJobs = Get-VBRJob | where {$_.IsScheduleEnabled -eq $true } foreach ($myJob in $myBackupJobs) { - $myJobName = "" $myJobName = $myJob.Name -replace "\'","_" -replace " ","_" - $myJobType = "" $myJobType = $myjob.JobType - $myJobLastState = "" $myJobLastState = $myJob.GetLastState() - $myJobLastResult = "" $myJobLastResult = $myJob.GetLastResult() $myJobLastSession = $myJob.FindLastSession() - $myJobCreationTime = "" $myJobCreationTime = $myJobLastSession.CreationTime | get-date -Format "dd.MM.yyyy HH\:mm\:ss" -ErrorAction SilentlyContinue - $myJobEndTime = "" $myJobEndTime = $myJobLastSession.EndTime | get-date -Format "dd.MM.yyyy HH\:mm\:ss" -ErrorAction SilentlyContinue $myJobsText = "$myJobsText" + "$myJobName" + "`t" + "$myJobType" + "`t" + "$myJobLastState" + "`t" + "$myJobLastResult" + "`t" + "$myJobCreationTime" + "`t" + "$myJobEndTime" + "`n" @@ -68,24 +62,20 @@ foreach ($myJob in $myBackupJobs) $myJobLastSessionTasks = $sessions | Get-VBRTaskSession -ErrorAction SilentlyContinue - $myTask = "" foreach ($myTask in $myJobLastSessionTasks) { - $myTaskName = "" $myTaskName = $myTask.Name $myTaskText = "$myTaskText" + "<<<<" + "$myTaskName" + ">>>>" + "`n" $myTaskText = "$myTaskText" + "<<<"+ "veeam_client:sep(9)" +">>>" +"`n" - $myTaskStatus = "" $myTaskStatus = $myTask.Status $myTaskText = "$myTaskText" + "Status" + "`t" + "$myTaskStatus" + "`n" $myTaskText = "$myTaskText" + "JobName" + "`t" + "$myJobName" + "`n" - $myTaskTotalSize = "" $myTaskTotalSize = $myTask.Progress.TotalSize $myTaskText = "$myTaskText" + "TotalSizeByte" + "`t" + "$myTaskTotalSize" + "`n" @@ -98,28 +88,23 @@ foreach ($myJob in $myBackupJobs) $myTaskText = "$myTaskText" + "TransferedSizeByte" + "`t" + "$myTaskTransferedSize" + "`n" - $myTaskStartTime = "" $myTaskStartTime = $myTask.Progress.StartTime | get-date -Format "dd.MM.yyyy HH\:mm\:ss" -ErrorAction SilentlyContinue $myTaskText = "$myTaskText" + "StartTime" + "`t" + "$myTaskStartTime" + "`n" - $myTaskStopTime = "" $myTaskStopTime = $myTask.Progress.StopTime | get-date -Format "dd.MM.yyyy HH\:mm\:ss" -ErrorAction SilentlyContinue $myTaskText = "$myTaskText" + "StopTime" + "`t" + "$myTaskStopTime" + "`n" # Result is a value of type System.TimeStamp. I'm sure there is a more elegant way of formatting the output: - $myTaskDuration = "" $myTaskDuration = "" + "{0:D2}" -f $myTask.Progress.duration.Days + ":" + "{0:D2}" -f $myTask.Progress.duration.Hours + ":" + "{0:D2}" -f $myTask.Progress.duration.Minutes + ":" + "{0:D2}" -f $myTask.Progress.duration.Seconds $myTaskText = "$myTaskText" + "DurationDDHHMMSS" + "`t" + "$myTaskDuration" + "`n" - $myTaskAvgSpeed = "" $myTaskAvgSpeed = $myTask.Progress.AvgSpeed $myTaskText = "$myTaskText" + "AvgSpeedBps" + "`t" + "$myTaskAvgSpeed" + "`n" - $myTaskDisplayName = "" $myTaskDisplayName = $myTask.Progress.DisplayName $myTaskText = "$myTaskText" + "DisplayName" + "`t" + "$myTaskDisplayName" + "`n"

7 years, 9 months

Fixed exception in contact group module after recent HTML refactoring

by Mathias Kettner

Module: check_mk Branch: master Commit: 36dcd874f297fc59f538d0a35d4e0427991082f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36dcd874f297fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 11:31:18 2016 +0100 Fixed exception in contact group module after recent HTML refactoring Change-Id: I95ca6be363f5de8d002d04badf1df35f82400235 --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c7b0e8f..a3e967d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6626,7 +6626,7 @@ def mode_groups(phase, what): if what == "contact": table.cell(_("Members")) - html.write_html(", ".join( + html.write_html(HTML(", ").join( [ html.render_a(alias, href=folder_preserving_link([("mode", "edit_user"), ("edit", userid)])) for userid, alias in members.get(name, [])]))

7 years, 9 months

4150 FIX Avoid exception in host search when searching for empty texts

by Mathias Kettner

Module: check_mk Branch: master Commit: 098edee947e0c8ea1d1db8229d8813770b0fe9d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=098edee947e0c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 11:07:21 2016 +0100 4150 FIX Avoid exception in host search when searching for empty texts Change-Id: I1179c3d0b434f7a07695c5173b022f40de73dca8 --- .werks/4150 | 9 +++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4150 b/.werks/4150 new file mode 100644 index 0000000..5150b21 --- /dev/null +++ b/.werks/4150 @@ -0,0 +1,9 @@ +Title: Avoid exception in host search when searching for empty texts +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i3 +Date: 1481882827 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index adca56c..09d6409 100644 --- a/ChangeLog +++ b/ChangeLog @@ -122,6 +122,7 @@ * 4133 FIX: Do not suppress site specific global issues during WATO activation * 4134 FIX: Unified ineffective rulesets view with other ruleset list views * 3999 FIX: Added core restart note to bulk host rename page + * 4150 FIX: Avoid exception in host search when searching for empty texts Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index ed43001..bb1dbe7 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -2582,7 +2582,7 @@ class TextAttribute(Attribute): def host_attribute_matches(crit, value): - if crit[0] == "~": + if crit and crit[0] == "~": # insensitive infix regex match return re.search(crit[1:], value, re.IGNORECASE) != None else:

7 years, 9 months

← Newer
1
...
16
17
18
19
20
21
22
...
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