Merge pull request #155 from danbus/main

Complete AWS Regions Configuration

flask-consul/config.py

@@ -8,19 +8,37 @@ log_level = os.environ.get('log_level','INFO')
 vendors = {'alicloud': '阿里云','tencent_cloud': '腾讯云','huaweicloud': '华为云', 'awscloud': 'AWS云'}
 # https://aws.amazon.com/cn/about-aws/global-infrastructure/regional-product-services
 regions = {
-    "awscloud":{
+    "awscloud": {
         "none": "无",
         "us-east-1": "美国东部（弗吉尼亚州北部）",
+        "us-east-2": "美国东部（俄亥俄州）",
         "us-west-1": "美国西部（北加利福尼亚）",
+        "us-west-2": "美国西部（俄勒冈州）",
+        "af-south-1": "非洲（开普敦）",
         "ap-east-1": "亚太地区（香港）",
         "ap-south-1": "亚太地区（孟买）",
-        "ap-northeast-2": "亚太地区（首尔）",
+        "ap-south-2": "亚太地区（海得拉巴）",
         "ap-southeast-1": "亚太地区（新加坡）",
+        "ap-southeast-2": "亚太地区（悉尼）",
         "ap-southeast-3": "亚太地区（雅加达）",
+        "ap-southeast-4": "亚太地区（墨尔本）",
         "ap-northeast-1": "亚太地区（东京）",
+        "ap-northeast-2": "亚太地区（首尔）",
+        "ap-northeast-3": "亚太地区（大阪）",
+        "ca-central-1": "加拿大（中央）",
+        "ca-west-1": "加拿大（卡尔加里）",
         "eu-central-1": "欧洲（法兰克福）",
+        "eu-central-2": "欧洲（苏黎世）",
+        "eu-west-1": "欧洲（爱尔兰）",
         "eu-west-2": "欧洲（伦敦）",
         "eu-west-3": "欧洲（巴黎）",
+        "eu-south-1": "欧洲（米兰）",
+        "eu-south-2": "欧洲（马德里）",
+        "eu-north-1": "欧洲（斯德哥尔摩）",
+        "me-south-1": "中东（巴林）",
+        "me-central-1": "中东（阿联酋）",
+        "sa-east-1": "南美洲（圣保罗）",
+        "il-central-1": "以色列（特拉维夫）",
     },
     "huaweicloud": {
         "none": "无",

vue-consul/src/views/node-exporter/jobs.vue

@@ -327,16 +327,34 @@ export default {
       regions: {
         awscloud: [
           { value: 'us-east-1', label: '美国东部（弗吉尼亚州北部）' },
+          { value: 'us-east-2', label: '美国东部（俄亥俄州）' },
           { value: 'us-west-1', label: '美国西部（北加利福尼亚）' },
+          { value: 'us-west-2', label: '美国西部（俄勒冈州）' },
+          { value: 'af-south-1', label: '非洲（开普敦）' },
           { value: 'ap-east-1', label: '亚太地区（香港）' },
           { value: 'ap-south-1', label: '亚太地区（孟买）' },
-          { value: 'ap-northeast-2', label: '亚太地区（首尔）' },
+          { value: 'ap-south-2', label: '亚太地区（海得拉巴）' },
           { value: 'ap-southeast-1', label: '亚太地区（新加坡）' },
+          { value: 'ap-southeast-2', label: '亚太地区（悉尼）' },
           { value: 'ap-southeast-3', label: '亚太地区（雅加达）' },
+          { value: 'ap-southeast-4', label: '亚太地区（墨尔本）' },
           { value: 'ap-northeast-1', label: '亚太地区（东京）' },
+          { value: 'ap-northeast-2', label: '亚太地区（首尔）' },
+          { value: 'ap-northeast-3', label: '亚太地区（大阪）' },
+          { value: 'ca-central-1', label: '加拿大（中央）' },
+          { value: 'ca-west-1', label: '加拿大（卡尔加里）' },
           { value: 'eu-central-1', label: '欧洲（法兰克福）' },
+          { value: 'eu-central-2', label: '欧洲（苏黎世）' },
+          { value: 'eu-west-1', label: '欧洲（爱尔兰）' },
           { value: 'eu-west-2', label: '欧洲（伦敦）' },
-          { value: 'eu-west-3', label: '欧洲（巴黎）' }
+          { value: 'eu-west-3', label: '欧洲（巴黎）' },
+          { value: 'eu-south-1', label: '欧洲（米兰）' },
+          { value: 'eu-south-2', label: '欧洲（马德里）' },
+          { value: 'eu-north-1', label: '欧洲（斯德哥尔摩）' },
+          { value: 'me-south-1', label: '中东（巴林）' },
+          { value: 'me-central-1', label: '中东（阿联酋）' },
+          { value: 'sa-east-1', label: '南美洲（圣保罗）' },
+          { value: 'il-central-1', label: '以色列（特拉维夫）' }
         ],
         huaweicloud: [
           { value: 'cn-north-219', label: '华北-北京金融二' },