Skip to content

Commit 63c1833

Browse files
feat: [PAYMCLOUD-583] Route table metabase + Remove zabbix (#3626)
* remove zabbix * add route table from metabase to nexi
1 parent 2b438d1 commit 63c1833

38 files changed

+44
-3005
lines changed

src/db-security/02_metabase_db.tf

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,24 @@ module "postgres_flexible_snet" {
1717
product_name = var.prefix
1818
env = var.env
1919

20+
tags = module.tag_config.tags
2021
}
2122

23+
# Route Table
24+
module "route_table_app_service_snet" {
25+
source = "./.terraform/modules/__v4__/route_table"
26+
count = length(var.route_table_routes) > 0 ? 1 : 0
27+
28+
name = "${local.project}-rt"
29+
resource_group_name = azurerm_resource_group.metabase_rg.name
30+
location = azurerm_resource_group.metabase_rg.location
31+
32+
routes = var.route_table_routes
33+
34+
subnet_ids = [module.app_service_snet.id]
35+
36+
tags = module.tag_config.tags
37+
}
2238

2339
module "metabase_postgres_db" {
2440
source = "./.terraform/modules/__v4__/IDH/postgres_flexible_server"
@@ -54,6 +70,9 @@ module "metabase_postgres_db" {
5470
private_dns_record_cname = "metabase-db"
5571

5672
additional_azure_extensions = ["citext"]
73+
embedded_subnet = {
74+
enabled = false
75+
}
5776

5877
tags = module.tag_config.tags
5978

src/db-security/03_metabase_app.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ module "app_service_snet" {
1111

1212
service_endpoints = ["Microsoft.Web"]
1313

14+
tags = module.tag_config.tags
15+
1416
}
1517

1618
module "metabase_app_service" {

src/db-security/99_main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ data "azurerm_subscription" "current" {}
3131
data "azurerm_client_config" "current" {}
3232

3333
module "__v4__" {
34-
# v7.40.3
35-
source = "git::https://github.com/pagopa/terraform-azurerm-v4?ref=a4b4d4eeb688973df4c4f70cb996086497d84bd4"
34+
# v8.40.0
35+
source = "git::https://github.com/pagopa/terraform-azurerm-v4?ref=91f7e70706ce328dc819a908d6e953f0b7b0fed3"
3636
}

src/db-security/99_variables.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,3 +172,13 @@ variable "db_vdi_settings" {
172172
error_message = "db_vdi_settings.host_pool_type must be either \"Personal\" or \"Pooled\"."
173173
}
174174
}
175+
176+
variable "route_table_routes" {
177+
type = list(object({
178+
name = string
179+
address_prefix = string
180+
next_hop_type = string
181+
next_hop_in_ip_address = string
182+
}))
183+
default = []
184+
}

src/db-security/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@ After creating the VM, login as admin user and follow these instructions:
3535

3636
| Name | Source | Version |
3737
|------|--------|---------|
38-
| <a name="module___v4__"></a> [\_\_v4\_\_](#module\_\_\_v4\_\_) | git::https://github.com/pagopa/terraform-azurerm-v4 | a4b4d4eeb688973df4c4f70cb996086497d84bd4 |
38+
| <a name="module___v4__"></a> [\_\_v4\_\_](#module\_\_\_v4\_\_) | git::https://github.com/pagopa/terraform-azurerm-v4 | 91f7e70706ce328dc819a908d6e953f0b7b0fed3 |
3939
| <a name="module_app_service_snet"></a> [app\_service\_snet](#module\_app\_service\_snet) | ./.terraform/modules/__v4__/IDH/subnet | n/a |
4040
| <a name="module_metabase_app_service"></a> [metabase\_app\_service](#module\_metabase\_app\_service) | ./.terraform/modules/__v4__/IDH/app_service_webapp | n/a |
4141
| <a name="module_metabase_postgres_db"></a> [metabase\_postgres\_db](#module\_metabase\_postgres\_db) | ./.terraform/modules/__v4__/IDH/postgres_flexible_server | n/a |
4242
| <a name="module_postgres_flexible_snet"></a> [postgres\_flexible\_snet](#module\_postgres\_flexible\_snet) | ./.terraform/modules/__v4__/IDH/subnet | n/a |
43+
| <a name="module_route_table_app_service_snet"></a> [route\_table\_app\_service\_snet](#module\_route\_table\_app\_service\_snet) | ./.terraform/modules/__v4__/route_table | n/a |
4344
| <a name="module_secret_core"></a> [secret\_core](#module\_secret\_core) | ./.terraform/modules/__v4__/key_vault_secrets_query | n/a |
4445
| <a name="module_secret_core_itn"></a> [secret\_core\_itn](#module\_secret\_core\_itn) | ./.terraform/modules/__v4__/key_vault_secrets_query | n/a |
4546
| <a name="module_tag_config"></a> [tag\_config](#module\_tag\_config) | ../tag_config | n/a |
@@ -98,6 +99,7 @@ After creating the VM, login as admin user and follow these instructions:
9899
| <a name="input_metabase_pgflex_params"></a> [metabase\_pgflex\_params](#input\_metabase\_pgflex\_params) | n/a | <pre>object({<br/> idh_tier = string<br/> db_version = string<br/> storage_mb = string<br/> pgres_flex_diagnostic_settings_enabled = bool<br/> alerts_enabled = bool<br/> private_dns_registration_enabled = bool<br/> })</pre> | n/a | yes |
99100
| <a name="input_metabase_plan_idh_tier"></a> [metabase\_plan\_idh\_tier](#input\_metabase\_plan\_idh\_tier) | IDH resource tier for metabase app service | `string` | n/a | yes |
100101
| <a name="input_prefix"></a> [prefix](#input\_prefix) | n/a | `string` | n/a | yes |
102+
| <a name="input_route_table_routes"></a> [route\_table\_routes](#input\_route\_table\_routes) | n/a | <pre>list(object({<br/> name = string<br/> address_prefix = string<br/> next_hop_type = string<br/> next_hop_in_ip_address = string<br/> }))</pre> | `[]` | no |
101103

102104
## Outputs
103105

src/db-security/env/dev/terraform.tfvars

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ metabase_plan_idh_tier = "basic_high_performance"
2121
enabled_features = {
2222
db_vdi = false
2323
}
24+

src/db-security/env/prod/terraform.tfvars

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,10 @@ db_vdi_settings = {
3030
session_limit = 1
3131
host_pool_type = "Pooled"
3232
}
33+
34+
route_table_routes = [{
35+
name = "dbsecurity-subnet-to-nexi-postgres-onprem-subnet"
36+
address_prefix = "10.102.1.93/32"
37+
next_hop_type = "VirtualAppliance"
38+
next_hop_in_ip_address = "10.230.10.150"
39+
}]

src/db-security/env/uat/backend.ini

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/db-security/env/uat/backend.tfvars

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/db-security/env/uat/terraform.tfvars

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)