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

feat: Upgraded synthetic module, disabled fdr and customized nexi tests #2697

Merged
merged 1 commit into from
Dec 24, 2024
Merged
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
2 changes: 2 additions & 0 deletions src/synthetic-monitoring/02_monitoring.tf
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,7 @@ module "monitoring_function" {
alert_enabled = var.synthetic_alerts_enabled
verify_payment_internal_expected_outcome = var.verify_payment_internal_expected_outcome
nexi_node_ip = var.nexi_node_ip
fdr_enabled = var.env == "prod" ? false : true
nexi_ndp_host = var.nexi_ndp_host
})
}
4 changes: 2 additions & 2 deletions src/synthetic-monitoring/99_main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ data "azurerm_subscription" "current" {}
data "azurerm_client_config" "current" {}

module "__v3__" {
# v8.64.0
source = "git::https://github.com/pagopa/terraform-azurerm-v3?ref=ff49c94c7bfb8f2867e550483d8acc125bf516a7"
# v8.67.0
source = "git::https://github.com/pagopa/terraform-azurerm-v3?ref=bfddd6f7c18b5bd1aa1b367cefed6b5dc6f1242d"
}
4 changes: 4 additions & 0 deletions src/synthetic-monitoring/99_variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,7 @@ variable "nexi_node_ip" {
type = string
description = "Nodo Pagamenti Nexi ip"
}
variable "nexi_ndp_host" {
type = string
description = "Nodo Pagamenti Nexi ip"
}
3 changes: 2 additions & 1 deletion src/synthetic-monitoring/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

| Name | Source | Version |
|------|--------|---------|
| <a name="module___v3__"></a> [\_\_v3\_\_](#module\_\_\_v3\_\_) | git::https://github.com/pagopa/terraform-azurerm-v3 | ff49c94c7bfb8f2867e550483d8acc125bf516a7 |
| <a name="module___v3__"></a> [\_\_v3\_\_](#module\_\_\_v3\_\_) | git::https://github.com/pagopa/terraform-azurerm-v3 | bfddd6f7c18b5bd1aa1b367cefed6b5dc6f1242d |
| <a name="module_monitoring_function"></a> [monitoring\_function](#module\_monitoring\_function) | ./.terraform/modules/__v3__/monitoring_function | n/a |
| <a name="module_secret_core"></a> [secret\_core](#module\_secret\_core) | git::https://github.com/pagopa/terraform-azurerm-v3.git//key_vault_secrets_query | v8.54.0 |

Expand Down Expand Up @@ -51,6 +51,7 @@
| <a name="input_law_sku"></a> [law\_sku](#input\_law\_sku) | Sku of the Log Analytics Workspace | `string` | `"PerGB2018"` | no |
| <a name="input_location"></a> [location](#input\_location) | One of westeurope, northeurope | `string` | n/a | yes |
| <a name="input_location_short"></a> [location\_short](#input\_location\_short) | One of wue, neu | `string` | n/a | yes |
| <a name="input_nexi_ndp_host"></a> [nexi\_ndp\_host](#input\_nexi\_ndp\_host) | Nodo Pagamenti Nexi ip | `string` | n/a | yes |
| <a name="input_nexi_node_ip"></a> [nexi\_node\_ip](#input\_nexi\_node\_ip) | Nodo Pagamenti Nexi ip | `string` | n/a | yes |
| <a name="input_prefix"></a> [prefix](#input\_prefix) | n/a | `string` | n/a | yes |
| <a name="input_self_alert_enabled"></a> [self\_alert\_enabled](#input\_self\_alert\_enabled) | (Optional) enables the alert on the function itself | `bool` | `true` | no |
Expand Down
1 change: 1 addition & 0 deletions src/synthetic-monitoring/env/weu-dev/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ check_position_body = {
}
verify_payment_internal_expected_outcome = "KO"
nexi_node_ip = "10.70.66.200"
nexi_ndp_host = "nodo-p-sit.tst-npc.sia.eu"
3 changes: 2 additions & 1 deletion src/synthetic-monitoring/env/weu-prod/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@ check_position_body = {
}
verify_payment_internal_expected_outcome = "OK"
nexi_node_ip = "10.79.20.34"

nexi_ndp_host = "nodo-p.npc.sia.eu"
nexi_ndp_host_2 = "nodo-dei-pagamenti.npc.sia.eu"
2 changes: 1 addition & 1 deletion src/synthetic-monitoring/env/weu-uat/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ check_position_body = {
}
verify_payment_internal_expected_outcome = "KO"
nexi_node_ip = "10.70.74.200"

nexi_ndp_host = "nodo-p-uat.tst-npc.sia.eu"
8 changes: 5 additions & 3 deletions src/synthetic-monitoring/monitoring_configuration.json.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@
{
"apiName" : "status",
"appName" : "fdr",
"enabled" : ${fdr_enabled},
"url" : "https://${internal_api_domain_prefix}.fdr.${internal_api_domain_suffix}/pagopa-fdr-service/info",
"type" : "aks",
"checkCertificate" : true,
Expand All @@ -333,6 +334,7 @@
{
"apiName" : "status",
"appName" : "fdr",
"enabled" : ${fdr_enabled},
"url" : "https://${api_dot_env_name}.platform.pagopa.it/shared/statuspage/v1/info?product=fdrndpnew",
"type" : "apim",
"checkCertificate" : true,
Expand Down Expand Up @@ -724,7 +726,7 @@
"headers": {
"Content-Type": "application/json",
"ndphost": "nodo-${env_short}.nexigroup.com",
"Host": "nodo-dei-pagamenti.npc.sia.eu"
"Host": "${nexi_ndp_host}"
},
"tags" : {
"description" : "pagopa nodo ${env_name} check position"
Expand Down Expand Up @@ -854,7 +856,7 @@
"SOAPAction": "verifyPaymentNotice",
"Content-Type": "application/xml",
"ndphost": "nodo-${env_short}.nexigroup.com",
"Host": "nodo-dei-pagamenti.npc.sia.eu"
"Host": "${nexi_ndp_host}"
},
"tags" : {
"description" : "pagopa nodo ${env_name} verify payment notice to internal service"
Expand Down Expand Up @@ -920,7 +922,7 @@
"SOAPAction": "verifyPaymentNotice",
"Content-Type": "application/xml",
"ndphost": "nodo-${env_short}.nexigroup.com",
"Host": "nodo-dei-pagamenti.npc.sia.eu"
"Host": "${nexi_ndp_host}"
},
"tags" : {
"description" : "pagopa nodo ${env_name} verify payment notice to external service trough nexi"
Expand Down
Loading