mirror of
https://github.com/VictoriaMetrics/VictoriaMetrics.git
synced 2024-11-21 14:44:00 +00:00
added IMDSv2 for YC SD (#6524)
### Describe Your Changes Fixes https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5513 ### Checklist The following checks are **mandatory**: - [ ] My change adheres [VictoriaMetrics contributing guidelines](https://docs.victoriametrics.com/contributing/).
This commit is contained in:
parent
e666d64f1d
commit
070abe5c71
2 changed files with 49 additions and 2 deletions
|
@ -31,7 +31,7 @@ See also [LTS releases](https://docs.victoriametrics.com/lts-releases/).
|
||||||
|
|
||||||
* FEATURE: [vmauth](https://docs.victoriametrics.com/vmauth/): allow overriding `Host` header with a target host before sending to a downstream. See this [issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/6453)
|
* FEATURE: [vmauth](https://docs.victoriametrics.com/vmauth/): allow overriding `Host` header with a target host before sending to a downstream. See this [issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/6453)
|
||||||
* FEATURE: [dashboards](https://grafana.com/orgs/victoriametrics): add [Grafana dashboard](https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/dashboards/vmauth.json) and [alerting rules](https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/deployment/docker/alerts-vmauth.yml) for [vmauth](https://docs.victoriametrics.com/vmauth/) dashboard. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4313) for details.
|
* FEATURE: [dashboards](https://grafana.com/orgs/victoriametrics): add [Grafana dashboard](https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/dashboards/vmauth.json) and [alerting rules](https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/deployment/docker/alerts-vmauth.yml) for [vmauth](https://docs.victoriametrics.com/vmauth/) dashboard. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4313) for details.
|
||||||
|
* FEATURE: [vmagent](https://docs.victoriametrics.com/vmagent/): added `yandexcloud_sd` AWS API IMDSv2 support.
|
||||||
* BUGFIX: [docker-compose](https://github.com/VictoriaMetrics/VictoriaMetrics/tree/master/deployment/docker#docker-compose-environment-for-victoriametrics): fix incorrect link to vmui from [VictoriaMetrics plugin in Grafana](https://github.com/VictoriaMetrics/VictoriaMetrics/tree/master/deployment/docker#grafana).
|
* BUGFIX: [docker-compose](https://github.com/VictoriaMetrics/VictoriaMetrics/tree/master/deployment/docker#docker-compose-environment-for-victoriametrics): fix incorrect link to vmui from [VictoriaMetrics plugin in Grafana](https://github.com/VictoriaMetrics/VictoriaMetrics/tree/master/deployment/docker#grafana).
|
||||||
|
|
||||||
* BUGFIX: [Single-node VictoriaMetrics](https://docs.victoriametrics.com/) and `vmstorage` in [VictoriaMetrics cluster](https://docs.victoriametrics.com/cluster-victoriametrics/): Fix the dateMetricIDCache consistency issue that leads to duplicate per-day index entries when new time series are inserted concurrently. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/6534) for details.
|
* BUGFIX: [Single-node VictoriaMetrics](https://docs.victoriametrics.com/) and `vmstorage` in [VictoriaMetrics cluster](https://docs.victoriametrics.com/cluster-victoriametrics/): Fix the dateMetricIDCache consistency issue that leads to duplicate per-day index entries when new time series are inserted concurrently. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/6534) for details.
|
||||||
|
|
|
@ -7,6 +7,7 @@ import (
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"strconv"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
@ -36,6 +37,10 @@ type apiConfig struct {
|
||||||
// credsLock protects the refresh of creds
|
// credsLock protects the refresh of creds
|
||||||
credsLock sync.Mutex
|
credsLock sync.Mutex
|
||||||
creds *apiCredentials
|
creds *apiCredentials
|
||||||
|
|
||||||
|
// metadataCredsLock protects the refresh of metadataCreds
|
||||||
|
metadataCredsLock sync.Mutex
|
||||||
|
metadataCreds *apiCredentials
|
||||||
}
|
}
|
||||||
|
|
||||||
func getAPIConfig(sdc *SDConfig, baseDir string) (*apiConfig, error) {
|
func getAPIConfig(sdc *SDConfig, baseDir string) (*apiConfig, error) {
|
||||||
|
@ -119,12 +124,53 @@ func getCreds(cfg *apiConfig) (*apiCredentials, error) {
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// getMetadataCreds gets Yandex Cloud IAM metadata token
|
||||||
|
func getMetadataCreds(cfg *apiConfig) (*apiCredentials, error) {
|
||||||
|
cfg.metadataCredsLock.Lock()
|
||||||
|
defer cfg.metadataCredsLock.Unlock()
|
||||||
|
|
||||||
|
if cfg.metadataCreds != nil && time.Until(cfg.metadataCreds.Expiration) > 10*time.Second {
|
||||||
|
// Credentials aren't expired yet.
|
||||||
|
return cfg.metadataCreds, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
endpoint := "http://169.254.169.254/latest/api/token"
|
||||||
|
req, err := http.NewRequest(http.MethodPut, endpoint, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("cannot create metadata token request: %w", err)
|
||||||
|
}
|
||||||
|
ttl := 1800
|
||||||
|
expiration := time.Now().Add(time.Duration(ttl) * time.Second)
|
||||||
|
req.Header.Add("X-aws-ec2-metadata-token-ttl-seconds", strconv.Itoa(ttl))
|
||||||
|
resp, err := cfg.client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("cannot perform metadata token request: %w", err)
|
||||||
|
}
|
||||||
|
data, err := readResponseBody(resp, endpoint)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("cannot read metadata creds from %s: %w", endpoint, err)
|
||||||
|
}
|
||||||
|
return &apiCredentials{
|
||||||
|
Token: string(data),
|
||||||
|
Expiration: expiration,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
// getInstanceCreds gets Yandex Cloud IAM token using instance Service Account
|
// getInstanceCreds gets Yandex Cloud IAM token using instance Service Account
|
||||||
//
|
//
|
||||||
// See https://cloud.yandex.com/en-ru/docs/compute/operations/vm-connect/auth-inside-vm
|
// See https://cloud.yandex.com/en-ru/docs/compute/operations/vm-connect/auth-inside-vm
|
||||||
func getInstanceCreds(cfg *apiConfig) (*apiCredentials, error) {
|
func getInstanceCreds(cfg *apiConfig) (*apiCredentials, error) {
|
||||||
|
metadataCreds, err := getMetadataCreds(cfg)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
endpoint := "http://169.254.169.254/latest/meta-data/iam/security-credentials/default"
|
endpoint := "http://169.254.169.254/latest/meta-data/iam/security-credentials/default"
|
||||||
resp, err := cfg.client.Get(endpoint)
|
req, err := http.NewRequest(http.MethodGet, endpoint, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("cannot create instance creds request: %w", err)
|
||||||
|
}
|
||||||
|
req.Header.Add("X-aws-ec2-metadata-token", metadataCreds.Token)
|
||||||
|
resp, err := cfg.client.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("cannot read instance creds from %s: %w", endpoint, err)
|
return nil, fmt.Errorf("cannot read instance creds from %s: %w", endpoint, err)
|
||||||
}
|
}
|
||||||
|
@ -132,6 +178,7 @@ func getInstanceCreds(cfg *apiConfig) (*apiCredentials, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
var ac apiCredentials
|
var ac apiCredentials
|
||||||
if err := json.Unmarshal(data, &ac); err != nil {
|
if err := json.Unmarshal(data, &ac); err != nil {
|
||||||
return nil, fmt.Errorf("cannot parse auth credentials response from %s: %w", endpoint, err)
|
return nil, fmt.Errorf("cannot parse auth credentials response from %s: %w", endpoint, err)
|
||||||
|
|
Loading…
Reference in a new issue