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.

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

Jump to bottom

fix(ui/blocks): fixing overlapping blocks for undefined poolArrays #7242

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

fix(ui/blocks): fixing overlapping blocks for undefined poolArrays #7242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4075933
fix(ui/blocks): fixing overlapping blocks for empty poolArrays
outofrange Mar 28, 2024
6a3796d
docs(changelog): added changelog for #7242
outofrange Mar 28, 2024
9601582
build(ui): rebuild react app
outofrange Mar 28, 2024
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
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 :warning:* to mark changes that are not backward compatible (re
- [#7122](https://github.com/thanos-io/thanos/pull/7122) Store Gateway: Fix lazy expanded postings estimate base cardinality using posting group with remove keys.
- [#7224](https://github.com/thanos-io/thanos/pull/7224) Query-frontend: Add Redis username to the client configuration.
- [#7220](https://github.com/thanos-io/thanos/pull/7220) Store Gateway: Fix lazy expanded postings caching partial expanded postings and bug of estimating remove postings with non existent value. Added `PromQLSmith` based fuzz test to improve correctness.
- [#7242](https://github.com/thanos-io/thanos/pull/7242): UI: Fixing error when showing overlapping blocks

### Added

Expand Down
2 changes: 1 addition & 1 deletion pkg/ui/react-app/src/thanos/pages/blocks/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export const getFilteredBlockPools = (
const poolArrayIndex = blockPools[key];
const poolArray = poolArrayIndex[Object.keys(poolArrayIndex)[0]];
for (let i = 0; i < filteredBlocks.length; i++) {
if (JSON.stringify(filteredBlocks[i].thanos.labels) === JSON.stringify(poolArray[0][0].thanos.labels)) {
if (JSON.stringify(filteredBlocks[i]?.thanos.labels) === JSON.stringify(poolArray[0][0]?.thanos.labels)) {
Object.assign(newblockPools, { [key]: blockPools[key] });
break;
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/ui/static/react/asset-manifest.json
View file
Open in desktop
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.f9e9438f.js",
"main.js": "./static/js/main.dee298d6.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.f9e9438f.js.map": "./static/js/main.f9e9438f.js.map"
"main.dee298d6.js.map": "./static/js/main.dee298d6.js.map"
},
"entrypoints": [
"static/css/main.5a4981c4.css",
"static/js/main.f9e9438f.js"
"static/js/main.dee298d6.js"
]
}
2 changes: 1 addition & 1 deletion pkg/ui/static/react/index.html
View file
Open in desktop
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 }}",THANOS_TENANT_HEADER="{{ .tenantHeader }}",THANOS_DEFAULT_TENANT="{{ .defaultTenant }}",THANOS_DISPLAY_TENANT_BOX="{{ .displayTenantBox }}"</script><link rel="manifest" href="./manifest.json"/><title>Thanos | Highly available Prometheus setup</title><script defer="defer" src="./static/js/main.f9e9438f.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 }}",THANOS_DISPLAY_TENANT_BOX="{{ .displayTenantBox }}"</script><link rel="manifest" href="./manifest.json"/><title>Thanos | Highly available Prometheus setup</title><script defer="defer" src="./static/js/main.dee298d6.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 ...i/static/react/static/js/main.f9e9438f.js → ...i/static/react/static/js/main.dee298d6.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...ct/static/js/main.f9e9438f.js.LICENSE.txt → ...ct/static/js/main.dee298d6.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...atic/react/static/js/main.f9e9438f.js.map → ...atic/react/static/js/main.dee298d6.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading