Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix web.external-prefix 404s and add web.prefix-header for bucket web UI. #1770

Merged
merged 9 commits into from Nov 22, 2019

Conversation

cmanzi
Copy link
Contributor

@cmanzi cmanzi commented Nov 20, 2019

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

Using the following build: quay.io/thanos/thanos:master-2019-11-20-af2a342b, I encountered 404s on static resources when trying to run the bucket web UI behind a Nginx proxy.

  • This PR fixes that by ensuring that the UI is handled at the provided external path.
  • Added web.prefix-header to provide similar functionality available in the Query UI

Verification

I am running an internal build of this branch behind a Nginx proxy with no issues.

Fixes: #1349

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, Thanks!

@bwplotka bwplotka merged commit 8a8f576 into thanos-io:master Nov 22, 2019
IKSIN pushed a commit to monitoring-tools/thanos that referenced this pull request Nov 26, 2019
… UI. (thanos-io#1770)

* Add --web.prefix-header flag.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Resolve conflicts with upstream.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* More docs linting.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Remove extra flags.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Final docs lint.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Aleksey Sin <asin@ozon.ru>
IKSIN pushed a commit to monitoring-tools/thanos that referenced this pull request Nov 27, 2019
… UI. (thanos-io#1770)

* Add --web.prefix-header flag.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Resolve conflicts with upstream.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* More docs linting.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Remove extra flags.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Final docs lint.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Aleksey Sin <asin@ozon.ru>
IKSIN pushed a commit to monitoring-tools/thanos that referenced this pull request Nov 27, 2019
… UI. (thanos-io#1770)

* Add --web.prefix-header flag.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Resolve conflicts with upstream.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* More docs linting.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Remove extra flags.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Final docs lint.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Aleksey Sin <asin@ozon.ru>
IKSIN pushed a commit to monitoring-tools/thanos that referenced this pull request Nov 27, 2019
… UI. (thanos-io#1770)

* Add --web.prefix-header flag.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Resolve conflicts with upstream.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* More docs linting.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Remove extra flags.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Final docs lint.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Aleksey Sin <asin@ozon.ru>
IKSIN pushed a commit to monitoring-tools/thanos that referenced this pull request Nov 27, 2019
… UI. (thanos-io#1770)

* Add --web.prefix-header flag.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Resolve conflicts with upstream.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* More docs linting.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Remove extra flags.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Final docs lint.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Aleksey Sin <asin@ozon.ru>
IKSIN pushed a commit to monitoring-tools/thanos that referenced this pull request Nov 27, 2019
… UI. (thanos-io#1770)

* Add --web.prefix-header flag.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Resolve conflicts with upstream.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* More docs linting.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Remove extra flags.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Final docs lint.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Aleksey Sin <asin@ozon.ru>
IKSIN pushed a commit to monitoring-tools/thanos that referenced this pull request Nov 27, 2019
… UI. (thanos-io#1770)

* Add --web.prefix-header flag.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Resolve conflicts with upstream.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* More docs linting.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Remove extra flags.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Final docs lint.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Aleksey Sin <asin@ozon.ru>
IKSIN pushed a commit to monitoring-tools/thanos that referenced this pull request Nov 27, 2019
… UI. (thanos-io#1770)

* Add --web.prefix-header flag.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Resolve conflicts with upstream.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* More docs linting.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Remove extra flags.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Final docs lint.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Aleksey Sin <asin@ozon.ru>
IKSIN pushed a commit to monitoring-tools/thanos that referenced this pull request Nov 27, 2019
… UI. (thanos-io#1770)

* Add --web.prefix-header flag.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Resolve conflicts with upstream.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* More docs linting.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Remove extra flags.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Final docs lint.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Aleksey Sin <asin@ozon.ru>
IKSIN pushed a commit to monitoring-tools/thanos that referenced this pull request Nov 27, 2019
… UI. (thanos-io#1770)

* Add --web.prefix-header flag.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Resolve conflicts with upstream.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* More docs linting.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Remove extra flags.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Update changelog.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Lint docs.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>

* Final docs lint.

Signed-off-by: Christopher Manzi <chris.manzi@invitae.com>
Signed-off-by: Aleksey Sin <asin@ozon.ru>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bucket web view behind reverse proxy
2 participants