From dc48cd841a057975c5c041f909b78f07b013216c Mon Sep 17 00:00:00 2001
From: Alex <33497058+bexsoft@users.noreply.github.com>
Date: Thu, 14 Sep 2023 18:28:21 -0600
Subject: [PATCH] Added MINIO_PROMETHEUS_AUTH_TOKEN env support (#18028)

Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
---
 cmd/common-main.go           | 14 +++++++++-----
 internal/config/constants.go | 20 +++++++++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/cmd/common-main.go b/cmd/common-main.go
index 5d584ad40..e83535ca2 100644
--- a/cmd/common-main.go
+++ b/cmd/common-main.go
@@ -130,9 +130,9 @@ func minioConfigToConsoleFeatures() {
 		// This will save users from providing a certificate with IP or FQDN SAN that points to the local host.
 		os.Setenv("CONSOLE_MINIO_SERVER", fmt.Sprintf("%s://127.0.0.1:%s", getURLScheme(globalIsTLS), globalMinioPort))
 	}
-	if value := env.Get("MINIO_LOG_QUERY_URL", ""); value != "" {
+	if value := env.Get(config.EnvMinIOLogQueryURL, ""); value != "" {
 		os.Setenv("CONSOLE_LOG_QUERY_URL", value)
-		if value := env.Get("MINIO_LOG_QUERY_AUTH_TOKEN", ""); value != "" {
+		if value := env.Get(config.EnvMinIOLogQueryAuthToken, ""); value != "" {
 			os.Setenv("CONSOLE_LOG_QUERY_AUTH_TOKEN", value)
 		}
 	}
@@ -144,15 +144,19 @@ func minioConfigToConsoleFeatures() {
 		}
 	}
 	// Enable if prometheus URL is set.
-	if value := env.Get("MINIO_PROMETHEUS_URL", ""); value != "" {
+	if value := env.Get(config.EnvMinIOPrometheusURL, ""); value != "" {
 		os.Setenv("CONSOLE_PROMETHEUS_URL", value)
-		if value := env.Get("MINIO_PROMETHEUS_JOB_ID", "minio-job"); value != "" {
+		if value := env.Get(config.EnvMinIOPrometheusJobID, "minio-job"); value != "" {
 			os.Setenv("CONSOLE_PROMETHEUS_JOB_ID", value)
 			// Support additional labels for more granular filtering.
-			if value := env.Get("MINIO_PROMETHEUS_EXTRA_LABELS", ""); value != "" {
+			if value := env.Get(config.EnvMinIOPrometheusExtraLabels, ""); value != "" {
 				os.Setenv("CONSOLE_PROMETHEUS_EXTRA_LABELS", value)
 			}
 		}
+		// Support Prometheus Auth Token
+		if value := env.Get(config.EnvMinIOPrometheusAuthToken, ""); value != "" {
+			os.Setenv("CONSOLE_PROMETHEUS_AUTH_TOKEN", value)
+		}
 	}
 	// Enable if LDAP is enabled.
 	if globalIAMSys.LDAPConfig.Enabled() {
diff --git a/internal/config/constants.go b/internal/config/constants.go
index f5ab2e152..f83401b15 100644
--- a/internal/config/constants.go
+++ b/internal/config/constants.go
@@ -61,13 +61,19 @@ const (
 	EnvMinIOCallhomeEnable    = "MINIO_CALLHOME_ENABLE"
 	EnvMinIOCallhomeFrequency = "MINIO_CALLHOME_FREQUENCY"
 
-	EnvMinIOServerURL         = "MINIO_SERVER_URL"
-	EnvBrowserRedirect        = "MINIO_BROWSER_REDIRECT" // On by default
-	EnvBrowserRedirectURL     = "MINIO_BROWSER_REDIRECT_URL"
-	EnvRootDriveThresholdSize = "MINIO_ROOTDRIVE_THRESHOLD_SIZE"
-	EnvRootDiskThresholdSize  = "MINIO_ROOTDISK_THRESHOLD_SIZE" // Deprecated Sep 2023
-	EnvBrowserLoginAnimation  = "MINIO_BROWSER_LOGIN_ANIMATION"
-	EnvBrowserSessionDuration = "MINIO_BROWSER_SESSION_DURATION"
+	EnvMinIOServerURL             = "MINIO_SERVER_URL"
+	EnvBrowserRedirect            = "MINIO_BROWSER_REDIRECT" // On by default
+	EnvBrowserRedirectURL         = "MINIO_BROWSER_REDIRECT_URL"
+	EnvRootDriveThresholdSize     = "MINIO_ROOTDRIVE_THRESHOLD_SIZE"
+	EnvRootDiskThresholdSize      = "MINIO_ROOTDISK_THRESHOLD_SIZE" // Deprecated Sep 2023
+	EnvBrowserLoginAnimation      = "MINIO_BROWSER_LOGIN_ANIMATION"
+	EnvBrowserSessionDuration     = "MINIO_BROWSER_SESSION_DURATION"
+	EnvMinIOLogQueryURL           = "MINIO_LOG_QUERY_URL"
+	EnvMinIOLogQueryAuthToken     = "MINIO_LOG_QUERY_AUTH_TOKEN"
+	EnvMinIOPrometheusURL         = "MINIO_PROMETHEUS_URL"
+	EnvMinIOPrometheusJobID       = "MINIO_PROMETHEUS_JOB_ID"
+	EnvMinIOPrometheusExtraLabels = "MINIO_PROMETHEUS_EXTRA_LABELS"
+	EnvMinIOPrometheusAuthToken   = "MINIO_PROMETHEUS_AUTH_TOKEN"
 
 	EnvUpdate = "MINIO_UPDATE"