Merged PR 568: Azure Function App上でのDBアクセス・メール送信疎通実施

## 概要
[Task2867: Azure Function App上でのDBアクセス・メール送信疎通実施](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2867)

- 元PBI or タスクへのリンク(内容・目的などはそちらにあるはず)
- 何をどう変更したか、追加したライブラリなど
  - ライセンスアラート処理がAzureFunction上で動作するよう構成変更を行いました
    - DBアクセス、SendGrid、AADB2Cアクセスに必要な環境変数を追加
    - kv-odms-secret-devのアクセスポリシにfunc-odms-dictation-devを追加
    - ネットワーク設定にvnet-odms-network-dev/snet-odms-integration-devを追加
  - プロジェクトの内容もいくつか修正しています
    - 最新のpackage.jsonに合わせてpackage-lock.jsonを生成
    - licenseAlertのスケジュールを毎日1:00(UTC)に変更
    - ビルド用にDockerfileを復活
- このPull Requestでの対象/対象外
- 影響範囲(他の機能にも影響があるか)

## レビューポイント
- 特段注視する部分はありません。ソース上の修正はスケジュールの変更のみです。

## UIの変更
- 無し

## 動作確認状況
- unitテスト実施、ローカルで確認

## 補足
- 相談、参考資料などがあれば
This commit is contained in:
masaaki 2023-11-14 12:08:30 +00:00
parent aeb2eb392a
commit 40162ef3af
12 changed files with 6547 additions and 2737 deletions

File diff suppressed because it is too large Load Diff

View File

