Pull request update/240827

c84dca8 OS-7752. Update incorrect_alibaba_expenses email template af12dab OS-7765. Fixed missing Alibaba regions
hystax · Aug 27, 2024 · 609f64f · 609f64f
2 parents a3d2a99 + c84dca8
commit 609f64f
Show file tree

Hide file tree

Showing 5 changed files with 442 additions and 569 deletions.
diff --git 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/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': {