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"- 状态：{avd_dict['avd_stat']}({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 @@ - 前5个字段组合后需唯一，重复会覆盖已有监控项！ + 上面5个字段组合后需唯一，重复会覆盖已有监控项! 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 @@ StarsL.cn + + +

v0.6.2

+

已披露的漏洞有状态或类型更新，再次推送时候增加了提示。

+

同步阿里云ECS支持同步ECS的标签到Consul的meta中，注意标签的key有中文或符号会忽略，因为meta的key不支持。

+

自建主机的新增页面优化了描述和提交处理逻辑。

+ +

v0.6.1

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 @@
- v0.6.1 + v0.6.2
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 @@ + 【注意：前5个字段组合后需唯一，重复会覆盖已有监控项!】