v1.6.4 checkin

doherty100 · Jan 23, 2021 · 4ba73d7 · 4ba73d7
1 parent 6690019
commit 4ba73d7
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 177 deletions.
diff --git a/terraform-azurerm-bench-windows/20-vm-db.tf b/terraform-azurerm-bench-windows/20-vm-db.tf
@@ -119,48 +119,6 @@ resource "azurerm_role_assignment" "virtual_machine_03_rbac_role_key_vault_secre
 
 # Virtual machine extensions
 
-resource "azurerm_virtual_machine_extension" "virtual_machine_03_extension_monitoring" {
-  name                       = "vmext-${azurerm_windows_virtual_machine.virtual_machine_03.name}-monitoring"
-  virtual_machine_id         = azurerm_windows_virtual_machine.virtual_machine_03.id
-  publisher                  = "Microsoft.EnterpriseCloud.Monitoring"
-  type                       = "MicrosoftMonitoringAgent"
-  type_handler_version       = "1.0"
-  auto_upgrade_minor_version = true
-  tags                       = var.tags
-
-  settings           = <<SETTINGS
-    {
-      "workspaceId": "${var.log_analytics_workspace_id}"
-    }
-    SETTINGS
-  protected_settings = <<PROTECTED_SETTINGS
-    {
-      "workspaceKey" : "${data.azurerm_key_vault_secret.log_analytics_workspace_key.value}"
-    }
-    PROTECTED_SETTINGS
-}
-
-resource "azurerm_virtual_machine_extension" "virtual_machine_03_extension_dependency" {
-  name                       = "vmext-${azurerm_windows_virtual_machine.virtual_machine_03.name}-dependency"
-  virtual_machine_id         = azurerm_windows_virtual_machine.virtual_machine_03.id
-  publisher                  = "Microsoft.Azure.Monitoring.DependencyAgent"
-  type                       = "DependencyAgentWindows"
-  type_handler_version       = "9.0"
-  auto_upgrade_minor_version = true
-  tags                       = var.tags
-
-  settings           = <<SETTINGS
-    {
-      "workspaceId": "${var.log_analytics_workspace_id}"
-    }
-    SETTINGS
-  protected_settings = <<PROTECTED_SETTINGS
-    {
-      "workspaceKey" : "${data.azurerm_key_vault_secret.log_analytics_workspace_key.value}"
-    }
-    PROTECTED_SETTINGS
-}
-
 resource "azurerm_virtual_machine_extension" "virtual_machine_03_postdeploy_script" {
   name                       = "vmext-${azurerm_windows_virtual_machine.virtual_machine_03.name}-postdeploy-script"
   virtual_machine_id         = azurerm_windows_virtual_machine.virtual_machine_03.id

diff --git a/terraform-azurerm-bench-windows/30-vm-app.tf b/terraform-azurerm-bench-windows/30-vm-app.tf
@@ -71,48 +71,6 @@ output "virtual_machine_04_nic_01_private_ip_address" {
 
 # Virtual machine extensions
 
-resource "azurerm_virtual_machine_extension" "virtual_machine_04_extension_monitoring" {
-  name                       = "vmext-${azurerm_windows_virtual_machine.virtual_machine_04.name}-monitoring"
-  virtual_machine_id         = azurerm_windows_virtual_machine.virtual_machine_04.id
-  publisher                  = "Microsoft.EnterpriseCloud.Monitoring"
-  type                       = "MicrosoftMonitoringAgent"
-  type_handler_version       = "1.0"
-  auto_upgrade_minor_version = true
-  tags                       = var.tags
-
-  settings           = <<SETTINGS
-    {
-      "workspaceId": "${var.log_analytics_workspace_id}"
-    }
-    SETTINGS
-  protected_settings = <<PROTECTED_SETTINGS
-    {
-      "workspaceKey" : "${data.azurerm_key_vault_secret.log_analytics_workspace_key.value}"
-    }
-    PROTECTED_SETTINGS
-}
-
-resource "azurerm_virtual_machine_extension" "virtual_machine_04_extension_dependency" {
-  name                       = "vmext-${azurerm_windows_virtual_machine.virtual_machine_04.name}-dependency"
-  virtual_machine_id         = azurerm_windows_virtual_machine.virtual_machine_04.id
-  publisher                  = "Microsoft.Azure.Monitoring.DependencyAgent"
-  type                       = "DependencyAgentWindows"
-  type_handler_version       = "9.0"
-  auto_upgrade_minor_version = true
-  tags                       = var.tags
-
-  settings           = <<SETTINGS
-    {
-      "workspaceId": "${var.log_analytics_workspace_id}"
-    }
-    SETTINGS
-  protected_settings = <<PROTECTED_SETTINGS
-    {
-      "workspaceKey" : "${data.azurerm_key_vault_secret.log_analytics_workspace_key.value}"
-    }
-    PROTECTED_SETTINGS
-}
-
 resource "azurerm_virtual_machine_extension" "virtual_machine_04_postdeploy_script" {
   name                       = "vmext-${azurerm_windows_virtual_machine.virtual_machine_04.name}-postdeploy-script"
   virtual_machine_id         = azurerm_windows_virtual_machine.virtual_machine_04.id

diff --git a/terraform-azurerm-bench-windows/README.md b/terraform-azurerm-bench-windows/README.md
@@ -34,7 +34,6 @@ This section provides an index of the 18 resources included in this quick start.
 
 Database Server [virtual machine](https://docs.microsoft.com/en-us/azure/azure-glossary-cloud-terminology#vm) based on the [SQL Server on Azure Virtual Machine \(Windows\)](https://docs.microsoft.com/en-us/azure/azure-sql/virtual-machines/windows/sql-server-on-azure-vm-iaas-what-is-overview) offering which is connected to the dedicated spoke virtual network, supports a configurable number of data disks, pre-configured administrator credentials using key vault and pre-configured virtual machine extensions. The quick start implements [Performance guidelines for SQL Server on Azure Virtual Machines](https://docs.microsoft.com/en-us/azure/azure-sql/virtual-machines/windows/performance-guidelines-best-practices) using a post-deployment script. Pre-configured support for [Azure VM backup](https://docs.microsoft.com/en-us/azure/backup/backup-azure-vms-introduction) is enabled on the virtual machine for application consistent backups using the backup policy and recovery services vault already pre-configured in the shared services vnet quick start. Note that SQL Server database backups are handled separately.
 
-
 Variable | In/Out | Type | Scope | Sample
 --- | --- | --- | --- | ---
 vm_db_name | Input | string | Local | winbenchdb01
@@ -94,8 +93,6 @@ The database virtual machine is registered with the [Microsoft.SqlVirtualMachine
 
 Pre-configured [virtual machine extensions](https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/overview) attached to the virtual machine including:
 
-* [Azure Monitor virtual machine extension](https://docs.microsoft.com/en-us/azure/azure-monitor/platform/agent-windows) known as the *Azure Monitor Agent* (AMA) version 1.0 with automatic minor version upgrades enabled.
-* [Dependency virtual machine extension](https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/agent-dependency-windows) version 9.0 with automatic minor version upgrades enabled and automatically connected to the shared log analytics workspace.
 * [Custom script extension](https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/custom-script-windows) version 1.10 with automatic minor version upgrades enabled and configured to run a post-deployment script installs software, configures data disks, and reconfigures SQL Server to follow recommendations in [Performance guidelines for SQL Server on Azure Virtual Machines](https://docs.microsoft.com/en-us/azure/azure-sql/virtual-machines/windows/performance-guidelines-best-practices).
 * [SQL Server IaaS agent extension](https://docs.microsoft.com/en-us/azure/azure-sql/virtual-machines/windows/sql-server-iaas-agent-extension-automate-management) is automatically installed when the virtual machine is registered with the SQL Server virtual machine resource provider.
 
@@ -141,8 +138,6 @@ virtual_machine_04_nic_01_private_ip_address | Output | string | Local | 10.2.1.
 
 Pre-configured [virtual machine extensions](https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/overview) attached to the virtual machine including:
 
-* [Log Analytics virtual machine extension](https://docs.microsoft.com/en-us/azure/azure-monitor/platform/agent-windows) also known as the *Microsoft Monitoring Agent* (MMA) version 1.0 with automatic minor version upgrades enabled and automatically connected to the shared log analytics workspace.
-* [Dependency virtual machine extension](https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/agent-dependency-windows) version 9.0 with automatic minor version upgrades enabled and automatically connected to the shared log analytics workspace.
 * [Custom script extension](https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/custom-script-windows) version 1.10 with automatic minor version upgrades enabled and configured to run a post-deployment script which partitions and formats new data disks.
 
 Variable | In/Out | Type | Scope | Sample

diff --git a/terraform-azurerm-vm-linux/20-compute.tf b/terraform-azurerm-vm-linux/20-compute.tf
@@ -88,48 +88,6 @@ resource "azurerm_virtual_machine_data_disk_attachment" "virtual_machine_02_data
 
 # Virtual machine extensions
 
-resource "azurerm_virtual_machine_extension" "virtual_machine_02_extension_monitoring" {
-  name                       = "vmext-${azurerm_linux_virtual_machine.virtual_machine_02.name}-monitoring"
-  virtual_machine_id         = azurerm_linux_virtual_machine.virtual_machine_02.id
-  publisher                  = "Microsoft.EnterpriseCloud.Monitoring"
-  type                       = "OmsAgentForLinux"
-  type_handler_version       = "1.13"
-  auto_upgrade_minor_version = true
-  tags                       = var.tags
-
-  settings           = <<SETTINGS
-    {
-      "workspaceId": "${var.log_analytics_workspace_id}"
-    }
-    SETTINGS
-  protected_settings = <<PROTECTED_SETTINGS
-    {
-      "workspaceKey" : "${data.azurerm_key_vault_secret.log_analytics_workspace_key.value}"
-    }
-    PROTECTED_SETTINGS
-}
-
-resource "azurerm_virtual_machine_extension" "virtual_machine_02_extension_dependency" {
-  name                       = "vmext-${azurerm_linux_virtual_machine.virtual_machine_02.name}-dependency"
-  virtual_machine_id         = azurerm_linux_virtual_machine.virtual_machine_02.id
-  publisher                  = "Microsoft.Azure.Monitoring.DependencyAgent"
-  type                       = "DependencyAgentLinux"
-  type_handler_version       = "9.10"
-  auto_upgrade_minor_version = true
-  tags                       = var.tags
-
-  settings           = <<SETTINGS
-    {
-      "workspaceId": "${var.log_analytics_workspace_id}"
-    }
-    SETTINGS
-  protected_settings = <<PROTECTED_SETTINGS
-    {
-      "workspaceKey" : "${data.azurerm_key_vault_secret.log_analytics_workspace_key.value}"
-    }
-    PROTECTED_SETTINGS
-}
-
 resource "azurerm_virtual_machine_extension" "virtual_machine_02_postdeploy_script" {
   name                       = "vmext-${azurerm_linux_virtual_machine.virtual_machine_02.name}-postdeploy-script"
   virtual_machine_id         = azurerm_linux_virtual_machine.virtual_machine_02.id

diff --git a/terraform-azurerm-vm-linux/README.md b/terraform-azurerm-vm-linux/README.md
@@ -68,8 +68,6 @@ vm_storage_account_type | Input | string | Local | Standard_LRS
 
 Pre-configured [virtual machine extensions](https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/overview) attached to the Linux jump box virtual machine including:
 
-* [Log Analytics virtual machine extension](https://docs.microsoft.com/en-us/azure/azure-monitor/platform/agent-linux) also known as the *OMS Agent* version 1.13 with automatic minor version upgrades enabled and automatically connected to the shared log analytics workspace.
-* [Dependency virtual machine extension](https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/agent-dependency-linux) version 9.10 with automatic minor version upgrades enabled and automatically connected to the shared log analytics workspace.
 * [Custom script extension](https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/custom-script-linux) version 2.1 with automatic minor version upgrades enabled and configured to run a post-deployment script.
 
 Variable | In/Out | Type | Scope | Sample

diff --git a/terraform-azurerm-vm-windows/20-compute.tf b/terraform-azurerm-vm-windows/20-compute.tf
@@ -88,48 +88,6 @@ resource "azurerm_virtual_machine_data_disk_attachment" "virtual_machine_01_data
 
 # Virtual machine extensions
 
-resource "azurerm_virtual_machine_extension" "virtual_machine_01_extension_monitoring" {
-  name                       = "vmext-${azurerm_windows_virtual_machine.virtual_machine_01.name}-monitoring"
-  virtual_machine_id         = azurerm_windows_virtual_machine.virtual_machine_01.id
-  publisher                  = "Microsoft.EnterpriseCloud.Monitoring"
-  type                       = "MicrosoftMonitoringAgent"
-  type_handler_version       = "1.0"
-  auto_upgrade_minor_version = true
-  tags                       = var.tags
-
-  settings           = <<SETTINGS
-    {
-      "workspaceId": "${var.log_analytics_workspace_id}"
-    }
-    SETTINGS
-  protected_settings = <<PROTECTED_SETTINGS
-    {
-      "workspaceKey" : "${data.azurerm_key_vault_secret.log_analytics_workspace_key.value}"
-    }
-    PROTECTED_SETTINGS
-}
-
-resource "azurerm_virtual_machine_extension" "virtual_machine_01_extension_dependency" {
-  name                       = "vmext-${azurerm_windows_virtual_machine.virtual_machine_01.name}-dependency"
-  virtual_machine_id         = azurerm_windows_virtual_machine.virtual_machine_01.id
-  publisher                  = "Microsoft.Azure.Monitoring.DependencyAgent"
-  type                       = "DependencyAgentWindows"
-  type_handler_version       = "9.0"
-  auto_upgrade_minor_version = true
-  tags                       = var.tags
-
-  settings           = <<SETTINGS
-    {
-      "workspaceId": "${var.log_analytics_workspace_id}"
-    }
-    SETTINGS
-  protected_settings = <<PROTECTED_SETTINGS
-    {
-      "workspaceKey" : "${data.azurerm_key_vault_secret.log_analytics_workspace_key.value}"
-    }
-    PROTECTED_SETTINGS
-}
-
 resource "azurerm_virtual_machine_extension" "virtual_machine_01_postdeploy_script" {
   name                       = "vmext-${azurerm_windows_virtual_machine.virtual_machine_01.name}-postdeploy-script"
   virtual_machine_id         = azurerm_windows_virtual_machine.virtual_machine_01.id

diff --git a/terraform-azurerm-vm-windows/README.md b/terraform-azurerm-vm-windows/README.md
@@ -68,8 +68,6 @@ vm_storage_account_type | Input | string | Local | Standard_LRS
 
 Pre-configured [virtual machine extensions](https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/overview) attached to the Windows jump box virtual machine including:
 
-* [Azure Monitor virtual machine extension](https://docs.microsoft.com/en-us/azure/azure-monitor/platform/agent-windows) known as the *Azure Monitor Agent* (AMA) version 1.0 with automatic minor version upgrades enabled.
-* [Dependency virtual machine extension](https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/agent-dependency-windows) version 9.0 with automatic minor version upgrades enabled and automatically connected to the log analytics workspace.
 * [Custom script extension](https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/custom-script-windows) version 1.10 with automatic minor version upgrades enabled and configured to run a post-deployment script.
 
 Variable | In/Out | Type | Scope | Sample