From d9c0ee4abdbd9bede9cc35db7f57475584761ba0 Mon Sep 17 00:00:00 2001 From: "saito.k" Date: Wed, 26 Jul 2023 09:12:06 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20PR=20271:=20=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9FAzure=E3=83=AA=E3=82=BD?= =?UTF-8?q?=E3=83=BC=E3=82=B9=E3=83=BB=E8=A8=AD=E5=AE=9A=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 概要 [Task2279: 不要になったAzureリソース・設定を削除する](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2279) - 不要になったAzureリソース削除 - vm-odms-pipeline-maintenance(今までマイグレーションを行っていたVM) - vm_odms_pipeline_maintenance433(NIC) - nsg_odms_pipeline_maintenance(NSG) - vm_odms_pipeline_maintenance_key(SSHキー) - snet-odms-pipeline-maintenance(サブネット) - アクセス許可IPを削除 - crOdmsRegistryMaintenance(コンテナリポジトリ) - kv_odms_secret_dev(Key Vault) - kv_odms_secret_stg(Key Vault) ## レビューポイント ## UIの変更 - Before/Afterのスクショなど - スクショ置き場 ## 動作確認状況 - ローカルで確認、develop環境で確認など ## 補足 - 相談、参考資料などがあれば --- configurations/azure/dev-application-rg.json | 671 +++++++++++-------- configurations/azure/dev-database-rg.json | 20 +- configurations/azure/dev-network-rg.json | 91 +-- configurations/azure/maintenance-rg.json | 327 +-------- configurations/azure/stg-application-rg.json | 364 +++++----- configurations/azure/stg-database-rg.json | 20 +- configurations/azure/stg-network-rg.json | 53 +- 7 files changed, 647 insertions(+), 899 deletions(-) diff --git a/configurations/azure/dev-application-rg.json b/configurations/azure/dev-application-rg.json index eeba156..ec4fac9 100644 --- a/configurations/azure/dev-application-rg.json +++ b/configurations/azure/dev-application-rg.json @@ -654,37 +654,8 @@ "networkAcls": { "bypass": "AzureServices", "defaultAction": "Deny", - "ipRules": [ - { - "value": "118.238.231.215/32" - }, - { - "value": "60.97.55.122/32" - }, - { - "value": "153.161.148.137/32" - }, - { - "value": "60.65.231.128/32" - }, - { - "value": "61.87.49.72/32" - }, - { - "value": "122.210.18.114/32" - }, - { - "value": "175.177.42.20/32" - }, - { - "value": "126.227.194.195/32" - } - ], + "ipRules": [], "virtualNetworkRules": [ - { - "id": "[concat(parameters('virtualnetworks_vnet_odms_network_maintenance_externalid'), '/subnets/snet-odms-pipeline-maintenance')]", - "ignoreMissingVnetServiceEndpoint": false - }, { "id": "[concat(parameters('virtualnetworks_vnet_odms_network_dev_externalid'), '/subnets/snet-odms-endpoint-dev')]", "ignoreMissingVnetServiceEndpoint": false @@ -2437,22 +2408,6 @@ }, "type": "Microsoft.Web/sites/privateEndpointConnections" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-06-24T17_01_55_4639315')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-06-25T04_01_55_2289817')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -3133,22 +3088,6 @@ "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-19T17_01_45_3353090')]", "type": "Microsoft.Web/sites/snapshots" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-19T23_01_45_2866323')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T00_01_45_2457559')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -3157,22 +3096,6 @@ "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T01_01_45_1943436')]", "type": "Microsoft.Web/sites/snapshots" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T02_01_45_1794980')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T03_01_45_1381197')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -3181,22 +3104,6 @@ "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T04_01_45_1427344')]", "type": "Microsoft.Web/sites/snapshots" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T05_01_45_1267772')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T06_01_45_1026539')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -3205,38 +3112,6 @@ "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T07_01_45_0899981')]", "type": "Microsoft.Web/sites/snapshots" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T08_01_45_0851998')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-20T08_01_45_0851998')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T09_01_45_1496934')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-20T09_01_45_1496934')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -3253,38 +3128,6 @@ "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-20T10_01_45_0307686')]", "type": "Microsoft.Web/sites/snapshots" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T11_01_45_0534084')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-20T11_01_45_0534084')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T12_01_45_0364790')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-20T12_01_45_0364790')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -3301,54 +3144,6 @@ "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-20T13_01_44_9867133')]", "type": "Microsoft.Web/sites/snapshots" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T14_01_45_0241519')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-20T14_01_45_0241519')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T15_01_44_9639761')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-20T15_01_44_9639761')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T16_01_45_2188746')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-20T16_01_45_2188746')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -3365,86 +3160,6 @@ "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-20T17_01_45_2104714')]", "type": "Microsoft.Web/sites/snapshots" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T18_01_45_1687161')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-20T18_01_45_1687161')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T19_01_45_2130321')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-20T19_01_45_2130321')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T20_01_45_1697031')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-20T20_01_45_1697031')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T21_01_45_1494112')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-20T21_01_45_1494112')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-20T22_01_45_1365461')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-20T22_01_45_1365461')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -4773,6 +4488,390 @@ "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-24T09_01_44_0731132')]", "type": "Microsoft.Web/sites/snapshots" }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-24T10_01_44_0795777')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-24T10_01_44_0795777')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-24T11_01_44_0597297')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-24T11_01_44_0597297')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-24T12_01_44_0740113')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-24T12_01_44_0740113')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-24T13_01_44_0312289')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-24T13_01_44_0312289')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-24T14_01_43_9896839')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-24T14_01_43_9896839')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-24T15_01_44_1349855')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-24T15_01_44_1349855')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-24T16_01_44_1846148')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-24T16_01_44_1846148')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-24T17_01_43_9680803')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-24T17_01_43_9680803')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-24T18_01_43_9158661')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-24T18_01_43_9158661')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-24T19_01_43_8703450')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-24T19_01_43_8703450')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-24T20_01_43_8936930')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-24T20_01_43_8936930')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-24T21_01_43_8459570')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-24T21_01_43_8459570')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-24T22_01_43_8591537')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-24T22_01_43_8591537')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-24T23_01_43_8382010')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-24T23_01_43_8382010')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-25T00_01_43_8208508')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-25T00_01_43_8208508')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-25T01_01_43_8023518')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-25T01_01_43_8023518')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-25T02_01_43_7968472')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-25T02_01_43_7968472')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-25T03_01_43_7653515')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-25T03_01_43_7653515')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-25T04_01_43_7272741')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-25T04_01_43_7272741')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-25T05_01_43_7278555')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-25T05_01_43_7278555')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-25T06_01_43_7050058')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-25T06_01_43_7050058')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-25T07_01_43_7059167')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-25T07_01_43_7059167')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-25T08_01_43_7585763')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-25T08_01_43_7585763')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_dev_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_dev_name'), '/2023-07-25T09_01_43_6590186')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_test_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_test_name'), '/2023-07-25T09_01_43_6590186')]", + "type": "Microsoft.Web/sites/snapshots" + }, { "apiVersion": "2022-09-01", "dependsOn": [ diff --git a/configurations/azure/dev-database-rg.json b/configurations/azure/dev-database-rg.json index edc3826..a9b3156 100644 --- a/configurations/azure/dev-database-rg.json +++ b/configurations/azure/dev-database-rg.json @@ -58,14 +58,6 @@ }, "type": "Microsoft.DBforMySQL/flexibleServers" }, - { - "apiVersion": "2022-09-30-preview", - "dependsOn": [ - "[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_dev_name'))]" - ], - "name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20230717t201400-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]", - "type": "Microsoft.DBforMySQL/flexibleServers/backups" - }, { "apiVersion": "2022-09-30-preview", "dependsOn": [ @@ -114,6 +106,14 @@ "name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20230723t162400-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]", "type": "Microsoft.DBforMySQL/flexibleServers/backups" }, + { + "apiVersion": "2022-09-30-preview", + "dependsOn": [ + "[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_dev_name'))]" + ], + "name": "[concat(parameters('flexibleServers_mysql_odms_db_dev_name'), '/daily-20230724t162400-6cc69487-0eb7-4530-8f35-d1ce130a7df7')]", + "type": "Microsoft.DBforMySQL/flexibleServers/backups" + }, { "apiVersion": "2022-01-01", "dependsOn": [ @@ -5306,9 +5306,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-2023072409.log", + "currentValue": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-dev-2023072509.log", "source": "user-override", - "value": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-dev-2023072409.log" + "value": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-dev-2023072509.log" }, "type": "Microsoft.DBforMySQL/flexibleServers/configurations" }, diff --git a/configurations/azure/dev-network-rg.json b/configurations/azure/dev-network-rg.json index 28bb58f..57f5632 100644 --- a/configurations/azure/dev-network-rg.json +++ b/configurations/azure/dev-network-rg.json @@ -1486,31 +1486,12 @@ }, "type": "Microsoft.Network/networkSecurityGroups/securityRules" }, - { - "id": "[resourceId('Microsoft.Network/networkSecurityGroups/securityRules', parameters('networkSecurityGroups_nsg_odms_private_dev_name'), 'AllowPipelineInbound')]", - "name": "AllowPipelineInbound", - "properties": { - "access": "Allow", - "destinationAddressPrefix": "*", - "destinationAddressPrefixes": [], - "destinationPortRange": "3306", - "destinationPortRanges": [], - "direction": "Inbound", - "priority": 1002, - "protocol": "TCP", - "sourceAddressPrefix": "10.0.3.4/32", - "sourceAddressPrefixes": [], - "sourcePortRange": "*", - "sourcePortRanges": [] - }, - "type": "Microsoft.Network/networkSecurityGroups/securityRules" - }, { "id": "[resourceId('Microsoft.Network/networkSecurityGroups/securityRules', parameters('networkSecurityGroups_nsg_odms_private_dev_name'), 'AllowDeployMigrationInbound')]", "name": "AllowDeployMigrationInbound", "properties": { "access": "Allow", - "description": "deploy���̃}�C�O���[�V����������", + "description": "deploỹ}CO[V", "destinationAddressPrefix": "*", "destinationAddressPrefixes": [], "destinationPortRange": "3306", @@ -1562,26 +1543,6 @@ "sourcePortRanges": [] }, "type": "Microsoft.Network/networkSecurityGroups/securityRules" - }, - { - "id": "[resourceId('Microsoft.Network/networkSecurityGroups/securityRules', parameters('networkSecurityGroups_nsg_odms_private_dev_name'), 'AllowDeployMigrationInbound')]", - "name": "AllowDeployMigrationInbound", - "properties": { - "access": "Allow", - "description": "deploy���̃}�C�O���[�V����������", - "destinationAddressPrefix": "*", - "destinationAddressPrefixes": [], - "destinationPortRange": "3306", - "destinationPortRanges": [], - "direction": "Inbound", - "priority": 1004, - "protocol": "TCP", - "sourceAddressPrefix": "10.0.4.4/32", - "sourceAddressPrefixes": [], - "sourcePortRange": "*", - "sourcePortRanges": [] - }, - "type": "Microsoft.Network/networkSecurityGroups/securityRules" } ] }, @@ -1602,7 +1563,7 @@ "name": "AllowCidrBlockCustomAnyInbound", "properties": { "access": "Allow", - "description": "10.1.0.0/24�iapplication gateway�̏�������T�u�l�b�g�j����̎�M�����‚���", + "description": "10.1.0.0/24iapplication gateway̏Tulbgj̎M‚", "destinationAddressPrefix": "*", "destinationAddressPrefixes": [], "destinationPortRange": "*", @@ -1923,6 +1884,28 @@ }, "type": "Microsoft.Network/networkInterfaces" }, + { + "apiVersion": "2022-11-01", + "dependsOn": [ + "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_private_dev_name'))]" + ], + "name": "[concat(parameters('networkSecurityGroups_nsg_odms_private_dev_name'), '/AllowAppServiceInbound')]", + "properties": { + "access": "Allow", + "destinationAddressPrefix": "*", + "destinationAddressPrefixes": [], + "destinationPortRange": "3306", + "destinationPortRanges": [], + "direction": "Inbound", + "priority": 1001, + "protocol": "TCP", + "sourceAddressPrefix": "10.1.10.0/24", + "sourceAddressPrefixes": [], + "sourcePortRange": "*", + "sourcePortRanges": [] + }, + "type": "Microsoft.Network/networkSecurityGroups/securityRules" + }, { "apiVersion": "2022-11-01", "dependsOn": [ @@ -1931,7 +1914,7 @@ "name": "[concat(parameters('networkSecurityGroups_nsg_odms_public_dev_name'), '/AllowCidrBlockCustomAnyInbound')]", "properties": { "access": "Allow", - "description": "10.1.0.0/24�iapplication gateway�̏�������T�u�l�b�g�j����̎�M�����‚���", + "description": "10.1.0.0/24iapplication gateway̏Tulbgj̎M‚", "destinationAddressPrefix": "*", "destinationAddressPrefixes": [], "destinationPortRange": "*", @@ -1954,7 +1937,7 @@ "name": "[concat(parameters('networkSecurityGroups_nsg_odms_private_dev_name'), '/AllowDeployMigrationInbound')]", "properties": { "access": "Allow", - "description": "deploy���̃}�C�O���[�V����������", + "description": "deploỹ}CO[V", "destinationAddressPrefix": "*", "destinationAddressPrefixes": [], "destinationPortRange": "3306", @@ -1969,28 +1952,6 @@ }, "type": "Microsoft.Network/networkSecurityGroups/securityRules" }, - { - "apiVersion": "2022-11-01", - "dependsOn": [ - "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_private_dev_name'))]" - ], - "name": "[concat(parameters('networkSecurityGroups_nsg_odms_private_dev_name'), '/AllowPipelineInbound')]", - "properties": { - "access": "Allow", - "destinationAddressPrefix": "*", - "destinationAddressPrefixes": [], - "destinationPortRange": "3306", - "destinationPortRanges": [], - "direction": "Inbound", - "priority": 1002, - "protocol": "TCP", - "sourceAddressPrefix": "10.0.3.4/32", - "sourceAddressPrefixes": [], - "sourcePortRange": "*", - "sourcePortRanges": [] - }, - "type": "Microsoft.Network/networkSecurityGroups/securityRules" - }, { "apiVersion": "2022-11-01", "dependsOn": [ diff --git a/configurations/azure/maintenance-rg.json b/configurations/azure/maintenance-rg.json index 3b261b4..256c538 100644 --- a/configurations/azure/maintenance-rg.json +++ b/configurations/azure/maintenance-rg.json @@ -14,9 +14,6 @@ "networkInterfaces_vm_odms_maintenance600_name": { "type": "String" }, - "networkInterfaces_vm_odms_pipeline_maintenance433_name": { - "type": "String" - }, "networkInterfaces_vm_odms_staging_maintenance158_name": { "type": "String" }, @@ -26,9 +23,6 @@ "networkSecurityGroups_nsg_odms_deploy_maintenance_name": { "type": "String" }, - "networkSecurityGroups_nsg_odms_pipeline_maintenance_name": { - "type": "String" - }, "networkSecurityGroups_nsg_odms_vm_maintenance_name": { "type": "String" }, @@ -56,9 +50,6 @@ "sshPublicKeys_vm_odms_deploy_maintenance_key_0720_name": { "type": "String" }, - "sshPublicKeys_vm_odms_pipeline_maintenance_key_name": { - "type": "String" - }, "storageAccounts_saodmscloudshell_name": { "type": "String" }, @@ -68,9 +59,6 @@ "virtualMachines_vm_odms_maintenance_name": { "type": "String" }, - "virtualMachines_vm_odms_pipeline_maintenance_name": { - "type": "String" - }, "virtualMachines_vm_odms_staging_maintenance_name": { "type": "String" }, @@ -105,20 +93,6 @@ }, "type": "Microsoft.Compute/sshPublicKeys" }, - { - "apiVersion": "2023-03-01", - "location": "japaneast", - "name": "[parameters('sshPublicKeys_vm_odms_pipeline_maintenance_key_name')]", - "properties": { - "publicKey": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCb0imUhrem2umlz2VWbspkWxIPoA/N4L5goqLBi8Wj4KH+Fnz95jeGug5aBxlCUiqtYZJJUUOeynXDOws4R0q+mRY/rbsQ02O3QiwVpSH6RWwFeR3xvXpMRJ13W3c1eMTSLOAjLwIYsV9xJDluc3ju26lgUe/WoAeuF0G7ZpceuS4Y1n5Z8ociepESttTfaYV70vgSzT+EzImUbZrHbFj3vcs1Cl9VrnQbotu0x26aVJdtYo3C8DPKXD7g+MCOVbnLqUIs2IML4EIcRAWaefhL7F766gajSwcUn//jZYo6Ei7ec4LcxJYKfRlLb4iU2+Tia2HYJ5LLkejrPImS4xdq6hCSqyKG9yUPI354gJ77tHWzVFMl4BikbjkksJ+mYNqK1KtlluVbhWRaxc5sUpwYjYlzlh05ZfgCRqwKf7k502WkK7IDt01ROEVtD5njEoH+FUlIApT2Y3LlI/y1sZuyi9alhZ5PK9VpQ46a7M/02El0WRbQgoyOTVG+y/Q9EPU= generated-by-azure" - }, - "tags": { - "Environment": "maintenance", - "Project": "OMDS", - "ms-resource-usage": "pipeline-self-hosted-agent" - }, - "type": "Microsoft.Compute/sshPublicKeys" - }, { "apiVersion": "2023-01-01-preview", "location": "japaneast", @@ -134,33 +108,13 @@ "networkRuleSet": { "defaultAction": "Deny", "ipRules": [ - { - "action": "Allow", - "value": "60.97.55.122" - }, - { - "action": "Allow", - "value": "118.238.231.215" - }, - { - "action": "Allow", - "value": "126.227.194.195" - }, - { - "action": "Allow", - "value": "175.177.42.17" - }, - { - "action": "Allow", - "value": "4.193.0.0/16" - }, - { - "action": "Allow", - "value": "4.194.0.0/16" - }, { "action": "Allow", "value": "175.177.42.28" + }, + { + "action": "Allow", + "value": "153.210.243.72" } ] }, @@ -395,7 +349,7 @@ "direction": "Inbound", "priority": 140, "protocol": "TCP", - "sourceAddressPrefix": "211.125.140.87", + "sourceAddressPrefix": "211.125.140.83", "sourceAddressPrefixes": [], "sourcePortRange": "*", "sourcePortRanges": [] @@ -530,7 +484,7 @@ "direction": "Inbound", "priority": 203, "protocol": "TCP", - "sourceAddressPrefix": "126.74.128.188", + "sourceAddressPrefix": "126.74.195.84", "sourceAddressPrefixes": [], "sourcePortRange": "*", "sourcePortRanges": [] @@ -579,39 +533,6 @@ }, "type": "Microsoft.Network/networkSecurityGroups" }, - { - "apiVersion": "2022-11-01", - "location": "japaneast", - "name": "[parameters('networkSecurityGroups_nsg_odms_pipeline_maintenance_name')]", - "properties": { - "securityRules": [ - { - "id": "[resourceId('Microsoft.Network/networkSecurityGroups/securityRules', parameters('networkSecurityGroups_nsg_odms_pipeline_maintenance_name'), 'DenyAllInbound')]", - "name": "DenyAllInbound", - "properties": { - "access": "Deny", - "destinationAddressPrefix": "*", - "destinationAddressPrefixes": [], - "destinationPortRange": "*", - "destinationPortRanges": [], - "direction": "Inbound", - "priority": 4096, - "protocol": "*", - "sourceAddressPrefix": "*", - "sourceAddressPrefixes": [], - "sourcePortRange": "*", - "sourcePortRanges": [] - }, - "type": "Microsoft.Network/networkSecurityGroups/securityRules" - } - ] - }, - "tags": { - "Environment": "maintenance", - "Project": "OMDS" - }, - "type": "Microsoft.Network/networkSecurityGroups" - }, { "apiVersion": "2022-11-01", "location": "japaneast", @@ -661,7 +582,7 @@ "name": "DenyCidrBlockCustom4443Outbound", "properties": { "access": "Deny", - "description": "staging���ݑ䂩��dev�‹��ւ̃A�N�Z�X���֎~", + "description": "stagingݑ䂩dev‹ւ̃ANZX֎~", "destinationAddressPrefix": "10.1.0.10", "destinationAddressPrefixes": [], "destinationPortRange": "4443", @@ -681,7 +602,7 @@ "name": "DenyCidrBlockCustom4443Outbound_DevToStg", "properties": { "access": "Deny", - "description": "dev���ݑ䂩��staging�‹��ւ̃A�N�Z�X���֎~", + "description": "devݑ䂩staging‹ւ̃ANZX֎~", "destinationAddressPrefix": "10.2.0.10", "destinationAddressPrefixes": [], "destinationPortRange": "4443", @@ -701,7 +622,7 @@ "name": "AllowDevAppOutbound", "properties": { "access": "Allow", - "description": "Dev���ݑ䂩��Dev�‹��ւ̃A�N�Z�X������", + "description": "Devݑ䂩Dev‹ւ̃ANZX", "destinationAddressPrefix": "10.1.0.10", "destinationAddressPrefixes": [], "destinationPortRange": "4443", @@ -721,7 +642,7 @@ "name": "AllowStgAppOutbound", "properties": { "access": "Allow", - "description": "STG���ݑ䂩��STG�‹��ւ̃A�N�Z�X������", + "description": "STGݑ䂩STG‹ւ̃ANZX", "destinationAddressPrefix": "10.2.0.10", "destinationAddressPrefixes": [], "destinationPortRange": "4443", @@ -798,7 +719,7 @@ "name": "AllowStorageAccountEastUSOutbound", "properties": { "access": "Allow", - "description": "US�p��StorageAccount�ւ̃A�N�Z�X�����‚���", + "description": "USpStorageAccountւ̃ANZX‚", "destinationAddressPrefix": "Storage.EastUS", "destinationAddressPrefixes": [], "destinationPortRange": "443", @@ -818,7 +739,7 @@ "name": "AllowStorageAccountNorthEuropeOutbound", "properties": { "access": "Allow", - "description": "EU�p��StorageAccount�ւ̃A�N�Z�X�����‚���", + "description": "EUpStorageAccountւ̃ANZX‚", "destinationAddressPrefix": "Storage.NorthEurope", "destinationAddressPrefixes": [], "destinationPortRange": "443", @@ -838,7 +759,7 @@ "name": "AllowStorageAccountAustraliaEastOutbound", "properties": { "access": "Allow", - "description": "AU�p��StorageAccount�ւ̃A�N�Z�X�����‚���", + "description": "AUpStorageAccountւ̃ANZX‚", "destinationAddressPrefix": "Storage.AustraliaEast", "destinationAddressPrefixes": [], "destinationPortRange": "443", @@ -1139,93 +1060,6 @@ }, "type": "Microsoft.Compute/virtualMachines" }, - { - "apiVersion": "2023-03-01", - "dependsOn": [ - "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_vm_odms_pipeline_maintenance433_name'))]" - ], - "location": "japaneast", - "name": "[parameters('virtualMachines_vm_odms_pipeline_maintenance_name')]", - "properties": { - "diagnosticsProfile": { - "bootDiagnostics": { - "enabled": true - } - }, - "hardwareProfile": { - "vmSize": "Standard_B1s" - }, - "networkProfile": { - "networkInterfaces": [ - { - "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_vm_odms_pipeline_maintenance433_name'))]", - "properties": { - "deleteOption": "Detach" - } - } - ] - }, - "osProfile": { - "adminUsername": "azureuser", - "allowExtensionOperations": true, - "computerName": "[parameters('virtualMachines_vm_odms_pipeline_maintenance_name')]", - "linuxConfiguration": { - "disablePasswordAuthentication": true, - "enableVMAgentPlatformUpdates": false, - "patchSettings": { - "assessmentMode": "ImageDefault", - "patchMode": "ImageDefault" - }, - "provisionVMAgent": true, - "ssh": { - "publicKeys": [ - { - "keyData": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCb0imUhrem2umlz2VWbspkWxIPoA/N4L5goqLBi8Wj4KH+Fnz95jeGug5aBxlCUiqtYZJJUUOeynXDOws4R0q+mRY/rbsQ02O3QiwVpSH6RWwFeR3xvXpMRJ13W3c1eMTSLOAjLwIYsV9xJDluc3ju26lgUe/WoAeuF0G7ZpceuS4Y1n5Z8ociepESttTfaYV70vgSzT+EzImUbZrHbFj3vcs1Cl9VrnQbotu0x26aVJdtYo3C8DPKXD7g+MCOVbnLqUIs2IML4EIcRAWaefhL7F766gajSwcUn//jZYo6Ei7ec4LcxJYKfRlLb4iU2+Tia2HYJ5LLkejrPImS4xdq6hCSqyKG9yUPI354gJ77tHWzVFMl4BikbjkksJ+mYNqK1KtlluVbhWRaxc5sUpwYjYlzlh05ZfgCRqwKf7k502WkK7IDt01ROEVtD5njEoH+FUlIApT2Y3LlI/y1sZuyi9alhZ5PK9VpQ46a7M/02El0WRbQgoyOTVG+y/Q9EPU= generated-by-azure", - "path": "/home/azureuser/.ssh/authorized_keys" - } - ] - } - }, - "requireGuestProvisionSignal": true, - "secrets": [] - }, - "securityProfile": { - "securityType": "TrustedLaunch", - "uefiSettings": { - "secureBootEnabled": true, - "vTpmEnabled": true - } - }, - "storageProfile": { - "dataDisks": [], - "diskControllerType": "SCSI", - "imageReference": { - "offer": "0001-com-ubuntu-server-focal", - "publisher": "canonical", - "sku": "20_04-lts-gen2", - "version": "latest" - }, - "osDisk": { - "caching": "ReadWrite", - "createOption": "FromImage", - "deleteOption": "Delete", - "diskSizeGB": 30, - "managedDisk": { - "id": "[resourceId('Microsoft.Compute/disks', concat(parameters('virtualMachines_vm_odms_pipeline_maintenance_name'), '_OsDisk_1_44286493b6da484b851af53dcaffb460'))]", - "storageAccountType": "Premium_LRS" - }, - "name": "[concat(parameters('virtualMachines_vm_odms_pipeline_maintenance_name'), '_OsDisk_1_44286493b6da484b851af53dcaffb460')]", - "osType": "Linux" - } - } - }, - "tags": { - "Environment": "maintenance", - "Project": "OMDS", - "ms-resource-usage": "pipeline-self-hosted-agent" - }, - "type": "Microsoft.Compute/virtualMachines" - }, { "apiVersion": "2023-03-01", "dependsOn": [ @@ -1566,7 +1400,7 @@ "enableIPForwarding": false, "ipConfigurations": [ { - "etag": "W/\"c9ca18a9-39d8-41b0-8a66-c58e6548c7f7\"", + "etag": "W/\"a89a925e-9e45-4487-8a05-e6328c371ed8\"", "id": "[concat(resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_vm_odms_maintenance600_name')), '/ipConfigurations/ipconfig1')]", "name": "ipconfig1", "properties": { @@ -1590,48 +1424,6 @@ }, "type": "Microsoft.Network/networkInterfaces" }, - { - "apiVersion": "2022-11-01", - "dependsOn": [ - "[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('virtualNetworks_vnet_odms_network_maintenance_name'), 'snet-odms-pipeline-maintenance')]" - ], - "kind": "Regular", - "location": "japaneast", - "name": "[parameters('networkInterfaces_vm_odms_pipeline_maintenance433_name')]", - "properties": { - "disableTcpStateTracking": false, - "dnsSettings": { - "dnsServers": [] - }, - "enableAcceleratedNetworking": false, - "enableIPForwarding": false, - "ipConfigurations": [ - { - "etag": "W/\"579f5ca6-b4d4-4ad0-afa0-ab28aa57d9f9\"", - "id": "[concat(resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_vm_odms_pipeline_maintenance433_name')), '/ipConfigurations/ipconfig1')]", - "name": "ipconfig1", - "properties": { - "primary": true, - "privateIPAddress": "10.0.3.4", - "privateIPAddressVersion": "IPv4", - "privateIPAllocationMethod": "Dynamic", - "provisioningState": "Succeeded", - "subnet": { - "id": "[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('virtualNetworks_vnet_odms_network_maintenance_name'), 'snet-odms-pipeline-maintenance')]" - } - }, - "type": "Microsoft.Network/networkInterfaces/ipConfigurations" - } - ], - "nicType": "Standard" - }, - "tags": { - "Environment": "maintenance", - "Project": "OMDS", - "ms-resource-usage": "pipeline-self-hosted-agent" - }, - "type": "Microsoft.Network/networkInterfaces" - }, { "apiVersion": "2022-11-01", "dependsOn": [ @@ -1649,7 +1441,7 @@ "enableIPForwarding": false, "ipConfigurations": [ { - "etag": "W/\"b1ccd000-f216-4102-8493-ca82ec2ded02\"", + "etag": "W/\"c3eedbb4-4d67-4bd5-9af0-2b3c54700529\"", "id": "[concat(resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_vm_odms_staging_maintenance158_name')), '/ipConfigurations/ipconfig1')]", "name": "ipconfig1", "properties": { @@ -1817,7 +1609,7 @@ "name": "[concat(parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), '/AllowDevAppOutbound')]", "properties": { "access": "Allow", - "description": "Dev���ݑ䂩��Dev�‹��ւ̃A�N�Z�X������", + "description": "Devݑ䂩Dev‹ւ̃ANZX", "destinationAddressPrefix": "10.1.0.10", "destinationAddressPrefixes": [], "destinationPortRange": "4443", @@ -1935,7 +1727,7 @@ "direction": "Inbound", "priority": 203, "protocol": "TCP", - "sourceAddressPrefix": "126.74.128.188", + "sourceAddressPrefix": "126.74.195.84", "sourceAddressPrefixes": [], "sourcePortRange": "*", "sourcePortRanges": [] @@ -2003,7 +1795,7 @@ "direction": "Inbound", "priority": 140, "protocol": "TCP", - "sourceAddressPrefix": "211.125.140.87", + "sourceAddressPrefix": "211.125.140.83", "sourceAddressPrefixes": [], "sourcePortRange": "*", "sourcePortRanges": [] @@ -2130,7 +1922,7 @@ "name": "[concat(parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), '/AllowStgAppOutbound')]", "properties": { "access": "Allow", - "description": "STG���ݑ䂩��STG�‹��ւ̃A�N�Z�X������", + "description": "STGݑ䂩STG‹ւ̃ANZX", "destinationAddressPrefix": "10.2.0.10", "destinationAddressPrefixes": [], "destinationPortRange": "4443", @@ -2175,7 +1967,7 @@ "name": "[concat(parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), '/AllowStorageAccountAustraliaEastOutbound')]", "properties": { "access": "Allow", - "description": "AU�p��StorageAccount�ւ̃A�N�Z�X�����‚���", + "description": "AUpStorageAccountւ̃ANZX‚", "destinationAddressPrefix": "Storage.AustraliaEast", "destinationAddressPrefixes": [], "destinationPortRange": "443", @@ -2198,7 +1990,7 @@ "name": "[concat(parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), '/AllowStorageAccountEastUSOutbound')]", "properties": { "access": "Allow", - "description": "US�p��StorageAccount�ւ̃A�N�Z�X�����‚���", + "description": "USpStorageAccountւ̃ANZX‚", "destinationAddressPrefix": "Storage.EastUS", "destinationAddressPrefixes": [], "destinationPortRange": "443", @@ -2221,7 +2013,7 @@ "name": "[concat(parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), '/AllowStorageAccountNorthEuropeOutbound')]", "properties": { "access": "Allow", - "description": "EU�p��StorageAccount�ւ̃A�N�Z�X�����‚���", + "description": "EUpStorageAccountւ̃ANZX‚", "destinationAddressPrefix": "Storage.NorthEurope", "destinationAddressPrefixes": [], "destinationPortRange": "443", @@ -2258,28 +2050,6 @@ }, "type": "Microsoft.Network/networkSecurityGroups/securityRules" }, - { - "apiVersion": "2022-11-01", - "dependsOn": [ - "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_pipeline_maintenance_name'))]" - ], - "name": "[concat(parameters('networkSecurityGroups_nsg_odms_pipeline_maintenance_name'), '/DenyAllInbound')]", - "properties": { - "access": "Deny", - "destinationAddressPrefix": "*", - "destinationAddressPrefixes": [], - "destinationPortRange": "*", - "destinationPortRanges": [], - "direction": "Inbound", - "priority": 4096, - "protocol": "*", - "sourceAddressPrefix": "*", - "sourceAddressPrefixes": [], - "sourcePortRange": "*", - "sourcePortRanges": [] - }, - "type": "Microsoft.Network/networkSecurityGroups/securityRules" - }, { "apiVersion": "2022-11-01", "dependsOn": [ @@ -2354,7 +2124,7 @@ "name": "[concat(parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), '/DenyCidrBlockCustom4443Outbound')]", "properties": { "access": "Deny", - "description": "staging���ݑ䂩��dev�‹��ւ̃A�N�Z�X���֎~", + "description": "stagingݑ䂩dev‹ւ̃ANZX֎~", "destinationAddressPrefix": "10.1.0.10", "destinationAddressPrefixes": [], "destinationPortRange": "4443", @@ -2377,7 +2147,7 @@ "name": "[concat(parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'), '/DenyCidrBlockCustom4443Outbound_DevToStg')]", "properties": { "access": "Deny", - "description": "dev���ݑ䂩��staging�‹��ւ̃A�N�Z�X���֎~", + "description": "devݑ䂩staging‹ւ̃ANZX֎~", "destinationAddressPrefix": "10.2.0.10", "destinationAddressPrefixes": [], "destinationPortRange": "4443", @@ -2812,32 +2582,6 @@ }, "type": "Microsoft.Network/virtualNetworks/subnets" }, - { - "apiVersion": "2022-11-01", - "dependsOn": [ - "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_vnet_odms_network_maintenance_name'))]", - "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_pipeline_maintenance_name'))]" - ], - "name": "[concat(parameters('virtualNetworks_vnet_odms_network_maintenance_name'), '/snet-odms-pipeline-maintenance')]", - "properties": { - "addressPrefix": "10.0.3.0/24", - "delegations": [], - "networkSecurityGroup": { - "id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_pipeline_maintenance_name'))]" - }, - "privateEndpointNetworkPolicies": "Disabled", - "privateLinkServiceNetworkPolicies": "Enabled", - "serviceEndpoints": [ - { - "locations": [ - "*" - ], - "service": "Microsoft.KeyVault" - } - ] - }, - "type": "Microsoft.Network/virtualNetworks/subnets" - }, { "apiVersion": "2022-11-01", "dependsOn": [ @@ -2875,7 +2619,6 @@ "apiVersion": "2022-11-01", "dependsOn": [ "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_bas_maintenance_name'))]", - "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_pipeline_maintenance_name'))]", "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_vm_maintenance_name'))]", "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_deploy_maintenance_name'))]" ], @@ -2923,28 +2666,6 @@ }, "type": "Microsoft.Network/virtualNetworks/subnets" }, - { - "id": "[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('virtualNetworks_vnet_odms_network_maintenance_name'), 'snet-odms-pipeline-maintenance')]", - "name": "snet-odms-pipeline-maintenance", - "properties": { - "addressPrefix": "10.0.3.0/24", - "delegations": [], - "networkSecurityGroup": { - "id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_pipeline_maintenance_name'))]" - }, - "privateEndpointNetworkPolicies": "Disabled", - "privateLinkServiceNetworkPolicies": "Enabled", - "serviceEndpoints": [ - { - "locations": [ - "*" - ], - "service": "Microsoft.KeyVault" - } - ] - }, - "type": "Microsoft.Network/virtualNetworks/subnets" - }, { "id": "[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('virtualNetworks_vnet_odms_network_maintenance_name'), 'snet-odms-vm-maintenance')]", "name": "snet-odms-vm-maintenance", diff --git a/configurations/azure/stg-application-rg.json b/configurations/azure/stg-application-rg.json index 01d81f6..213a1e1 100644 --- a/configurations/azure/stg-application-rg.json +++ b/configurations/azure/stg-application-rg.json @@ -559,23 +559,7 @@ "networkAcls": { "bypass": "AzureServices", "defaultAction": "Deny", - "ipRules": [ - { - "value": "60.65.231.128/32" - }, - { - "value": "175.177.42.25/32" - }, - { - "value": "126.227.194.195/32" - }, - { - "value": "20.212.208.168/32" - }, - { - "value": "4.194.188.0/24" - } - ], + "ipRules": [], "virtualNetworkRules": [ { "id": "[concat(parameters('virtualnetworks_vnet_odms_network_stg_externalid'), '/subnets/snet-odms-gateway-stg')]", @@ -598,7 +582,7 @@ "ignoreMissingVnetServiceEndpoint": false }, { - "id": "[concat(parameters('virtualnetworks_vnet_odms_network_maintenance_externalid'), '/subnets/snet-odms-pipeline-maintenance')]", + "id": "[concat(parameters('virtualnetworks_vnet_odms_network_maintenance_externalid'), '/subnets/snet-odms-deploy-maintenance')]", "ignoreMissingVnetServiceEndpoint": false } ] @@ -1722,22 +1706,6 @@ }, "type": "Microsoft.Web/sites/privateEndpointConnections" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-06-24T17_01_55_4639315')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-06-25T04_01_55_2289817')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -2418,22 +2386,6 @@ "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-19T17_01_45_3353090')]", "type": "Microsoft.Web/sites/snapshots" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-19T23_01_45_2866323')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T00_01_45_2457559')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -2442,22 +2394,6 @@ "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T01_01_45_1943436')]", "type": "Microsoft.Web/sites/snapshots" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T02_01_45_1794980')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T03_01_45_1381197')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -2466,22 +2402,6 @@ "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T04_01_45_1427344')]", "type": "Microsoft.Web/sites/snapshots" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T05_01_45_1267772')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T06_01_45_1026539')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -2490,22 +2410,6 @@ "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T07_01_45_0899981')]", "type": "Microsoft.Web/sites/snapshots" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T08_01_45_0851998')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T09_01_45_1496934')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -2514,22 +2418,6 @@ "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T10_01_45_0307686')]", "type": "Microsoft.Web/sites/snapshots" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T11_01_45_0534084')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T12_01_45_0364790')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -2538,30 +2426,6 @@ "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T13_01_44_9867133')]", "type": "Microsoft.Web/sites/snapshots" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T14_01_45_0241519')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T15_01_44_9639761')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T16_01_45_2188746')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -2570,46 +2434,6 @@ "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T17_01_45_2104714')]", "type": "Microsoft.Web/sites/snapshots" }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T18_01_45_1687161')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T19_01_45_2130321')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T20_01_45_1697031')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T21_01_45_1494112')]", - "type": "Microsoft.Web/sites/snapshots" - }, - { - "apiVersion": "2015-08-01", - "dependsOn": [ - "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" - ], - "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-20T22_01_45_1365461')]", - "type": "Microsoft.Web/sites/snapshots" - }, { "apiVersion": "2015-08-01", "dependsOn": [ @@ -3274,6 +3098,190 @@ "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-24T09_01_44_0731132')]", "type": "Microsoft.Web/sites/snapshots" }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-24T10_01_44_0795777')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-24T11_01_44_0597297')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-24T12_01_44_0740113')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-24T13_01_44_0312289')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-24T14_01_43_9896839')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-24T15_01_44_1349855')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-24T16_01_44_1846148')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-24T17_01_43_9680803')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-24T18_01_43_9158661')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-24T19_01_43_8703450')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-24T20_01_43_8936930')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-24T21_01_43_8459570')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-24T22_01_43_8591537')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-24T23_01_43_8382010')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-25T00_01_43_8208508')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-25T01_01_43_8023518')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-25T02_01_43_7968472')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-25T03_01_43_7653515')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-25T04_01_43_7272741')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-25T05_01_43_7278555')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-25T06_01_43_7050058')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-25T07_01_43_7059167')]", + "type": "Microsoft.Web/sites/snapshots" + }, + { + "apiVersion": "2015-08-01", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('sites_app_odms_dictation_stg_name'))]" + ], + "name": "[concat(parameters('sites_app_odms_dictation_stg_name'), '/2023-07-25T08_01_43_7585763')]", + "type": "Microsoft.Web/sites/snapshots" + }, { "apiVersion": "2022-09-01", "dependsOn": [ diff --git a/configurations/azure/stg-database-rg.json b/configurations/azure/stg-database-rg.json index d256a7b..80b0817 100644 --- a/configurations/azure/stg-database-rg.json +++ b/configurations/azure/stg-database-rg.json @@ -58,14 +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-20230717t121600-c3fd140d-3620-488c-9516-d0c0fb44c636')]", - "type": "Microsoft.DBforMySQL/flexibleServers/backups" - }, { "apiVersion": "2022-09-30-preview", "dependsOn": [ @@ -122,6 +114,14 @@ "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": [ + "[resourceId('Microsoft.DBforMySQL/flexibleServers', parameters('flexibleServers_mysql_odms_db_stg_name'))]" + ], + "name": "[concat(parameters('flexibleServers_mysql_odms_db_stg_name'), '/daily-20230725t053700-c3fd140d-3620-488c-9516-d0c0fb44c636')]", + "type": "Microsoft.DBforMySQL/flexibleServers/backups" + }, { "apiVersion": "2022-01-01", "dependsOn": [ @@ -5314,9 +5314,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-2023072401.log", + "currentValue": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-stg-2023072501.log", "source": "user-override", - "value": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-stg-2023072401.log" + "value": "/app/serverlogs/slowlogs/mysql-slow-mysql-odms-db-stg-2023072501.log" }, "type": "Microsoft.DBforMySQL/flexibleServers/configurations" }, diff --git a/configurations/azure/stg-network-rg.json b/configurations/azure/stg-network-rg.json index 1d4215a..6472738 100644 --- a/configurations/azure/stg-network-rg.json +++ b/configurations/azure/stg-network-rg.json @@ -672,7 +672,7 @@ "name": "AllowCidrBlockHTTPSInboundOMDSSC01", "properties": { "access": "Allow", - "description": "Subcontractor�F�ϑ���", + "description": "SubcontractorFϑ", "destinationAddressPrefix": "*", "destinationAddressPrefixes": [], "destinationPortRange": "443", @@ -813,7 +813,7 @@ "direction": "Inbound", "priority": 903, "protocol": "TCP", - "sourceAddressPrefix": "211.125.140.64", + "sourceAddressPrefix": "211.125.140.83", "sourceAddressPrefixes": [], "sourcePortRange": "*", "sourcePortRanges": [] @@ -853,25 +853,6 @@ }, "type": "Microsoft.Network/networkSecurityGroups/securityRules" }, - { - "id": "[resourceId('Microsoft.Network/networkSecurityGroups/securityRules', parameters('networkSecurityGroups_nsg_odms_private_stg_name'), 'AllowPipelineInbound')]", - "name": "AllowPipelineInbound", - "properties": { - "access": "Allow", - "destinationAddressPrefix": "*", - "destinationAddressPrefixes": [], - "destinationPortRange": "3306", - "destinationPortRanges": [], - "direction": "Inbound", - "priority": 1002, - "protocol": "TCP", - "sourceAddressPrefix": "10.0.3.4/32", - "sourceAddressPrefixes": [], - "sourcePortRange": "*", - "sourcePortRanges": [] - }, - "type": "Microsoft.Network/networkSecurityGroups/securityRules" - }, { "id": "[resourceId('Microsoft.Network/networkSecurityGroups/securityRules', parameters('networkSecurityGroups_nsg_odms_private_stg_name'), 'bastionStagingVMInbound')]", "name": "bastionStagingVMInbound", @@ -967,7 +948,7 @@ "name": "AllowCidrBlockCustomAnyInbound", "properties": { "access": "Allow", - "description": "10.1.0.0/24�iapplication gateway�̏�������T�u�l�b�g�j����̎�M�����‚���", + "description": "10.1.0.0/24iapplication gateway̏Tulbgj̎M‚", "destinationAddressPrefix": "*", "destinationAddressPrefixes": [], "destinationPortRange": "*", @@ -1298,7 +1279,7 @@ "name": "[concat(parameters('networkSecurityGroups_nsg_odms_public_stg_name'), '/AllowCidrBlockCustomAnyInbound')]", "properties": { "access": "Allow", - "description": "10.1.0.0/24�iapplication gateway�̏�������T�u�l�b�g�j����̎�M�����‚���", + "description": "10.1.0.0/24iapplication gateway̏Tulbgj̎M‚", "destinationAddressPrefix": "*", "destinationAddressPrefixes": [], "destinationPortRange": "*", @@ -1372,7 +1353,7 @@ "direction": "Inbound", "priority": 903, "protocol": "TCP", - "sourceAddressPrefix": "211.125.140.64", + "sourceAddressPrefix": "211.125.140.83", "sourceAddressPrefixes": [], "sourcePortRange": "*", "sourcePortRanges": [] @@ -1475,7 +1456,7 @@ "name": "[concat(parameters('networkSecurityGroups_nsg_odms_gateway_stg_name'), '/AllowCidrBlockHTTPSInboundOMDSSC01')]", "properties": { "access": "Allow", - "description": "Subcontractor�F�ϑ���", + "description": "SubcontractorFϑ", "destinationAddressPrefix": "*", "destinationAddressPrefixes": [], "destinationPortRange": "443", @@ -1710,28 +1691,6 @@ }, "type": "Microsoft.Network/networkSecurityGroups/securityRules" }, - { - "apiVersion": "2022-11-01", - "dependsOn": [ - "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_odms_private_stg_name'))]" - ], - "name": "[concat(parameters('networkSecurityGroups_nsg_odms_private_stg_name'), '/AllowPipelineInbound')]", - "properties": { - "access": "Allow", - "destinationAddressPrefix": "*", - "destinationAddressPrefixes": [], - "destinationPortRange": "3306", - "destinationPortRanges": [], - "direction": "Inbound", - "priority": 1002, - "protocol": "TCP", - "sourceAddressPrefix": "10.0.3.4/32", - "sourceAddressPrefixes": [], - "sourcePortRange": "*", - "sourcePortRanges": [] - }, - "type": "Microsoft.Network/networkSecurityGroups/securityRules" - }, { "apiVersion": "2022-11-01", "dependsOn": [