From af12dab86c1fd8d96ae558b472c428ec00e4bd86 Mon Sep 17 00:00:00 2001 From: nk-hystax <128669932+nk-hystax@users.noreply.github.com> Date: Mon, 26 Aug 2024 07:02:51 +0000 Subject: [PATCH 1/2] OS-7765. Fixed missing Alibaba regions --- .../modules/recommendations/instance_migration.py | 3 ++- tools/cloud_adapter/clouds/alibaba.py | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/bumiworker/bumiworker/modules/recommendations/instance_migration.py b/bumiworker/bumiworker/modules/recommendations/instance_migration.py index 87093274e..7c874b5a4 100644 --- a/bumiworker/bumiworker/modules/recommendations/instance_migration.py +++ b/bumiworker/bumiworker/modules/recommendations/instance_migration.py @@ -25,7 +25,8 @@ 'China (Nanjing - Local Region)'], 'ap': ['China (Hong Kong)', 'Japan (Tokyo)', 'Singapore', 'Australia (Sydney)', 'Malaysia (Kuala Lumpur)', - 'Indonesia (Jakarta)', 'India (Mumbai)'], + 'Indonesia (Jakarta)', 'India (Mumbai)', 'Thailand (Bangkok)', + 'Philippines (Manila)', 'South Korea (Seoul)'], 'me': ['UAE (Dubai)']} diff --git a/tools/cloud_adapter/clouds/alibaba.py b/tools/cloud_adapter/clouds/alibaba.py index 3307169dc..435eb2347 100644 --- a/tools/cloud_adapter/clouds/alibaba.py +++ b/tools/cloud_adapter/clouds/alibaba.py @@ -736,6 +736,10 @@ def _get_coordinates_map(self): 'ap-northeast-1': { 'name': 'Japan (Tokyo)', 'longitude': 139.2080387, 'latitude': 35.5079383}, + 'ap-northeast-2': { + 'name': 'South Korea (Seoul)', + 'longitude': 126.985613, 'latitude': 37.538269 + }, 'ap-southeast-1': { 'name': 'Singapore', 'longitude': 103.7038234, 'latitude': 1.3139961}, @@ -748,6 +752,14 @@ def _get_coordinates_map(self): 'ap-southeast-5': { 'name': 'Indonesia (Jakarta)', 'longitude': 106.7593066, 'latitude': -6.2297419}, + 'ap-southeast-6': { + 'name': 'Philippines (Manila)', + 'longitude': 120.975954, 'latitude': 14.602475, + }, + 'ap-southeast-7': { + 'name': 'Thailand (Bangkok)', + 'longitude': 100.515775, 'latitude': 13.755747 + }, 'ap-south-1': { 'name': 'India (Mumbai) Closing Down', 'longitude': 72.74076, 'latitude': 19.0821976}, From c84dca8f387d7a1923d65215bb0ef26592171548 Mon Sep 17 00:00:00 2001 From: ek-hystax <33006768+ek-hystax@users.noreply.github.com> Date: Mon, 26 Aug 2024 11:03:48 +0400 Subject: [PATCH 2/2] OS-7752. Update incorrect_alibaba_expenses email template --- diworker/diworker/importers/alibaba.py | 2 +- .../templates/incorrect_alibaba_expenses.html | 988 ++++++++---------- herald/send_templates.py | 6 +- 3 files changed, 428 insertions(+), 568 deletions(-) diff --git a/diworker/diworker/importers/alibaba.py b/diworker/diworker/importers/alibaba.py index 56073bbc7..4a675d7a2 100644 --- a/diworker/diworker/importers/alibaba.py +++ b/diworker/diworker/importers/alibaba.py @@ -395,7 +395,7 @@ def send_service_incorrect_expenses_email(self, cloud_account, period, recipient = self.config_cl.optscale_error_email_recipient() if not recipient: return - title = "Incorrect expenses for Alibaba cloud account" + title = "Incorrect expenses for Alibaba data source" subject = '[%s] %s' % (self.config_cl.public_ip(), title) template_params = { 'texts': { diff --git a/herald/modules/email_generator/templates/incorrect_alibaba_expenses.html b/herald/modules/email_generator/templates/incorrect_alibaba_expenses.html index db1597842..274bca096 100644 --- a/herald/modules/email_generator/templates/incorrect_alibaba_expenses.html +++ b/herald/modules/email_generator/templates/incorrect_alibaba_expenses.html @@ -1,586 +1,446 @@ - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- - - -
- -
- - - -
- - +
+ + + + + - - - - - - -
- - - - - - -
- -
- - - - - - - - - -
-
-

Total sum of clean - expenses for period {{texts.period}} - in Alibaba cloud account differs from the cloud - values for {{texts.cloud_account.name}} - ({{texts.cloud_account.id}}) cloud account.
- Organization: {{texts.organization.name}} - ({{texts.organization.id}})
- Cloud value: {{texts.cloud_expenses}}
- OptScale value: {{texts.clean_expenses}}
-

-
-
-
-

Go to OptScale - by clicking on the button below.

-
-
-
- -
-
- -
- - - - - - -
- -
- - - - - - -
- - - - - - -
- Go to OptScale - -
-
-
- -
-
-
- - - - - - -
- -
- - - - - - -
-
-

{{texts.copyright}}

-

Hystax Inc. All Rights - Reserved -

-
-
-
- -
- - - - - - -
- -
-
- -
- - - - - - -
-
-

{{texts.address}} -

-
-
-
- -
-
- -
- - - -
- -
- - - - + + +
- - - - - - - -
- - - - - - -
- - - -
-
- - - - - - - -
- - - - - - -
- - - -
-
- - - - - + + +
- - +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - -
- - - + + diff --git a/herald/send_templates.py b/herald/send_templates.py index fbe465411..dc32948e5 100755 --- a/herald/send_templates.py +++ b/herald/send_templates.py @@ -1350,20 +1350,20 @@ }}}, 'incorrect_alibaba_expenses': { "email": ["optscale-staging-notifications@hystax.com"], - "subject": "[172.22.20.6] Incorrect expenses for Alibaba cloud account", + "subject": "[172.22.20.6] Incorrect expenses for Alibaba data source", 'template_type': 'incorrect_alibaba_expenses', 'template_params': { 'texts': { 'clean_expenses': 18256.11, 'cloud_expenses': 17822.97, - 'period': '2022-11', + 'period': '2022-11-11 - 2022-11-17', 'organization': { 'id': '6946211f-47ff-43a3-a9a3-3e5f57d52415', 'name': 'AQA_1617018508.3637385', }, 'cloud_account': { 'id': 'c063973e-0bb2-4134-9ebe-2e68104d7aa8', - 'name': 'Test cloud account', + 'name': 'Test_data_source', }}}}, 'disconnect_survey': { 'email': ['andersonmatthew_hwp@hystax.com'],