Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Merge from master to 1.10 release #181

Merged
merged 67 commits into from
Aug 24, 2020
Merged

Conversation

sruti1312
Copy link
Contributor

Fixes #, if available:
Merge from master to 1.10 release

Description of changes:

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

ktkrg and others added 30 commits July 24, 2019 16:44
Merging OpenDistro-1.2 into master
Merge fixes from OD-1.1 branch
This commit has 3 major changes -

1) Performance Analyzer code that is Elasticsearch version independent.
3) Performance optimization in the Elasticsearch plugin to emit events
   to a single event log file. This brings down CPU utilization by
   an order of magnitude on large clusters.
Update Performance Analyzer to support ElasticSearch version 7.3.2
…en in the split version of PA.

Features and fixes introduced in this PR:

    Allow performance analyzer to be en(dis)abled through a cluster setting across the cluster.
    Allow logging to be controllable through the cluster setting
    Capture a node's role along with the host address and the node name
    Checkstyle compliance

Some issues that are still not addressed in this PR:

    Update build scripts to start the agent from the reader location instead of the plugin location
    Remove pa_config, pa_bin and other folders that are already present in the reader
Remove NewFormatProcessorTest class which is not used.
Make the unit test backward compatible with the _cat/master fix
* Create gradle.yml

* Update gradle.yml

* Update gradle.yml
* add cd.yml

* upgrade ospackage version to 8.2.0

* change s3

* update cd.yml
* Making sure that we don't throw exceptions while intercepting ES requests

PerformanceAnalyzer intercepts various ES request paths toget detailed metrics. But today if we throw an exception, then it will bubble all the way upto ES and fail the request.

* Addressing the PR comments

* Updating the .gitignore

* style changes
* Adding Shard Size Metric as a part of Node Stats

* removing the -i flag

* fix a bug in StatsTests.java (#97)

* Update CONTRIBUTORS.md

* Update CONTRIBUTORS.md

* Adressing Typos

Co-authored-by: Aditya Jindal <[email protected]>
Co-authored-by: Joydeep Sinha <[email protected]>
Co-authored-by: Ruizhen Guo <[email protected]>
Co-authored-by: Balaji <[email protected]>
adityaj1107 and others added 16 commits August 3, 2020 16:10
Node Collector split is created based on the metrics which are required for all the shards on the node and other which can be collected on a few number of shards per iteration.

Built the Jar from this Patch and applied on the AES cluster. The Cache related metrics which should be collected for all the shards irrespective of the value of shardsPerCollection value are getting collected.

Tested with a zero value of this parameter (shardsPerCollection).
* Use the correct ctor for NodeDetailsCollector

* Check for null ConfigOverrides wrapper while appending timestamps
* Use the correct ctor for NodeDetailsCollector

* Check for null ConfigOverrides wrapper while appending timestamps

* Add unit test for null cluster setting for config overrides
* Fix invalid cluster state

* Address PR comments
# Conflicts:
#	.github/workflows/cd.yml
#	.github/workflows/gradle.yml
#	CONTRIBUTORS.md
#	build.gradle
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
#	licenses/commons-lang3-LICENSE.txt
#	licenses/commons-lang3-NOTICE.txt
#	licenses/sqlite-jdbc-LICENSE.txt
#	release-notes
#	src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/PerformanceAnalyzerPlugin.java
#	src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/collectors/NodeDetailsCollector.java
#	src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/collectors/NodeStatsMetricsCollector.java
#	src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/collectors/ThreadPoolMetricsCollector.java
#	src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/config/setting/ClusterSettingsManager.java
#	src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/config/setting/PerformanceAnalyzerClusterSettings.java
#	src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/config/setting/handler/PerformanceAnalyzerClusterSettingHandler.java
#	src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java
#	src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java
#	src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProvider.java
#	src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/http_action/whoami/WhoAmIAction.java
#	src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/util/Utils.java
#	src/test/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/PerformanceAnalyzerIT.java
#	src/test/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/collectors/JsonKeyTests.java
#	src/test/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/collectors/NodeStatsMetricsCollectorTests.java
#	src/test/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/config/PerformanceAnalyzerClusterSettingHandlerTest.java
#	src/test/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/hwnet/CollectMetricsTests.java
#	src/test/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/reader/AbstractReaderTests.java
@sruti1312 sruti1312 requested review from ktkrg and sidheart August 24, 2020 02:48
Base automatically changed from partsrut-opendistro-1.10 to opendistro-1.10 August 24, 2020 18:07
@sruti1312 sruti1312 requested review from khushbr and yojs August 24, 2020 18:40
Copy link
Contributor

@khushbr khushbr left a comment

Choose a reason for hiding this comment

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

LGTM! Thank you for making these changes.

Copy link
Contributor

@yojs yojs left a comment

Choose a reason for hiding this comment

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

Is it possible to have a test, that checks for the lib dependencies that we share with ES, we are using the same version ? Just to make sure, we don't upgrade libs and run into this in future ?

@sruti1312
Copy link
Contributor Author

Is it possible to have a test, that checks for the lib dependencies that we share with ES, we are using the same version ? Just to make sure, we don't upgrade libs and run into this in future ?

I ran onto this issue when testing with docker. Definitely adding a test around this is going to be helpful in the future. I will add them on subsequent PR.

Copy link
Contributor

@yojs yojs left a comment

Choose a reason for hiding this comment

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

We added some new files. Can we add a javadoc comment as why they were required ?

@sruti1312 sruti1312 merged commit cb5ed15 into opendistro-1.10 Aug 24, 2020
@sruti1312 sruti1312 deleted the partsrut-1.10-merge branch August 24, 2020 23:47
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.