-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
Query UI: Add tenant box #6867
Merged
+87
−20
Merged
Query UI: Add tenant box #6867
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
2562f1b
Query UI: Add tenant box
jacobbaungard dc536e4
Re-compile static react app
jacobbaungard d0e669e
Merge branch 'upstream/main' into tenant-ui-box
jacobbaungard 1925e72
Merge branch 'upstream/main' into tenant-ui-box
jacobbaungard 11ed083
Merge 'upstream/main' into tenant-ui-box
jacobbaungard 1e81a8d
Move changelog item to appropiate future release
jacobbaungard f21e51b
Move query path tenancy proposal to done
jacobbaungard File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,18 @@ | ||
declare const THANOS_QUERY_URL: string; | ||
declare const THANOS_TENANT_HEADER: string; | ||
declare const THANOS_DEFAULT_TENANT: string; | ||
|
||
export let queryURL = THANOS_QUERY_URL; | ||
if (queryURL === '' || queryURL === '{{ .queryURL }}') { | ||
queryURL = 'http://localhost:10902'; | ||
} | ||
|
||
export let defaultTenant = THANOS_DEFAULT_TENANT; | ||
if (defaultTenant === '' || defaultTenant === '{{ .defaultTenant }}') { | ||
defaultTenant = 'default-tenant'; | ||
} | ||
|
||
export let tenantHeader = THANOS_TENANT_HEADER; | ||
if (tenantHeader === '' || tenantHeader === '{{ .tenantHeader }}') { | ||
tenantHeader = 'thanos-tenant'; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
{ | ||
"files": { | ||
"main.css": "./static/css/main.5a4981c4.css", | ||
"main.js": "./static/js/main.f33bee70.js", | ||
"main.js": "./static/js/main.1da5c0bf.js", | ||
"static/media/codicon.ttf": "./static/media/codicon.b3726f0165bf67ac6849.ttf", | ||
"index.html": "./index.html", | ||
"static/media/index.cjs": "./static/media/index.cd351d7c31d0d3fccf96.cjs", | ||
"main.5a4981c4.css.map": "./static/css/main.5a4981c4.css.map", | ||
"main.f33bee70.js.map": "./static/js/main.f33bee70.js.map" | ||
"main.1da5c0bf.js.map": "./static/js/main.1da5c0bf.js.map" | ||
}, | ||
"entrypoints": [ | ||
"static/css/main.5a4981c4.css", | ||
"static/js/main.f33bee70.js" | ||
"static/js/main.1da5c0bf.js" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><script>const GLOBAL_PATH_PREFIX="{{ pathPrefix }}"</script><script>const THANOS_COMPONENT="{{ .Component }}",THANOS_QUERY_URL="{{ .queryURL }}"</script><link rel="manifest" href="./manifest.json"/><title>Thanos | Highly available Prometheus setup</title><script defer="defer" src="./static/js/main.f33bee70.js"></script><link href="./static/css/main.5a4981c4.css" rel="stylesheet"></head><body class="bootstrap"><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html> | ||
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><script>const GLOBAL_PATH_PREFIX="{{ pathPrefix }}"</script><script>const THANOS_COMPONENT="{{ .Component }}",THANOS_QUERY_URL="{{ .queryURL }}",THANOS_TENANT_HEADER="{{ .tenantHeader }}",THANOS_DEFAULT_TENANT="{{ .defaultTenant }}"</script><link rel="manifest" href="./manifest.json"/><title>Thanos | Highly available Prometheus setup</title><script defer="defer" src="./static/js/main.1da5c0bf.js"></script><link href="./static/css/main.5a4981c4.css" rel="stylesheet"></head><body class="bootstrap"><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html> |
6 changes: 3 additions & 3 deletions
6
...i/static/react/static/js/main.f33bee70.js → ...i/static/react/static/js/main.1da5c0bf.js
Large diffs are not rendered by default.
Oops, something went wrong.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...atic/react/static/js/main.f33bee70.js.map → ...atic/react/static/js/main.1da5c0bf.js.map
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need any validation for the tenant value? Or we want to rely on Thanos backend to do it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's currently just the following validation in the backend:
thanos/pkg/tenancy/tenancy.go
Line 38 in ec6b8b6
I'm not sure if it makes sense to do any more format validation of the tenant? For receive this is also the only thing we have in place.