Merge pull request #102 from plzm/develop

Develop
plzm · Apr 24, 2024 · 19db24f · 19db24f
2 parents 03d2bbc + f905c02
commit 19db24f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/modules/plzm.Azure/plzm.Azure.psd1 b/modules/plzm.Azure/plzm.Azure.psd1
@@ -12,13 +12,13 @@
 RootModule = '.\modules\plzm.Azure\plzm.Azure.psm1'
 
 # Version number of this module.
-ModuleVersion = '2.13'
+ModuleVersion = '2.14'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
 
 # ID used to uniquely identify this module
-GUID = '0317d0ec-2512-4653-80d9-3051590c77f4'
+GUID = 'ae2eef44-7610-4493-a615-15b223ac0654'
 
 # Author of this module
 Author = 'Patrick El-Azem'

diff --git a/modules/plzm.Azure/plzm.Azure.psm1 b/modules/plzm.Azure/plzm.Azure.psm1
@@ -1695,15 +1695,8 @@ function Get-DiagnosticsSettingsForResource()
   Write-Debug -Debug:$true -Message "query = $query"
 
   # Main resource diagnostic settings
-  try
-  {
-    $settings = "$(az monitor diagnostic-settings list --subscription $SubscriptionId --resource $ResourceId --query "$query" 2>nul)"
-  }
-  catch
-  {
-    Write-Debug -Debug:$true -Message "Error: $_"
-    $settings = $null
-  }
+  #$settings = "$(az monitor diagnostic-settings list --subscription $SubscriptionId --resource $ResourceId --query "$query" 2>nul)"
+  $settings = az monitor diagnostic-settings list --subscription $SubscriptionId --resource $ResourceId --query "$query" 2>nul
 
   if ($settings)
   {

diff --git a/scripts/AzureMonitor.ps1 b/scripts/AzureMonitor.ps1
@@ -626,15 +626,8 @@ function Get-DiagnosticsSettingsForResource()
   Write-Debug -Debug:$true -Message "query = $query"
 
   # Main resource diagnostic settings
-  try
-  {
-    $settings = "$(az monitor diagnostic-settings list --subscription $SubscriptionId --resource $ResourceId --query "$query" 2>nul)"
-  }
-  catch
-  {
-    Write-Debug -Debug:$true -Message "Error: $_"
-    $settings = $null
-  }
+  #$settings = "$(az monitor diagnostic-settings list --subscription $SubscriptionId --resource $ResourceId --query "$query" 2>nul)"
+  $settings = az monitor diagnostic-settings list --subscription $SubscriptionId --resource $ResourceId --query "$query" 2>nul
 
   if ($settings)
   {