From 609feb277013baa798fc2d3388ed2f669cb04fc3 Mon Sep 17 00:00:00 2001
From: "StarsL.cn" <starsliao@163.com>
Date: Thu, 16 Jun 2022 02:05:06 +0800
Subject: [PATCH] =?UTF-8?q?close=20#16=20v0.6.2=E5=B7=B2=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5=E9=98=BF=E9=87=8C?=
 =?UTF-8?q?=E4=BA=91ECS=E6=A0=87=E7=AD=BE=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flask-consul/units/avd/avd_list.py          | 4 ++++
 flask-consul/units/cloud/alicloud.py        | 2 +-
 flask-consul/units/cloud/sync_ecs.py        | 6 ++++++
 vue-consul/src/views/blackbox/index.vue     | 2 +-
 vue-consul/src/views/dashboard/index.vue    | 8 ++++++++
 vue-consul/src/views/login/index.vue        | 6 +++---
 vue-consul/src/views/node-exporter/self.vue | 1 +
 7 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/flask-consul/units/avd/avd_list.py b/flask-consul/units/avd/avd_list.py
index e992b7c..63a27bc 100644
--- a/flask-consul/units/avd/avd_list.py
+++ b/flask-consul/units/avd/avd_list.py
@@ -39,6 +39,8 @@ def get_avd():
                     f"- 类型：{avd_dict['avd_type']}\n" \
                     f"- 披露：{avd_dict['avd_time']}\n" \
                     f"- 状态：<font color=\"#ff0000\">{avd_dict['avd_stat']}</font>({avd_dict['avd_collect']})\n"
+                if avd_dict['avd_id'] == last_avd.get('avd_id'):
+                    content = content + '(已披露漏洞，今日推送为状态或类型有更新。)\n'
                 if avd_switch['switch'] and avd_switch['wecom'] and wecomwh.startswith('https://qyapi.weixin.qq.com'):
                     wecom(wecomwh,content)
                 if avd_switch['switch'] and avd_switch['dingding'] and dingdingwh.startswith('https://oapi.dingtalk.com'):
@@ -49,6 +51,8 @@ def get_avd():
                          f"类型：{avd_dict['avd_type']}\n" \
                          f"披露：{avd_dict['avd_time']}\n" \
                          f"状态：**{avd_dict['avd_stat']}**({avd_dict['avd_collect']})"
+                    if avd_dict['avd_id'] == last_avd.get('avd_id'):
+                        md = md + '\n(已披露漏洞，今日推送为状态或类型有更新。)'
                     feishu(feishuwh,title,md)
                 
 def wecom(webhook,content):
diff --git a/flask-consul/units/cloud/alicloud.py b/flask-consul/units/cloud/alicloud.py
index 0024d16..7edef3a 100644
--- a/flask-consul/units/cloud/alicloud.py
+++ b/flask-consul/units/cloud/alicloud.py
@@ -63,7 +63,7 @@ def ecs(account,region):
                 'name':i['InstanceName'],'group':group_dict.get(i['ResourceGroupId'],'无'),'ostype':i['OSType'].lower(),
                 'status':i['Status'],'region':region,
                 'ip':i["InnerIpAddress"]["IpAddress"] if len(i["InnerIpAddress"]["IpAddress"]) != 0 else i['NetworkInterfaces']['NetworkInterface'][0]['PrimaryIpAddress'],
-                'cpu':f"{i['Cpu']}核",'mem':f"{str(round(i['Memory']/1024,1)).rstrip('.0')}GB",'exp':i['ExpiredTime'].split('T')[0]
+                'cpu':f"{i['Cpu']}核",'mem':f"{str(round(i['Memory']/1024,1)).rstrip('.0')}GB",'exp':i['ExpiredTime'].split('T')[0],'ecstag': i.get('Tags',{}).get('Tag',[])
                 }for i in ecs_list}
             ecs_dict.update(ecs_dict_temp)
             next_token = ecs.body.next_token
diff --git a/flask-consul/units/cloud/sync_ecs.py b/flask-consul/units/cloud/sync_ecs.py
index 0ef43e8..9ed6486 100644
--- a/flask-consul/units/cloud/sync_ecs.py
+++ b/flask-consul/units/cloud/sync_ecs.py
@@ -61,6 +61,12 @@ def w2consul(vendor,account,region,ecs_dict):
                     "interval": "60s"
                 }
             }
