Bucket Web UI: Added web.external-prefix to Bucket Web UI #3251
Conversation
Signed-off-by: aribalam <[email protected]>
Signed-off-by: aribalam <[email protected]>
Signed-off-by: aribalam <[email protected]>
|
@prmsrswt Done! Wish there was some kind of auto-commit for that! :') |
Signed-off-by: aribalam <[email protected]>
| @@ -347,6 +347,10 @@ func registerBucketWeb(app extkingpin.AppClause, objStoreConfig *extflag.PathOrC | |||
| router := route.New() | |||
| ins := extpromhttp.NewInstrumentationMiddleware(reg) | |||
|
|
|||
| if *webExternalPrefix != "" { | |||
| router = router.WithPrefix("/" + strings.Trim(*webExternalPrefix, "/")) | |||
There was a problem hiding this comment.
This is not what external-prefix is used for. This is what route-prefix is for. The default value of route-prefix is equal to external-prefix though. Take a look at how it is handled in query.go.
There was a problem hiding this comment.
The issue is that the bucket web currently does not pick up route-prefix through cmd flags. Therefore the router is not getting prefixed before creating the UI paths, as is happening in query.go. I am not sure whether bucket web should support route-prefix as it was not mentioned in the docs. If it should, then I could add code for picking route-prefix through cmd flags then proceed similar to query.go.
|
Is this still relevant? If so, what is blocking it? Is there anything you can do to help move it forward? This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. |
Changes
Fixes #3211
The router was not prefixed with the
webExternalPrefixstring before the routes for the Bucket Web UI was created. Moreover, thebucket-menu.htmltemplate was missing thepathPrefixin the link to new UI.The question remains, as to the Bucket Web UI should also support the
web.route-prefixflag?Also, the code for handling external prefixes and route prefix were becoming sort of repeating, with the same thing happening in querier too. Maybe we could create a function to the Base UI to automatically attach the required prefixes to the router.
@prmsrswt @bwplotka Any thoughts?
Verification
Started Bucket Web UI with
--web.external-prefix=thanos/bucket. All links and assets were working fine.