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

[Bugfix] filter data streams from rollover alias requirement #429

Merged
merged 63 commits into from
Dec 3, 2022
Merged
Show file tree
Hide file tree
Changes from 62 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
ede3cb1
Change alignment of Snapshot Management panels in pages/Main/Main.tsx
phestecAMZN Aug 24, 2022
a5fa7fb
Unify vertical button alignment across panels, ContentPanel.tsx
phestecAMZN Aug 24, 2022
6145593
Update jest snapshots, add ROUTE_STYLE variable
phestecAMZN Aug 24, 2022
f86a83f
Add placeholder restore button to Snapshots panel
phestecAMZN Aug 24, 2022
7a5545c
Merge branch 'opensearch-project:main' into main
phestecAMZN Aug 26, 2022
8001349
Comment out line 20 rollups_spec.js in cypress/integration/
phestecAMZN Aug 26, 2022
f27c4e4
Remove unused code and comment cypress/integration/rollups_spec.js
phestecAMZN Aug 26, 2022
cf0917a
Merge branch 'opensearch-project:main' into main
phestecAMZN Sep 1, 2022
391159f
Starting adaptation/use of existing code for Restore functionality
phestecAMZN Aug 29, 2022
983ed48
Adapt Snapshots.tsx to include RestoreSnapshotFlyout
phestecAMZN Aug 29, 2022
3558936
Add restoreSnapshot method to SMservice,RestoreSnapshotResponse int
phestecAMZN Aug 29, 2022
b3141bd
Implement RestoreSnapshotFlyout open/close
phestecAMZN Aug 29, 2022
7bfdb86
Make Snapshot name appear on RestoreSnapshotFlyout
phestecAMZN Aug 29, 2022
845cca2
Add/adapt restoreSnapshot to server/SnapshotManagementService
phestecAMZN Aug 29, 2022
703d93b
Add route for restoreSnapshot in server/routes.ts
phestecAMZN Aug 29, 2022
78095b7
Rudimentary restore from snapshot functionality reached, buggy
phestecAMZN Aug 29, 2022
e16528b
Fix index list-snapshot restore, restrict restore to single selection
phestecAMZN Aug 29, 2022
75e1dfe
Remove console.logs, commented out code
phestecAMZN Sep 6, 2022
02d651c
Create Advanced options accordion for Snapshot restore.
phestecAMZN Aug 30, 2022
bf4a4a5
Add initial restore/rename options to ui. Only visual functionality
phestecAMZN Aug 30, 2022
e8e46ea
Resolve radio button events not firing
phestecAMZN Aug 31, 2022
5cd9afc
Add AddPrefixInput, remove unused component RestoreSnapshotInitialOpt…
phestecAMZN Sep 1, 2022
a80656f
Fix issues with restore specific indices
phestecAMZN Sep 1, 2022
aa46d71
Begin cypress testing for snapshots
phestecAMZN Sep 1, 2022
3cf3711
Begin cypress testing Snapshots. Create repo and Create snapshot done
phestecAMZN Sep 2, 2022
b9ad019
Implement add_prefix functionality for snapshot restore
phestecAMZN Sep 2, 2022
fdfb43a
Implement rename indices option for restore snapshot
phestecAMZN Sep 2, 2022
5af4208
Remove console.logs, unusted variables in SnapshotFlyout, SMservice
phestecAMZN Sep 5, 2022
5cf239f
Add full stop to help text/errors, add RESTORE_OPTIONS enum
phestecAMZN Sep 7, 2022
2637b33
Merge branch 'opensearch-project:main' into main
phestecAMZN Sep 10, 2022
fd77a64
Add back line 20 in rollups_spec, required by changes in 2.3 release.
phestecAMZN Sep 12, 2022
fb7f19e
Remove unused getRepos func, add repo prop, trim state in RestoreFlyout
phestecAMZN Sep 15, 2022
f553dbe
Add increment to 2.3.0
phestecAMZN Sep 15, 2022
653fc0d
Merge branch 'opensearch-project:main' into main
phestecAMZN Sep 16, 2022
2ba8b71
Merge branch 'main' of github.com:phestecAMZN/index-management-dashbo…
phestecAMZN Oct 4, 2022
b2f9132
Version bump 2.3.0 to 2.3 1
phestecAMZN Oct 4, 2022
98cc0ee
Add version bump 2.3.1 for OS in cypress-workflow.yml
phestecAMZN Oct 4, 2022
9315502
Remove 2.3.1 bump
phestecAMZN Oct 5, 2022
6609e8d
Merge branch 'main' of github.com:phestecAMZN/index-management-dashbo…
phestecAMZN Oct 6, 2022
20e8c9e
Merge branch 'main' of github.com:phestecAMZN/index-management-dashbo…
phestecAMZN Oct 17, 2022
762c60d
Change 2.4 to 2.4.0 opensearch_dashboards.json
phestecAMZN Oct 17, 2022
c13a1d0
Merge branch 'main' of github.com:phestecAMZN/index-management-dashbo…
phestecAMZN Oct 18, 2022
4fdab67
Merge branch 'main' of github.com:phestecAMZN/index-management-dashbo…
phestecAMZN Oct 21, 2022
bad73ce
Merge branch 'main' of github.com:phestecAMZN/index-management-dashbo…
phestecAMZN Oct 26, 2022
3711075
Merge branch 'main' of github.com:phestecAMZN/index-management-dashbo…
phestecAMZN Nov 2, 2022
a29a558
Merge branch 'main' of github.com:phestecAMZN/index-management-dashbo…
phestecAMZN Nov 3, 2022
5e913a0
Merge branch 'main' of github.com:phestecAMZN/index-management-dashbo…
phestecAMZN Nov 7, 2022
edc71ac
Update package.json, opensearch-dashboards.json
phestecAMZN Nov 7, 2022
8c47b5f
Merge branch 'main' of github.com:phestecAMZN/index-management-dashbo…
phestecAMZN Nov 17, 2022
c7f18b7
Update package.json, opensearch_dashboards.json
phestecAMZN Nov 17, 2022
2f78649
Update OSD to 2.4.1, update loader-utils, ts-loader, webpack
phestecAMZN Nov 17, 2022
9a367f7
Merge branch 'main' of github.com:phestecAMZN/index-management-dashbo…
phestecAMZN Nov 29, 2022
2714dd2
Merge branch 'main' of github.com:phestecAMZN/index-management-dashbo…
phestecAMZN Nov 30, 2022
f77922b
Backport to 1.x
phestecAMZN Dec 1, 2022
1591ecd
Revert "Backport to 1.x", backport failed
phestecAMZN Dec 2, 2022
ecb3f46
Implement check for singleIndex/datastream to address alias requirement
phestecAMZN Dec 2, 2022
5b52f5f
Run version sync, adj. OSDB versions in workflows
phestecAMZN Dec 2, 2022
8faf23a
Set OSDB version to 2.4 in workflows
phestecAMZN Dec 2, 2022
925dd80
Version bump to 2.4.1 to keep it working
phestecAMZN Dec 2, 2022
c3c3ec7
Remove unintended dependency bumps
phestecAMZN Dec 2, 2022
2b70436
Implement fix to exempt data streams from rollover alias requirement
phestecAMZN Dec 2, 2022
7bf92e2
Fresh bootstrap to update yarn lock
phestecAMZN Dec 2, 2022
6e3d463
Merge branch 'opensearch-project:main' into ticketFix2
phestecAMZN Dec 3, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/cypress-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches:
- "*"
env:
OPENSEARCH_DASHBOARDS_VERSION: '2.4.0'
OPENSEARCH_DASHBOARDS_VERSION: '2.4'
OPENSEARCH_VERSION: '2.4.0-SNAPSHOT'
jobs:
tests:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches:
- "*"
env:
OPENSEARCH_DASHBOARDS_VERSION: '2.4.0'
OPENSEARCH_DASHBOARDS_VERSION: '2.4'
jobs:
tests:
name: Run unit tests
Expand Down
4 changes: 2 additions & 2 deletions opensearch_dashboards.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "indexManagementDashboards",
"version": "2.4.0.0",
"opensearchDashboardsVersion": "2.4.0",
"version": "2.4.1",
"opensearchDashboardsVersion": "2.4.1",
"configPath": ["opensearch_index_management"],
"requiredPlugins": ["navigation"],
"server": true,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "opensearch_index_management_dashboards",
"version": "2.4.0",
"version": "2.4.1",
"description": "Opensearch Dashboards plugin for Index Management",
"main": "index.js",
"license": "Apache-2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,9 @@ export default class ApplyPolicyModal extends Component<ApplyPolicyModalProps, A
getRolloverAliasError = (rolloverAlias: string): string => {
const { hasRolloverAction } = this.state;
const { indices } = this.props;
const isDataStream = indices[0].includes(".ds");
const hasSingleIndexSelected = indices.length === 1;
const requiresAlias = hasRolloverAction && hasSingleIndexSelected;
const requiresAlias = hasRolloverAction && hasSingleIndexSelected && !isDataStream;
const hasAliasError = requiresAlias && !rolloverAlias;
return hasAliasError ? "Required" : "";
};
Expand Down
Loading