Module: check_mk
Branch: master
Commit: e09f1fc8a50f5e1fda4a8476584e9080574d789f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e09f1fc8a50f5e…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Dec 15 16:23:26 2016 +0100
Fixed typo in warning message (missing space before ")
Change-Id: Id4c84251b189543d16bfd9ee748749de142bb09d
---
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 3608b81..c7b0e8f 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -7789,7 +7789,7 @@ def mode_notifications(phase):
"<a href=\"%s\">fallback email address</a> nor enabled receiving fallback emails for "
"any user. If your monitoring produces a notification that is not matched by any of your "
"notification rules, the notification will not be sent out. To prevent that, please "
- "configure either the global setting or enable the fallback contact option for at least"
+ "configure either the global setting or enable the fallback contact option for at least "
"one of your users.") % url)
if show_bulks:
Module: check_mk
Branch: master
Commit: e9b270e448cb98c037edf6c11be26e60c66e1a42
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9b270e448cb98…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Fri Dec 16 10:35:08 2016 +0100
Remove a number of code-paraphrasing comments.
Change-Id: I0e991f3dbe8d015ffa40b6b5b4a961f44a3c114a
---
agents/windows/plugins/veeam_backup_status.ps1_ | 25 +++----------------------
1 file changed, 3 insertions(+), 22 deletions(-)
diff --git a/agents/windows/plugins/veeam_backup_status.ps1_ b/agents/windows/plugins/veeam_backup_status.ps1_
index df9d9b1..208740e 100644
--- a/agents/windows/plugins/veeam_backup_status.ps1_
+++ b/agents/windows/plugins/veeam_backup_status.ps1_
@@ -20,24 +20,15 @@ $pswindow.buffersize = $newsize
# Load Veeam Backup and Replication Powershell Snapin
Add-PSSnapin VeeamPSSnapIn -ErrorAction SilentlyContinue
-
-# No real error handling in the whole script, just using this try ... catch for totally unexpected errors.
-# If any error occurs during check, a field might just remain blank
-
try
{
-# Create new text string for backup job section. Initialize it with header
$myJobsText = "<<<veeam_jobs:sep(9)>>>`n"
-# Create new text string for backup tasks section.
$myTaskText = ""
-# List all planned backup AND replication jobs which are ENABLED
$myBackupJobs = Get-VBRJob | where {$_.IsScheduleEnabled -eq $true }
-# to check only for Backups or Replicas: "$_.IsBackup -eq $true" "$_.IsReplica -eq $true"
-# Iterate through all backup jobs
foreach ($myJob in $myBackupJobs)
-{
+ {
$myJobName = ""
$myJobName = $myJob.Name -replace "\'","_" -replace " ","_"
@@ -62,7 +53,7 @@ foreach ($myJob in $myBackupJobs)
# For Non Backup Jobs (Replicas) we bail out
# because we are interested in the status of the original backup but
- # for replicas the overall job state is all we need.
+ # for replicas the overall job state is all we need.
if ($myJob.IsBackup -eq $false) { continue }
# Each backup job has a number of tasks which were executed (VMs which were processed)
@@ -77,7 +68,6 @@ foreach ($myJob in $myBackupJobs)
$myJobLastSessionTasks = $sessions | Get-VBRTaskSession -ErrorAction SilentlyContinue
- # Iterate through all tasks in the last backup job
$myTask = ""
foreach ($myTask in $myJobLastSessionTasks)
{
@@ -134,25 +124,16 @@ foreach ($myJob in $myBackupJobs)
$myTaskText = "$myTaskText" + "DisplayName" + "`t" + "$myTaskDisplayName" + "`n"
- # End of section <<<veeam.client>>>
$myTaskText = "$myTaskText" + "<<<<" + ">>>>" +"`n"
- # END OF LOOP foreach ($myTask in $myJobLastSessionTasks)
}
-# END OF LOOP foreach ($myJob in $myBackupJobs)
-}
+ }
-# Final output
write-host $myJobsText
write-host $myTaskText
-# "$myJobsText" + "$myTaskText"
-
-
-# END OF TRY
}
-# CATCH only totally impossible catastrophic errors
catch
{
$errMsg = $_.Exception.Message