fix bug

flask-consul/config.py

@@ -24,6 +24,7 @@ regions = {
     },
     "huaweicloud": {
         "none": "无",
+        "cn-north-219": "华北-北京金融二",
         "cn-east-3": "华东-上海一",
         "cn-east-2": "华东-上海二",
         "cn-south-1": "华南-广州",
@@ -51,6 +52,7 @@ regions = {
         "us-east-1": "美国东部1(弗吉尼亚)",
         "us-west-1": "美国(硅谷)",
         "eu-west-1": "英国(伦敦)",
+        "eu-central-1": "德国(法兰克福)",
         "ap-southeast-1": "新加坡",
         "ap-northeast-1": "日本(东京)",
         "ap-south-1": "印度(孟买)",

flask-consul/units/avd/avd_list.py

@@ -6,7 +6,7 @@ from units.config_log import *
 
 def get_avd():
     avd_url = 'https://avd.aliyun.com'
-    res = requests.get(avd_url + '/high-risk/list')
+    res = requests.get(avd_url) # + '/high-risk/list')
     res.encoding = 'utf-8'
     soup = BeautifulSoup(res.text, 'html.parser')
     bugs = soup.select('tr')

flask-consul/units/avd/avd_test.py

@@ -0,0 +1,22 @@
+import sys,requests,hashlib,json
+from datetime import datetime
+from bs4 import BeautifulSoup
+
+def get_avd():
+    avd_url = 'https://avd.aliyun.com'
+    res = requests.get(avd_url) # + '/high-risk/list')
+    res.encoding = 'utf-8'
+    soup = BeautifulSoup(res.text, 'html.parser')
+    bugs = soup.select('tr')
+    for index, avd_info in enumerate(bugs[1:]):
+        avd = avd_info.select('td')
+        avd_dict = {}
+        avd_dict['avd_id'] = avd[0].getText(strip=True)
+        avd_dict['avd_id_url'] = avd_url + avd[0].a.attrs['href']
+        avd_dict['avd_name'] = avd[1].getText(strip=True)
+        avd_dict['avd_type'] = avd[2].button.attrs.get('title',avd[2].getText(strip=True))
+        avd_dict['avd_time'] = avd[3].getText(strip=True)
+        avd_dict['avd_stat'] = avd[4].select('button')[1].attrs['title']
+    print(avd_dict)
+
+get_avd()

vue-consul/src/main.js

@@ -46,7 +46,7 @@ Object.keys(filters).forEach(key => {
 })
 
 Vue.config.productionTip = false
-Vue.prototype.VER = 'v1.1.1'
+Vue.prototype.VER = 'v1.1.2'
 
 new Vue({
   el: '#app',

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

@@ -339,6 +339,7 @@ export default {
           { value: 'eu-west-3', label: '欧洲（巴黎）' }
         ],
         huaweicloud: [
+          { value: 'cn-north-219', label: '华北-北京金融二' },
           { value: 'cn-east-3', label: '华东-上海一' },
           { value: 'cn-east-2', label: '华东-上海二' },
           { value: 'cn-south-1', label: '华南-广州' },
@@ -365,6 +366,7 @@ export default {
           { value: 'us-east-1', label: '美国东部1(弗吉尼亚)' },
           { value: 'us-west-1', label: '美国(硅谷)' },
           { value: 'eu-west-1', label: '英国(伦敦)' },
+          { value: 'eu-central-1', label: '德国(法兰克福)' },
           { value: 'ap-southeast-1', label: '新加坡' },
           { value: 'ap-northeast-1', label: '日本(东京)' },
           { value: 'ap-south-1', label: '印度(孟买)' },