Skip to content

Commit

Permalink
Merge branch 'release/1.2' into hotfix/pipeline-support-multi-contain…
Browse files Browse the repository at this point in the history
…ers-monitor
  • Loading branch information
chengjoey authored Sep 10, 2021
2 parents 02f3dba + a0637cd commit 5756002
Show file tree
Hide file tree
Showing 63 changed files with 3,128 additions and 444 deletions.
8 changes: 8 additions & 0 deletions .erda/migrations/monitor/20210902-sp_metric_expression.sql

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions .erda/migrations/monitor/20210906-sp_metric_expression.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
REPLACE INTO `sp_dashboard_block_system` (`id`,`name`,`desc`,`scope`,`scope_id`,`version`,`view_config`) VALUES ("translation_analysis_mq","translation_analysis_mq","","micro_service","global","v2",'[{"h":10,"i":"view-lVTYdASX","view":{"api":{"body":null,"extraData":null,"header":null,"method":"get","query":{"end":"{{endTime}}","filterServiceName":"{{serviceName}}","layer":"mq","search":"{{topic}}","serviceId":"{{serviceId}}","sort":"{{sort}}","start":"{{startTime}}","terminusKey":"{{terminusKey}}","type":"{{type}}"},"url":"/api/apm/topology/translation/db"},"chartType":"table","config":{"dataSourceConfig":{"valueDimensions":[{"alias":"Topic","i18n":{"alias":{"en":"Topic","zh":"Topic"}},"key":"operation","resultType":"string","type":"field"},{"alias":"调用类型","i18n":{"alias":{"en":"Call Type","zh":"调用类型"}},"key":"type","resultType":"string","type":"field"},{"alias":"MQ 类型","i18n":{"alias":{"en":"MQ Type","zh":"MQ 类型"}},"key":"component","resultType":"string","type":"field"},{"alias":"服务地址","i18n":{"alias":{"en":"Service Address","zh":"服务地址"}},"key":"host","resultType":"string","type":"field"},{"alias":"调用次数","i18n":{"alias":{"en":"Request Count","zh":"调用次数"}},"key":"call_count","resultType":"number","type":"field"},{"alias":"慢调用次数","i18n":{"alias":{"en":"Slow Request Count","zh":"慢调用次数"}},"key":"slow_elapsed_count","resultType":"number","type":"field"},{"alias":"平均延迟","i18n":{"alias":{"en":"Avg Time Delay","zh":"平均延迟"}},"key":"avg_elapsed","resultType":"string","type":"field"}]},"optionProps":{"isMoreThanOneDay":true,"moreThanOneDayFormat":"M/D","rowClick":{"name":"searchTranslation","value":"operation"}}},"controls":null,"dataSourceType":"api","description":"","i18n":{"title":{"en":"MQ Translation","zh":"MQ 事务"}},"staticData":{},"title":"MQ 事务"},"w":24,"x":0,"y":0},{"h":11,"i":"view-1XA1pzWR","view":{"api":{"body":{"from":["application_mq"],"groupby":["time()"],"select":[{"alias":"typegq99wZs2","expr":"time()"},{"alias":"valueSR6vrde7","expr":"round_float(sum(elapsed_count::field), 2)"}],"where":["message_bus_destination::tag=~/.*{{subSearch}}.*/"]},"extraData":null,"header":null,"method":"post","query":{"end":"{{endTime}}","epoch":"ms","filter__metric_scope":"micro_service","filter__metric_scope_id":"{{terminusKey}}","filter_terminus_key":"{{terminusKey}}","format":"chartv2","or_eq_source_service_id":"{{serviceId}}","or_eq_target_service_id":"{{serviceId}}","ql":"influxql:ast","serviceName":"{{serviceName}}","start":"{{startTime}}","type":"_"},"url":"/api/tmc/metrics-query"},"chartType":"chart:bar","config":{"dataSourceConfig":{"activedMetricGroups":["application_mq"],"typeDimensions":[{"alias":"时间","i18n":{"alias":{"en":"Time","zh":"时间"}},"key":"typegq99wZs2","timeFormat":"YYYY/MM/DD","timeInterval":{"unit":"m","value":1},"type":"time"}],"valueDimensions":[{"aggregation":"count","alias":"请求次数","field":"application_mq-elapsed_count::field","i18n":{"alias":{"en":"Request Count","zh":"请求次数"}},"key":"valueSR6vrde7","resultType":"number","type":"field"}]},"optionProps":{"isMoreThanOneDay":false,"moreThanOneDayFormat":"YYYY/MM/DD"}},"controls":null,"dataSourceType":"api","description":"","i18n":{"title":{"en":"Service Request","zh":"服务请求"}},"staticData":{},"title":"服务请求"},"w":12,"x":0,"y":10},{"h":11,"i":"view-J4SwjHDP","view":{"api":{"body":{"from":["application_mq"],"groupby":["time()"],"select":[{"alias":"typeQuPvs7M2","expr":"time()"},{"alias":"valueCxbcWuWT","expr":"round_float(avg(elapsed_mean::field), 2)"}],"where":["message_bus_destination::tag=~/.*{{subSearch}}.*/"]},"extraData":null,"header":null,"method":"post","query":{"end":"{{endTime}}","epoch":"ms","filter__metric_scope":"micro_service","filter__metric_scope_id":"{{terminusKey}}","filter_terminus_key":"{{terminusKey}}","format":"chartv2","or_eq_source_service_id":"{{serviceId}}","or_eq_target_service_id":"{{serviceId}}","ql":"influxql:ast","serviceName":"{{serviceName}}","start":"{{startTime}}","type":"_"},"url":"/api/tmc/metrics-query"},"chartType":"chart:line","config":{"dataSourceConfig":{"activedMetricGroups":["application_mq"],"typeDimensions":[{"alias":"时间","i18n":{"alias":{"en":"Time","zh":"时间"}},"key":"typeQuPvs7M2","timeFormat":"YYYY/MM/DD","timeInterval":{"unit":"m","value":1},"type":"time"}],"valueDimensions":[{"aggregation":"avg","alias":"平均响应时间","field":"application_mq-elapsed_mean::field","i18n":{"alias":{"en":"Avg Response Time","zh":"平均响应时间"}},"key":"valueCxbcWuWT","resultType":"number","type":"field","unit":{"type":"TIME","unit":"ns"}}]},"optionProps":{"isMoreThanOneDay":false,"moreThanOneDayFormat":"YYYY/MM/DD","noAreaColor":true}},"controls":null,"dataSourceType":"api","description":"","i18n":{"title":{"en":"Request Time Delay","zh":"请求时延"}},"staticData":{},"title":"请求时延"},"w":12,"x":12,"y":10},{"h":9,"i":"view-FlQBcOqT","view":{"api":{"body":null,"extraData":null,"header":null,"method":"get","query":{"end":"{{endTime}}","filter__metric_scope":"micro_service","filter__metric_scope_id":"{{terminusKey}}","format":"chartv2","or_eq_source_service_id":"{{serviceId}}","or_eq_target_service_id":"{{serviceId}}","q":"SELECT message_bus_destination::tag as Topic,format_time(timestamp,\'2006-01-02 15:04:05\') as 时间,format_duration(max(elapsed_max::field),\'\',2) as 最大耗时,format_duration(min(elapsed_min::field),\'\',2) as 最小耗时 FROM application_mq_slow WHERE message_bus_destination::tag=~/.*{{subSearch}}.*/ GROUP BY message_bus_destination::tag ORDER BY avg(elapsed_mean::field) DESC LIMIT 50 ","ql":"influxql","start":"{{startTime}}","type":"_"},"url":"/api/tmc/metrics-query"},"chartType":"table","config":{"dataSourceConfig":{"isSqlMode":true,"sql":{"from":"application_mq_slow","fromSource":["application_mq_slow"],"groupBy":"message_bus_destination::tag","limit":50,"orderBy":"","select":"message_bus_destination::tag as Topic,format_time(timestamp,\'2006-01-02 15:04:05\') as 时间,format_duration(elapsed_max::field,\'\',2) as 最大耗时,format_duration(elapsed_min::field,\'\',2) as 最小耗时","where":["message_bus_destination::tag=~/.*{{subSearch}}.*/"]}},"optionProps":{"isMoreThanOneDay":true,"moreThanOneDayFormat":"M/D","rowClick":{"name":"traceSlowTranslation","value":"Topic"}}},"controls":null,"dataSourceType":"api","description":"","i18n":{"title":{"en":"Slow Translation Tracing Top50","zh":"慢事务追踪 Top50"}},"staticData":{},"title":"慢事务追踪 Top50"},"w":14,"x":0,"y":21},{"h":9,"i":"view-sCRTdIQb","view":{"api":{"body":null,"extraData":null,"header":null,"method":"get","query":{"end":"{{endTime}}","filter__metric_scope":"micro_service","filter__metric_scope_id":"{{terminusKey}}","format":"chartv2","or_eq_source_service_id":"{{serviceId}}","or_eq_target_service_id":"{{serviceId}}","q":"SELECT message_bus_destination::tag as Topic,format_time(timestamp,\'2006-01-02 15:04:05\') as 时间 FROM application_mq_error WHERE message_bus_destination::tag=~/.*{{subSearch}}.*/ GROUP BY message_bus_destination::tag ORDER BY max(timestamp) DESC LIMIT 50 ","ql":"influxql","serviceName":"{{serviceName}}","start":"{{startTime}}","type":"_"},"url":"/api/tmc/metrics-query"},"chartType":"table","config":{"dataSourceConfig":{"isSqlMode":true,"sql":{"from":"application_mq_error","fromSource":["application_mq_error"],"groupBy":"message_bus_destination::tag","limit":50,"select":"message_bus_destination::tag as Topic,format_time(timestamp,\'2006-01-02 15:04:05\') as 时间","where":["message_bus_destination::tag=~/.*{{subSearch}}.*/"]}},"optionProps":{"isMoreThanOneDay":true,"moreThanOneDayFormat":"M/D","rowClick":{"name":"traceSlowTranslation","value":"Topic"}}},"controls":null,"dataSourceType":"api","description":"","i18n":{"title":{"en":"Error Translation Tracing Top50","zh":"错误事务追踪 Top50"}},"staticData":{},"title":"错误事务追踪 Top50"},"w":10,"x":14,"y":21}]');
Loading

0 comments on commit 5756002

Please sign in to comment.