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

fix: log search URL, token environment variables

Browse Source
This commit is contained in:
Minio Trusted
2021-06-18 16:03:17 -07:00
parent 14604e0cba
commit b10c4f51b1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
restapi/config.go
View File

@@ -230,11 +230,14 @@ func getSecureExpectCTHeader() string {
} }
func getLogSearchAPIToken() string { func getLogSearchAPIToken() string {
if v := env.Get(ConsoleLogQueryAuthToken, ""); v != "" {
return v
}
return env.Get(LogSearchQueryAuthToken, "") return env.Get(LogSearchQueryAuthToken, "")
} }
func getLogSearchURL() string { func getLogSearchURL() string {
return env.Get(LogSearchURL, "http://localhost:8080") return env.Get(ConsoleLogQueryURL, "http://localhost:8080")
} }
func getPrometheusURL() string { func getPrometheusURL() string {

3
restapi/consts.go
View File

@@ -50,9 +50,10 @@ const (
ConsoleSecureExpectCTHeader = "CONSOLE_SECURE_EXPECT_CT_HEADER" ConsoleSecureExpectCTHeader = "CONSOLE_SECURE_EXPECT_CT_HEADER"
ConsoleOperatorSAToken = "CONSOLE_OPERATOR_SA_TOKEN" ConsoleOperatorSAToken = "CONSOLE_OPERATOR_SA_TOKEN"
ConsoleOperatorConsoleImage = "CONSOLE_OPERATOR_CONSOLE_IMAGE" ConsoleOperatorConsoleImage = "CONSOLE_OPERATOR_CONSOLE_IMAGE"
LogSearchURL = "CONSOLE_LOG_QUERY_URL"
PrometheusURL = "CONSOLE_PROMETHEUS_URL" PrometheusURL = "CONSOLE_PROMETHEUS_URL"
PrometheusJobID = "CONSOLE_PROMETHEUS_JOB_ID" PrometheusJobID = "CONSOLE_PROMETHEUS_JOB_ID"
ConsoleLogQueryURL = "CONSOLE_LOG_QUERY_URL"
ConsoleLogQueryAuthToken = "CONSOLE_LOG_QUERY_AUTH_TOKEN"
LogSearchQueryAuthToken = "LOGSEARCH_QUERY_AUTH_TOKEN" LogSearchQueryAuthToken = "LOGSEARCH_QUERY_AUTH_TOKEN"
// Constants for prometheus annotations // Constants for prometheus annotations