feat: allow to provide existing azurerm_log_analytics_solution

nebuly-ai · Dec 10, 2024 · e263660 · e263660
1 parent 9751081
commit e263660
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -149,6 +149,7 @@ You can find examples of code that uses this Terraform module in the [examples](
 | <a name="input_aks_cluster_admin_group_object_ids"></a> [aks\_cluster\_admin\_group\_object\_ids](#input\_aks\_cluster\_admin\_group\_object\_ids) | Object IDs that are granted the Cluster Admin role over the AKS cluster. | `set(string)` | n/a | yes |
 | <a name="input_aks_cluster_admin_users"></a> [aks\_cluster\_admin\_users](#input\_aks\_cluster\_admin\_users) | User Principal Names (UPNs) of the users that are granted the Cluster Admin role over the AKS cluster. | `set(string)` | n/a | yes |
 | <a name="input_aks_kubernetes_version"></a> [aks\_kubernetes\_version](#input\_aks\_kubernetes\_version) | The Kubernetes version to use. | <pre>object({<br/>    workers       = string<br/>    control_plane = string<br/>  })</pre> | <pre>{<br/>  "control_plane": "1.30.6",<br/>  "workers": "1.30.6"<br/>}</pre> | no |
+| <a name="input_aks_log_analytics_solution"></a> [aks\_log\_analytics\_solution](#input\_aks\_log\_analytics\_solution) | Existing azurerm\_log\_analytics\_solution to be attached to the azurerm\_log\_analytics\_workspace. Providing the config disables creation of azurerm\_log\_analytics\_solution. | <pre>object({<br/>    id                  = string<br/>    name                = string<br/>    location            = optional(string)<br/>    resource_group_name = optional(string)<br/>  })</pre> | `null` | no |
 | <a name="input_aks_log_analytics_workspace"></a> [aks\_log\_analytics\_workspace](#input\_aks\_log\_analytics\_workspace) | Existing azurerm\_log\_analytics\_workspace to attach azurerm\_log\_analytics\_solution. Providing the config disables creation of azurerm\_log\_analytics\_workspace. | <pre>object({<br/>    id                  = string<br/>    name                = string<br/>    location            = optional(string)<br/>    resource_group_name = optional(string)<br/>  })</pre> | `null` | no |
 | <a name="input_aks_net_profile_dns_service_ip"></a> [aks\_net\_profile\_dns\_service\_ip](#input\_aks\_net\_profile\_dns\_service\_ip) | IP address within the Kubernetes service address range that is used by cluster service discovery (kube-dns). Must be inluced in net\_profile\_cidr. Example: 10.32.0.10 | `string` | `"10.32.0.10"` | no |
 | <a name="input_aks_net_profile_service_cidr"></a> [aks\_net\_profile\_service\_cidr](#input\_aks\_net\_profile\_service\_cidr) | The Network Range used by the Kubernetes service. Must not overlap with the AKS Nodes address space. Example: 10.32.0.0/24 | `string` | `"10.32.0.0/24"` | no |
@@ -209,14 +210,14 @@ You can find examples of code that uses this Terraform module in the [examples](
 - resource.azurerm_key_vault_secret.azure_openai_api_key (/terraform-docs/main.tf#585)
 - resource.azurerm_key_vault_secret.azuread_application_client_id (/terraform-docs/main.tf#324)
 - resource.azurerm_key_vault_secret.azuread_application_client_secret (/terraform-docs/main.tf#333)
-- resource.azurerm_key_vault_secret.jwt_signing_key (/terraform-docs/main.tf#792)
+- resource.azurerm_key_vault_secret.jwt_signing_key (/terraform-docs/main.tf#793)
 - resource.azurerm_key_vault_secret.nebuly_azure_client_id (/terraform-docs/main.tf#346)
 - resource.azurerm_key_vault_secret.nebuly_azure_client_secret (/terraform-docs/main.tf#355)
-- resource.azurerm_key_vault_secret.okta_sso_client_id (/terraform-docs/main.tf#804)
-- resource.azurerm_key_vault_secret.okta_sso_client_secret (/terraform-docs/main.tf#815)
+- resource.azurerm_key_vault_secret.okta_sso_client_id (/terraform-docs/main.tf#805)
+- resource.azurerm_key_vault_secret.okta_sso_client_secret (/terraform-docs/main.tf#816)
 - resource.azurerm_key_vault_secret.postgres_password (/terraform-docs/main.tf#510)
 - resource.azurerm_key_vault_secret.postgres_user (/terraform-docs/main.tf#501)
-- resource.azurerm_kubernetes_cluster_node_pool.linux_pools (/terraform-docs/main.tf#749)
+- resource.azurerm_kubernetes_cluster_node_pool.linux_pools (/terraform-docs/main.tf#750)
 - resource.azurerm_management_lock.postgres_server (/terraform-docs/main.tf#444)
 - resource.azurerm_monitor_metric_alert.postgres_server_alerts (/terraform-docs/main.tf#452)
 - resource.azurerm_postgresql_flexible_server.main (/terraform-docs/main.tf#374)
@@ -229,7 +230,7 @@ You can find examples of code that uses this Terraform module in the [examples](
 - resource.azurerm_private_dns_zone_virtual_network_link.flexible_postgres (/terraform-docs/main.tf#206)
 - resource.azurerm_private_dns_zone_virtual_network_link.key_vault (/terraform-docs/main.tf#223)
 - resource.azurerm_private_endpoint.key_vault (/terraform-docs/main.tf#264)
-- resource.azurerm_role_assignment.aks_network_contributor (/terraform-docs/main.tf#744)
+- resource.azurerm_role_assignment.aks_network_contributor (/terraform-docs/main.tf#745)
 - resource.azurerm_role_assignment.key_vault_secret_officer__current (/terraform-docs/main.tf#295)
 - resource.azurerm_role_assignment.key_vault_secret_user__aks (/terraform-docs/main.tf#287)
 - resource.azurerm_role_assignment.storage_container_models__data_contributor (/terraform-docs/main.tf#636)
@@ -240,9 +241,9 @@ You can find examples of code that uses this Terraform module in the [examples](
 - resource.azurerm_subnet.private_endpints (/terraform-docs/main.tf#170)
 - resource.azurerm_virtual_network.main (/terraform-docs/main.tf#144)
 - resource.random_password.postgres_server_admin_password (/terraform-docs/main.tf#369)
-- resource.time_sleep.wait_aks_creation (/terraform-docs/main.tf#731)
+- resource.time_sleep.wait_aks_creation (/terraform-docs/main.tf#732)
 - resource.tls_private_key.aks (/terraform-docs/main.tf#646)
-- resource.tls_private_key.jwt_signing_key (/terraform-docs/main.tf#788)
+- resource.tls_private_key.jwt_signing_key (/terraform-docs/main.tf#789)
 - data source.azuread_user.aks_admins (/terraform-docs/main.tf#96)
 - data source.azurerm_client_config.current (/terraform-docs/main.tf#88)
 - data source.azurerm_private_dns_zone.flexible_postgres (/terraform-docs/main.tf#129)

diff --git a/main.tf b/main.tf
@@ -689,6 +689,7 @@ module "aks" {
   private_cluster_enabled           = false
 
   log_analytics_workspace = var.aks_log_analytics_workspace
+  log_analytics_solution  = var.aks_log_analytics_solution
 
   temporary_name_for_rotation = "systemback"
 

diff --git a/variables.tf b/variables.tf
@@ -416,6 +416,16 @@ variable "aks_log_analytics_workspace" {
   })
   default = null
 }
+variable "aks_log_analytics_solution" {
+  description = " Existing azurerm_log_analytics_solution to be attached to the azurerm_log_analytics_workspace. Providing the config disables creation of azurerm_log_analytics_solution."
+  type = object({
+    id                  = string
+    name                = string
+    location            = optional(string)
+    resource_group_name = optional(string)
+  })
+  default = null
+}
 variable "aks_cluster_admin_users" {
   description = "User Principal Names (UPNs) of the users that are granted the Cluster Admin role over the AKS cluster."
   type        = set(string)