Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shared adx #12

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@

| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_adx_ingestion_uri"></a> [adx\_ingestion\_uri](#input\_adx\_ingestion\_uri) | n/a | `string` | n/a | yes |
| <a name="input_adx_uri"></a> [adx\_uri](#input\_adx\_uri) | n/a | `string` | n/a | yes |
| <a name="input_namespace"></a> [namespace](#input\_namespace) | The kubernetes namespace to create | `string` | n/a | yes |
| <a name="input_owner_list"></a> [owner\_list](#input\_owner\_list) | List of mail addresses for App Registration owners | `list(string)` | n/a | yes |
| <a name="input_platform_public_ip"></a> [platform\_public\_ip](#input\_platform\_public\_ip) | The public IP resource of the platform | `string` | n/a | yes |
Expand Down Expand Up @@ -107,7 +109,6 @@
| Name | Description |
|------|-------------|
| <a name="output_acr_login_server"></a> [acr\_login\_server](#output\_acr\_login\_server) | n/a |
| <a name="output_adx_uri"></a> [adx\_uri](#output\_adx\_uri) | n/a |
| <a name="output_babylon_client_id"></a> [babylon\_client\_id](#output\_babylon\_client\_id) | n/a |
| <a name="output_babylon_principal_id"></a> [babylon\_principal\_id](#output\_babylon\_principal\_id) | n/a |
| <a name="output_babylon_secret"></a> [babylon\_secret](#output\_babylon\_secret) | n/a |
Expand All @@ -116,7 +117,6 @@
| <a name="output_managed_disk_id"></a> [managed\_disk\_id](#output\_managed\_disk\_id) | n/a |
| <a name="output_out_acr_login_password"></a> [out\_acr\_login\_password](#output\_out\_acr\_login\_password) | n/a |
| <a name="output_out_acr_login_username"></a> [out\_acr\_login\_username](#output\_out\_acr\_login\_username) | n/a |
| <a name="output_out_adx_ingestion_uri"></a> [out\_adx\_ingestion\_uri](#output\_out\_adx\_ingestion\_uri) | n/a |
| <a name="output_out_cosmos_key"></a> [out\_cosmos\_key](#output\_out\_cosmos\_key) | n/a |
| <a name="output_out_cosmos_uri"></a> [out\_cosmos\_uri](#output\_out\_cosmos\_uri) | n/a |
| <a name="output_out_eventbus_uri"></a> [out\_eventbus\_uri](#output\_out\_eventbus\_uri) | n/a |
Expand Down
20 changes: 10 additions & 10 deletions azure-tenant-resources/modules.tf
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,17 @@ module "create-eventhub" {
tags = local.tags
}

module "create-kusto" {
source = "./create-kusto"
# module "create-kusto" {
# source = "./create-kusto"

count = var.create_adx ? 1 : 0
location = var.location
resource_group = var.tenant_resource_group.name
kusto_name = local.kusto_name
private_dns_zone_id = module.create-network-resources.out_private_dns_zone_id
subnet_id = module.create-network-resources.out_subnet_id
tags = local.tags
}
# count = var.create_adx ? 1 : 0
# location = var.location
# resource_group = var.tenant_resource_group.name
# kusto_name = local.kusto_name
# private_dns_zone_id = module.create-network-resources.out_private_dns_zone_id
# subnet_id = module.create-network-resources.out_subnet_id
# tags = local.tags
# }

module "create-backup" {
source = "./create-backup"
Expand Down
12 changes: 6 additions & 6 deletions azure-tenant-resources/output.tf
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ output "eventbus_uri" {
sensitive = true
}

output "adx_uri" {
value = var.create_adx ? module.create-kusto.0.adx_uri : ""
}
# output "adx_uri" {
# value = var.create_adx ? module.create-kusto.0.adx_uri : ""
# }

output "adx_ingestion_uri" {
value = var.create_adx ? module.create-kusto.0.adx_ingestion_uri : ""
}
# output "adx_ingestion_uri" {
# value = var.create_adx ? module.create-kusto.0.adx_ingestion_uri : ""
# }

output "backup_instance_disk" {
value = var.create_backup ? module.create-backup.0.backup_instance_disk : null
Expand Down
12 changes: 10 additions & 2 deletions modules.tf
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ module "platform-tenant-resources" {
acr_login_password = module.azure-tenant-resources.out_acr_login_password
acr_login_server = module.azure-tenant-resources.out_acr_login_server
acr_login_username = module.azure-tenant-resources.out_acr_login_username
adx_ingestion_uri = module.azure-tenant-resources.adx_ingestion_uri
adx_uri = module.azure-tenant-resources.adx_uri
adx_ingestion_uri = var.adx_ingestion_uri
adx_uri = var.adx_uri
cosmos_uri = module.azure-tenant-resources.cosmos_uri
cosmos_key = module.azure-tenant-resources.cosmos_key
eventbus_uri = module.azure-tenant-resources.eventbus_uri
Expand All @@ -86,6 +86,14 @@ module "platform-tenant-resources" {
depends_on = [module.azure-tenant-resources]
}

variable "adx_ingestion_uri" {
type = string
}

variable "adx_uri" {
type = string
}

module "create-vault-entries" {
source = "./create-vault-entries"

Expand Down
12 changes: 6 additions & 6 deletions outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ output "out_eventbus_uri" {
sensitive = true
}

output "adx_uri" {
value = module.azure-tenant-resources.adx_uri
}
# output "adx_uri" {
# value = module.azure-tenant-resources.adx_uri
# }

output "out_adx_ingestion_uri" {
value = module.azure-tenant-resources.adx_ingestion_uri
}
# output "out_adx_ingestion_uri" {
# value = module.azure-tenant-resources.adx_ingestion_uri
# }

output "babylon_client_id" {
value = module.azure-tenant-prerequisites.0.out_babylon_client_id
Expand Down