mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added CONSOLE_PROMETHEUS_AUTH_TOKEN flag support (#3043)

Browse Source 
Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
This commit is contained in:
Alex
2023-09-13 12:02:13 -06:00
committed by GitHub
parent d30c0c8cbb
commit 8a918324aa
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
restapi/admin_info.go
View File

@@ -963,6 +963,12 @@ func unmarshalPrometheus(ctx context.Context, httpClnt *http.Client, endpoint st
return true return true
} }
prometheusBearer := getPrometheusAuthToken()
if prometheusBearer != "" {
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", prometheusBearer))
}
resp, err := httpClnt.Do(req) resp, err := httpClnt.Do(req)
if err != nil { if err != nil {
ErrorWithContext(ctx, fmt.Errorf("Unable to fetch labels from prometheus: %w", err)) ErrorWithContext(ctx, fmt.Errorf("Unable to fetch labels from prometheus: %w", err))
@@ -992,6 +998,13 @@ func testPrometheusURL(ctx context.Context, url string) bool {
ErrorWithContext(ctx, fmt.Errorf("error Building Request: (%v)", err)) ErrorWithContext(ctx, fmt.Errorf("error Building Request: (%v)", err))
return false return false
} }
prometheusBearer := getPrometheusAuthToken()
if prometheusBearer != "" {
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", prometheusBearer))
}
response, err := httpClnt.Do(req) response, err := httpClnt.Do(req)
if err != nil { if err != nil {
ErrorWithContext(ctx, fmt.Errorf("default Prometheus URL not reachable, trying root testing: (%v)", err)) ErrorWithContext(ctx, fmt.Errorf("default Prometheus URL not reachable, trying root testing: (%v)", err))

4
restapi/config.go
View File

@@ -247,6 +247,10 @@ func getPrometheusURL() string {
return env.Get(PrometheusURL, "") return env.Get(PrometheusURL, "")
} }
func getPrometheusAuthToken() string {
return env.Get(PrometheusAuthToken, "")
}
func getPrometheusJobID() string { func getPrometheusJobID() string {
return env.Get(PrometheusJobID, "minio-job") return env.Get(PrometheusJobID, "minio-job")
} }

1
restapi/consts.go
View File

@@ -47,6 +47,7 @@ const (
ConsoleSecureFeaturePolicy = "CONSOLE_SECURE_FEATURE_POLICY" ConsoleSecureFeaturePolicy = "CONSOLE_SECURE_FEATURE_POLICY"
ConsoleSecureExpectCTHeader = "CONSOLE_SECURE_EXPECT_CT_HEADER" ConsoleSecureExpectCTHeader = "CONSOLE_SECURE_EXPECT_CT_HEADER"
PrometheusURL = "CONSOLE_PROMETHEUS_URL" PrometheusURL = "CONSOLE_PROMETHEUS_URL"
PrometheusAuthToken = "CONSOLE_PROMETHEUS_AUTH_TOKEN"
PrometheusJobID = "CONSOLE_PROMETHEUS_JOB_ID" PrometheusJobID = "CONSOLE_PROMETHEUS_JOB_ID"
PrometheusExtraLabels = "CONSOLE_PROMETHEUS_EXTRA_LABELS" PrometheusExtraLabels = "CONSOLE_PROMETHEUS_EXTRA_LABELS"
ConsoleLogQueryURL = "CONSOLE_LOG_QUERY_URL" ConsoleLogQueryURL = "CONSOLE_LOG_QUERY_URL"