@ -63,7 +63,7 @@
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_dev_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20231026t072100-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]",
"name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20231108t072100-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
@ -71,7 +71,7 @@
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_dev_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20231027t072100-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]",
"name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20231109t072100-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
@ -79,7 +79,7 @@
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_dev_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20231028t072100-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]",
"name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20231110t072100-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
@ -87,7 +87,7 @@
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_dev_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20231029t072100-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]",
"name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20231111t072100-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
@ -95,7 +95,7 @@
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_dev_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20231030t072100-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]",
"name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20231112t072100-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
@ -103,7 +103,7 @@
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_dev_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20231031t072100-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]",
"name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20231113t072100-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
@ -111,7 +111,7 @@
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_dev_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20231101t072100-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]",
"name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20231114t072100-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
@ -5332,9 +5332,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/slow_query_log_file')]",
"properties": {
"currentValue": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-dev-2023110109.log",
"currentValue": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-dev-2023111409.log",
"source": "user-override",
"value": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-dev-2023110109.log"
"value": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-dev-2023111409.log"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},

View File

@ -8,6 +8,9 @@
"applicationGateways_agw_odms_webapp_dev_name": {
"type": "String"
},
"networkSecurityGroups_nsg_odms_gateway_dev_name": {
"type": "String"
},
"networkSecurityGroups_nsg_odms_private_dev_name": {
"type": "String"
},
@ -1591,6 +1594,78 @@
},
"type": "Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies"
},
{
"apiVersion": "2023-05-01",
"location": "japaneast",
"name": "[parameters('networkSecurityGroups_nsg_odms_gateway_dev_name')]",
"properties": {
"securityRules": [
{
"id": "[resourceId('Microsoft.Network/networkSecurityGroups/securityRules', parameters('networkSecurityGroups_nsg_odms_gateway_dev_name'), 'AllowTagCustom65200-65535Inbound')]",
"name": "AllowTagCustom65200-65535Inbound",
"properties": {
"access": "Allow",
"destinationAddressPrefix": "*",
"destinationAddressPrefixes": [],
"destinationPortRange": "65200-65535",
"destinationPortRanges": [],
"direction": "Inbound",
"priority": 100,
"protocol": "TCP",
"sourceAddressPrefix": "GatewayManager",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"id": "[resourceId('Microsoft.Network/networkSecurityGroups/securityRules', parameters('networkSecurityGroups_nsg_odms_gateway_dev_name'), 'DenyAnyHTTPSInbound')]",
"name": "DenyAnyHTTPSInbound",
"properties": {
"access": "Deny",
"destinationAddressPrefix": "*",
"destinationAddressPrefixes": [],
"destinationPortRange": "443",
"destinationPortRanges": [],
"direction": "Inbound",
"priority": 1000,
"protocol": "TCP",
"sourceAddressPrefix": "*",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"id": "[resourceId('Microsoft.Network/networkSecurityGroups/securityRules', parameters('networkSecurityGroups_nsg_odms_gateway_dev_name'), 'AllowDeveloperInboundYumoto')]",
"name": "AllowDeveloperInboundYumoto",
"properties": {
"access": "Allow",
"description": "開発チーム NDS 湯本の動作確認用",
"destinationAddressPrefix": "*",
"destinationAddressPrefixes": [],
"destinationPortRange": "443",
"destinationPortRanges": [],
"direction": "Inbound",
"priority": 101,
"protocol": "TCP",
"sourceAddressPrefix": "180.39.76.100",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
}
]
},
"tags": {
"Environment": "develop",
"Project": "ODMS"
},
"type": "Microsoft.Network/networkSecurityGroups"
},
{
"apiVersion": "2023-05-01",
"location": "japaneast",
@ -1725,7 +1800,7 @@
"maxNumberOfVirtualNetworkLinks": 1000,
"maxNumberOfVirtualNetworkLinksWithRegistration": 100,
"numberOfRecordSets": 3,
"numberOfVirtualNetworkLinks": 0,
"numberOfVirtualNetworkLinks": 2,
"numberOfVirtualNetworkLinksWithRegistration": 0,
"provisioningState": "Succeeded"
},
@ -1740,7 +1815,7 @@
"maxNumberOfVirtualNetworkLinks": 1000,
"maxNumberOfVirtualNetworkLinksWithRegistration": 100,
"numberOfRecordSets": 2,
"numberOfVirtualNetworkLinks": 0,
"numberOfVirtualNetworkLinks": 1,
"numberOfVirtualNetworkLinksWithRegistration": 0,
"provisioningState": "Succeeded"
},
@ -1755,7 +1830,7 @@
"maxNumberOfVirtualNetworkLinks": 1000,
"maxNumberOfVirtualNetworkLinksWithRegistration": 100,
"numberOfRecordSets": 3,
"numberOfVirtualNetworkLinks": 0,
"numberOfVirtualNetworkLinks": 2,
"numberOfVirtualNetworkLinksWithRegistration": 0,
"provisioningState": "Succeeded"
},
@ -1770,7 +1845,7 @@
"maxNumberOfVirtualNetworkLinks": 1000,
"maxNumberOfVirtualNetworkLinksWithRegistration": 100,
"numberOfRecordSets": 2,
"numberOfVirtualNetworkLinks": 0,
"numberOfVirtualNetworkLinks": 1,
"numberOfVirtualNetworkLinksWithRegistration": 0,
"provisioningState": "Succeeded"
},
@ -1885,6 +1960,51 @@
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_gateway_dev_name'))]"
],
"name": "[concat(parameters('networkSecurityGroups_nsg_odms_gateway_dev_name'), '/AllowDeveloperInboundYumoto')]",
"properties": {
"access": "Allow",
"description": "開発チーム NDS 湯本の動作確認用",
"destinationAddressPrefix": "*",
"destinationAddressPrefixes": [],
"destinationPortRange": "443",
"destinationPortRanges": [],
"direction": "Inbound",
"priority": 101,
"protocol": "TCP",
"sourceAddressPrefix": "180.39.76.100",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_gateway_dev_name'))]"
],
"name": "[concat(parameters('networkSecurityGroups_nsg_odms_gateway_dev_name'), '/AllowTagCustom65200-65535Inbound')]",
"properties": {
"access": "Allow",
"destinationAddressPrefix": "*",
"destinationAddressPrefixes": [],
"destinationPortRange": "65200-65535",
"destinationPortRanges": [],
"direction": "Inbound",
"priority": 100,
"protocol": "TCP",
"sourceAddressPrefix": "GatewayManager",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
@ -1929,6 +2049,28 @@
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_gateway_dev_name'))]"
],
"name": "[concat(parameters('networkSecurityGroups_nsg_odms_gateway_dev_name'), '/DenyAnyHTTPSInbound')]",
"properties": {
"access": "Deny",
"destinationAddressPrefix": "*",
"destinationAddressPrefixes": [],
"destinationPortRange": "443",
"destinationPortRanges": [],
"direction": "Inbound",
"priority": 1000,
"protocol": "TCP",
"sourceAddressPrefix": "*",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"apiVersion": "2018-09-01",
"dependsOn": [
@ -8500,6 +8642,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'), '/LASummaryLogs')]",
"properties": {
"plan": "Analytics",
"retentionInDays": 30,
"schema": {
"name": "LASummaryLogs"
},
"totalRetentionInDays": 30
},
"type": "Microsoft.OperationalInsights/workspaces/tables"
},
{
"apiVersion": "2021-12-01-preview",
"dependsOn": [
@ -10810,40 +10968,6 @@
},
"type": "Microsoft.Network/privateEndpoints/privateDnsZoneGroups"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_vnet_odms_network_dev_name'))]",
"[resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name'))]"
],
"name": "[concat(parameters('virtualNetworks_vnet_odms_network_dev_name'), '/snet-odms-gateway-dev')]",
"properties": {
"addressPrefix": "10.1.0.0/24",
"applicationGatewayIPConfigurations": [
{
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name')), '/gatewayIPConfigurations/appGatewayIpConfig')]"
}
],
"delegations": [],
"privateEndpointNetworkPolicies": "Disabled",
"privateLinkServiceNetworkPolicies": "Enabled",
"serviceEndpoints": [
{
"locations": [
"*"
],
"service": "Microsoft.KeyVault"
},
{
"locations": [
"*"
],
"service": "Microsoft.Web"
}
]
},
"type": "Microsoft.Network/virtualNetworks/subnets"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
@ -11185,12 +11309,51 @@
},
"type": "Microsoft.Network/applicationGateways"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_vnet_odms_network_dev_name'))]",
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_gateway_dev_name'))]",
"[resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name'))]"
],
"name": "[concat(parameters('virtualNetworks_vnet_odms_network_dev_name'), '/snet-odms-gateway-dev')]",
"properties": {
"addressPrefix": "10.1.0.0/24",
"applicationGatewayIPConfigurations": [
{
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name')), '/gatewayIPConfigurations/appGatewayIpConfig')]"
}
],
"delegations": [],
"networkSecurityGroup": {
"id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_gateway_dev_name'))]"
},
"privateEndpointNetworkPolicies": "Disabled",
"privateLinkServiceNetworkPolicies": "Enabled",
"serviceEndpoints": [
{
"locations": [
"*"
],
"service": "Microsoft.KeyVault"
},
{
"locations": [
"*"
],
"service": "Microsoft.Web"
}
]
},
"type": "Microsoft.Network/virtualNetworks/subnets"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_public_dev_name'))]",
"[resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name'))]",
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_private_dev_name'))]"
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_private_dev_name'))]",
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_gateway_dev_name'))]",
"[resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name'))]"
],
"location": "japaneast",
"name": "[parameters('virtualNetworks_vnet_odms_network_dev_name')]",
@ -11243,36 +11406,6 @@
},
"type": "Microsoft.Network/virtualNetworks/subnets"
},
{
"id": "[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('virtualNetworks_vnet_odms_network_dev_name'), 'snet-odms-gateway-dev')]",
"name": "snet-odms-gateway-dev",
"properties": {
"addressPrefix": "10.1.0.0/24",
"applicationGatewayIPConfigurations": [
{
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name')), '/gatewayIPConfigurations/appGatewayIpConfig')]"
}
],
"delegations": [],
"privateEndpointNetworkPolicies": "Disabled",
"privateLinkServiceNetworkPolicies": "Enabled",
"serviceEndpoints": [
{
"locations": [
"*"
],
"service": "Microsoft.KeyVault"
},
{
"locations": [
"*"
],
"service": "Microsoft.Web"
}
]
},
"type": "Microsoft.Network/virtualNetworks/subnets"
},
{
"id": "[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('virtualNetworks_vnet_odms_network_dev_name'), 'snet-odms-private-dev')]",
"name": "snet-odms-private-dev",
@ -11341,6 +11474,39 @@
]
},
"type": "Microsoft.Network/virtualNetworks/subnets"
},
{
"id": "[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('virtualNetworks_vnet_odms_network_dev_name'), 'snet-odms-gateway-dev')]",
"name": "snet-odms-gateway-dev",
"properties": {
"addressPrefix": "10.1.0.0/24",
"applicationGatewayIPConfigurations": [
{
"id": "[concat(resourceId('Microsoft.Network/applicationGateways', parameters('applicationGateways_agw_odms_webapp_dev_name')), '/gatewayIPConfigurations/appGatewayIpConfig')]"
}
],
"delegations": [],
"networkSecurityGroup": {
"id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_gateway_dev_name'))]"
},
"privateEndpointNetworkPolicies": "Disabled",
"privateLinkServiceNetworkPolicies": "Enabled",
"serviceEndpoints": [
{
"locations": [
"*"
],
"service": "Microsoft.KeyVault"
},
{
"locations": [
"*"
],
"service": "Microsoft.Web"
}
]
},
"type": "Microsoft.Network/virtualNetworks/subnets"
}
],
"virtualNetworkPeerings": [

View File

@ -564,6 +564,23 @@
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/blobServices', parameters('storageAccounts_saodmsaudev_name'), 'default')]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saodmsaudev_name'))]"
],
"name": "[concat(parameters('storageAccounts_saodmsaudev_name'), '/default/account-10')]",
"properties": {
"defaultEncryptionScope": "$account-encryption-key",
"denyEncryptionScopeOverride": false,
"immutableStorageWithVersioning": {
"enabled": false
},
"publicAccess": "None"
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
@ -1210,23 +1227,6 @@
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/blobServices', parameters('storageAccounts_saodmseudev_name'), 'default')]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saodmseudev_name'))]"
],
"name": "[concat(parameters('storageAccounts_saodmseudev_name'), '/default/account-63')]",
"properties": {
"defaultEncryptionScope": "$account-encryption-key",
"denyEncryptionScopeOverride": false,
"immutableStorageWithVersioning": {
"enabled": false
},
"publicAccess": "None"
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
@ -1787,6 +1787,57 @@
"publicAccess": "None"
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/blobServices', parameters('storageAccounts_saodmseudev_name'), 'default')]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saodmseudev_name'))]"
],
"name": "[concat(parameters('storageAccounts_saodmseudev_name'), '/default/account-92')]",
"properties": {
"defaultEncryptionScope": "$account-encryption-key",
"denyEncryptionScopeOverride": false,
"immutableStorageWithVersioning": {
"enabled": false
},
"publicAccess": "None"
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/blobServices', parameters('storageAccounts_saodmsusdev_name'), 'default')]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saodmsusdev_name'))]"
],
"name": "[concat(parameters('storageAccounts_saodmsusdev_name'), '/default/account-93')]",
"properties": {
"defaultEncryptionScope": "$account-encryption-key",
"denyEncryptionScopeOverride": false,
"immutableStorageWithVersioning": {
"enabled": false
},
"publicAccess": "None"
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/blobServices', parameters('storageAccounts_saodmseudev_name'), 'default')]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saodmseudev_name'))]"
],
"name": "[concat(parameters('storageAccounts_saodmseudev_name'), '/default/account-94')]",
"properties": {
"defaultEncryptionScope": "$account-encryption-key",
"denyEncryptionScopeOverride": false,
"immutableStorageWithVersioning": {
"enabled": false
},
"publicAccess": "None"
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers"
}
],
"variables": {}

