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

feat: add ioxQuery limits #6875

Merged
merged 6 commits into from
Apr 4, 2024
Merged

feat: add ioxQuery limits #6875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f55f3fc
feat: add ioxQuery limits
mhilton Mar 21, 2024
391d360
fix: move new limits to correct place in dialogue
mhilton Mar 21, 2024
926e5c4
chore: update openapi version
mhilton Mar 21, 2024
b795274
chore: update openapi version
mhilton Mar 21, 2024
8e60bd7
chore: update openapi sha
mhilton Mar 22, 2024
6bbdbe1
Merge remote-tracking branch 'origin/master' into mh-iox-query-limits
mhilton Apr 2, 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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"prettier:fix": "pretty-quick --config .prettierrc.json --write '{src,cypress}/**/*.{ts,tsx}'",
"tsc": "tsc -p ./tsconfig.json --noEmit --pretty --skipLibCheck",
"tsc:watch": "yarn tsc --watch",
"generate": "export SHA=96ac07e89b65d81b5f84ffbc7279e8bf36353ddb && export REMOTE=https://raw.githubusercontent.com/influxdata/openapi/${SHA}/ && yarn generate-meta",
"generate": "export SHA=9ca282867ee2b2766ea60f29cdbb9b0556361335 && export REMOTE=https://raw.githubusercontent.com/influxdata/openapi/${SHA}/ && yarn generate-meta",
"generate-local": "export REMOTE=../openapi/ && yarn generate-meta",
"generate-local-cloud": "export REMOTE=../openapi/ && yarn generate-meta-cloud",
"generate-meta": "if [ -z \"${CLOUD_URL}\" ]; then yarn generate-meta-oss; else yarn generate-meta-cloud; fi",
Expand Down Expand Up @@ -85,7 +85,7 @@
"@babel/preset-env": "^7.20.2",
"@babel/runtime": "^7.20.6",
"@cypress/skip-test": "^2.6.1",
"@influxdata/oats": "0.5.3",
"@influxdata/oats": "^0.7.0",
"@testing-library/dom": "^8.17.1",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.5",
Expand Down
22 changes: 22 additions & 0 deletions src/operator/OrgOverlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,28 @@ export const OrgOverlay: FC = () => {
</Grid.Column>
</Grid.Row>
)}
{limits?.ioxQuery && (
Copy link
Contributor

Choose a reason for hiding this comment

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

Seems like ioxQuery is defined under the type OrgLimits, but limits is a type of OperatorOrgLimits

Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is now resolved after influxdata/openapi#649

<Grid.Row>
<Grid.Column widthMD={Columns.Four}>
<Form.Label label="Partitions" />
<LimitsField
type={InputType.Number}
name="ioxQuery.partitions"
limits={limits}
onChangeLimits={setLimits}
/>
</Grid.Column>
<Grid.Column widthMD={Columns.Four}>
<Form.Label label="Parquet Files" />
<LimitsField
type={InputType.Number}
name="ioxQuery.parquetFiles"
limits={limits}
onChangeLimits={setLimits}
/>
</Grid.Column>
</Grid.Row>
)}
<Grid.Row>
<h4>Notification Rules</h4>
<Grid.Column widthMD={Columns.Four}>
Expand Down