From a5d842caf877cfbfd090107e606ac1b3d4ce7460 Mon Sep 17 00:00:00 2001 From: Nikolay Khramchikhin Date: Fri, 16 Oct 2020 21:20:57 +0300 Subject: [PATCH] fixes openstack api endpoint with suffix trim adds openstack (#840) api v2.0 check Updates https://github.com/VictoriaMetrics/VictoriaMetrics/issues/728 --- lib/promscrape/discovery/openstack/api.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/promscrape/discovery/openstack/api.go b/lib/promscrape/discovery/openstack/api.go index 8c15d3187d..615fe89712 100644 --- a/lib/promscrape/discovery/openstack/api.go +++ b/lib/promscrape/discovery/openstack/api.go @@ -3,11 +3,13 @@ package openstack import ( "bytes" "encoding/json" + "errors" "fmt" "io/ioutil" "net/http" "net/url" "path" + "strings" "sync" "time" @@ -95,6 +97,11 @@ func newAPIConfig(sdc *SDConfig, baseDir string) (*apiConfig, error) { // override sdc sdcAuth = readCredentialsFromEnv() } + if strings.HasSuffix(sdcAuth.IdentityEndpoint, "v2.0") { + return nil, errors.New("identity_endpoint v2.0 is not supported") + } + // trim .0 from v3.0 for prometheus cfg compatibility + sdcAuth.IdentityEndpoint = strings.TrimSuffix(sdcAuth.IdentityEndpoint, ".0") parsedURL, err := url.Parse(sdcAuth.IdentityEndpoint) if err != nil {