From 6bee04f0634dcf04ceb2bd089187a0ff16c8492c Mon Sep 17 00:00:00 2001 From: Hamed Shirbandi Date: Sun, 22 Oct 2023 21:44:35 +0200 Subject: [PATCH] chore: disable metric stand-alone server --- .../Api/Boards.Read.Api/appsettings.json | 4 +- .../Properties/launchSettings.json | 2 +- .../Api/Boards.Write.Api/appsettings.json | 4 +- .../Api/Identity.Api/appsettings.json | 4 +- .../Api/Owners.Read.Api/appsettings.json | 4 +- .../Properties/launchSettings.json | 2 +- .../Api/Owners.Write.Api/appsettings.json | 4 +- .../Tasks/Api/Tasks.Read.Api/appsettings.json | 4 +- .../Api/Tasks.Write.Api/appsettings.json | 4 +- .../UserPanel/Aggregator/appsettings.json | 4 +- .../UserPanel/ApiGateway/appsettings.json | 4 +- src/4-Clients/Website/appsettings.json | 4 +- src/7-Docker/docker-compose.override.yml | 11 ----- src/7-Docker/docker-compose.yml | 43 +++++-------------- src/7-Docker/launchSettings.json | 1 - 15 files changed, 32 insertions(+), 67 deletions(-) diff --git a/src/2-Services/Boards/Api/Boards.Read.Api/appsettings.json b/src/2-Services/Boards/Api/Boards.Read.Api/appsettings.json index dad6e7a7c..98537976c 100644 --- a/src/2-Services/Boards/Api/Boards.Read.Api/appsettings.json +++ b/src/2-Services/Boards/Api/Boards.Read.Api/appsettings.json @@ -10,8 +10,8 @@ "Password": "guest" }, "Metric": { - "StandAloneKestrelServerEnabled": true, - "Port": 8081, + "StandAloneKestrelServerEnabled": false, + "Port": 5025, "Url": "/metrics", "Hostname": "+", "HttpMetricsEnabled": true, diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Properties/launchSettings.json b/src/2-Services/Boards/Api/Boards.Write.Api/Properties/launchSettings.json index 38b4092ff..a6558e566 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Properties/launchSettings.json +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Properties/launchSettings.json @@ -11,7 +11,7 @@ "dotnetRunMessages": true, "applicationUrl": "https://localhost:5023;http://localhost:5022" }, - "Docker (1)": { + "Docker": { "commandName": "Docker", "launchBrowser": true, "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/", diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/appsettings.json b/src/2-Services/Boards/Api/Boards.Write.Api/appsettings.json index bfdb423f6..0f24e4316 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/appsettings.json +++ b/src/2-Services/Boards/Api/Boards.Write.Api/appsettings.json @@ -15,8 +15,8 @@ "KeyNamespace": "TaskoMaskEventStore" }, "Metric": { - "StandAloneKestrelServerEnabled": true, - "Port": 8081, + "StandAloneKestrelServerEnabled": false, + "Port": 5023, "Url": "/metrics", "Hostname": "+", "HttpMetricsEnabled": true, diff --git a/src/2-Services/Identity/Api/Identity.Api/appsettings.json b/src/2-Services/Identity/Api/Identity.Api/appsettings.json index 774b22a8a..ceef17da9 100644 --- a/src/2-Services/Identity/Api/Identity.Api/appsettings.json +++ b/src/2-Services/Identity/Api/Identity.Api/appsettings.json @@ -15,8 +15,8 @@ "KeyNamespace": "TaskoMaskEventStore" }, "Metric": { - "StandAloneKestrelServerEnabled": true, - "Port": 8081, + "StandAloneKestrelServerEnabled": false, + "Port": 5017, "Url": "/metrics", "Hostname": "+", "HttpMetricsEnabled": true, diff --git a/src/2-Services/Owners/Api/Owners.Read.Api/appsettings.json b/src/2-Services/Owners/Api/Owners.Read.Api/appsettings.json index 38a66daf6..6a694922d 100644 --- a/src/2-Services/Owners/Api/Owners.Read.Api/appsettings.json +++ b/src/2-Services/Owners/Api/Owners.Read.Api/appsettings.json @@ -10,8 +10,8 @@ "Password": "guest" }, "Metric": { - "StandAloneKestrelServerEnabled": true, - "Port": 8081, + "StandAloneKestrelServerEnabled": false, + "Port": 5021, "Url": "/metrics", "Hostname": "+", "HttpMetricsEnabled": true, diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Properties/launchSettings.json b/src/2-Services/Owners/Api/Owners.Write.Api/Properties/launchSettings.json index b8c7e70d7..12e08a48c 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Properties/launchSettings.json +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Properties/launchSettings.json @@ -11,7 +11,7 @@ "dotnetRunMessages": true, "applicationUrl": "https://localhost:5019;http://localhost:5018" }, - "Docker (1)": { + "Docker": { "commandName": "Docker", "launchBrowser": true, "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/", diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/appsettings.json b/src/2-Services/Owners/Api/Owners.Write.Api/appsettings.json index 89511c231..98dc92793 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/appsettings.json +++ b/src/2-Services/Owners/Api/Owners.Write.Api/appsettings.json @@ -15,8 +15,8 @@ "KeyNamespace": "TaskoMaskEventStore" }, "Metric": { - "StandAloneKestrelServerEnabled": true, - "Port": 8081, + "StandAloneKestrelServerEnabled": false, + "Port": 5019, "Url": "/metrics", "Hostname": "+", "HttpMetricsEnabled": true, diff --git a/src/2-Services/Tasks/Api/Tasks.Read.Api/appsettings.json b/src/2-Services/Tasks/Api/Tasks.Read.Api/appsettings.json index de9289640..2501cf969 100644 --- a/src/2-Services/Tasks/Api/Tasks.Read.Api/appsettings.json +++ b/src/2-Services/Tasks/Api/Tasks.Read.Api/appsettings.json @@ -14,8 +14,8 @@ "Enabled": true }, "Metric": { - "StandAloneKestrelServerEnabled": true, - "Port": 8081, + "StandAloneKestrelServerEnabled": false, + "Port": 5029, "Url": "/metrics", "Hostname": "+", "HttpMetricsEnabled": true, diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/appsettings.json b/src/2-Services/Tasks/Api/Tasks.Write.Api/appsettings.json index b5b08eb28..942879290 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/appsettings.json +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/appsettings.json @@ -15,8 +15,8 @@ "KeyNamespace": "TaskoMaskEventStore" }, "Metric": { - "StandAloneKestrelServerEnabled": true, - "Port": 8081, + "StandAloneKestrelServerEnabled": false, + "Port": 5027, "Url": "/metrics", "Hostname": "+", "HttpMetricsEnabled": true, diff --git a/src/3-ApiGateways/UserPanel/Aggregator/appsettings.json b/src/3-ApiGateways/UserPanel/Aggregator/appsettings.json index d9fd9eb9b..f68e0a3b1 100644 --- a/src/3-ApiGateways/UserPanel/Aggregator/appsettings.json +++ b/src/3-ApiGateways/UserPanel/Aggregator/appsettings.json @@ -12,8 +12,8 @@ "Task-Read-Service": "https://localhost:5029" }, "Metric": { - "StandAloneKestrelServerEnabled": true, - "Port": 8081, + "StandAloneKestrelServerEnabled": false, + "Port": 5003, "Url": "/metrics", "Hostname": "+", "HttpMetricsEnabled": true, diff --git a/src/3-ApiGateways/UserPanel/ApiGateway/appsettings.json b/src/3-ApiGateways/UserPanel/ApiGateway/appsettings.json index e9cf13634..84c55ea7c 100644 --- a/src/3-ApiGateways/UserPanel/ApiGateway/appsettings.json +++ b/src/3-ApiGateways/UserPanel/ApiGateway/appsettings.json @@ -40,8 +40,8 @@ "IdentityServer": "https://identity.taskomask.ir" }, "Metric": { - "StandAloneKestrelServerEnabled": true, - "Port": 8081, + "StandAloneKestrelServerEnabled": false, + "Port": 5001, "Url": "/metrics", "Hostname": "+", "HttpMetricsEnabled": true, diff --git a/src/4-Clients/Website/appsettings.json b/src/4-Clients/Website/appsettings.json index cb29f8eb9..da071fe58 100644 --- a/src/4-Clients/Website/appsettings.json +++ b/src/4-Clients/Website/appsettings.json @@ -7,8 +7,8 @@ "IdentityServer": "https://identity.taskomask.ir" }, "Metric": { - "StandAloneKestrelServerEnabled": true, - "Port": 8081, + "StandAloneKestrelServerEnabled": false, + "Port": 5009, "Url": "/metrics", "Hostname": "+", "HttpMetricsEnabled": true, diff --git a/src/7-Docker/docker-compose.override.yml b/src/7-Docker/docker-compose.override.yml index f0149605f..935f067e3 100644 --- a/src/7-Docker/docker-compose.override.yml +++ b/src/7-Docker/docker-compose.override.yml @@ -5,17 +5,6 @@ services: environment: - ACCEPT_EULA=Y - monolith-api: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - ASPNETCORE_URLS=https://+:443;http://+:80 - ports: - - "80" - - "443" - volumes: - - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro - - ${APPDATA}/ASP.NET/Https:/root/.aspnet/https:ro - owners-read-api: environment: - ASPNETCORE_ENVIRONMENT=Development diff --git a/src/7-Docker/docker-compose.yml b/src/7-Docker/docker-compose.yml index 3491aa3fc..55737792f 100644 --- a/src/7-Docker/docker-compose.yml +++ b/src/7-Docker/docker-compose.yml @@ -67,28 +67,6 @@ services: volumes: - rabbitmq:/var/lib/rabbitmq/mnesia/ - monolith-api: - container_name: monolith-api - image: ${DOCKER_REGISTRY-}monolith-api - restart: on-failure - environment: - Mongo__Read__Connection: "mongodb://mongo:27017" - Mongo__Write__Connection: "mongodb://mongo:27017" - Redis__Connection: "redis:6379" - RabbitMQ__Host: "rabbitmq" - build: - context: ../.. - dockerfile: src/2-Services/Monolith/Api/Monolith.Api/Dockerfile - ports: - - 5014:80 - - 5015:443 - networks: - - taskomask-network - depends_on: - - redis - - mongo - - rabbitmq - owners-read-api: container_name: owners-read-api image: ${DOCKER_REGISTRY-}owners-read-api @@ -122,8 +100,8 @@ services: context: ../.. dockerfile: src/2-Services/Owners/Read/Api/Owners.Read.Api/Dockerfile ports: - - 5020:80 - - 5021:443 + - 5018:80 + - 5019:443 networks: - taskomask-network depends_on: @@ -143,8 +121,8 @@ services: context: ../.. dockerfile: src/2-Services/Boards/Read/Api/Boards.Read.Api/Dockerfile ports: - - 5020:80 - - 5021:443 + - 5024:80 + - 5025:443 networks: - taskomask-network depends_on: @@ -164,8 +142,8 @@ services: context: ../.. dockerfile: src/2-Services/Boards/Read/Api/Boards.Write.Api/Dockerfile ports: - - 5020:80 - - 5021:443 + - 5022:80 + - 5023:443 networks: - taskomask-network depends_on: @@ -185,8 +163,8 @@ services: context: ../.. dockerfile: src/2-Services/Tasks/Read/Api/Tasks.Read.Api/Dockerfile ports: - - 5020:80 - - 5021:443 + - 5028:80 + - 5029:443 networks: - taskomask-network depends_on: @@ -206,8 +184,8 @@ services: context: ../.. dockerfile: src/2-Services/Tasks/Read/Api/Tasks.Write.Api/Dockerfile ports: - - 5020:80 - - 5021:443 + - 5026:80 + - 5027:443 networks: - taskomask-network depends_on: @@ -265,7 +243,6 @@ services: networks: - taskomask-network depends_on: - - monolith-api - owners-read-api - owners-write-api - boards-read-api diff --git a/src/7-Docker/launchSettings.json b/src/7-Docker/launchSettings.json index 057f2dd1b..3ea0e514c 100644 --- a/src/7-Docker/launchSettings.json +++ b/src/7-Docker/launchSettings.json @@ -9,7 +9,6 @@ "seq": "StartWithoutDebugging", "sql": "StartWithoutDebugging", "rabbitmq": "StartWithoutDebugging", - "monolith-api": "StartWithoutDebugging", "owners-read-api": "StartWithoutDebugging", "owners-write-api": "StartWithoutDebugging", "boards-read-api": "StartWithoutDebugging",