Kiu/VictoriaMetrics
Kiu/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-12-15 16:30:55 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

lib/promscrape/discovery/azure: remove API server from URL returned by azure (#3403)

Browse Source 
* lib/promscrape/discovery/azure: remove API server from URL returned by azure

* lib/promscrape/discovery/azure: validate nextLink contains same URL as apiServer
This commit is contained in:
Zakhar Bessarab 2022-12-09 06:29:10 +04:00 committed by Aliaksandr Valialkin
parent 6e390f3b99
commit c939a8e8a2
No known key found for this signature in database
GPG Key ID: A72BEC6CD3D0DED1
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/promscrape/discovery/azure/machine.go
View File

@ -3,6 +3,7 @@ package azure
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/url"
"sync" "sync"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/cgroup" "github.com/VictoriaMetrics/VictoriaMetrics/lib/cgroup"
@ -61,24 +62,38 @@ type listAPIResponse struct {
// visitAllAPIObjects iterates over list API with pagination and applies cb for each response object // visitAllAPIObjects iterates over list API with pagination and applies cb for each response object
func visitAllAPIObjects(ac *apiConfig, apiURL string, cb func(data json.RawMessage) error) error { func visitAllAPIObjects(ac *apiConfig, apiURL string, cb func(data json.RawMessage) error) error {
nextLink := apiURL nextLinkURI := apiURL
for nextLink != "" { for {
resp, err := ac.c.GetAPIResponseWithReqParams(nextLink, func(request *fasthttp.Request) { resp, err := ac.c.GetAPIResponseWithReqParams(nextLinkURI, func(request *fasthttp.Request) {
request.Header.Set("Authorization", "Bearer "+ac.mustGetAuthToken()) request.Header.Set("Authorization", "Bearer "+ac.mustGetAuthToken())
}) })
if err != nil { if err != nil {
return fmt.Errorf("cannot execute azure api request at %s: %w", nextLink, err) return fmt.Errorf("cannot execute azure api request at %s: %w", nextLinkURI, err)
} }
var lar listAPIResponse var lar listAPIResponse
if err := json.Unmarshal(resp, &lar); err != nil { if err := json.Unmarshal(resp, &lar); err != nil {
return fmt.Errorf("cannot parse azure api response %q obtained from %s: %w", resp, nextLink, err) return fmt.Errorf("cannot parse azure api response %q obtained from %s: %w", resp, nextLinkURI, err)
} }
for i := range lar.Value { for i := range lar.Value {
if err := cb(lar.Value[i]); err != nil { if err := cb(lar.Value[i]); err != nil {
return err return err
} }
} }
nextLink = lar.NextLink
// Azure API returns NextLink with apiServer in it, so we need to remove it
if lar.NextLink == "" {
break
}
nextURL, err := url.Parse(lar.NextLink)
if err != nil {
return fmt.Errorf("cannot parse nextLink from response %q: %w", lar.NextLink, err)
}
if nextURL.Host != "" && nextURL.Host != ac.c.APIServer() {
return fmt.Errorf("unexpected nextLink host %q, expecting %q", nextURL.Host, ac.c.APIServer())
}
nextLinkURI = nextURL.RequestURI()
} }
return nil return nil
} }

5
lib/promscrape/discoveryutils/client.go
View File

@ -240,6 +240,11 @@ func (c *Client) getAPIResponseWithParamsAndClient(client *fasthttp.HostClient,
return data, nil return data, nil
} }
// APIServer returns the API server address
func (c *Client) APIServer() string {
return c.apiServer
}
// DoRequestWithPossibleRetry performs the given req at hc and stores the response at resp. // DoRequestWithPossibleRetry performs the given req at hc and stores the response at resp.
func DoRequestWithPossibleRetry(hc *fasthttp.HostClient, req *fasthttp.Request, resp *fasthttp.Response, deadline time.Time, requestCounter, retryCounter *metrics.Counter) error { func DoRequestWithPossibleRetry(hc *fasthttp.HostClient, req *fasthttp.Request, resp *fasthttp.Response, deadline time.Time, requestCounter, retryCounter *metrics.Counter) error {
sleepTime := time.Second sleepTime := time.Second