+            if vendor == 'alicloud' and v['ecstag'] != []:
+                ecstag_dict = {}
+                for ecstag in v['ecstag']:
+                    if ecstag['TagKey'].encode().isalnum():
+                        ecstag_dict[ecstag['TagKey']] = ecstag['TagValue']
+                data['Meta'].update(ecstag_dict)
             reg = requests.put(puturl, headers=headers, data=json.dumps(data))
             if reg.status_code == 200:
                 pass
diff --git a/vue-consul/src/views/blackbox/index.vue b/vue-consul/src/views/blackbox/index.vue
index 3bcb29f..9bb1f86 100644
--- a/vue-consul/src/views/blackbox/index.vue
+++ b/vue-consul/src/views/blackbox/index.vue
@@ -115,7 +115,7 @@
           <el-autocomplete v-model="temp.env" :fetch-suggestions="Sugg_env" placeholder="优先选择" clearable class="filter-item" />
         </el-form-item>
         <el-form-item label="名称" prop="name">
-          <el-input v-model="temp.name" placeholder="请输入" clearable class="filter-item" /><font size="2" color="#ff0000">前5个字段组合后需唯一，重复会覆盖已有监控项！</font>
+          <el-input v-model="temp.name" placeholder="请输入" clearable class="filter-item" /><font size="3px" color="#ff0000">上面5个字段组合后需唯一，重复会覆盖已有监控项!</font>
         </el-form-item>
         <el-form-item prop="instance">
           <span slot="label">
diff --git a/vue-consul/src/views/dashboard/index.vue b/vue-consul/src/views/dashboard/index.vue
index 2d3a1fd..df58b3b 100644
--- a/vue-consul/src/views/dashboard/index.vue
+++ b/vue-consul/src/views/dashboard/index.vue
@@ -4,6 +4,14 @@
       <el-link :underline="false" type="primary" icon="el-icon-star-on" href="https://github.com/starsliao/ConsulManager" target="_blank" class="dashboard-text">StarsL.cn</el-link>
     </el-badge>
     <el-timeline>
+      <el-timeline-item timestamp="2022/6/16" placement="top">
+        <el-card>
+          <h4>v0.6.2</h4>
+          <p>已披露的漏洞有状态或类型更新，再次推送时候增加了提示。</p>
+          <p>同步阿里云ECS支持同步ECS的标签到Consul的meta中，注意标签的key有中文或符号会忽略，因为meta的key不支持。</p>
+          <p>自建主机的新增页面优化了描述和提交处理逻辑。</p>
+        </el-card>
+      </el-timeline-item>
       <el-timeline-item timestamp="2022/6/13" placement="top">
         <el-card>
           <h4>v0.6.1</h4>
diff --git a/vue-consul/src/views/login/index.vue b/vue-consul/src/views/login/index.vue
index dcfa4fc..c222bee 100644
--- a/vue-consul/src/views/login/index.vue
+++ b/vue-consul/src/views/login/index.vue
@@ -3,8 +3,8 @@
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
 
       <div class="title-container" style="text-align:center">
-        <img src="../../assets/login_images/SLH.png" width="90" height="90">
-        <h3 style="font-size:35px" class="title">Consul Manager</h3>
+        <img src="../../assets/login_images/SLH.png" width="90" height="90"><br><br>
+        <h3 style="font-size:35px" class="title">Consul Manager</h3><br>
       </div>
 
       <el-form-item prop="username">
@@ -46,7 +46,7 @@
 
     </el-form>
     <div align="center" class="title-container">
-      <span style="font-size:12px" class="title">v0.6.1</span>
+      <span style="font-size:12px" class="title">v0.6.2</span>
     </div>
   </div>
 </template>
diff --git a/vue-consul/src/views/node-exporter/self.vue b/vue-consul/src/views/node-exporter/self.vue
index a486130..7e1bd35 100644
--- a/vue-consul/src/views/node-exporter/self.vue
+++ b/vue-consul/src/views/node-exporter/self.vue
@@ -96,6 +96,7 @@
 
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="37%">
       <el-form ref="dataForm" :rules="rules" :model="temp" label-position="right" label-width="auto" style="width: 90%; margin-left: 20px;">
+        <font size="3px" color="#ff0000">【注意：前5个字段组合后需唯一，重复会覆盖已有监控项!】</font>
         <el-form-item label="机房/公司" prop="vendor">
           <el-autocomplete v-model="temp.vendor" :fetch-suggestions="Sugg_vendor" placeholder="优先选择" clearable class="filter-item" />
         </el-form-item>