From 824310e898f902f4a104ac9f0c4a7f07209ef560 Mon Sep 17 00:00:00 2001 From: wuchangqing777 Date: Thu, 17 Sep 2020 14:11:43 +0800 Subject: [PATCH] fix get metrics uri contains resources_filter --- pkg/client/monitoring/client.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkg/client/monitoring/client.go b/pkg/client/monitoring/client.go index de306a9..3ef2916 100644 --- a/pkg/client/monitoring/client.go +++ b/pkg/client/monitoring/client.go @@ -42,10 +42,18 @@ func SendMonitoringRequest(uriPath string, extraQueryParams string, metrics []st queryParams = queryParams + "&" + extraQueryParams } - if strings.HasPrefix(uriPath, "http://") || strings.HasPrefix(uriPath, "https://") { - urlStr = uriPath + "&" + queryParams + if strings.Contains(uriPath, "?") { + if strings.HasPrefix(uriPath, "http://") || strings.HasPrefix(uriPath, "https://") { + urlStr = uriPath + "&" + queryParams + } else { + urlStr = DefaultScheme + "://" + uriPath + "&" + queryParams + } } else { - urlStr = DefaultScheme + "://" + uriPath + "&" + queryParams + if strings.HasPrefix(uriPath, "http://") || strings.HasPrefix(uriPath, "https://") { + urlStr = uriPath + "?" + queryParams + } else { + urlStr = DefaultScheme + "://" + uriPath + "?" + queryParams + } } logger.Info(nil, "SendMonitoringRequest %s", urlStr)