diff --git a/handlers/metrics.go b/handlers/metrics.go index a139f7a4..1f977ab2 100644 --- a/handlers/metrics.go +++ b/handlers/metrics.go @@ -255,7 +255,7 @@ func handleDescribeServicesMetric(discoverResp *model.BatchQueryResponse, timeou func describeServiceMetricsRequestTotal(conf *bootstrap.Config, namespace, start, end, step string) (map[string]map[string]*model.ServiceMetric, error) { stepVal, _ := strconv.ParseInt(step, 10, 64) if stepVal < 60 { - step = "60" + step = "10" } params := map[string]string{ "start": start, @@ -329,7 +329,7 @@ func describeServiceMetricsRequestTotal(conf *bootstrap.Config, namespace, start func describeServiceMetricsRequestTimeout(conf *bootstrap.Config, namespace, start, end, step string) (map[string]map[string]float64, error) { stepVal, _ := strconv.ParseInt(step, 10, 64) if stepVal < 60 { - step = "60" + step = "10" } params := map[string]string{ "start": start, @@ -490,7 +490,7 @@ func handleDescribeServiceInterfacesMetric(timeoutResp map[string]float64, func describeServiceInterfaceList(conf *bootstrap.Config, start, end, step string) (map[string]struct{}, error) { stepVal, _ := strconv.ParseInt(step, 10, 64) if stepVal < 60 { - step = "60" + step = "10" } params := map[string]string{ "query": "group(upstream_rq_total) by (callee_method)", @@ -524,7 +524,7 @@ func describeServiceInterfaceList(conf *bootstrap.Config, start, end, step strin func describeServiceInterfaceMetricsRequestTotal(conf *bootstrap.Config, namespace, service, calleeInstance, start, end, step string) (map[string]*model.InterfaceMetric, error) { stepVal, _ := strconv.ParseInt(step, 10, 64) if stepVal < 60 { - step = "60" + step = "10" } params := map[string]string{ "start": start, @@ -600,7 +600,7 @@ func describeServiceInterfaceMetricsRequestTotal(conf *bootstrap.Config, namespa func describeServiceInterfaceMetricsRequestTimeout(conf *bootstrap.Config, namespace, service, calleeInstance, start, end, step string) (map[string]float64, error) { stepVal, _ := strconv.ParseInt(step, 10, 64) if stepVal < 60 { - step = "60" + step = "10" } params := map[string]string{ "start": start, @@ -789,7 +789,7 @@ func describeServiceInstanceRequestTimeout(conf *bootstrap.Config, service, name start, end, step string) (map[string]float64, error) { stepVal, _ := strconv.ParseInt(step, 10, 64) if stepVal < 60 { - step = "60" + step = "10" } params := map[string]string{ "start": start, @@ -849,7 +849,7 @@ func describeServiceInstanceRequestTotal(conf *bootstrap.Config, service, namesp start, end, step string) (map[string]*model.InstanceMetric, error) { stepVal, _ := strconv.ParseInt(step, 10, 64) if stepVal < 60 { - step = "60" + step = "10" } params := map[string]string{ "start": start, @@ -1017,7 +1017,7 @@ func describeServiceCallerMetricRequestTotal(conf *bootstrap.Config, service, na calleeInstance, start, end, step string) (map[string]map[string]map[string]*model.CallerMetric, error) { stepVal, _ := strconv.ParseInt(step, 10, 64) if stepVal < 60 { - step = "60" + step = "10" } params := map[string]string{ "start": start, @@ -1102,7 +1102,7 @@ func describeServiceCallerMetricRequestTimeout(conf *bootstrap.Config, service, start, end, step string) (map[string]map[string]map[string]float64, error) { stepVal, _ := strconv.ParseInt(step, 10, 64) if stepVal < 60 { - step = "60" + step = "10" } params := map[string]string{ "start": start, diff --git a/web/src/polaris/monitor/registryMonitor/types.ts b/web/src/polaris/monitor/registryMonitor/types.ts index 2288d182..4a3c5ff8 100644 --- a/web/src/polaris/monitor/registryMonitor/types.ts +++ b/web/src/polaris/monitor/registryMonitor/types.ts @@ -22,6 +22,8 @@ export enum MetricName { RetCode = 'RetCode', } +const miniStep = 60 + export const getQueryMap = { [MetricName.Node]: () => [ { @@ -57,12 +59,12 @@ export const getQueryMap = { interfaceName && podName ? `sum(client_rq_interval_count{api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `sum(client_rq_interval_count{api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `sum(client_rq_interval_count{polaris_server_instance="${podName}"}) or on() vector(0)` - : 'sum(client_rq_interval_count) or on() vector(0)', + ? `sum(client_rq_interval_count{api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `sum(client_rq_interval_count{polaris_server_instance="${podName}"}) or on() vector(0)` + : 'sum(client_rq_interval_count) or on() vector(0)', boardFunction: SumUpReduceFunction, - minStep: 60, + minStep: miniStep, }, { name: '成功请求数', @@ -70,12 +72,12 @@ export const getQueryMap = { interfaceName && podName ? `sum(client_rq_interval_count{err_code=~"2.+|0",api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `sum(client_rq_interval_count{err_code=~"2.+|0",api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `sum(client_rq_interval_count{err_code=~"2.+|0",polaris_server_instance="${podName}"}) or on() vector(0)` - : 'sum(client_rq_interval_count{err_code=~"2.+|0"}) or on() vector(0)', + ? `sum(client_rq_interval_count{err_code=~"2.+|0",api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `sum(client_rq_interval_count{err_code=~"2.+|0",polaris_server_instance="${podName}"}) or on() vector(0)` + : 'sum(client_rq_interval_count{err_code=~"2.+|0"}) or on() vector(0)', boardFunction: SumUpReduceFunction, - minStep: 60, + minStep: miniStep, }, { name: '失败请求数', @@ -83,12 +85,12 @@ export const getQueryMap = { interfaceName && podName ? `sum(client_rq_interval_count{err_code!~"2.+|0",api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `sum(client_rq_interval_count{err_code!~"2.+|0",api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `sum(client_rq_interval_count{err_code!~"2.+|0",polaris_server_instance="${podName}"}) or on() vector(0)` - : 'sum(client_rq_interval_count{err_code!~"2.+|0"}) or on() vector(0)', + ? `sum(client_rq_interval_count{err_code!~"2.+|0",api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `sum(client_rq_interval_count{err_code!~"2.+|0",polaris_server_instance="${podName}"}) or on() vector(0)` + : 'sum(client_rq_interval_count{err_code!~"2.+|0"}) or on() vector(0)', boardFunction: SumUpReduceFunction, - minStep: 60, + minStep: miniStep, }, { name: '请求成功率', @@ -96,12 +98,12 @@ export const getQueryMap = { interfaceName && podName ? `((sum(client_rq_interval_count{err_code=~"2.+|0",api=~"${interfaceName}",polaris_server_instance="${podName}"}) / sum(client_rq_interval_count{api=~"${interfaceName}",polaris_server_instance="${podName}"})) * 100) or on() vector(0)` : interfaceName - ? `((sum(client_rq_interval_count{err_code=~"2.+|0",api=~"${interfaceName}"}) / sum(client_rq_interval_count{api=~"${interfaceName}"})) * 100) or on() vector(0)` - : podName - ? `((sum(client_rq_interval_count{err_code=~"2.+|0",polaris_server_instance="${podName}"}) / sum(client_rq_interval_count{api=~"${interfaceName}",polaris_server_instance="${podName}"})) * 100) or on() vector(0)` - : '((sum(client_rq_interval_count{err_code=~"2.+|0"}) / sum(client_rq_interval_count)) * 100) or on() vector(0)', + ? `((sum(client_rq_interval_count{err_code=~"2.+|0",api=~"${interfaceName}"}) / sum(client_rq_interval_count{api=~"${interfaceName}"})) * 100) or on() vector(0)` + : podName + ? `((sum(client_rq_interval_count{err_code=~"2.+|0",polaris_server_instance="${podName}"}) / sum(client_rq_interval_count{api=~"${interfaceName}",polaris_server_instance="${podName}"})) * 100) or on() vector(0)` + : '((sum(client_rq_interval_count{err_code=~"2.+|0"}) / sum(client_rq_interval_count)) * 100) or on() vector(0)', boardFunction: LatestValueReduceFunction, - minStep: 60, + minStep: miniStep, unit: '%', noLine: true, }, @@ -117,13 +119,13 @@ export const getQueryMap = { interfaceName && podName ? `avg(client_rq_timeout_avg{api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `avg(client_rq_timeout_avg{api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `avg(client_rq_timeout_avg{polaris_server_instance="${podName}"}) or on() vector(0)` - : `avg(client_rq_timeout_avg) or on() vector(0)`, + ? `avg(client_rq_timeout_avg{api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `avg(client_rq_timeout_avg{polaris_server_instance="${podName}"}) or on() vector(0)` + : `avg(client_rq_timeout_avg) or on() vector(0)`, boardFunction: AvgReduceFunction, unit: 'ms', - minStep: 60, + minStep: miniStep, color: LineColor.Blue, }, { @@ -132,13 +134,13 @@ export const getQueryMap = { interfaceName && podName ? `max(client_rq_timeout_avg{api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `max(client_rq_timeout_avg{api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `max(client_rq_timeout_avg{polaris_server_instance="${podName}"}) or on() vector(0)` - : `max(client_rq_timeout_avg) or on() vector(0)`, + ? `max(client_rq_timeout_avg{api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `max(client_rq_timeout_avg{polaris_server_instance="${podName}"}) or on() vector(0)` + : `max(client_rq_timeout_avg) or on() vector(0)`, boardFunction: MaxReduceFunction, unit: 'ms', - minStep: 60, + minStep: miniStep, color: LineColor.Red, }, { @@ -147,13 +149,13 @@ export const getQueryMap = { interfaceName && podName ? `min(client_rq_timeout_avg{api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `min(client_rq_timeout_avg{api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `min(client_rq_timeout_avg{polaris_server_instance="${podName}"}) or on() vector(0)` - : `min(client_rq_timeout_avg) or on() vector(0)`, + ? `min(client_rq_timeout_avg{api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `min(client_rq_timeout_avg{polaris_server_instance="${podName}"}) or on() vector(0)` + : `min(client_rq_timeout_avg) or on() vector(0)`, boardFunction: MinReduceFunction, unit: 'ms', - minStep: 60, + minStep: miniStep, color: LineColor.Green, }, { @@ -162,10 +164,10 @@ export const getQueryMap = { interfaceName && podName ? `quantile(0.99, client_rq_timeout_avg{api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `quantile(0.99, client_rq_timeout_avg{api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `quantile(0.99, client_rq_timeout_avg{polaris_server_instance="${podName}"}) or on() vector(0)` - : `quantile(0.99, client_rq_timeout_avg) or on() vector(0)`, + ? `quantile(0.99, client_rq_timeout_avg{api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `quantile(0.99, client_rq_timeout_avg{polaris_server_instance="${podName}"}) or on() vector(0)` + : `quantile(0.99, client_rq_timeout_avg) or on() vector(0)`, asyncBoardFunction: async () => { const res = await getMonitorData({ start, @@ -175,10 +177,10 @@ export const getQueryMap = { interfaceName && podName ? `quantile(0.99, client_rq_timeout_avg{api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `quantile(0.99, client_rq_timeout_avg{api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `quantile(0.99, client_rq_timeout_avg{polaris_server_instance="${podName}"}) or on() vector(0)` - : `quantile(0.99, client_rq_timeout_avg) or on() vector(0)`, + ? `quantile(0.99, client_rq_timeout_avg{api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `quantile(0.99, client_rq_timeout_avg{polaris_server_instance="${podName}"}) or on() vector(0)` + : `quantile(0.99, client_rq_timeout_avg) or on() vector(0)`, }) const point = res?.[0]?.values?.[0] if (!point) return '-' @@ -186,7 +188,7 @@ export const getQueryMap = { return value }, unit: 'ms', - minStep: 60, + minStep: miniStep, color: LineColor.Yellow, }, { @@ -195,10 +197,10 @@ export const getQueryMap = { interfaceName && podName ? `quantile(0.95, client_rq_timeout_avg{api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `quantile(0.95, client_rq_timeout_avg{api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `quantile(0.95, client_rq_timeout_avg{polaris_server_instance="${podName}"}) or on() vector(0)` - : `quantile(0.95, client_rq_timeout_avg) or on() vector(0)`, + ? `quantile(0.95, client_rq_timeout_avg{api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `quantile(0.95, client_rq_timeout_avg{polaris_server_instance="${podName}"}) or on() vector(0)` + : `quantile(0.95, client_rq_timeout_avg) or on() vector(0)`, asyncBoardFunction: async () => { const res = await getMonitorData({ start, @@ -208,10 +210,10 @@ export const getQueryMap = { interfaceName && podName ? `quantile(0.95, client_rq_timeout_avg{api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `quantile(0.95, client_rq_timeout_avg{api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `quantile(0.95, client_rq_timeout_avg{polaris_server_instance="${podName}"}) or on() vector(0)` - : `quantile(0.95, client_rq_timeout_avg) or on() vector(0)`, + ? `quantile(0.95, client_rq_timeout_avg{api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `quantile(0.95, client_rq_timeout_avg{polaris_server_instance="${podName}"}) or on() vector(0)` + : `quantile(0.95, client_rq_timeout_avg) or on() vector(0)`, }) const point = res?.[0]?.values?.[0] if (!point) return '-' @@ -219,7 +221,7 @@ export const getQueryMap = { return value }, unit: 'ms', - minStep: 60, + minStep: miniStep, color: LineColor.Gray, }, ] @@ -275,8 +277,8 @@ export const getQueryMap = { namespace && service ? `max(sum(instance_count{namespace="${namespace}",service="${service}"}) by(polaris_server_instance)) or on() vector(0)` : namespace - ? `max(sum(instance_count{namespace="${namespace}"}) by(polaris_server_instance)) or on() vector(0)` - : 'max(sum(instance_count) by(polaris_server_instance)) or on() vector(0)', + ? `max(sum(instance_count{namespace="${namespace}"}) by(polaris_server_instance)) or on() vector(0)` + : 'max(sum(instance_count) by(polaris_server_instance)) or on() vector(0)', boardFunction: LatestValueReduceFunction, }, { @@ -286,8 +288,8 @@ export const getQueryMap = { namespace && service ? `max(sum(instance_online_count{namespace="${namespace}",service="${service}"}) by(polaris_server_instance)) or on() vector(0)` : namespace - ? `max(sum(instance_online_count{namespace="${namespace}"}) by(polaris_server_instance)) or on() vector(0)` - : 'max(sum(instance_online_count) by(polaris_server_instance)) or on() vector(0)', + ? `max(sum(instance_online_count{namespace="${namespace}"}) by(polaris_server_instance)) or on() vector(0)` + : 'max(sum(instance_online_count) by(polaris_server_instance)) or on() vector(0)', boardFunction: LatestValueReduceFunction, }, { @@ -297,8 +299,8 @@ export const getQueryMap = { namespace && service ? `max(sum(instance_isolate_count{namespace="${namespace}",service="${service}"}) by(polaris_server_instance)) or on() vector(0)` : namespace - ? `max(sum(instance_isolate_count{namespace="${namespace}"}) by(polaris_server_instance)) or on() vector(0)` - : 'max(sum(instance_isolate_count) by(polaris_server_instance)) or on() vector(0)', + ? `max(sum(instance_isolate_count{namespace="${namespace}"}) by(polaris_server_instance)) or on() vector(0)` + : 'max(sum(instance_isolate_count) by(polaris_server_instance)) or on() vector(0)', boardFunction: LatestValueReduceFunction, }, { @@ -308,8 +310,8 @@ export const getQueryMap = { namespace && service ? `max(sum(instance_abnormal_count{namespace="${namespace}",service="${service}"}) by(polaris_server_instance)) or on() vector(0)` : namespace - ? `max(sum(instance_abnormal_count{namespace="${namespace}"}) by(polaris_server_instance)) or on() vector(0)` - : 'max(sum(instance_abnormal_count) by(polaris_server_instance)) or on() vector(0)', + ? `max(sum(instance_abnormal_count{namespace="${namespace}"}) by(polaris_server_instance)) or on() vector(0)` + : 'max(sum(instance_abnormal_count) by(polaris_server_instance)) or on() vector(0)', boardFunction: LatestValueReduceFunction, }, ] @@ -341,8 +343,8 @@ export const getQueryMap = { namespace && configGroup ? `max(sum(config_file_count{namespace="${namespace}",group="${configGroup}"}) by(polaris_server_instance)) or on() vector(0)` : namespace - ? `max(sum(config_file_count{namespace="${namespace}"}) by(polaris_server_instance)) or on() vector(0)` - : 'max(sum(config_file_count) by(polaris_server_instance)) or on() vector(0)', + ? `max(sum(config_file_count{namespace="${namespace}"}) by(polaris_server_instance)) or on() vector(0)` + : 'max(sum(config_file_count) by(polaris_server_instance)) or on() vector(0)', boardFunction: LatestValueReduceFunction, }, { @@ -352,8 +354,8 @@ export const getQueryMap = { namespace && configGroup ? `max(sum(config_release_file_count{namespace="${namespace}",group="${configGroup}"}) by(polaris_server_instance)) or on() vector(0)` : namespace - ? `max(sum(config_release_file_count{namespace="${namespace}"}) by(polaris_server_instance)) or on() vector(0)` - : 'max(sum(config_release_file_count) by(polaris_server_instance)) or on() vector(0)', + ? `max(sum(config_release_file_count{namespace="${namespace}"}) by(polaris_server_instance)) or on() vector(0)` + : 'max(sum(config_release_file_count) by(polaris_server_instance)) or on() vector(0)', boardFunction: LatestValueReduceFunction, }, ] @@ -367,10 +369,10 @@ export const getQueryMap = { interfaceName && podName ? `sum(client_rq_interval_count{err_code!~"2.+|0",api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `sum(client_rq_interval_count{err_code!~"2.+|0",api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `sum(client_rq_interval_count{err_code!~"2.+|0",polaris_server_instance="${podName}"}) or on() vector(0)` - : 'sum(client_rq_interval_count{err_code!~"2.+|0"}) or on() vector(0)', + ? `sum(client_rq_interval_count{err_code!~"2.+|0",api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `sum(client_rq_interval_count{err_code!~"2.+|0",polaris_server_instance="${podName}"}) or on() vector(0)` + : 'sum(client_rq_interval_count{err_code!~"2.+|0"}) or on() vector(0)', boardFunction: SumUpReduceFunction, minStep: 60, }, @@ -380,10 +382,10 @@ export const getQueryMap = { interfaceName && podName ? `sum(client_rq_interval_count{err_code=~"5.+",api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `sum(client_rq_interval_count{err_code=~"5.+",api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `sum(client_rq_interval_count{err_code=~"5.+",polaris_server_instance="${podName}"}) or on() vector(0)` - : 'sum(client_rq_interval_count{err_code=~"5.+"}) or on() vector(0)', + ? `sum(client_rq_interval_count{err_code=~"5.+",api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `sum(client_rq_interval_count{err_code=~"5.+",polaris_server_instance="${podName}"}) or on() vector(0)` + : 'sum(client_rq_interval_count{err_code=~"5.+"}) or on() vector(0)', boardFunction: SumUpReduceFunction, minStep: 60, }, @@ -393,10 +395,10 @@ export const getQueryMap = { interfaceName && podName ? `sum(client_rq_interval_count{err_code=~"4.+",api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `sum(client_rq_interval_count{err_code=~"4.+",api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `sum(client_rq_interval_count{err_code=~"4.+",polaris_server_instance="${podName}"}) or on() vector(0)` - : 'sum(client_rq_interval_count{err_code=~"4.+"}) or on() vector(0)', + ? `sum(client_rq_interval_count{err_code=~"4.+",api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `sum(client_rq_interval_count{err_code=~"4.+",polaris_server_instance="${podName}"}) or on() vector(0)` + : 'sum(client_rq_interval_count{err_code=~"4.+"}) or on() vector(0)', boardFunction: SumUpReduceFunction, minStep: 60, }, @@ -406,10 +408,10 @@ export const getQueryMap = { interfaceName && podName ? `sum(client_rq_interval_count{err_code=~"-1",api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `sum(client_rq_interval_count{err_code=~"-1",api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `sum(client_rq_interval_count{err_code=~"-1",polaris_server_instance="${podName}"}) or on() vector(0)` - : 'sum(client_rq_interval_count{err_code=~"-1"}) or on() vector(0)', + ? `sum(client_rq_interval_count{err_code=~"-1",api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `sum(client_rq_interval_count{err_code=~"-1",polaris_server_instance="${podName}"}) or on() vector(0)` + : 'sum(client_rq_interval_count{err_code=~"-1"}) or on() vector(0)', boardFunction: SumUpReduceFunction, minStep: 60, }, @@ -424,10 +426,10 @@ export const getQueryMap = { interfaceName && podName ? `sum(client_rq_interval_count{err_code=~"2.+|0",api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `sum(client_rq_interval_count{err_code=~"2.+|0",api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `sum(client_rq_interval_count{err_code=~"2.+|0",polaris_server_instance="${podName}"}) or on() vector(0)` - : 'sum(client_rq_interval_count{err_code=~"2.+|0"}) or on() vector(0)', + ? `sum(client_rq_interval_count{err_code=~"2.+|0",api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `sum(client_rq_interval_count{err_code=~"2.+|0",polaris_server_instance="${podName}"}) or on() vector(0)` + : 'sum(client_rq_interval_count{err_code=~"2.+|0"}) or on() vector(0)', boardFunction: SumUpReduceFunction, minStep: 60, }, @@ -437,10 +439,10 @@ export const getQueryMap = { interfaceName && podName ? `sum(client_rq_interval_count{err_code=~"5.+",api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `sum(client_rq_interval_count{err_code=~"5.+",api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `sum(client_rq_interval_count{err_code=~"5.+",polaris_server_instance="${podName}"}) or on() vector(0)` - : 'sum(client_rq_interval_count{err_code=~"5.+"}) or on() vector(0)', + ? `sum(client_rq_interval_count{err_code=~"5.+",api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `sum(client_rq_interval_count{err_code=~"5.+",polaris_server_instance="${podName}"}) or on() vector(0)` + : 'sum(client_rq_interval_count{err_code=~"5.+"}) or on() vector(0)', boardFunction: SumUpReduceFunction, minStep: 60, }, @@ -450,10 +452,10 @@ export const getQueryMap = { interfaceName && podName ? `sum(client_rq_interval_count{err_code=~"4.+",api=~"${interfaceName}",polaris_server_instance="${podName}"}) or on() vector(0)` : interfaceName - ? `sum(client_rq_interval_count{err_code=~"4.+",api=~"${interfaceName}"}) or on() vector(0)` - : podName - ? `sum(client_rq_interval_count{err_code=~"4.+",polaris_server_instance="${podName}"}) or on() vector(0)` - : 'sum(client_rq_interval_count{err_code=~"4.+"}) or on() vector(0)', + ? `sum(client_rq_interval_count{err_code=~"4.+",api=~"${interfaceName}"}) or on() vector(0)` + : podName + ? `sum(client_rq_interval_count{err_code=~"4.+",polaris_server_instance="${podName}"}) or on() vector(0)` + : 'sum(client_rq_interval_count{err_code=~"4.+"}) or on() vector(0)', boardFunction: SumUpReduceFunction, minStep: 60, }, diff --git a/web/src/polaris/monitor/serviceMonitor/Page.tsx b/web/src/polaris/monitor/serviceMonitor/Page.tsx index 95bf13a7..b80c2f33 100644 --- a/web/src/polaris/monitor/serviceMonitor/Page.tsx +++ b/web/src/polaris/monitor/serviceMonitor/Page.tsx @@ -52,8 +52,8 @@ export default purify(function ServiceDetail(props: DuckCmpProps 60 * 60, }, { @@ -114,6 +114,7 @@ export default purify(function ServiceDetail(props: DuckCmpProps dispatch(creators.setStep(Number(v)))} > diff --git a/web/src/polaris/monitor/serviceMonitor/types.ts b/web/src/polaris/monitor/serviceMonitor/types.ts index 237554e1..97a0519a 100644 --- a/web/src/polaris/monitor/serviceMonitor/types.ts +++ b/web/src/polaris/monitor/serviceMonitor/types.ts @@ -19,6 +19,8 @@ export enum LineColor { export const DefaultLineColors = Object.values(LineColor) +const miniStep = 10; + export const getQueryMap = { [MetricName.Request]: (queryParam = {} as any) => { const { calleeNamespace, calleeService, calleeMethod, calleeInstance } = queryParam @@ -39,7 +41,7 @@ export const getQueryMap = { ? `sum(upstream_rq_total{${conditionString}}) or on() vector(0)` : 'sum(upstream_rq_total) or on() vector(0)', boardFunction: SumUpReduceFunction, - minStep: 60, + minStep: miniStep, }, { name: '成功请求数', @@ -47,7 +49,7 @@ export const getQueryMap = { ? `sum(upstream_rq_total{callee_result="success",${conditionString}}) or on() vector(0)` : 'sum(upstream_rq_total{callee_result="success"}) or on() vector(0)', boardFunction: SumUpReduceFunction, - minStep: 60, + minStep: miniStep, }, { name: '限流请求数', @@ -55,7 +57,7 @@ export const getQueryMap = { ? `sum(upstream_rq_total{callee_result="flow_control",${conditionString}}) or on() vector(0)` : 'sum(upstream_rq_total{callee_result="flow_control"}) or on() vector(0)', boardFunction: SumUpReduceFunction, - minStep: 60, + minStep: miniStep, }, { name: '熔断请求数', @@ -63,7 +65,7 @@ export const getQueryMap = { ? `sum(upstream_rq_total{callee_result="reject",${conditionString}}) or on() vector(0)` : 'sum(upstream_rq_total{callee_result="reject"}) or on() vector(0)', boardFunction: SumUpReduceFunction, - minStep: 60, + minStep: miniStep, }, ] }, @@ -89,7 +91,7 @@ export const getQueryMap = { : 'avg(upstream_rq_timeout) or on() vector(0)', boardFunction: AvgReduceFunction, unit: 'ms', - minStep: 60, + minStep: miniStep, color: LineColor.Blue, }, { @@ -99,7 +101,7 @@ export const getQueryMap = { : 'max(upstream_rq_max_timeout) or on() vector(0)', boardFunction: MaxReduceFunction, unit: 'ms', - minStep: 60, + minStep: miniStep, color: LineColor.Red, }, { @@ -109,7 +111,7 @@ export const getQueryMap = { : 'min(upstream_rq_timeout) or on() vector(0)', boardFunction: MinReduceFunction, unit: 'ms', - minStep: 60, + minStep: miniStep, color: LineColor.Green, }, { @@ -132,7 +134,7 @@ export const getQueryMap = { return value }, unit: 'ms', - minStep: 60, + minStep: miniStep, color: LineColor.Yellow, }, { @@ -155,7 +157,7 @@ export const getQueryMap = { return value }, unit: 'ms', - minStep: 60, + minStep: miniStep, color: LineColor.Gray, }, ] @@ -188,7 +190,7 @@ export const getQueryMap = { { name: '错误码统计', query: `sum by (callee_result_code) (upstream_rq_total{${conditionString}})`, - minStep: 60, + minStep: miniStep, multiMetricName: 'callee_result_code', multiValue: true, }, @@ -330,7 +332,7 @@ export const getTableQueryMap = { query: conditions.length ? `sort_desc(sum by (callee_result_code) (upstream_rq_total{${conditionString}}))` : 'sort_desc(sum by (callee_result_code) (upstream_rq_total))', - minStep: 60, + minStep: miniStep, }, ] }, diff --git a/web/src/polaris/service/detail/interface/PageDuck.tsx b/web/src/polaris/service/detail/interface/PageDuck.tsx index 57bb5231..012a6e08 100644 --- a/web/src/polaris/service/detail/interface/PageDuck.tsx +++ b/web/src/polaris/service/detail/interface/PageDuck.tsx @@ -265,6 +265,17 @@ export default class InterfacePageDuck extends GridPageDuck { }) yield takeLatest(types.SHOW_DETAIL, function*(action) { const detail = action.payload as InterfacePageDuck['Item'] + if (detail.protocol === "dubbo") { + yield Modal.confirm({ + size: 'l', + message: 'dubbo接口详情', + description: ( +
+ {detail.content} +
+ ) + }) + } const parameterDetail = JSON.parse(detail.content)?.[detail.method?.toLowerCase()] const requestParameter = parameterDetail.parameters const responses = parameterDetail.responses