Skip to content

Commit 8a91832

Browse files
authored
Added CONSOLE_PROMETHEUS_AUTH_TOKEN flag support (#3043)
Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
1 parent d30c0c8 commit 8a91832

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

restapi/admin_info.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -963,6 +963,12 @@ func unmarshalPrometheus(ctx context.Context, httpClnt *http.Client, endpoint st
963963
return true
964964
}
965965

966+
prometheusBearer := getPrometheusAuthToken()
967+
968+
if prometheusBearer != "" {
969+
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", prometheusBearer))
970+
}
971+
966972
resp, err := httpClnt.Do(req)
967973
if err != nil {
968974
ErrorWithContext(ctx, fmt.Errorf("Unable to fetch labels from prometheus: %w", err))
@@ -992,6 +998,13 @@ func testPrometheusURL(ctx context.Context, url string) bool {
992998
ErrorWithContext(ctx, fmt.Errorf("error Building Request: (%v)", err))
993999
return false
9941000
}
1001+
1002+
prometheusBearer := getPrometheusAuthToken()
1003+
1004+
if prometheusBearer != "" {
1005+
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", prometheusBearer))
1006+
}
1007+
9951008
response, err := httpClnt.Do(req)
9961009
if err != nil {
9971010
ErrorWithContext(ctx, fmt.Errorf("default Prometheus URL not reachable, trying root testing: (%v)", err))

restapi/config.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,10 @@ func getPrometheusURL() string {
247247
return env.Get(PrometheusURL, "")
248248
}
249249

250+
func getPrometheusAuthToken() string {
251+
return env.Get(PrometheusAuthToken, "")
252+
}
253+
250254
func getPrometheusJobID() string {
251255
return env.Get(PrometheusJobID, "minio-job")
252256
}

restapi/consts.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ const (
4747
ConsoleSecureFeaturePolicy = "CONSOLE_SECURE_FEATURE_POLICY"
4848
ConsoleSecureExpectCTHeader = "CONSOLE_SECURE_EXPECT_CT_HEADER"
4949
PrometheusURL = "CONSOLE_PROMETHEUS_URL"
50+
PrometheusAuthToken = "CONSOLE_PROMETHEUS_AUTH_TOKEN"
5051
PrometheusJobID = "CONSOLE_PROMETHEUS_JOB_ID"
5152
PrometheusExtraLabels = "CONSOLE_PROMETHEUS_EXTRA_LABELS"
5253
ConsoleLogQueryURL = "CONSOLE_LOG_QUERY_URL"

0 commit comments

Comments
 (0)