Skip to content

Commit

Permalink
Backport 1.1.0.0 changes from main to 1.1 (#145)
Browse files Browse the repository at this point in the history
* Release note for 1.1.0.0 release. (#139)

* Release note for 1.1.0.0 release.

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Correct copyright notices

* License header check (#142)

* Provide default copyright header using IDE feature

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Address #103

history write index is rolled over even if the history indices are
disabled

* Update 1.1.0.0 release note

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
  • Loading branch information
bowenlan-amzn authored Sep 10, 2021
1 parent 9450269 commit 1ec0bc6
Show file tree
Hide file tree
Showing 13 changed files with 76 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*Description of changes:*

*CheckList:*
[ ] Commits are signed per the DCO using --signoff
- [ ] Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check [here](https://github.com/opensearch-project/index-management/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).
4 changes: 2 additions & 2 deletions .github/draft-release-notes-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ replacers:
- search: '##'
replace: '###'

# Organizing the tagged PRs into unified ODFE categories
# Organizing the tagged PRs into unified OpenSearch categories
categories:
- title: 'Breaking changes'
labels:
Expand Down Expand Up @@ -45,4 +45,4 @@ categories:
- 'backwards-compatibility'
- title: 'Refactoring'
labels:
- 'Refactor'
- 'refactor'
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
.gradle/
build/
out/
.idea/
.idea/*
!.idea/copyright
*.ipr
*.iws
.DS_Store
Expand Down
6 changes: 6 additions & 0 deletions .idea/copyright/OpenSearch.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 2 additions & 12 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,12 +1,2 @@
OpenSearch
Copyright 2021 OpenSearch Contributors

This product includes software developed by
Elasticsearch (http://www.elastic.co).
Copyright 2009-2018 Elasticsearch

This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).

This product includes software developed by
Joda.org (http://www.joda.org/).
OpenSearch (https://opensearch.org/)
Copyright OpenSearch Contributors
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ This project is licensed under the [Apache v2.0 License](./LICENSE)

## Copyright

Copyright 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Copyright OpenSearch Contributors. See [NOTICE](NOTICE) for details.
5 changes: 5 additions & 0 deletions build-tools/coverage.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

/*
* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
Expand Down
5 changes: 5 additions & 0 deletions build-tools/pkgbuild.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

/*
* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
Expand Down
27 changes: 27 additions & 0 deletions release-notes/opensearch-index-management.release-notes-1.1.0.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
## Version 1.1.0.0 2021-09-03

Compatible with OpenSearch 1.1.0

### Infrastructure

* Upgrade dependencies to 1.1 and build snapshot by default. ([#121](https://github.com/opensearch-project/index-management/pull/121))

### Features

* Storing user information as part of the job when security plugin is installed ([#113](https://github.com/opensearch-project/index-management/pull/113))
* Storing user object in all APIs and enabling filter of response based on user ([#115](https://github.com/opensearch-project/index-management/pull/115))
* Security improvements ([#126](https://github.com/opensearch-project/index-management/pull/126))
* Updating security filtering logic ([#137](https://github.com/opensearch-project/index-management/pull/137))

### Enhancements

* Enhance ISM template ([#105](https://github.com/opensearch-project/index-management/pull/105))

### Bug Fixes

* Removing Usages of Action Get Call and using listeners ([#100](https://github.com/opensearch-project/index-management/pull/100))
* Explain response still use old opendistro policy id ([#109](https://github.com/opensearch-project/index-management/pull/109))
* Only rollover history index onMaster if enabled ([#142](https://github.com/opensearch-project/index-management/pull/142))

### Maintenance
* License header check ([#142](https://github.com/opensearch-project/index-management/pull/142))
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class IndexStateManagementHistory(
override fun onMaster() {
try {
// try to rollover immediately as we might be restarting the cluster
rolloverHistoryIndex()
if (historyEnabled) rolloverHistoryIndex()
// schedule the next rollover for approx MAX_AGE later
scheduledRollover = threadPool.scheduleWithFixedDelay(
{ rolloverAndDeleteHistoryIndex() },
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

package org.opensearch.indexmanagement.util;

/*
* Need to have a java file, so licenseHeaders task can function
*/
public class DummyFileForLicenseCheck {
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

/*
* Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
Expand Down

0 comments on commit 1ec0bc6

Please sign in to comment.