Merge pull request #5 from kumarvna/develop

updating examples for version 2.2.0
kumarvna · Jul 18, 2021 · 0b08c0f · 0b08c0f
2 parents 274cb6b + 1bca967
commit 0b08c0f
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -37,8 +37,8 @@ module "virtual-machine" {
   virtual_machine_name = "vm-linux"
 
   # (Optional) To enable Azure Monitoring and install log analytics agents
+  # (Optional) Specify `storage_account_name` to save monitoring logs to storage.   
   log_analytics_workspace_name = var.log_analytics_workspace_name
-  hub_storage_account_name     = var.hub_storage_account_name
 
   # Deploy log analytics agents to virtual machine. Log analytics workspace name required.
   # Defaults to `false` 
@@ -307,6 +307,9 @@ Name | Description | Type | Default
 `dedicated_host_id`|The ID of a Dedicated Host where this machine should be run on|string|`null`
 `license_type`|Specifies the type of on-premise license which should be used for this Virtual Machine. Possible values are `None`, `Windows_Client` and `Windows_Server`.|string|`"None"`
 `vm_time_zone`|Specifies the Time Zone which should be used by the Virtual Machine. Ex. `"UTC"` or `"W. Europe Standard Time"` [The possible values are defined here](https://jackstromberg.com/2017/01/list-of-time-zones-consumed-by-azure/) |string|`null`
+`log_analytics_workspace_name`|The name of log analytics workspace name|string|`null`
+`storage_account_name`|The name of the storage account name|string|`null`
+`deploy_log_analytics_agent`|Install log analytics agent to windows or linux VM|string|`false`
 `Tags`|A map of tags to add to all resources|map|`{}`
 
 ## Outputs

diff --git a/examples/README.md b/examples/README.md
@@ -24,8 +24,8 @@ module "virtual-machine" {
   virtual_machine_name = "vm-linux"
 
   # (Optional) To enable Azure Monitoring and install log analytics agents
+  # (Optional) Specify `storage_account_name` to save monitoring logs to storage.   
   log_analytics_workspace_name = var.log_analytics_workspace_name
-  hub_storage_account_name     = var.hub_storage_account_name
 
   # Deploy log analytics agents to virtual machine. Log analytics workspace name required.
   # Defaults to `false` 
@@ -101,8 +101,8 @@ module "virtual-machine" {
   virtual_machine_name = "win-machine"
 
   # (Optional) To enable Azure Monitoring and install log analytics agents
+  # (Optional) Specify `storage_account_name` to save monitoring logs to storage.   
   log_analytics_workspace_name = var.log_analytics_workspace_name
-  hub_storage_account_name     = var.hub_storage_account_name
 
   # Deploy log analytics agents to virtual machine. Log analytics workspace name required.
   # Defaults to `false` 
@@ -179,8 +179,8 @@ module "virtual-machine" {
   virtual_machine_name = "win-sqlvm"
 
   # (Optional) To enable Azure Monitoring and install log analytics agents
+  # (Optional) Specify `storage_account_name` to save monitoring logs to storage.   
   log_analytics_workspace_name = var.log_analytics_workspace_name
-  hub_storage_account_name     = var.hub_storage_account_name
 
   # Deploy log analytics agents to virtual machine. Log analytics workspace name required.
   # Defaults to `false` 

diff --git a/examples/linux_virtual_machine/README.md b/examples/linux_virtual_machine/README.md
@@ -22,8 +22,8 @@ module "virtual-machine" {
   virtual_machine_name = "vm-linux"
 
   # (Optional) To enable Azure Monitoring and install log analytics agents
+  # (Optional) Specify `storage_account_name` to save monitoring logs to storage.   
   log_analytics_workspace_name = var.log_analytics_workspace_name
-  hub_storage_account_name     = var.hub_storage_account_name
 
   # Deploy log analytics agents to virtual machine. Log analytics workspace name required.
   # Defaults to `false` 

diff --git a/examples/linux_virtual_machine/main.tf b/examples/linux_virtual_machine/main.tf
@@ -15,8 +15,8 @@ module "virtual-machine" {
   virtual_machine_name = "vm-linux"
 
   # (Optional) To enable Azure Monitoring and install log analytics agents
+  # (Optional) Specify `storage_account_name` to save monitoring logs to storage.   
   log_analytics_workspace_name = var.log_analytics_workspace_name
-  hub_storage_account_name     = var.hub_storage_account_name
 
   # Deploy log analytics agents to virtual machine. Log analytics workspace name required.
   # Defaults to `false` 

diff --git a/examples/linux_virtual_machine/variables.tf b/examples/linux_virtual_machine/variables.tf
@@ -3,7 +3,7 @@ variable "log_analytics_workspace_name" {
   default     = null
 }
 
-variable "hub_storage_account_name" {
+variable "storage_account_name" {
   description = "The name of the hub storage account to store logs"
   default     = null
 }
diff --git a/examples/mssql_windows_virtual_machine/README.md b/examples/mssql_windows_virtual_machine/README.md
@@ -23,8 +23,8 @@ module "virtual-machine" {
   virtual_machine_name = "win-sqlvm"
 
   # (Optional) To enable Azure Monitoring and install log analytics agents
+  # (Optional) Specify `storage_account_name` to save monitoring logs to storage.   
   log_analytics_workspace_name = var.log_analytics_workspace_name
-  hub_storage_account_name     = var.hub_storage_account_name
 
   # Deploy log analytics agents to virtual machine. Log analytics workspace name required.
   # Defaults to `false` 

diff --git a/examples/mssql_windows_virtual_machine/main.tf b/examples/mssql_windows_virtual_machine/main.tf
@@ -16,8 +16,8 @@ module "virtual-machine" {
   virtual_machine_name = "win-sqlvm"
 
   # (Optional) To enable Azure Monitoring and install log analytics agents
+  # (Optional) Specify `storage_account_name` to save monitoring logs to storage.   
   log_analytics_workspace_name = var.log_analytics_workspace_name
-  hub_storage_account_name     = var.hub_storage_account_name
 
   # Deploy log analytics agents to virtual machine. Log analytics workspace name required.
   # Defaults to `false` 

diff --git a/examples/mssql_windows_virtual_machine/variables.tf b/examples/mssql_windows_virtual_machine/variables.tf
@@ -3,7 +3,7 @@ variable "log_analytics_workspace_name" {
   default     = null
 }
 
-variable "hub_storage_account_name" {
+variable "storage_account_name" {
   description = "The name of the hub storage account to store logs"
   default     = null
 }
diff --git a/examples/windows_virtual_machine/README.md b/examples/windows_virtual_machine/README.md
@@ -22,8 +22,8 @@ module "virtual-machine" {
   virtual_machine_name = "win-machine"
 
   # (Optional) To enable Azure Monitoring and install log analytics agents
+  # (Optional) Specify `storage_account_name` to save monitoring logs to storage.   
   log_analytics_workspace_name = var.log_analytics_workspace_name
-  hub_storage_account_name     = var.hub_storage_account_name
 
   # Deploy log analytics agents to virtual machine. Log analytics workspace name required.
   # Defaults to `false` 

diff --git a/examples/windows_virtual_machine/main.tf b/examples/windows_virtual_machine/main.tf
@@ -16,8 +16,8 @@ module "virtual-machine" {
   virtual_machine_name = "win-machine"
 
   # (Optional) To enable Azure Monitoring and install log analytics agents
+  # (Optional) Specify `storage_account_name` to save monitoring logs to storage.   
   log_analytics_workspace_name = var.log_analytics_workspace_name
-  hub_storage_account_name     = var.hub_storage_account_name
 
   # Deploy log analytics agents to virtual machine. Log analytics workspace name required.
   # Defaults to `false` 

diff --git a/examples/windows_virtual_machine/variables.tf b/examples/windows_virtual_machine/variables.tf
@@ -3,7 +3,7 @@ variable "log_analytics_workspace_name" {
   default     = null
 }
 
-variable "hub_storage_account_name" {
+variable "storage_account_name" {
   description = "The name of the hub storage account to store logs"
   default     = null
 }
diff --git a/main.tf b/main.tf
@@ -40,8 +40,8 @@ data "azurerm_log_analytics_workspace" "logws" {
 }
 
 data "azurerm_storage_account" "storeacc" {
-  count               = var.hub_storage_account_name != null ? 1 : 0
-  name                = var.hub_storage_account_name
+  count               = var.storage_account_name != null ? 1 : 0
+  name                = var.storage_account_name
   resource_group_name = data.azurerm_resource_group.rg.name
 }
 
@@ -292,10 +292,10 @@ resource "azurerm_virtual_machine_extension" "omsagentlinux" {
 # azurerm monitoring diagnostics 
 #--------------------------------------
 resource "azurerm_monitor_diagnostic_setting" "nsg" {
-  count                      = var.log_analytics_workspace_name != null && var.hub_storage_account_name != null ? 1 : 0
+  count                      = var.log_analytics_workspace_name != null || var.storage_account_name != null ? 1 : 0
   name                       = lower("nsg-${var.virtual_machine_name}-diag")
   target_resource_id         = azurerm_network_security_group.nsg.id
-  storage_account_id         = data.azurerm_storage_account.storeacc.0.id
+  storage_account_id         = var.storage_account_name != null ? data.azurerm_storage_account.storeacc.0.id : null
   log_analytics_workspace_id = data.azurerm_log_analytics_workspace.logws.0.id
 
   dynamic "log" {

diff --git a/variables.tf b/variables.tf
@@ -23,7 +23,7 @@ variable "log_analytics_workspace_name" {
   default     = null
 }
 
-variable "hub_storage_account_name" {
+variable "storage_account_name" {
   description = "The name of the hub storage account to store logs"
   default     = null
 }