View File

@ -11,6 +11,9 @@
"networkInterfaces_vm_odms_maintenance600_name": {
"type": "String"
},
"networkInterfaces_vm_odms_prod_maintenance7_name": {
"type": "String"
},
"networkInterfaces_vm_odms_staging_maintenance158_name": {
"type": "String"
},
@ -26,6 +29,12 @@
"privateDnsZones_privatelink_azurecr_io_name": {
"type": "String"
},
"privateDnsZones_privatelink_blob_core_windows_net_name": {
"type": "String"
},
"privateEndpoints_pep_odms_bastion_maintenance_name": {
"type": "String"
},
"privateEndpoints_pep_odms_registry_maintenance_name": {
"type": "String"
},
@ -41,6 +50,9 @@
"schedules_shutdown_computevm_vm_odms_maintenance_name": {
"type": "String"
},
"schedules_shutdown_computevm_vm_odms_prod_maintenance_name": {
"type": "String"
},
"schedules_shutdown_computevm_vm_odms_staging_maintenance_name": {
"type": "String"
},
@ -50,6 +62,9 @@
"storageAccounts_saodmscloudshell_name": {
"type": "String"
},
"storageAccounts_saomdsbastion_name": {
"type": "String"
},
"storageAccounts_saomdspipeline_name": {
"type": "String"
},
@ -62,6 +77,9 @@
"virtualMachines_vm_odms_maintenance_name": {
"type": "String"
},
"virtualMachines_vm_odms_prod_maintenance_name": {
"type": "String"
},
"virtualMachines_vm_odms_staging_maintenance_name": {
"type": "String"
},
@ -359,7 +377,7 @@
"direction": "Inbound",
"priority": 130,
"protocol": "TCP",
"sourceAddressPrefix": "220.215.171.117",
"sourceAddressPrefix": "220.215.248.23",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
@ -821,6 +839,124 @@
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"id": "[resourceId('Microsoft.Network/networkSecurityGroups/securityRules', parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), 'AllowToolInstallerStorageOutbound')]",
"name": "AllowToolInstallerStorageOutbound",
"properties": {
"access": "Allow",
"destinationAddressPrefix": "10.0.2.7",
"destinationAddressPrefixes": [],
"destinationPortRange": "443",
"destinationPortRanges": [],
"direction": "Outbound",
"priority": 1001,
"protocol": "TCP",
"sourceAddressPrefix": "10.0.2.0/24",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"id": "[resourceId('Microsoft.Network/networkSecurityGroups/securityRules', parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), 'AllowProdBastionToRedisOutbound')]",
"name": "AllowProdBastionToRedisOutbound",
"properties": {
"access": "Allow",
"description": "本番環境踏み台PCから本番環境Redisへのoutbound",
"destinationAddressPrefix": "10.3.1.4",
"destinationAddressPrefixes": [],
"destinationPortRange": "6380",
"destinationPortRanges": [],
"direction": "Outbound",
"priority": 122,
"protocol": "TCP",
"sourceAddressPrefix": "10.0.2.6",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"id": "[resourceId('Microsoft.Network/networkSecurityGroups/securityRules', parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), 'AllowDevBastionToRedisOutbound')]",
"name": "AllowDevBastionToRedisOutbound",
"properties": {
"access": "Allow",
"description": "DEV環境踏み台PCからDEV環境Redisへのoutbound",
"destinationAddressPrefix": "10.1.1.7",
"destinationAddressPrefixes": [],
"destinationPortRange": "6380",
"destinationPortRanges": [],
"direction": "Outbound",
"priority": 120,
"protocol": "TCP",
"sourceAddressPrefix": "10.0.2.4",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"id": "[resourceId('Microsoft.Network/networkSecurityGroups/securityRules', parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), 'AllowStgBastionToRedisOutbound')]",
"name": "AllowStgBastionToRedisOutbound",
"properties": {
"access": "Allow",
"description": "STG環境踏み台PCからSTG環境Redisへのoutbound",
"destinationAddressPrefix": "10.2.1.7",
"destinationAddressPrefixes": [],
"destinationPortRange": "6380",
"destinationPortRanges": [],
"direction": "Outbound",
"priority": 121,
"protocol": "TCP",
"sourceAddressPrefix": "10.0.2.5",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"id": "[resourceId('Microsoft.Network/networkSecurityGroups/securityRules', parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), 'AllowProdHTTPSOutbound')]",
"name": "AllowProdHTTPSOutbound",
"properties": {
"access": "Allow",
"destinationAddressPrefix": "AzureActiveDirectory",
"destinationAddressPrefixes": [],
"destinationPortRange": "443",
"destinationPortRanges": [],
"direction": "Outbound",
"priority": 112,
"protocol": "TCP",
"sourceAddressPrefix": "10.0.2.6",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"id": "[resourceId('Microsoft.Network/networkSecurityGroups/securityRules', parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), 'AllowProdAppOutbound')]",
"name": "AllowProdAppOutbound",
"properties": {
"access": "Allow",
"description": "PROD踏み台からPROD環境へのアクセスを許可",
"destinationAddressPrefix": "10.3.0.10",
"destinationAddressPrefixes": [],
"destinationPortRange": "4443",
"destinationPortRanges": [],
"direction": "Outbound",
"priority": 113,
"protocol": "TCP",
"sourceAddressPrefix": "10.0.2.6",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
}
]
},
@ -849,6 +985,21 @@
},
"type": "Microsoft.Network/privateDnsZones"
},
{
"apiVersion": "2018-09-01",
"location": "global",
"name": "[parameters('privateDnsZones_privatelink_blob_core_windows_net_name')]",
"properties": {
"maxNumberOfRecordSets": 25000,
"maxNumberOfVirtualNetworkLinks": 1000,
"maxNumberOfVirtualNetworkLinksWithRegistration": 100,
"numberOfRecordSets": 2,
"numberOfVirtualNetworkLinks": 1,
"numberOfVirtualNetworkLinksWithRegistration": 0,
"provisioningState": "Succeeded"
},
"type": "Microsoft.Network/privateDnsZones"
},
{
"apiVersion": "2023-05-01",
"location": "japaneast",
@ -930,6 +1081,58 @@
},
"type": "Microsoft.Storage/storageAccounts"
},
{
"apiVersion": "2023-01-01",
"kind": "StorageV2",
"location": "japaneast",
"name": "[parameters('storageAccounts_saomdsbastion_name')]",
"properties": {
"accessTier": "Hot",
"allowBlobPublicAccess": false,
"allowCrossTenantReplication": false,
"allowSharedKeyAccess": true,
"defaultToOAuthAuthentication": false,
"dnsEndpointType": "Standard",
"encryption": {
"keySource": "Microsoft.Storage",
"requireInfrastructureEncryption": true,
"services": {
"blob": {
"enabled": true,
"keyType": "Account"
},
"file": {
"enabled": true,
"keyType": "Account"
}
}
},
"minimumTlsVersion": "TLS1_2",
"networkAcls": {
"bypass": "AzureServices",
"defaultAction": "Deny",
"ipRules": [
{
"action": "Allow",
"value": "180.39.76.100"
}
],
"resourceAccessRules": [],
"virtualNetworkRules": []
},
"publicNetworkAccess": "Enabled",
"supportsHttpsTrafficOnly": true
},
"sku": {
"name": "Standard_LRS",
"tier": "Standard"
},
"tags": {
"Environment": "maintenance",
"Project": "ODMS"
},
"type": "Microsoft.Storage/storageAccounts"
},
{
"apiVersion": "2023-01-01",
"kind": "StorageV2",
@ -1136,6 +1339,80 @@
},
"type": "Microsoft.Compute/virtualMachines"
},
{
"apiVersion": "2023-03-01",
"dependsOn": [
"[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_vm_odms_prod_maintenance7_name'))]"
],
"location": "japaneast",
"name": "[parameters('virtualMachines_vm_odms_prod_maintenance_name')]",
"properties": {
"diagnosticsProfile": {
"bootDiagnostics": {
"enabled": true
}
},
"hardwareProfile": {
"vmSize": "Standard_B2s"
},
"networkProfile": {
"networkInterfaces": [
{
"id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_vm_odms_prod_maintenance7_name'))]"
}
]
},
"osProfile": {
"adminUsername": "odmsAdmin",
"allowExtensionOperations": true,
"computerName": "vm-odms-prod-ma",
"requireGuestProvisionSignal": true,
"secrets": [],
"windowsConfiguration": {
"enableAutomaticUpdates": true,
"enableVMAgentPlatformUpdates": false,
"patchSettings": {
"assessmentMode": "ImageDefault",
"enableHotpatching": false,
"patchMode": "AutomaticByOS"
},
"provisionVMAgent": true
}
},
"securityProfile": {
"securityType": "TrustedLaunch",
"uefiSettings": {
"secureBootEnabled": true,
"vTpmEnabled": true
}
},
"storageProfile": {
"dataDisks": [],
"diskControllerType": "SCSI",
"imageReference": {
"offer": "WindowsServer",
"publisher": "MicrosoftWindowsServer",
"sku": "2022-datacenter-azure-edition",
"version": "latest"
},
"osDisk": {
"caching": "ReadWrite",
"createOption": "FromImage",
"deleteOption": "Delete",
"managedDisk": {
"id": "[resourceId('Microsoft.Compute/disks', concat(parameters('virtualMachines_vm_odms_prod_maintenance_name'), '_OsDisk_1_89b0ffad76d44d57a136152577e01483'))]"
},
"name": "[concat(parameters('virtualMachines_vm_odms_prod_maintenance_name'), '_OsDisk_1_89b0ffad76d44d57a136152577e01483')]",
"osType": "Windows"
}
}
},
"tags": {
"Environment": "production",
"Project": "ODMS"
},
"type": "Microsoft.Compute/virtualMachines"
},
{
"apiVersion": "2023-03-01",
"dependsOn": [
@ -1199,10 +1476,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"
@ -1402,6 +1677,33 @@
},
"type": "microsoft.devtestlab/schedules"
},
{
"apiVersion": "2018-09-15",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines', parameters('virtualMachines_vm_odms_prod_maintenance_name'))]"
],
"location": "japaneast",
"name": "[parameters('schedules_shutdown_computevm_vm_odms_prod_maintenance_name')]",
"properties": {
"dailyRecurrence": {
"time": "1900"
},
"notificationSettings": {
"notificationLocale": "ja",
"status": "Disabled",
"timeInMinutes": 30
},
"status": "Enabled",
"targetResourceId": "[resourceId('Microsoft.Compute/virtualMachines', parameters('virtualMachines_vm_odms_prod_maintenance_name'))]",
"taskType": "ComputeVmShutdownTask",
"timeZoneId": "Tokyo Standard Time"
},
"tags": {
"Environment": "production",
"Project": "ODMS"
},
"type": "microsoft.devtestlab/schedules"
},
{
"apiVersion": "2018-09-15",
"dependsOn": [
@ -1507,7 +1809,7 @@
"enableIPForwarding": false,
"ipConfigurations": [
{
"etag": "W/\"0f027839-4941-4a48-a05c-b0f240513f07\"",
"etag": "W/\"7a9501b8-2c41-4e35-8622-46c24a6baa0d\"",
"id": "[concat(resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_vm_odms_maintenance600_name')), '/ipConfigurations/ipconfig1')]",
"name": "ipconfig1",
"properties": {
@ -1531,6 +1833,49 @@
},
"type": "Microsoft.Network/networkInterfaces"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('virtualNetworks_vnet_odms_network_maintenance_name'), 'snet-odms-vm-maintenance')]"
],
"kind": "Regular",
"location": "japaneast",
"name": "[parameters('networkInterfaces_vm_odms_prod_maintenance7_name')]",
"properties": {
"auxiliaryMode": "None",
"auxiliarySku": "None",
"disableTcpStateTracking": false,
"dnsSettings": {
"dnsServers": []
},
"enableAcceleratedNetworking": false,
"enableIPForwarding": false,
"ipConfigurations": [
{
"etag": "W/\"2e09acfb-738c-4282-80b6-c0d107ba3ac3\"",
"id": "[concat(resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_vm_odms_prod_maintenance7_name')), '/ipConfigurations/ipconfig1')]",
"name": "ipconfig1",
"properties": {
"primary": true,
"privateIPAddress": "10.0.2.6",
"privateIPAddressVersion": "IPv4",
"privateIPAllocationMethod": "Dynamic",
"provisioningState": "Succeeded",
"subnet": {
"id": "[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('virtualNetworks_vnet_odms_network_maintenance_name'), 'snet-odms-vm-maintenance')]"
}
},
"type": "Microsoft.Network/networkInterfaces/ipConfigurations"
}
],
"nicType": "Standard"
},
"tags": {
"Environment": "production",
"Project": "ODMS"
},
"type": "Microsoft.Network/networkInterfaces"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
@ -1550,7 +1895,7 @@
"enableIPForwarding": false,
"ipConfigurations": [
{
"etag": "W/\"94c366ab-a94a-4393-b858-aefb939b6fc9\"",
"etag": "W/\"d3adbed2-54d6-431d-b056-a9393f6021c3\"",
"id": "[concat(resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_vm_odms_staging_maintenance158_name')), '/ipConfigurations/ipconfig1')]",
"name": "ipconfig1",
"properties": {
@ -1733,6 +2078,29 @@
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'))]"
],
"name": "[concat(parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), '/AllowDevBastionToRedisOutbound')]",
"properties": {
"access": "Allow",
"description": "DEV環境踏み台PCからDEV環境Redisへのoutbound",
"destinationAddressPrefix": "10.1.1.7",
"destinationAddressPrefixes": [],
"destinationPortRange": "6380",
"destinationPortRanges": [],
"direction": "Outbound",
"priority": 120,
"protocol": "TCP",
"sourceAddressPrefix": "10.0.2.4",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
@ -1948,7 +2316,7 @@
"direction": "Inbound",
"priority": 130,
"protocol": "TCP",
"sourceAddressPrefix": "220.215.171.117",
"sourceAddressPrefix": "220.215.248.23",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
@ -1977,6 +2345,74 @@
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'))]"
],
"name": "[concat(parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), '/AllowProdAppOutbound')]",
"properties": {
"access": "Allow",
"description": "PROD踏み台からPROD環境へのアクセスを許可",
"destinationAddressPrefix": "10.3.0.10",
"destinationAddressPrefixes": [],
"destinationPortRange": "4443",
"destinationPortRanges": [],
"direction": "Outbound",
"priority": 113,
"protocol": "TCP",
"sourceAddressPrefix": "10.0.2.6",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'))]"
],
"name": "[concat(parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), '/AllowProdBastionToRedisOutbound')]",
"properties": {
"access": "Allow",
"description": "本番環境踏み台PCから本番環境Redisへのoutbound",
"destinationAddressPrefix": "10.3.1.4",
"destinationAddressPrefixes": [],
"destinationPortRange": "6380",
"destinationPortRanges": [],
"direction": "Outbound",
"priority": 122,
"protocol": "TCP",
"sourceAddressPrefix": "10.0.2.6",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'))]"
],
"name": "[concat(parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), '/AllowProdHTTPSOutbound')]",
"properties": {
"access": "Allow",
"destinationAddressPrefix": "AzureActiveDirectory",
"destinationAddressPrefixes": [],
"destinationPortRange": "443",
"destinationPortRanges": [],
"direction": "Outbound",
"priority": 112,
"protocol": "TCP",
"sourceAddressPrefix": "10.0.2.6",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
@ -2046,6 +2482,29 @@
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'))]"
],
"name": "[concat(parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), '/AllowStgBastionToRedisOutbound')]",
"properties": {
"access": "Allow",
"description": "STG環境踏み台PCからSTG環境Redisへのoutbound",
"destinationAddressPrefix": "10.2.1.7",
"destinationAddressPrefixes": [],
"destinationPortRange": "6380",
"destinationPortRanges": [],
"direction": "Outbound",
"priority": 121,
"protocol": "TCP",
"sourceAddressPrefix": "10.0.2.5",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
@ -2137,6 +2596,28 @@
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'))]"
],
"name": "[concat(parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), '/AllowToolInstallerStorageOutbound')]",
"properties": {
"access": "Allow",
"destinationAddressPrefix": "10.0.2.7",
"destinationAddressPrefixes": [],
"destinationPortRange": "443",
"destinationPortRanges": [],
"direction": "Outbound",
"priority": 1001,
"protocol": "TCP",
"sourceAddressPrefix": "10.0.2.0/24",
"sourceAddressPrefixes": [],
"sourcePortRange": "*",
"sourcePortRanges": []
},
"type": "Microsoft.Network/networkSecurityGroups/securityRules"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
@ -2309,6 +2790,22 @@
},
"type": "Microsoft.Network/privateDnsZones/A"
},
{
"apiVersion": "2018-09-01",
"dependsOn": [
"[resourceId('Microsoft.Network/privateDnsZones', parameters('privateDnsZones_privatelink_blob_core_windows_net_name'))]"
],
"name": "[concat(parameters('privateDnsZones_privatelink_blob_core_windows_net_name'), '/saomdsbastion')]",
"properties": {
"aRecords": [
{
"ipv4Address": "10.0.2.7"
}
],
"ttl": 3600
},
"type": "Microsoft.Network/privateDnsZones/A"
},
{
"apiVersion": "2018-09-01",
"dependsOn": [
@ -2329,6 +2826,26 @@
},
"type": "Microsoft.Network/privateDnsZones/SOA"
},
{
"apiVersion": "2018-09-01",
"dependsOn": [
"[resourceId('Microsoft.Network/privateDnsZones', parameters('privateDnsZones_privatelink_blob_core_windows_net_name'))]"
],
"name": "[concat(parameters('privateDnsZones_privatelink_blob_core_windows_net_name'), '/@')]",
"properties": {
"soaRecord": {
"email": "azureprivatedns-host.microsoft.com",
"expireTime": 2419200,
"host": "azureprivatedns.net",
"minimumTtl": 10,
"refreshTime": 3600,
"retryTime": 300,
"serialNumber": 1
},
"ttl": 3600
},
"type": "Microsoft.Network/privateDnsZones/SOA"
},
{
"apiVersion": "2018-09-01",
"dependsOn": [
@ -2507,6 +3024,39 @@
},
"type": "Microsoft.Storage/storageAccounts/blobServices"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saomdsbastion_name'))]"
],
"name": "[concat(parameters('storageAccounts_saomdsbastion_name'), '/default')]",
"properties": {
"changeFeed": {
"enabled": false
},
"containerDeleteRetentionPolicy": {
"days": 7,
"enabled": true
},
"cors": {
"corsRules": []
},
"deleteRetentionPolicy": {
"allowPermanentDelete": false,
"days": 7,
"enabled": true
},
"isVersioningEnabled": true,
"restorePolicy": {
"enabled": false
}
},
"sku": {
"name": "Standard_LRS",
"tier": "Standard"
},
"type": "Microsoft.Storage/storageAccounts/blobServices"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
@ -2564,6 +3114,30 @@
},
"type": "Microsoft.Storage/storageAccounts/fileServices"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saomdsbastion_name'))]"
],
"name": "[concat(parameters('storageAccounts_saomdsbastion_name'), '/default')]",
"properties": {
"cors": {
"corsRules": []
},
"protocolSettings": {
"smb": {}
},
"shareDeleteRetentionPolicy": {
"days": 7,
"enabled": true
}
},
"sku": {
"name": "Standard_LRS",
"tier": "Standard"
},
"type": "Microsoft.Storage/storageAccounts/fileServices"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
@ -2588,6 +3162,23 @@
},
"type": "Microsoft.Storage/storageAccounts/fileServices"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saomdsbastion_name'))]"
],
"name": "[concat(parameters('storageAccounts_saomdsbastion_name'), '/', parameters('storageAccounts_saomdsbastion_name'), '.9d0044b4-3ec4-4ef1-9c5f-dee9d7e813fb')]",
"properties": {
"privateEndpoint": {},
"privateLinkServiceConnectionState": {
"actionRequired": "None",
"description": "Auto-Approved",
"status": "Approved"
},
"provisioningState": "Succeeded"
},
"type": "Microsoft.Storage/storageAccounts/privateEndpointConnections"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
@ -2601,6 +3192,19 @@
},
"type": "Microsoft.Storage/storageAccounts/queueServices"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saomdsbastion_name'))]"
],
"name": "[concat(parameters('storageAccounts_saomdsbastion_name'), '/default')]",
"properties": {
"cors": {
"corsRules": []
}
},
"type": "Microsoft.Storage/storageAccounts/queueServices"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
@ -2627,6 +3231,19 @@
},
"type": "Microsoft.Storage/storageAccounts/tableServices"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saomdsbastion_name'))]"
],
"name": "[concat(parameters('storageAccounts_saomdsbastion_name'), '/default')]",
"properties": {
"cors": {
"corsRules": []
}
},
"type": "Microsoft.Storage/storageAccounts/tableServices"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
@ -2715,6 +3332,68 @@
},
"type": "Microsoft.Network/privateDnsZones/virtualNetworkLinks"
},
{
"apiVersion": "2018-09-01",
"dependsOn": [
"[resourceId('Microsoft.Network/privateDnsZones', parameters('privateDnsZones_privatelink_blob_core_windows_net_name'))]",
"[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_vnet_odms_network_maintenance_name'))]"
],
"location": "global",
"name": "[concat(parameters('privateDnsZones_privatelink_blob_core_windows_net_name'), '/e3fkm7ajqovu6')]",
"properties": {
"registrationEnabled": false,
"virtualNetwork": {
"id": "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_vnet_odms_network_maintenance_name'))]"
}
},
"type": "Microsoft.Network/privateDnsZones/virtualNetworkLinks"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saomdsbastion_name'))]",
"[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('virtualNetworks_vnet_odms_network_maintenance_name'), 'snet-odms-vm-maintenance')]"
],
"location": "japaneast",
"name": "[parameters('privateEndpoints_pep_odms_bastion_maintenance_name')]",
"properties": {
"customDnsConfigs": [
{
"fqdn": "saomdsbastion.blob.core.windows.net",
"ipAddresses": [
"10.0.2.7"
]
}
],
"ipConfigurations": [],
"manualPrivateLinkServiceConnections": [],
"privateLinkServiceConnections": [
{
"id": "[concat(resourceId('Microsoft.Network/privateEndpoints', parameters('privateEndpoints_pep_odms_bastion_maintenance_name')), concat('/privateLinkServiceConnections/', parameters('privateEndpoints_pep_odms_bastion_maintenance_name'), '_ac9d69cb-cf72-4b78-8163-0d902150b027'))]",
"name": "[concat(parameters('privateEndpoints_pep_odms_bastion_maintenance_name'), '_ac9d69cb-cf72-4b78-8163-0d902150b027')]",
"properties": {
"groupIds": [
"blob"
],
"privateLinkServiceConnectionState": {
"actionsRequired": "None",
"description": "Auto-Approved",
"status": "Approved"
},
"privateLinkServiceId": "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saomdsbastion_name'))]"
}
}
],
"subnet": {
"id": "[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('virtualNetworks_vnet_odms_network_maintenance_name'), 'snet-odms-vm-maintenance')]"
}
},
"tags": {
"Environment": "maintenance",
"Project": "ODMS"
},
"type": "Microsoft.Network/privateEndpoints"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
@ -2838,6 +3517,40 @@
},
"type": "Microsoft.Network/virtualNetworks/subnets"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/blobServices', parameters('storageAccounts_saomdsbastion_name'), 'default')]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saomdsbastion_name'))]"
],
"name": "[concat(parameters('storageAccounts_saomdsbastion_name'), '/default/develop')]",
"properties": {
"defaultEncryptionScope": "$account-encryption-key",
"denyEncryptionScopeOverride": false,
"immutableStorageWithVersioning": {
"enabled": false
},
"publicAccess": "None"
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/blobServices', parameters('storageAccounts_saomdsbastion_name'), 'default')]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saomdsbastion_name'))]"
],
"name": "[concat(parameters('storageAccounts_saomdsbastion_name'), '/default/prod')]",
"properties": {
"defaultEncryptionScope": "$account-encryption-key",
"denyEncryptionScopeOverride": false,
"immutableStorageWithVersioning": {
"enabled": false
},
"publicAccess": "None"
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [

File diff suppressed because it is too large Load Diff

View File

@ -49,8 +49,8 @@
"version": "8.0.21"
},
"sku": {
"name": "Standard_B1s",
"tier": "Burstable"
"name": "Standard_D2ads_v5",
"tier": "GeneralPurpose"
},
"tags": {
"Environment": "staging",
@ -63,7 +63,7 @@
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20231026t173100-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20231107t173100-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
@ -71,7 +71,7 @@
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20231027t173100-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20231108t173100-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
@ -79,7 +79,7 @@
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20231028t173100-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20231109t173100-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
@ -87,7 +87,7 @@
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20231029t173100-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20231110t173100-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
@ -95,7 +95,7 @@
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20231030t173100-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20231111t173100-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
@ -103,7 +103,7 @@
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20231031t173100-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20231112t173100-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
@ -111,7 +111,7 @@
"dependsOn": [
"[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]"
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20231101t173100-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20231113t173100-c3fd140d-3620-488c-9516-d0c0fb44c636')]",
"type": "Microsoft.DBforMySQL/flexibleServers/backups"
},
{
@ -443,9 +443,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/back_log')]",
"properties": {
"currentValue": "185",
"currentValue": "783",
"source": "system-default",
"value": "185"
"value": "783"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -469,9 +469,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/binlog_cache_size')]",
"properties": {
"currentValue": "131072",
"currentValue": "8388608",
"source": "system-default",
"value": "131072"
"value": "8388608"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -701,9 +701,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/binlog_transaction_dependency_history_size')]",
"properties": {
"currentValue": "1000",
"currentValue": "8000",
"source": "system-default",
"value": "1000"
"value": "8000"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -1479,9 +1479,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/innodb_buffer_pool_chunk_size')]",
"properties": {
"currentValue": "33554432",
"currentValue": "134217728",
"source": "system-default",
"value": "33554432"
"value": "134217728"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -1557,9 +1557,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/innodb_buffer_pool_instances')]",
"properties": {
"currentValue": "1",
"currentValue": "8",
"source": "system-default",
"value": "1"
"value": "8"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -1609,9 +1609,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/innodb_buffer_pool_size')]",
"properties": {
"currentValue": "134217728",
"currentValue": "4294967296",
"source": "system-default",
"value": "134217728"
"value": "4294967296"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -1902,9 +1902,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/innodb_fatal_semaphore_wait_threshold')]",
"properties": {
"currentValue": "7201",
"currentValue": "600",
"source": "system-default",
"value": "7201"
"value": "600"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -2993,9 +2993,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/innodb_temp_tablespaces_dir')]",
"properties": {
"currentValue": "/app/work/temp",
"currentValue": "/mnt/temp",
"source": "system-default",
"value": "/app/work/temp"
"value": "/mnt/temp"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -3032,9 +3032,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/innodb_tmpdir')]",
"properties": {
"currentValue": "/app/work/temp",
"currentValue": "/mnt/temp",
"source": "system-default",
"value": "/app/work/temp"
"value": "/mnt/temp"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -3559,9 +3559,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/max_allowed_packet')]",
"properties": {
"currentValue": "16777216",
"currentValue": "536870912",
"source": "system-default",
"value": "16777216"
"value": "536870912"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -3624,9 +3624,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/max_connections')]",
"properties": {
"currentValue": "85",
"currentValue": "683",
"source": "system-default",
"value": "85"
"value": "683"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -4736,9 +4736,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/relay_log')]",
"properties": {
"currentValue": "/app/work/relaylogs/relay_bin",
"currentValue": "/mnt/relaylogs/relay_bin",
"source": "system-default",
"value": "/app/work/relaylogs/relay_bin"
"value": "/mnt/relaylogs/relay_bin"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -4749,9 +4749,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/relay_log_index')]",
"properties": {
"currentValue": "/app/work/relaylogs/relay_bin.index",
"currentValue": "/mnt/relaylogs/relay_bin.index",
"source": "system-default",
"value": "/app/work/relaylogs/relay_bin.index"
"value": "/mnt/relaylogs/relay_bin.index"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -4801,9 +4801,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/relay_log_space_limit')]",
"properties": {
"currentValue": "1073741824",
"currentValue": "4294967296",
"source": "system-default",
"value": "1073741824"
"value": "4294967296"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -5152,9 +5152,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/slave_load_tmpdir')]",
"properties": {
"currentValue": "/app/work/temp",
"currentValue": "/mnt/temp",
"source": "system-default",
"value": "/app/work/temp"
"value": "/mnt/temp"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -5204,9 +5204,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/slave_parallel_workers')]",
"properties": {
"currentValue": "0",
"currentValue": "8",
"source": "system-default",
"value": "0"
"value": "8"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -5217,9 +5217,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/slave_pending_jobs_size_max')]",
"properties": {
"currentValue": "16777216",
"currentValue": "67108864",
"source": "system-default",
"value": "16777216"
"value": "67108864"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -5332,9 +5332,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-2023110201.log",
"currentValue": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-stg-2023111401.log",
"source": "user-override",
"value": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-stg-2023110201.log"
"value": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-stg-2023111401.log"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -5345,9 +5345,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/sort_buffer_size')]",
"properties": {
"currentValue": "262144",
"currentValue": "524288",
"source": "system-default",
"value": "262144"
"value": "524288"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -5501,9 +5501,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/table_definition_cache')]",
"properties": {
"currentValue": "300",
"currentValue": "2400",
"source": "system-default",
"value": "300"
"value": "2400"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -5527,9 +5527,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/table_open_cache')]",
"properties": {
"currentValue": "300",
"currentValue": "2400",
"source": "system-default",
"value": "300"
"value": "2400"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -5592,9 +5592,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/thread_cache_size')]",
"properties": {
"currentValue": "8",
"currentValue": "14",
"source": "system-default",
"value": "8"
"value": "14"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -5670,9 +5670,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/thread_pool_size')]",
"properties": {
"currentValue": "1",
"currentValue": "2",
"source": "system-default",
"value": "1"
"value": "2"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},
@ -5761,9 +5761,9 @@
],
"name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/tmpdir')]",
"properties": {
"currentValue": "/app/work/temp",
"currentValue": "/mnt/temp",
"source": "system-default",
"value": "/app/work/temp"
"value": "/mnt/temp"
},
"type": "Microsoft.DBforMySQL/flexibleServers/configurations"
},

View File

@ -32,6 +32,9 @@
"privateDnsZones_privatelink_redis_cache_windows_net_name": {
"type": "String"
},
"privateEndpoints_pep_odms_app_staging_stg_name": {
"type": "String"
},
"privateEndpoints_pep_odms_app_stg_name": {
"type": "String"
},
@ -1387,7 +1390,7 @@
"maxNumberOfVirtualNetworkLinks": 1000,
"maxNumberOfVirtualNetworkLinksWithRegistration": 100,
"numberOfRecordSets": 3,
"numberOfVirtualNetworkLinks": 0,
"numberOfVirtualNetworkLinks": 2,
"numberOfVirtualNetworkLinksWithRegistration": 0,
"provisioningState": "Succeeded"
},
@ -1402,7 +1405,7 @@
"maxNumberOfVirtualNetworkLinks": 1000,
"maxNumberOfVirtualNetworkLinksWithRegistration": 100,
"numberOfRecordSets": 3,
"numberOfVirtualNetworkLinks": 0,
"numberOfVirtualNetworkLinks": 2,
"numberOfVirtualNetworkLinksWithRegistration": 0,
"provisioningState": "Succeeded"
},
@ -1421,7 +1424,7 @@
"maxNumberOfVirtualNetworkLinks": 1000,
"maxNumberOfVirtualNetworkLinksWithRegistration": 100,
"numberOfRecordSets": 2,
"numberOfVirtualNetworkLinks": 0,
"numberOfVirtualNetworkLinks": 1,
"numberOfVirtualNetworkLinksWithRegistration": 0,
"provisioningState": "Succeeded"
},
@ -1435,8 +1438,8 @@
"maxNumberOfRecordSets": 25000,
"maxNumberOfVirtualNetworkLinks": 1000,
"maxNumberOfVirtualNetworkLinksWithRegistration": 100,
"numberOfRecordSets": 3,
"numberOfVirtualNetworkLinks": 0,
"numberOfRecordSets": 5,
"numberOfVirtualNetworkLinks": 1,
"numberOfVirtualNetworkLinksWithRegistration": 0,
"provisioningState": "Succeeded"
},
@ -1454,7 +1457,7 @@
"maxNumberOfVirtualNetworkLinks": 1000,
"maxNumberOfVirtualNetworkLinksWithRegistration": 100,
"numberOfRecordSets": 2,
"numberOfVirtualNetworkLinks": 0,
"numberOfVirtualNetworkLinks": 1,
"numberOfVirtualNetworkLinksWithRegistration": 0,
"provisioningState": "Succeeded"
},
@ -2411,6 +2414,44 @@
},
"type": "Microsoft.Network/privateDnsZones/A"
},
{
"apiVersion": "2018-09-01",
"dependsOn": [
"[resourceId('Microsoft.Network/privateDnsZones', parameters('privateDnsZones_privatelink_azurewebsites_net_name'))]"
],
"name": "[concat(parameters('privateDnsZones_privatelink_azurewebsites_net_name'), '/app-odms-dictation-stg-staging')]",
"properties": {
"aRecords": [
{
"ipv4Address": "10.2.1.8"
}
],
"metadata": {
"creator": "created by private endpoint pep-odms-app-staging-stg with resource guid 8d258be6-1804-4cc3-8172-46075366effa"
},
"ttl": 10
},
"type": "Microsoft.Network/privateDnsZones/A"
},
{
"apiVersion": "2018-09-01",
"dependsOn": [
"[resourceId('Microsoft.Network/privateDnsZones', parameters('privateDnsZones_privatelink_azurewebsites_net_name'))]"
],
"name": "[concat(parameters('privateDnsZones_privatelink_azurewebsites_net_name'), '/app-odms-dictation-stg-staging.scm')]",
"properties": {
"aRecords": [
{
"ipv4Address": "10.2.1.8"
}
],
"metadata": {
"creator": "created by private endpoint pep-odms-app-staging-stg with resource guid 8d258be6-1804-4cc3-8172-46075366effa"
},
"ttl": 10
},
"type": "Microsoft.Network/privateDnsZones/A"
},
{
"apiVersion": "2018-09-01",
"dependsOn": [
@ -2611,6 +2652,39 @@
},
"type": "Microsoft.Network/privateDnsZones/virtualNetworkLinks"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('virtualNetworks_vnet_odms_network_stg_name'), 'snet-odms-public-stg')]"
],
"location": "japaneast",
"name": "[parameters('privateEndpoints_pep_odms_app_staging_stg_name')]",
"properties": {
"customDnsConfigs": [],
"ipConfigurations": [],
"manualPrivateLinkServiceConnections": [],
"privateLinkServiceConnections": [
{
"id": "[concat(resourceId('Microsoft.Network/privateEndpoints', parameters('privateEndpoints_pep_odms_app_staging_stg_name')), concat('/privateLinkServiceConnections/', parameters('privateEndpoints_pep_odms_app_staging_stg_name'), '-9794'))]",
"name": "[concat(parameters('privateEndpoints_pep_odms_app_staging_stg_name'), '-9794')]",
"properties": {
"groupIds": [
"sites-staging"
],
"privateLinkServiceConnectionState": {
"actionsRequired": "None",
"status": "Approved"
},
"privateLinkServiceId": "[parameters('sites_app_odms_dictation_stg_externalid')]"
}
}
],
"subnet": {
"id": "[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('virtualNetworks_vnet_odms_network_stg_name'), 'snet-odms-public-stg')]"
}
},
"type": "Microsoft.Network/privateEndpoints"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
@ -8969,6 +9043,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'), '/LASummaryLogs')]",
"properties": {
"plan": "Analytics",
"retentionInDays": 30,
"schema": {
"name": "LASummaryLogs"
},
"totalRetentionInDays": 30
},
"type": "Microsoft.OperationalInsights/workspaces/tables"
},
{
"apiVersion": "2021-12-01-preview",
"dependsOn": [
@ -11257,6 +11347,25 @@
},
"type": "Microsoft.Network/privateDnsZones/virtualNetworkLinks"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [
"[resourceId('Microsoft.Network/privateEndpoints', parameters('privateEndpoints_pep_odms_app_staging_stg_name'))]",
"[resourceId('Microsoft.Network/privateDnsZones', parameters('privateDnsZones_privatelink_azurewebsites_net_name'))]"
],
"name": "[concat(parameters('privateEndpoints_pep_odms_app_staging_stg_name'), '/default')]",
"properties": {
"privateDnsZoneConfigs": [
{
"name": "privatelink-azurewebsites-net",
"properties": {
"privateDnsZoneId": "[resourceId('Microsoft.Network/privateDnsZones', parameters('privateDnsZones_privatelink_azurewebsites_net_name'))]"
}
}
]
},
"type": "Microsoft.Network/privateEndpoints/privateDnsZoneGroups"
},
{
"apiVersion": "2023-05-01",
"dependsOn": [

View File

@ -2066,6 +2066,23 @@
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/blobServices', parameters('storageAccounts_saodmsusstg_name'), 'default')]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saodmsusstg_name'))]"
],
"name": "[concat(parameters('storageAccounts_saodmsusstg_name'), '/default/account-189')]",
"properties": {
"defaultEncryptionScope": "$account-encryption-key",
"denyEncryptionScopeOverride": false,
"immutableStorageWithVersioning": {
"enabled": false
},
"publicAccess": "None"
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
@ -2083,6 +2100,40 @@
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/blobServices', parameters('storageAccounts_saodmsusstg_name'), 'default')]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saodmsusstg_name'))]"
],
"name": "[concat(parameters('storageAccounts_saodmsusstg_name'), '/default/account-191')]",
"properties": {
"defaultEncryptionScope": "$account-encryption-key",
"denyEncryptionScopeOverride": false,
"immutableStorageWithVersioning": {
"enabled": false
},
"publicAccess": "None"
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/blobServices', parameters('storageAccounts_saodmsaustg_name'), 'default')]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_saodmsaustg_name'))]"
],
"name": "[concat(parameters('storageAccounts_saodmsaustg_name'), '/default/account-192')]",
"properties": {
"defaultEncryptionScope": "$account-encryption-key",
"denyEncryptionScopeOverride": false,
"immutableStorageWithVersioning": {
"enabled": false
},
"publicAccess": "None"
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers"
},
{
"apiVersion": "2023-01-01",
"dependsOn": [

View File

@ -0,0 +1,12 @@
# To enable ssh & remote debugging on app service change the base image to the one below
# FROM mcr.microsoft.com/azure-functions/node:4-node18-appservice
FROM mcr.microsoft.com/azure-functions/node:4-node18
ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
AzureFunctionsJobHost__Logging__Console__IsEnabled=true
COPY . /home/site/wwwroot
RUN cd /home/site/wwwroot && \
npm install && \
npm run build

View File

@ -6663,6 +6663,77 @@
"node": ">=6.9.0"
}
},
"node_modules/slash/node_modules/ansi-styles": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"dev": true,
"dependencies": {
"color-convert": "^1.9.0"
},
"engines": {
"node": ">=4"
}
},
"node_modules/slash/node_modules/chalk": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
"dev": true,
"dependencies": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
"supports-color": "^5.3.0"
},
"engines": {
"node": ">=4"
}
},
"node_modules/slash/node_modules/color-convert": {
"version": "1.9.3",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
"dev": true,
"dependencies": {
"color-name": "1.1.3"
}
},
"node_modules/slash/node_modules/color-name": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
"dev": true
},
"node_modules/slash/node_modules/escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
"dev": true,
"engines": {
"node": ">=0.8.0"
}
},
"node_modules/slash/node_modules/has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
"dev": true,
"engines": {
"node": ">=4"
}
},
"node_modules/slash/node_modules/supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
"dev": true,
"dependencies": {
"has-flag": "^3.0.0"
},
"engines": {
"node": ">=4"
}
},
"node_modules/smart-buffer": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",

View File

@ -348,7 +348,7 @@ export async function licenseAlert(
}
app.timer("licenseAlert", {
schedule: "0 */1 * * * *",
schedule: "0 0 1 * * *",
handler: licenseAlert,
});