From 3d152015ebcabfb38244e1dbacfa9bf49f8ffa12 Mon Sep 17 00:00:00 2001 From: Ramon de Klein Date: Sat, 21 Sep 2024 03:18:54 +0200 Subject: [PATCH] Use MinIO console v1.7.1 (#20465) --- cmd/common-main.go | 3 +++ go.mod | 6 +++--- go.sum | 12 ++++++------ internal/config/constants.go | 1 + 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/cmd/common-main.go b/cmd/common-main.go index c9f709fa3..0670b5de0 100644 --- a/cmd/common-main.go +++ b/cmd/common-main.go @@ -138,6 +138,9 @@ func minioConfigToConsoleFeatures() { if value := env.Get(config.EnvBrowserRedirectURL, ""); value != "" { os.Setenv("CONSOLE_BROWSER_REDIRECT_URL", value) } + if value := env.Get(config.EnvConsoleDebugLogLevel, ""); value != "" { + os.Setenv("CONSOLE_DEBUG_LOGLEVEL", value) + } // pass the console subpath configuration if globalBrowserRedirectURL != nil { subPath := path.Clean(pathJoin(strings.TrimSpace(globalBrowserRedirectURL.Path), SlashSeparator)) diff --git a/go.mod b/go.mod index 32e33191f..d20c8c928 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( github.com/lithammer/shortuuid/v4 v4.0.0 github.com/miekg/dns v1.1.62 github.com/minio/cli v1.24.2 - github.com/minio/console v1.7.1-0.20240817215248-0b07cb38850f + github.com/minio/console v1.7.1 github.com/minio/csvparser v1.0.0 github.com/minio/dnscache v0.1.1 github.com/minio/dperf v0.5.3 @@ -73,7 +73,7 @@ require ( github.com/pkg/xattr v0.4.10 github.com/prometheus/client_golang v1.20.2 github.com/prometheus/client_model v0.6.1 - github.com/prometheus/common v0.55.0 + github.com/prometheus/common v0.58.0 github.com/prometheus/procfs v0.15.1 github.com/puzpuzpuz/xsync/v3 v3.4.0 github.com/rabbitmq/amqp091-go v1.10.0 @@ -221,7 +221,7 @@ require ( github.com/posener/complete v1.2.3 // indirect github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/prometheus/prom2json v1.4.0 // indirect - github.com/prometheus/prometheus v0.54.0 // indirect + github.com/prometheus/prometheus v0.54.1 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/rjeczalik/notify v0.9.3 // indirect github.com/rs/xid v1.6.0 // indirect diff --git a/go.sum b/go.sum index 7dc1a77bb..7729c2809 100644 --- a/go.sum +++ b/go.sum @@ -409,8 +409,8 @@ github.com/minio/cli v1.24.2 h1:J+fCUh9mhPLjN3Lj/YhklXvxj8mnyE/D6FpFduXJ2jg= github.com/minio/cli v1.24.2/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXhOY= github.com/minio/colorjson v1.0.8 h1:AS6gEQ1dTRYHmC4xuoodPDRILHP/9Wz5wYUGDQfPLpg= github.com/minio/colorjson v1.0.8/go.mod h1:wrs39G/4kqNlGjwqHvPlAnXuc2tlPszo6JKdSBCLN8w= -github.com/minio/console v1.7.1-0.20240817215248-0b07cb38850f h1:+nfGhuHtHRwQgHK/C2t44knNMyJ3upwouwIR+hUz7Ts= -github.com/minio/console v1.7.1-0.20240817215248-0b07cb38850f/go.mod h1:XOmAKeIFM3RbWMc6n7neBUzXboF8Xd6HkZw4FH2QrWo= +github.com/minio/console v1.7.1 h1:QsB0rdcLIqywtuHADoAv6UWQS7nQqjKo/dxKz6bPDw8= +github.com/minio/console v1.7.1/go.mod h1:hv9glXg8zSAn29PddPf5KAn5rl9GWIoZMIghadJEl90= github.com/minio/csvparser v1.0.0 h1:xJEHcYK8ZAjeW4hNV9Zu30u+/2o4UyPnYgyjWp8b7ZU= github.com/minio/csvparser v1.0.0/go.mod h1:lKXskSLzPgC5WQyzP7maKH7Sl1cqvANXo9YCto8zbtM= github.com/minio/dnscache v0.1.1 h1:AMYLqomzskpORiUA1ciN9k7bZT1oB3YZN4cEIi88W5o= @@ -540,16 +540,16 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= -github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.58.0 h1:N+N8vY4/23r6iYfD3UQZUoJPnUYAo7v6LG5XZxjZTXo= +github.com/prometheus/common v0.58.0/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/prometheus/prom2json v1.4.0 h1:2AEOsd1ebqql/p9u0IWgCpUAteAAf9Lnf/SVyieqer4= github.com/prometheus/prom2json v1.4.0/go.mod h1:DmcIMPspQD/fMyFCYti5qJJbuEnqDh3DGoooO0sgr4w= -github.com/prometheus/prometheus v0.54.0 h1:6+VmEkohHcofl3W5LyRlhw1Lfm575w/aX6ZFyVAmzM0= -github.com/prometheus/prometheus v0.54.0/go.mod h1:xlLByHhk2g3ycakQGrMaU8K7OySZx98BzeCR99991NY= +github.com/prometheus/prometheus v0.54.1 h1:vKuwQNjnYN2/mDoWfHXDhAsz/68q/dQDb+YbcEqU7MQ= +github.com/prometheus/prometheus v0.54.1/go.mod h1:xlLByHhk2g3ycakQGrMaU8K7OySZx98BzeCR99991NY= github.com/puzpuzpuz/xsync/v3 v3.4.0 h1:DuVBAdXuGFHv8adVXjWWZ63pJq+NRXOWVXlKDBZ+mJ4= github.com/puzpuzpuz/xsync/v3 v3.4.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA= github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw= diff --git a/internal/config/constants.go b/internal/config/constants.go index 0dc0f8343..bd00ae347 100644 --- a/internal/config/constants.go +++ b/internal/config/constants.go @@ -75,6 +75,7 @@ const ( EnvMinIOPrometheusJobID = "MINIO_PROMETHEUS_JOB_ID" EnvMinIOPrometheusExtraLabels = "MINIO_PROMETHEUS_EXTRA_LABELS" EnvMinIOPrometheusAuthToken = "MINIO_PROMETHEUS_AUTH_TOKEN" + EnvConsoleDebugLogLevel = "MINIO_CONSOLE_DEBUG_LOGLEVEL" EnvUpdate = "MINIO_UPDATE"