nik/OMDSCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged PR 287: Azureリソースの現状を更新 | エラーの挙動について確認する

Browse Source 
## 概要
[Task2302: エラーの挙動について確認する](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2302)

- ApplicationGatewayの正常性プローブの監視先を `/` から `/health` に変更
- httpの対象を監視となっていたものをhttpsにしてバックエンド設定を指定

## レビューポイント
- 情報共有

## 動作確認状況
- develop環境で確認
This commit is contained in:
湯本 開 2023-07-31 07:58:41 +00:00
parent 5fccc37dee
commit 781162f2d2
9 changed files with 9023 additions and 8682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3355
configurations/azure/dev-application-rg.json
View File

File diff suppressed because it is too large Load Diff

11852
configurations/azure/dev-database-rg.json
View File

File diff suppressed because it is too large Load Diff

91
configurations/azure/dev-network-rg.json
View File

@ -5732,6 +5732,22 @@
},
"type": "Microsoft.OperationalInsights/workspaces/tables"
},
{
"apiVersion": "2021-12-01-preview",
"dependsOn": [
"[resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspaces_log_odms_agw_dev_name'))]"
],
"name": "[concat(parameters('workspaces_log_odms_agw_dev_name'), '/AVNMRuleCollectionChange')]",
"properties": {
"plan": "Analytics",
"retentionInDays": 30,
"schema": {
"name": "AVNMRuleCollectionChange"
},
"totalRetentionInDays": 30
},
"type": "Microsoft.OperationalInsights/workspaces/tables"
},
{
"apiVersion": "2021-12-01-preview",
"dependsOn": [
@ -6239,6 +6255,10 @@
"retentionInDays": 30,
"schema": {
"columns": [
{
"name": "WAFPolicyID_s",
"type": "string"
},
{
"name": "clientIp_s",
"type": "string"
@ -6882,6 +6902,22 @@
},
"type": "Microsoft.OperationalInsights/workspaces/tables"
},
{
"apiVersion": "2021-12-01-preview",
"dependsOn": [
"[resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspaces_log_odms_agw_dev_name'))]"
],
"name": "[concat(parameters('workspaces_log_odms_agw_dev_name'), '/ContainerEvent')]",
"properties": {
"plan": "Analytics",
"retentionInDays": 30,
"schema": {
"name": "ContainerEvent"
},
"totalRetentionInDays": 30
},
"type": "Microsoft.OperationalInsights/workspaces/tables"
},
{
"apiVersion": "2021-12-01-preview",
"dependsOn": [
@ -6898,6 +6934,22 @@
},
"type": "Microsoft.OperationalInsights/workspaces/tables"
},
{
"apiVersion": "2021-12-01-preview",
"dependsOn": [
"[resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspaces_log_odms_agw_dev_name'))]"
],
"name": "[concat(parameters('workspaces_log_odms_agw_dev_name'), '/ContainerInstanceLog')]",
"properties": {
"plan": "Analytics",
"retentionInDays": 30,
"schema": {
"name": "ContainerInstanceLog"
},
"totalRetentionInDays": 30
},
"type": "Microsoft.OperationalInsights/workspaces/tables"
},
{
"apiVersion": "2021-12-01-preview",
"dependsOn": [
@ -10939,17 +10991,6 @@
}
]
}
},
{
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name')), '/backendAddressPools/pool-odms-app-test')]",
"name": "pool-odms-app-test",
"properties": {
"backendAddresses": [
{
"fqdn": "app-odms-dictation-test.azurewebsites.net"
}
]
}
}
],
"backendHttpSettingsCollection": [
@ -10957,10 +10998,14 @@
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name')), '/backendHttpSettingsCollection/setting-odms-https-dev')]",
"name": "setting-odms-https-dev",
"properties": {
"affinityCookieName": "ApplicationGatewayAffinity",
"cookieBasedAffinity": "Disabled",
"path": "/",
"pickHostNameFromBackendAddress": true,
"port": 443,
"probe": {
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name')), '/probes/setting-odms-https-dev')]"
},
"protocol": "Https",
"requestTimeout": 90
}
@ -10969,6 +11014,7 @@
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name')), '/backendHttpSettingsCollection/setting-odms-back-dev')]",
"name": "setting-odms-back-dev",
"properties": {
"affinityCookieName": "ApplicationGatewayAffinity",
"cookieBasedAffinity": "Disabled",
"path": "/",
"pickHostNameFromBackendAddress": true,
@ -11058,15 +11104,15 @@
"privateLinkConfigurations": [],
"probes": [
{
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name')), '/probes/setting-odms-https-dev53037635-c8be-48b2-9097-2a08277e304a')]",
"name": "setting-odms-https-dev53037635-c8be-48b2-9097-2a08277e304a",
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name')), '/probes/setting-odms-https-dev')]",
"name": "setting-odms-https-dev",
"properties": {
"interval": 30,
"match": {},
"minServers": 0,
"path": "/",
"path": "/health",
"pickHostNameFromBackendHttpSettings": true,
"protocol": "Http",
"protocol": "Https",
"timeout": 30,
"unhealthyThreshold": 3
}
@ -11131,21 +11177,6 @@
"/dictation/api/*"
]
}
},
{
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name')), '/urlPathMaps/rule-odms-private-dev/pathRules/target-odms-app-test')]",
"name": "target-odms-app-test",
"properties": {
"backendAddressPool": {
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name')), '/backendAddressPools/pool-odms-app-test')]"
},
"backendHttpSettings": {
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name')), '/backendHttpSettingsCollection/setting-odms-https-dev')]"
},
"paths": [
"/test/api/*"
]
}
}
]
}

