[checkmk-commits] 5488 FIX veeam_jobs: Add support for new veeam API

Module: check_mk Branch: master Commit: 837f3022d7f2de6c32a186fedb6b8105ec4aeb9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=837f3022d7f2de… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Jan 10 16:07:10 2018 +0100 5488 FIX veeam_jobs: Add support for new veeam API The new veeam API only supports StartTimeLocal and StopTimeLocal. The old API using StartTime and StopTime is not supported anymore. This lead to the error that backup jobs using the new API were shown as "No complete backup". This change adds support for StartTimeLocal and StopTimeLocal while maintaining compatibility to the old API. Change-Id: I787f79b8239a451232ce8ccb90d59a33d8d93f50 --- .werks/5488 | 14 ++++++++++++++ agents/windows/plugins/veeam_backup_status.ps1_ | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/.werks/5488 b/.werks/5488 new file mode 100644 index 0000000..c306ab9 --- /dev/null +++ b/.werks/5488 @@ -0,0 +1,14 @@ +Title: veeam_jobs: Add support for new veeam API +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1515682965 +Class: fix + +The new veeam API only supports StartTimeLocal and StopTimeLocal. The old API +using StartTime and StopTime is not supported anymore. This lead to the error +that backup jobs using the new API were shown as "No complete backup". This +change adds support for StartTimeLocal and StopTimeLocal while maintaining +compatibility to the old API. diff --git a/agents/windows/plugins/veeam_backup_status.ps1_ b/agents/windows/plugins/veeam_backup_status.ps1_ index 493542b..ade6f9f 100644 --- a/agents/windows/plugins/veeam_backup_status.ps1_ +++ b/agents/windows/plugins/veeam_backup_status.ps1_ @@ -101,11 +101,23 @@ foreach ($myJob in $myBackupJobs) $myTaskText = "$myTaskText" + "TransferedSizeByte" + "`t" + "$myTaskTransferedSize" + "`n" - $myTaskStartTime = $myTask.Progress.StartTime | get-date -Format "dd.MM.yyyy HH\:mm\:ss" -ErrorAction SilentlyContinue + # Starting from Version 9.5U3 StartTime is not supported anymore + If ($myTask.Progress.StartTime -eq $Null) { + $myTaskStartTime = $myTask.Progress.StartTimeLocal + } Else { + $myTaskStartTime = $myTask.Progress.StartTime + } + $myTaskStartTime = $myTaskStartTime | Get-Date -Format "dd.MM.yyyy HH\:mm\:ss" -ErrorAction SilentlyContinue $myTaskText = "$myTaskText" + "StartTime" + "`t" + "$myTaskStartTime" + "`n" - $myTaskStopTime = $myTask.Progress.StopTime | get-date -Format "dd.MM.yyyy HH\:mm\:ss" -ErrorAction SilentlyContinue + # Starting from Version 9.5U3 StopTime is not supported anymore + If ($myTask.Progress.StopTime -eq $Null) { + $myTaskStopTime = $myTask.Progress.StopTimeLocal + } Else { + $myTaskStopTime = $myTask.Progress.StopTime + } + $myTaskStopTime = $myTaskStopTime | Get-Date -Format "dd.MM.yyyy HH\:mm\:ss" -ErrorAction SilentlyContinue $myTaskText = "$myTaskText" + "StopTime" + "`t" + "$myTaskStopTime" + "`n"