github
/
ConsulManager
mirror of https://github.com/starsliao/ConsulManager
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add except msg

pull/72/head
starsliao 2023-03-23 15:16:19 +08:00
parent be4bbb2bc9
commit 7c7fb850a5
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
flask-consul/units/prom/mysql_ali.py
View File

@ -3,6 +3,7 @@ from aliyunsdkcms.request.v20190101.DescribeMetricLastRequest import DescribeMet
from datetime import datetime from datetime import datetime
from units import consul_kv from units import consul_kv
import json import json
from units.config_log import *
def exporter(vendor,account,region): def exporter(vendor,account,region):
ak,sk = consul_kv.get_aksk(vendor,account) ak,sk = consul_kv.get_aksk(vendor,account)
@ -19,7 +20,11 @@ def exporter(vendor,account,region):
for i in metric_name_dict.keys(): for i in metric_name_dict.keys():
request_rdsmonit.set_MetricName(i) request_rdsmonit.set_MetricName(i)
response_rdsmonit = json.loads(client_rdsmonit.do_action_with_exception(request_rdsmonit)) response_rdsmonit = json.loads(client_rdsmonit.do_action_with_exception(request_rdsmonit))
instance = json.loads(response_rdsmonit["Datapoints"]) try:
instance = json.loads(response_rdsmonit["Datapoints"])
except:
logger.error(f"{response_rdsmonit}")
instance = []
prom_metric_name = metric_name_dict[i][0].split()[2] prom_metric_name = metric_name_dict[i][0].split()[2]
for j in instance: for j in instance:
iid,max,ts = j["instanceId"],j["Maximum"],j["timestamp"] iid,max,ts = j["instanceId"],j["Maximum"],j["timestamp"]

7
flask-consul/units/prom/redis_ali.py
View File

@ -3,6 +3,7 @@ from aliyunsdkcms.request.v20190101.DescribeMetricLastRequest import DescribeMet
from datetime import datetime from datetime import datetime
from units import consul_kv from units import consul_kv
import json import json
from units.config_log import *
def exporter(vendor,account,region): def exporter(vendor,account,region):
ak,sk = consul_kv.get_aksk(vendor,account) ak,sk = consul_kv.get_aksk(vendor,account)
@ -19,7 +20,11 @@ def exporter(vendor,account,region):
for i in metric_name_dict.keys(): for i in metric_name_dict.keys():
request_redismonit.set_MetricName(i) request_redismonit.set_MetricName(i)
response_redismonit = json.loads(client_redismonit.do_action_with_exception(request_redismonit)) response_redismonit = json.loads(client_redismonit.do_action_with_exception(request_redismonit))
instance = json.loads(response_redismonit["Datapoints"]) try:
instance = json.loads(response_redismonit["Datapoints"])
except:
logger.error(f"{response_redismonit}")
instance = []
prom_metric_name = metric_name_dict[i][0].split()[2] prom_metric_name = metric_name_dict[i][0].split()[2]
for j in instance: for j in instance:
iid,max,ts = j["instanceId"],j["Maximum"],j["timestamp"] iid,max,ts = j["instanceId"],j["Maximum"],j["timestamp"]

2
vue-consul/src/main.js
View File

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