remove retention policy (#612)

Azure · Aug 16, 2023 · e133f88 · e133f88
1 parent 60b7a69
commit e133f88
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 161 deletions.
diff --git a/.ado/pipelines/config/configuration.yaml b/.ado/pipelines/config/configuration.yaml
@@ -5,11 +5,11 @@ variables:
   value: 'foundational-connected'
 
 - name: 'terraformVersion'    # Terraform Version
-  value: '1.4.1'
+  value: '1.5.5-*'
 - name: 'kubernetesVersion'   # kubernetes version used for aks clusters
-  value: '1.26.3'
+  value: '1.26.6'
 - name: 'helmVersion'         # helm package manager version
-  value: 'v3.11.3'
+  value: 'v3.12.3'
 - name: 'ingressNginxVersion' # nginx ingress controller helm chart version
   value: '4.6.0'
 - name: 'certManagerVersion'  # cert-manager helm chart version

diff --git a/src/infra/monitoring/grafana/terraform/globalresources/la-wpspace-config.tf b/src/infra/monitoring/grafana/terraform/globalresources/la-wpspace-config.tf
@@ -11,11 +11,6 @@ resource "azurerm_monitor_diagnostic_setting" "diag_settings_afd" {
 
     content {
       category = entry.value
-
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 
@@ -27,10 +22,6 @@ resource "azurerm_monitor_diagnostic_setting" "diag_settings_afd" {
       category = entry.value
       enabled  = true
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 }
@@ -50,10 +41,6 @@ resource "azurerm_monitor_diagnostic_setting" "acr" {
     content {
       category = entry.value
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 
@@ -65,10 +52,6 @@ resource "azurerm_monitor_diagnostic_setting" "acr" {
       category = entry.value
       enabled  = true
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 }
diff --git a/src/infra/monitoring/grafana/terraform/globalresources/main.tf b/src/infra/monitoring/grafana/terraform/globalresources/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.63.0"
+      version = "3.69.0"
     }
   }
 

diff --git a/src/infra/monitoring/grafana/terraform/stamps/la-wspace-config.tf b/src/infra/monitoring/grafana/terraform/stamps/la-wspace-config.tf
@@ -14,10 +14,6 @@ resource "azurerm_monitor_diagnostic_setting" "appservice" {
     content {
       category = entry.value
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 
@@ -29,10 +25,6 @@ resource "azurerm_monitor_diagnostic_setting" "appservice" {
       category = entry.value
       enabled  = true
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 }
@@ -51,10 +43,6 @@ resource "azurerm_monitor_diagnostic_setting" "pgprimary" {
     content {
       category = entry.value
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 
@@ -66,10 +54,6 @@ resource "azurerm_monitor_diagnostic_setting" "pgprimary" {
       category = entry.value
       enabled  = true
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 }
@@ -87,10 +71,6 @@ resource "azurerm_monitor_diagnostic_setting" "pgreplica" {
     content {
       category = entry.value
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 
@@ -102,10 +82,6 @@ resource "azurerm_monitor_diagnostic_setting" "pgreplica" {
       category = entry.value
       enabled  = true
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 }
@@ -125,10 +101,6 @@ resource "azurerm_monitor_diagnostic_setting" "vnet" {
     content {
       category = entry.value
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 
@@ -140,10 +112,6 @@ resource "azurerm_monitor_diagnostic_setting" "vnet" {
       category = entry.value
       enabled  = true
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 }
@@ -163,10 +131,6 @@ resource "azurerm_monitor_diagnostic_setting" "asp" {
     content {
       category = entry.value
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 
@@ -178,10 +142,6 @@ resource "azurerm_monitor_diagnostic_setting" "asp" {
       category = entry.value
       enabled  = true
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 }
@@ -201,10 +161,6 @@ resource "azurerm_monitor_diagnostic_setting" "akv" {
     content {
       category = entry.value
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 
@@ -216,10 +172,6 @@ resource "azurerm_monitor_diagnostic_setting" "akv" {
       category = entry.value
       enabled  = true
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 }
diff --git a/src/infra/monitoring/grafana/terraform/stamps/main.tf b/src/infra/monitoring/grafana/terraform/stamps/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.63.0"
+      version = "3.69.0"
     }
   }
 

diff --git a/src/infra/workload/globalresources/acr.tf b/src/infra/workload/globalresources/acr.tf
@@ -46,10 +46,6 @@ resource "azurerm_monitor_diagnostic_setting" "acr" {
     content {
       category = entry.value
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 
@@ -61,10 +57,6 @@ resource "azurerm_monitor_diagnostic_setting" "acr" {
       category = entry.value
       enabled  = true
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 }
diff --git a/src/infra/workload/globalresources/cosmosdb.tf b/src/infra/workload/globalresources/cosmosdb.tf
@@ -129,10 +129,6 @@ resource "azurerm_monitor_diagnostic_setting" "cosmosdb" {
     content {
       category = entry.value
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 
@@ -144,10 +140,6 @@ resource "azurerm_monitor_diagnostic_setting" "cosmosdb" {
       category = entry.value
       enabled  = true
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 }
diff --git a/src/infra/workload/globalresources/frontdoor.tf b/src/infra/workload/globalresources/frontdoor.tf
@@ -319,10 +319,6 @@ resource "azurerm_monitor_diagnostic_setting" "frontdoor" {
     content {
       category = entry.value
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 
@@ -334,10 +330,6 @@ resource "azurerm_monitor_diagnostic_setting" "frontdoor" {
       category = entry.value
       enabled  = true
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 }
diff --git a/src/infra/workload/globalresources/main.tf b/src/infra/workload/globalresources/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.63.0"
+      version = "3.69.0"
     }
   }
 

diff --git a/src/infra/workload/globalresources/storage.tf b/src/infra/workload/globalresources/storage.tf
@@ -46,10 +46,6 @@ resource "azurerm_monitor_diagnostic_setting" "storage_global" {
     content {
       category = entry.value
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 
@@ -61,10 +57,6 @@ resource "azurerm_monitor_diagnostic_setting" "storage_global" {
       category = entry.value
       enabled  = true
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 }
diff --git a/src/infra/workload/ingress_private_connections/main.tf b/src/infra/workload/ingress_private_connections/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.63.0"
+      version = "3.69.0"
     }
   }
 

diff --git a/src/infra/workload/releaseunit/main.tf b/src/infra/workload/releaseunit/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.63.0"
+      version = "3.69.0"
     }
   }
 

diff --git a/src/infra/workload/releaseunit/modules/stamp/eventhub.tf b/src/infra/workload/releaseunit/modules/stamp/eventhub.tf
@@ -78,10 +78,6 @@ resource "azurerm_monitor_diagnostic_setting" "eventhub" {
     content {
       category = entry.value
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 
@@ -93,10 +89,6 @@ resource "azurerm_monitor_diagnostic_setting" "eventhub" {
       category = entry.value
       enabled  = true
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 }
diff --git a/src/infra/workload/releaseunit/modules/stamp/keyvault.tf b/src/infra/workload/releaseunit/modules/stamp/keyvault.tf
@@ -80,10 +80,6 @@ resource "azurerm_monitor_diagnostic_setting" "kv" {
     content {
       category = entry.value
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 
@@ -95,10 +91,6 @@ resource "azurerm_monitor_diagnostic_setting" "kv" {
       category = entry.value
       enabled  = true
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 }
diff --git a/src/infra/workload/releaseunit/modules/stamp/kubernetes.tf b/src/infra/workload/releaseunit/modules/stamp/kubernetes.tf
@@ -125,10 +125,6 @@ resource "azurerm_monitor_diagnostic_setting" "aks" {
     content {
       category = entry.value
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 
@@ -140,10 +136,6 @@ resource "azurerm_monitor_diagnostic_setting" "aks" {
       category = entry.value
       enabled  = true
 
-      retention_policy {
-        enabled = true
-        days    = 30
-      }
     }
   }
 }