Skip to content

query: Fix external prefix and add an e2e test for it #2800

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.

Sign up for GitHub

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

Merged
GiedriusS merged 12 commits into from
Jul 2, 2020
Merged

query: Fix external prefix and add an e2e test for it #2800

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fb86080
query: e2e: Test --web.external-prefix
onprem Jun 24, 2020
f5bff42
query: e2e: Test both routePrefix and externalPrefix used simultaneously
onprem Jun 24, 2020
09c22f0
query: ui: Fix external prefix handling in UI
onprem Jun 27, 2020
c479438
Merge branch 'master' into test-external-prefix
onprem Jun 27, 2020
3559fcb
ui: handle web.external-prefix in React UI
onprem Jun 27, 2020
fe380e1
e2e: query: Fix e2e externalPrefix tests
onprem Jun 27, 2020
1113fac
Add changelog and regenerated docs
onprem Jun 27, 2020
eb4dff8
query: e2e: close httptest server after test completes
onprem Jun 30, 2020
9cb5eb8
Merge branch 'master' into test-external-prefix
onprem Jun 30, 2020
cbb85e7
Make changes according to Giedrius' suggestions
onprem Jun 30, 2020
d0ad77c
ui: Fix react development build erroring out
onprem Jul 2, 2020
577fb16
Make changes according to Lucas' suggestions
onprem Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add changelog and regenerated docs 
Signed-off-by: Prem Kumar <prmsrswt@gmail.com>
  • Loading branch information
@onprem
onprem committed Jun 27, 2020
commit 1113fac657c7227ff6a1f474e9f2d4ec2f6335fb
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel
- [#2728](https://github.com/thanos-io/thanos/pull/2728) Query: Fixed panics when using larger number of replica labels with short series label sets.
- [#2787](https://github.com/thanos-io/thanos/pull/2787) Update Prometheus mod to pull in prometheus/prometheus#7414.
- [#2807](https://github.com/thanos-io/thanos/pull/2807) Store: decreased memory allocations while querying block's index.
- [#2800](https://github.com/thanos-io/thanos/pull/2800) Query: Fix handling of `--web.external-prefix` and `--web.route-prefix`

### Changed

Expand Down
3 changes: 2 additions & 1 deletion docs/components/query.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,8 @@ Flags:
returned gRPC certificates. See
https://tools.ietf.org/html/rfc4366#section-3.1
--web.route-prefix="" Prefix for API and UI endpoints. This allows
thanos UI to be served on a sub-path. This
thanos UI to be served on a sub-path. Defaults
to the value of --web.external-prefix. This
option is analogous to --web.route-prefix of
Promethus.
--web.external-prefix="" Static prefix for all HTML links and redirect
Expand Down