190
configurations/azure/dev-notification-rg.json
View File

@ -1,95 +1,95 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"namespaces_ntfns_odms_dev_name": {
"type": "String"
}
},
"resources": [
{
"apiVersion": "2017-04-01",
"location": "Japan East",
"name": "[parameters('namespaces_ntfns_odms_dev_name')]",
"properties": {
"createdAt": "2023-07-24T01:26:14.6870000Z",
"critical": false,
"enabled": true,
"provisioningState": "Succeeded",
"serviceBusEndpoint": "[concat('https://', parameters('namespaces_ntfns_odms_dev_name'), '.servicebus.windows.net:443/')]",
"status": "Active",
"updatedAt": "2023-07-24T01:26:14.7370000Z"
},
"sku": {
"name": "Free"
},
"type": "Microsoft.NotificationHubs/namespaces"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_dev_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_dev_name'), '/RootManageSharedAccessKey')]",
"properties": {
"rights": [
"Manage",
"Listen",
"Send"
]
},
"type": "Microsoft.NotificationHubs/namespaces/AuthorizationRules"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_dev_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_dev_name'), '/ntf-odms-dev')]",
"properties": {
"authorizationRules": [],
"registrationTtl": "10675199.02:48:05.4775807"
},
"tags": {
"Project": "OMDS",
"environment": "develop"
},
"type": "Microsoft.NotificationHubs/namespaces/NotificationHubs"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces/NotificationHubs', parameters('namespaces_ntfns_odms_dev_name'), 'ntf-odms-dev')]",
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_dev_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_dev_name'), '/ntf-odms-dev/DefaultFullSharedAccessSignature')]",
"properties": {
"rights": [
"Manage",
"Listen",
"Send"
]
},
"type": "Microsoft.NotificationHubs/namespaces/NotificationHubs/AuthorizationRules"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces/NotificationHubs', parameters('namespaces_ntfns_odms_dev_name'), 'ntf-odms-dev')]",
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_dev_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_dev_name'), '/ntf-odms-dev/DefaultListenSharedAccessSignature')]",
"properties": {
"rights": [
"Listen"
]
},
"type": "Microsoft.NotificationHubs/namespaces/NotificationHubs/AuthorizationRules"
}
],
"variables": {}
}
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"namespaces_ntfns_odms_dev_name": {
"type": "String"
}
},
"resources": [
{
"apiVersion": "2017-04-01",
"location": "Japan East",
"name": "[parameters('namespaces_ntfns_odms_dev_name')]",
"properties": {
"createdAt": "2023-07-24T01:26:14.6870000Z",
"critical": false,
"enabled": true,
"provisioningState": "Succeeded",
"serviceBusEndpoint": "[concat('https://', parameters('namespaces_ntfns_odms_dev_name'), '.servicebus.windows.net:443/')]",
"status": "Active",
"updatedAt": "2023-07-24T01:26:14.7370000Z"
},
"sku": {
"name": "Free"
},
"type": "Microsoft.NotificationHubs/namespaces"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_dev_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_dev_name'), '/RootManageSharedAccessKey')]",
"properties": {
"rights": [
"Manage",
"Listen",
"Send"
]
},
"type": "Microsoft.NotificationHubs/namespaces/AuthorizationRules"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_dev_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_dev_name'), '/ntf-odms-dev')]",
"properties": {
"authorizationRules": [],
"registrationTtl": "10675199.02:48:05.4775807"
},
"tags": {
"Project": "OMDS",
"environment": "develop"
},
"type": "Microsoft.NotificationHubs/namespaces/NotificationHubs"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces/NotificationHubs', parameters('namespaces_ntfns_odms_dev_name'), 'ntf-odms-dev')]",
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_dev_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_dev_name'), '/ntf-odms-dev/DefaultFullSharedAccessSignature')]",
"properties": {
"rights": [
"Manage",
"Listen",
"Send"
]
},
"type": "Microsoft.NotificationHubs/namespaces/NotificationHubs/AuthorizationRules"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces/NotificationHubs', parameters('namespaces_ntfns_odms_dev_name'), 'ntf-odms-dev')]",
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_dev_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_dev_name'), '/ntf-odms-dev/DefaultListenSharedAccessSignature')]",
"properties": {
"rights": [
"Listen"
]
},
"type": "Microsoft.NotificationHubs/namespaces/NotificationHubs/AuthorizationRules"
}
],
"variables": {}
}

