Merge branch 'fix/add-missing-tags' into component-updates

Azure · Feb 5, 2024 · 8e6d05a · 8e6d05a
2 parents 8e33bb4 + 773ebc9
commit 8e6d05a
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/.ado/pipelines/config/configuration.yaml b/.ado/pipelines/config/configuration.yaml
@@ -9,7 +9,7 @@ variables:
 - name: 'kubernetesVersion'   # kubernetes version used for aks clusters
   value: '1.27.3'
 - name: 'helmVersion'         # helm package manager version
-  value: 'v3.13.1'
+  value: 'v3.14.0'
 - name: 'ingressNginxVersion' # nginx ingress controller helm chart version
   value: '4.7.3'
 - name: 'certManagerVersion'  # cert-manager helm chart version

diff --git a/src/app/AlwaysOn.UI/package-lock.json b/src/app/AlwaysOn.UI/package-lock.json
diff --git a/src/infra/monitoring/grafana/config/grafana.ini b/src/infra/monitoring/grafana/config/grafana.ini
@@ -216,8 +216,6 @@ admin_user = ${GRAFANA_USERNAME}
 # default admin password, can be changed before first start of grafana,  or in profile settings
 admin_password = ${GRAFANA_PASSWORD}
 
-# used for signing
-;secret_key = SW2YcwTIb9zpOOhoPsMm
 
 # disable gravatar profile images
 ;disable_gravatar = false

diff --git a/src/infra/workload/releaseunit/modules/stamp/prometheus.tf b/src/infra/workload/releaseunit/modules/stamp/prometheus.tf
@@ -12,6 +12,8 @@ resource "azurerm_monitor_data_collection_endpoint" "stamp" {
   kind                          = "Linux"
   public_network_access_enabled = true
   description                   = "monitor_data_collection_endpoint example"
+
+  tags = var.default_tags
 }
 
 resource "azurerm_monitor_data_collection_rule" "stamp" {
@@ -39,6 +41,8 @@ resource "azurerm_monitor_data_collection_rule" "stamp" {
       name               = "MonitoringAccount1"
     }
   }
+
+  tags = var.default_tags
 }
 
 resource "azurerm_monitor_data_collection_rule_association" "aks" {
@@ -75,6 +79,7 @@ resource "azurerm_monitor_alert_prometheus_rule_group" "prometheusK8sRuleGroup"
     enabled = true
   }
 
+  tags = var.default_tags
 }
 
 resource "azurerm_monitor_alert_prometheus_rule_group" "prometheusNodeRuleGroup" {
@@ -95,4 +100,6 @@ resource "azurerm_monitor_alert_prometheus_rule_group" "prometheusNodeRuleGroup"
     }
     enabled = true
   }
+
+  tags = var.default_tags
 }
diff --git a/src/testing/userload-generator/AzureFunctions/RegionalLoadGenerator/package-lock.json b/src/testing/userload-generator/AzureFunctions/RegionalLoadGenerator/package-lock.json
diff --git a/src/testing/userload-generator/infra/modules/regional_function/storage.tf b/src/testing/userload-generator/infra/modules/regional_function/storage.tf
@@ -4,6 +4,7 @@ resource "azurerm_storage_account" "regional" {
   resource_group_name      = var.resource_group_name
   account_tier             = "Standard"
   account_replication_type = "LRS"
+  allow_nested_items_to_be_public = false
 
   tags = var.default_tags
 }
diff --git a/src/testing/userload-generator/infra/storage.tf b/src/testing/userload-generator/infra/storage.tf
@@ -4,6 +4,7 @@ resource "azurerm_storage_account" "master" {
   resource_group_name      = azurerm_resource_group.deployment.name
   account_tier             = "Standard"
   account_replication_type = "LRS"
+  allow_nested_items_to_be_public = false
 
   tags = local.default_tags
 }