Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix retention policy in set-azdiagnosticsettings #11635

Merged
merged 1 commit into from
Apr 21, 2020
Merged

fix retention policy in set-azdiagnosticsettings #11635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Monitor/Monitor/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
-->

## Upcoming Release
* Fixed bug for `Set-AzDiagnosticSettings`, retention policy won't apply to all categories; issue: https://github.com/Azure/azure-powershell/issues/11589

## Version 1.7.0
* Added cmdlets for private link scope
Expand Down
25 changes: 17 additions & 8 deletions src/Monitor/Monitor/Diagnostics/SetAzureRmDiagnosticSettingCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
using Microsoft.Azure.Commands.Insights.OutputClasses;
using Microsoft.Azure.Management.Monitor;
using Microsoft.Azure.Management.Monitor.Models;
using Microsoft.WindowsAzure.Commands.Utilities.Common;

namespace Microsoft.Azure.Commands.Insights.Diagnostics
{
Expand Down Expand Up @@ -373,22 +374,30 @@ private void SetRetention(DiagnosticSettingsResource properties)
Days = this.RetentionInDays.Value
};

if (properties.Logs != null)
if (properties.Logs != null && this.IsParameterBound(c => c.Category))
{
WriteDebugWithTimestamp("Setting retention policy for logs");
foreach (LogSettings logSettings in properties.Logs)
properties.Logs = properties.Logs.Select(setting =>
{
logSettings.RetentionPolicy = retentionPolicy;
}
if (setting != null)
{
setting.RetentionPolicy = this.Category.Contains(setting.Category) ? retentionPolicy : (setting.RetentionPolicy == null ? null : setting.RetentionPolicy);
}
return setting;
}).ToList();
}

if (properties.Metrics != null)
if (properties.Metrics != null && this.IsParameterBound(c => c.MetricCategory))
{
WriteDebugWithTimestamp("Setting retention policy for metrics");
foreach (MetricSettings metricSettings in properties.Metrics)
properties.Metrics = properties.Metrics.Select(setting =>
{
metricSettings.RetentionPolicy = retentionPolicy;
}
if (setting != null)
{
setting.RetentionPolicy = this.MetricCategory.Contains(setting.Category) ? retentionPolicy : (setting.RetentionPolicy == null ? null : setting.RetentionPolicy);
}
return setting;
}).ToList();
}
}

Expand Down