12
configurations/azure/maintenance-rg.json
View File

@ -111,10 +111,6 @@
{
"action": "Allow",
"value": "175.177.42.28"
},
{
"action": "Allow",
"value": "153.210.243.72"
}
]
},
@ -1123,10 +1119,8 @@
"caching": "ReadWrite",
"createOption": "FromImage",
"deleteOption": "Delete",
"diskSizeGB": 127,
"managedDisk": {
"id": "[resourceId('Microsoft.Compute/disks', concat(parameters('virtualMachines_vm_odms_staging_maintenance_name'), '_OsDisk_1_903a7540b5a64475b512aedc10487661'))]",
"storageAccountType": "Premium_LRS"
"id": "[resourceId('Microsoft.Compute/disks', concat(parameters('virtualMachines_vm_odms_staging_maintenance_name'), '_OsDisk_1_903a7540b5a64475b512aedc10487661'))]"
},
"name": "[concat(parameters('virtualMachines_vm_odms_staging_maintenance_name'), '_OsDisk_1_903a7540b5a64475b512aedc10487661')]",
"osType": "Windows"
@ -1400,7 +1394,7 @@
"enableIPForwarding": false,
"ipConfigurations": [
{
"etag": "W/\"a89a925e-9e45-4487-8a05-e6328c371ed8\"",
"etag": "W/\"9b4f72e2-4c0e-49c9-b61d-5850d51b00fe\"",
"id": "[concat(resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_vm_odms_maintenance600_name')), '/ipConfigurations/ipconfig1')]",
"name": "ipconfig1",
"properties": {
@ -1441,7 +1435,7 @@
"enableIPForwarding": false,
"ipConfigurations": [
{
"etag": "W/\"c3eedbb4-4d67-4bd5-9af0-2b3c54700529\"",
"etag": "W/\"536cf40c-df06-4ea0-a2e4-253c4c420070\"",
"id": "[concat(resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_vm_odms_staging_maintenance158_name')), '/ipConfigurations/ipconfig1')]",
"name": "ipconfig1",
"properties": {

1828
configurations/azure/stg-application-rg.json
View File

File diff suppressed because it is too large Load Diff

108
configurations/azure/stg-database-rg.json
View File

@ -58,62 +58,6 @@
},
"type": "Microsoft.DBforMySQL/flexibleServers"
},
{
"apiVersion": "2022-09-30-preview",
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20230718t121600-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
"apiVersion": "2022-09-30-preview",
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20230719t121600-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
"apiVersion": "2022-09-30-preview",
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20230720t121600-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
"apiVersion": "2022-09-30-preview",
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20230721t053700-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
"apiVersion": "2022-09-30-preview",
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20230722t053700-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
"apiVersion": "2022-09-30-preview",
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20230723t053700-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
"apiVersion": "2022-09-30-preview",
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20230724t053700-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
"apiVersion": "2022-09-30-preview",
"dependsOn": [
@ -122,6 +66,54 @@
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20230725t053700-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
"apiVersion": "2022-09-30-preview",
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20230726t053700-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
"apiVersion": "2022-09-30-preview",
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20230727t041600-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
"apiVersion": "2022-09-30-preview",
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20230728t045729-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
"apiVersion": "2022-09-30-preview",
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20230728t230900-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
"apiVersion": "2022-09-30-preview",
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20230729t230900-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
"apiVersion": "2022-09-30-preview",
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20230730t230900-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
"apiVersion": "2022-01-01",
"dependsOn": [
@ -5314,9 +5306,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/slow_query_log_file')]",
"properties": {
"currentValue": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-stg-2023072501.log",
"currentValue": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-stg-2023073101.log",
"source": "user-override",
"value": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-stg-2023072501.log"
"value": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-stg-2023073101.log"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},

79
configurations/azure/stg-network-rg.json
View File

@ -584,7 +584,7 @@
"direction": "Inbound",
"priority": 302,
"protocol": "TCP",
"sourceAddressPrefix": "36.226.52.0/23",
"sourceAddressPrefix": "136.226.52.0/23",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
@ -775,7 +775,7 @@
"direction": "Inbound",
"priority": 902,
"protocol": "TCP",
"sourceAddressPrefix": "126.74.128.188/32",
"sourceAddressPrefix": "126.74.195.84/32",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
@ -813,7 +813,7 @@
"direction": "Inbound",
"priority": 903,
"protocol": "TCP",
"sourceAddressPrefix": "211.125.140.83",
"sourceAddressPrefix": "211.125.140.74",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
@ -1309,7 +1309,7 @@
"direction": "Inbound",
"priority": 902,
"protocol": "TCP",
"sourceAddressPrefix": "126.74.128.188/32",
"sourceAddressPrefix": "126.74.195.84/32",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
@ -1353,7 +1353,7 @@
"direction": "Inbound",
"priority": 903,
"protocol": "TCP",
"sourceAddressPrefix": "211.125.140.83",
"sourceAddressPrefix": "211.125.140.74",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
@ -1574,7 +1574,7 @@
"direction": "Inbound",
"priority": 302,
"protocol": "TCP",
"sourceAddressPrefix": "36.226.52.0/23",
"sourceAddressPrefix": "136.226.52.0/23",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
@ -5491,6 +5491,22 @@
},
"type": "Microsoft.OperationalInsights/workspaces/tables"
},
{
"apiVersion": "2021-12-01-preview",
"dependsOn": [
"[resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspaces_log_odms_agw_stg_name'))]"
],
"name": "[concat(parameters('workspaces_log_odms_agw_stg_name'), '/AVNMRuleCollectionChange')]",
"properties": {
"plan": "Analytics",
"retentionInDays": 30,
"schema": {
"name": "AVNMRuleCollectionChange"
},
"totalRetentionInDays": 30
},
"type": "Microsoft.OperationalInsights/workspaces/tables"
},
{
"apiVersion": "2021-12-01-preview",
"dependsOn": [
@ -5998,6 +6014,10 @@
"retentionInDays": 30,
"schema": {
"columns": [
{
"name": "WAFPolicyID_s",
"type": "string"
},
{
"name": "listenerName_s",
"type": "string"
@ -6641,6 +6661,22 @@
},
"type": "Microsoft.OperationalInsights/workspaces/tables"
},
{
"apiVersion": "2021-12-01-preview",
"dependsOn": [
"[resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspaces_log_odms_agw_stg_name'))]"
],
"name": "[concat(parameters('workspaces_log_odms_agw_stg_name'), '/ContainerEvent')]",
"properties": {
"plan": "Analytics",
"retentionInDays": 30,
"schema": {
"name": "ContainerEvent"
},
"totalRetentionInDays": 30
},
"type": "Microsoft.OperationalInsights/workspaces/tables"
},
{
"apiVersion": "2021-12-01-preview",
"dependsOn": [
@ -6657,6 +6693,22 @@
},
"type": "Microsoft.OperationalInsights/workspaces/tables"
},
{
"apiVersion": "2021-12-01-preview",
"dependsOn": [
"[resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspaces_log_odms_agw_stg_name'))]"
],
"name": "[concat(parameters('workspaces_log_odms_agw_stg_name'), '/ContainerInstanceLog')]",
"properties": {
"plan": "Analytics",
"retentionInDays": 30,
"schema": {
"name": "ContainerInstanceLog"
},
"totalRetentionInDays": 30
},
"type": "Microsoft.OperationalInsights/workspaces/tables"
},
{
"apiVersion": "2021-12-01-preview",
"dependsOn": [
@ -10646,6 +10698,9 @@
"path": "/",
"pickHostNameFromBackendAddress": true,
"port": 443,
"probe": {
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_stg_name')), '/probes/setting-odms-https-stg')]"
},
"protocol": "Https",
"requestTimeout": 90
}
@ -10741,6 +10796,7 @@
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_stg_name')), '/httpListeners/listener-odms-public-stg')]",
"name": "listener-odms-public-stg",
"properties": {
"customErrorConfigurations": [],
"frontendIPConfiguration": {
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_stg_name')), '/frontendIPConfigurations/appGwPublicFrontendIpIPv4')]"
},
@ -10751,7 +10807,7 @@
"protocol": "Https",
"requireServerNameIndication": false,
"sslCertificate": {
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_stg_name')), '/sslCertificates/ca-odms-agw-stg')]"
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_stg_name')), '/sslCertificates/ca-odms-agw-stg-ip')]"
}
}
}
@ -10767,9 +10823,9 @@
"interval": 30,
"match": {},
"minServers": 0,
"path": "/",
"path": "/health",
"pickHostNameFromBackendHttpSettings": true,
"protocol": "Http",
"protocol": "Https",
"timeout": 30,
"unhealthyThreshold": 3
}
@ -10817,6 +10873,11 @@
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_stg_name')), '/sslCertificates/ca-odms-agw-stg')]",
"name": "ca-odms-agw-stg",
"properties": {}
},
{
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_stg_name')), '/sslCertificates/ca-odms-agw-stg-ip')]",
"name": "ca-odms-agw-stg-ip",
"properties": {}
}
],
"sslProfiles": [],

190
configurations/azure/stg-notification-rg.json
View File

@ -1,95 +1,95 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"namespaces_ntfns_odms_stg_name": {
"type": "String"
}
},
"resources": [
{
"apiVersion": "2017-04-01",
"location": "Japan East",
"name": "[parameters('namespaces_ntfns_odms_stg_name')]",
"properties": {
"createdAt": "2023-07-25T01:57:35.5400000Z",
"critical": false,
"enabled": true,
"provisioningState": "Succeeded",
"serviceBusEndpoint": "[concat('https://', parameters('namespaces_ntfns_odms_stg_name'), '.servicebus.windows.net:443/')]",
"status": "Active",
"updatedAt": "2023-07-25T01:57:35.5970000Z"
},
"sku": {
"name": "Free"
},
"type": "Microsoft.NotificationHubs/namespaces"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_stg_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_stg_name'), '/RootManageSharedAccessKey')]",
"properties": {
"rights": [
"Manage",
"Listen",
"Send"
]
},
"type": "Microsoft.NotificationHubs/namespaces/AuthorizationRules"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_stg_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_stg_name'), '/ntf-odms-stg')]",
"properties": {
"authorizationRules": [],
"registrationTtl": "10675199.02:48:05.4775807"
},
"tags": {
"Project": "OMDS",
"environment": "staging"
},
"type": "Microsoft.NotificationHubs/namespaces/NotificationHubs"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces/NotificationHubs', parameters('namespaces_ntfns_odms_stg_name'), 'ntf-odms-stg')]",
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_stg_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_stg_name'), '/ntf-odms-stg/DefaultFullSharedAccessSignature')]",
"properties": {
"rights": [
"Manage",
"Listen",
"Send"
]
},
"type": "Microsoft.NotificationHubs/namespaces/NotificationHubs/AuthorizationRules"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces/NotificationHubs', parameters('namespaces_ntfns_odms_stg_name'), 'ntf-odms-stg')]",
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_stg_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_stg_name'), '/ntf-odms-stg/DefaultListenSharedAccessSignature')]",
"properties": {
"rights": [
"Listen"
]
},
"type": "Microsoft.NotificationHubs/namespaces/NotificationHubs/AuthorizationRules"
}
],
"variables": {}
}
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"namespaces_ntfns_odms_stg_name": {
"type": "String"
}
},
"resources": [
{
"apiVersion": "2017-04-01",
"location": "Japan East",
"name": "[parameters('namespaces_ntfns_odms_stg_name')]",
"properties": {
"createdAt": "2023-07-25T01:57:35.5400000Z",
"critical": false,
"enabled": true,
"provisioningState": "Succeeded",
"serviceBusEndpoint": "[concat('https://', parameters('namespaces_ntfns_odms_stg_name'), '.servicebus.windows.net:443/')]",
"status": "Active",
"updatedAt": "2023-07-25T01:57:35.5970000Z"
},
"sku": {
"name": "Free"
},
"type": "Microsoft.NotificationHubs/namespaces"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_stg_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_stg_name'), '/RootManageSharedAccessKey')]",
"properties": {
"rights": [
"Manage",
"Listen",
"Send"
]
},
"type": "Microsoft.NotificationHubs/namespaces/AuthorizationRules"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_stg_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_stg_name'), '/ntf-odms-stg')]",
"properties": {
"authorizationRules": [],
"registrationTtl": "10675199.02:48:05.4775807"
},
"tags": {
"Project": "OMDS",
"environment": "staging"
},
"type": "Microsoft.NotificationHubs/namespaces/NotificationHubs"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces/NotificationHubs', parameters('namespaces_ntfns_odms_stg_name'), 'ntf-odms-stg')]",
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_stg_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_stg_name'), '/ntf-odms-stg/DefaultFullSharedAccessSignature')]",
"properties": {
"rights": [
"Manage",
"Listen",
"Send"
]
},
"type": "Microsoft.NotificationHubs/namespaces/NotificationHubs/AuthorizationRules"
},
{
"apiVersion": "2017-04-01",
"dependsOn": [
"[resourceId('Microsoft.NotificationHubs/namespaces/NotificationHubs', parameters('namespaces_ntfns_odms_stg_name'), 'ntf-odms-stg')]",
"[resourceId('Microsoft.NotificationHubs/namespaces', parameters('namespaces_ntfns_odms_stg_name'))]"
],
"location": "Japan East",
"name": "[concat(parameters('namespaces_ntfns_odms_stg_name'), '/ntf-odms-stg/DefaultListenSharedAccessSignature')]",
"properties": {
"rights": [
"Listen"
]
},
"type": "Microsoft.NotificationHubs/namespaces/NotificationHubs/AuthorizationRules"
}
],
"variables": {}
}