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

Modify namespace from opendistro to opensearch #12

Merged
merged 2 commits into from
May 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
/.idea/
/build/
*.iml
licenses/performanceanalyzer-rca-1.3.jar.sha1s
licenses/performanceanalyzer-rca-*
licenses/*.sha1
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ This code of conduct applies to all spaces provided by the OpenSource project in

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported. [Contact us](mailto:[email protected]). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.

In the event of conflict, this **Code of Conduct** supercedes the original [Code of Conduct](https://opendistro.github.io/for-elasticsearch/codeofconduct.html) that this project had adopted.
In the event of conflict, this **Code of Conduct** supercedes the original [Code of Conduct](https://opensearch.org/codeofconduct.html) that this project had adopted.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Looking at the existing issues is a great way to find something to contribute on

## Code of Conduct

This project has adopted an [Open Source Code of Conduct](https://opendistro.github.io/for-elasticsearch/codeofconduct.html).
This project has adopted an [Open Source Code of Conduct](https://opensearch.org/codeofconduct.html).


## Security issue notifications
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![Java CI](https://github.com/opensearch-project/performance-analyzer/workflows/Java%20CI/badge.svg)](https://github.com/opensearch-project/performance-analyzer/actions?query=workflow%3A%22Java+CI%22)
[![CD](https://github.com/opensearch-project/performance-analyzer/workflows/CD/badge.svg)](https://github.com/opensearch-project/performance-analyzer/actions?query=workflow%3ACD)
[![codecov](https://codecov.io/gh/opensearch-project/performance-analyzer/branch/master/graph/badge.svg)](https://codecov.io/gh/opensearch-project/performance-analyzer)
[![Documentation](https://img.shields.io/badge/api-reference-blue.svg)](https://opendistro.github.io/for-elasticsearch-docs/docs/pa/)
[![Documentation](https://img.shields.io/badge/api-reference-blue.svg)](https://docs-beta.opensearch.org/docs/pa/)
[![Chat](https://img.shields.io/badge/chat-on%20forums-blue)](https://discuss.opendistrocommunity.dev/c/performance-analyzer/)
![PRs welcome!](https://img.shields.io/badge/PRs-welcome!-success)

Expand Down Expand Up @@ -82,11 +82,11 @@ See the [design doc](https://github.com/opensearch-project/performance-analyzer-

## Documentation

Please refer to the [technical documentation](https://opendistro.github.io/for-elasticsearch-docs/) for detailed information on installing and configuring Performance Analyzer.
Please refer to the [technical documentation](https://docs-beta.opensearch.org/) for detailed information on installing and configuring Performance Analyzer.

## Code of Conduct

This project has adopted an [Open Source Code of Conduct](https://opendistro.github.io/for-elasticsearch/codeofconduct.html).
This project has adopted an [Open Source Code of Conduct](https://opensearch.org/codeofconduct.html).


## Security issue notifications
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ loggerUsageCheck.enabled = false
opensearchplugin {
name 'opensearch-performance-analyzer'
description 'OpenSearch Performance Analyzer Plugin'
classname 'com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerPlugin'
classname 'org.opensearch.performanceanalyzer.PerformanceAnalyzerPlugin'
}

sourceCompatibility = 1.8
Expand Down Expand Up @@ -178,7 +178,7 @@ jacocoTestReport {
classDirectories.from = files(classDirectories.files.collect {
fileTree(dir: it,
include: [
'**/com/amazon/opendistro/opensearch/performanceanalyzer/**',
'**/org/opensearch/performanceanalyzer/**',
],
exclude: [
'**/FaultDetectionMetricsCollector.class',
Expand All @@ -195,7 +195,7 @@ jacocoTestCoverageVerification {
classDirectories.from = files(classDirectories.files.collect {
fileTree(dir: it,
include: [
'**/com/amazon/opendistro/opensearch/performanceanalyzer/**',
'**/org/opensearch/performanceanalyzer/**',
],
exclude: [
])
Expand Down Expand Up @@ -485,7 +485,7 @@ afterEvaluate {
url 'https://opendistro.github.io/for-elasticsearch/downloads.html'
summary '''
Performance Analyzer plugin for OpenSearch.
Reference documentation can be found at https://opendistro.github.io/for-elasticsearch-docs/.
Reference documentation can be found at https://docs-beta.opensearch.org/.
'''.stripIndent().replace('\n', ' ').trim()
}

Expand Down
2 changes: 1 addition & 1 deletion checkstyle/findbugs-exclude.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Bug pattern="DM_DEFAULT_ENCODING" />
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.collectors.ThreadPoolMetricsCollector"/>
<Class name="org.opensearch.performanceanalyzer.collectors.ThreadPoolMetricsCollector"/>
<Bug pattern="REC_CATCH_EXCEPTION"/>
</Match>
</FindBugsFilter>
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ systemProp.tests.pa.port=9600
# Whether or not to use https for REST and transport clients
systemProp.tests.https=false

# The username of the admin user (or any user able to auth requests against opendistro-security)
# The username of the admin user (or any user able to auth requests against opensearch-security)
# NOTE: this only does something if tests.https is set to true
systemProp.tests.user=admin
# The password of the user specified above
Expand Down
2 changes: 1 addition & 1 deletion pa_bin/performance-analyzer-agent
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ fi
# Instead of the supervisor executing performance-analyzer-agent from the plugin location,
# we should move this to the reader. The entry-point script should be executing
# performance-analyzer-agent from the reader location.
# We need to change this file: https://github.com/opendistro-for-elasticsearch/opendistro-build/blob/main/opensearch/docker/config/docker-entrypoint.sh
# We need to change this file: https://github.com/opensearch-project/opensearch-build/blob/main/release/docker/config/opensearch/opensearch-docker-entrypoint.sh

if ! echo $* | grep -E '(^-d |-d$| -d |--daemonize$|--daemonize )' >/dev/null; then
export JAVA_OPTS=-Des.path.home=$OPENSEARCH_HOME\ -Dlog4j.configurationFile=$OPENSEARCH_HOME/performance-analyzer-rca-1.3.0-SNAPSHOT/pa_config/log4j2.xml
Expand Down
2 changes: 1 addition & 1 deletion packaging/performance-analyzer-agent-cli
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PA_AGENT_JAVA_OPTS="-Dlog4j.configurationFile=$OPENSEARCH_HOME/plugins/opensearc
-Xms64M -Xmx64M -XX:+UseSerialGC -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:InitialCodeCacheSize=4096 \
-XX:InitialBootClassLoaderMetaspaceSize=30720 -XX:MaxRAM=400m"

OPENSEARCH_MAIN_CLASS="com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp" \
OPENSEARCH_MAIN_CLASS="org.opensearch.performanceanalyzer.PerformanceAnalyzerApp" \
OPENSEARCH_ADDITIONAL_CLASSPATH_DIRECTORIES=performance-analyzer-rca/lib \
OPENSEARCH_JAVA_OPTS=$PA_AGENT_JAVA_OPTS \
$OPENSEARCH_HOME/bin/opensearch-cli \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* permissions and limitations under the License.
*/

package com.amazon.opendistro.opensearch.performanceanalyzer;
package org.opensearch.performanceanalyzer;


import org.opensearch.client.Client;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,55 +24,10 @@
* permissions and limitations under the License.
*/

package com.amazon.opendistro.opensearch.performanceanalyzer;
package org.opensearch.performanceanalyzer;

import static java.util.Collections.singletonList;

import com.amazon.opendistro.opensearch.performanceanalyzer.action.PerformanceAnalyzerActionFilter;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.AdmissionControlMetricsCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.CacheConfigMetricsCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.CircuitBreakerCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.ClusterApplierServiceStatsCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.DisksCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.ElectionTermCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.FaultDetectionMetricsCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.GCInfoCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.HeapMetricsCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.MasterServiceEventMetrics;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.MasterServiceMetrics;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.MasterThrottlingMetricsCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.MetricsPurgeActivity;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.NetworkInterfaceCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.NodeDetailsCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.NodeStatsAllShardsMetricsCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.NodeStatsFixedShardsMetricsCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.OSMetricsCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.ScheduledMetricCollectorsExecutor;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.ShardIndexingPressureMetricsCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.ShardStateCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.collectors.ThreadPoolMetricsCollector;
import com.amazon.opendistro.opensearch.performanceanalyzer.config.PerformanceAnalyzerController;
import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
import com.amazon.opendistro.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper;
import com.amazon.opendistro.opensearch.performanceanalyzer.config.setting.ClusterSettingsManager;
import com.amazon.opendistro.opensearch.performanceanalyzer.config.setting.PerformanceAnalyzerClusterSettings;
import com.amazon.opendistro.opensearch.performanceanalyzer.config.setting.handler.ConfigOverridesClusterSettingHandler;
import com.amazon.opendistro.opensearch.performanceanalyzer.config.setting.handler.NodeStatsSettingHandler;
import com.amazon.opendistro.opensearch.performanceanalyzer.config.setting.handler.PerformanceAnalyzerClusterSettingHandler;
import com.amazon.opendistro.opensearch.performanceanalyzer.http_action.config.PerformanceAnalyzerClusterConfigAction;
import com.amazon.opendistro.opensearch.performanceanalyzer.http_action.config.PerformanceAnalyzerConfigAction;
import com.amazon.opendistro.opensearch.performanceanalyzer.http_action.config.PerformanceAnalyzerOverridesClusterConfigAction;
import com.amazon.opendistro.opensearch.performanceanalyzer.http_action.config.PerformanceAnalyzerResourceProvider;
import com.amazon.opendistro.opensearch.performanceanalyzer.http_action.whoami.TransportWhoAmIAction;
import com.amazon.opendistro.opensearch.performanceanalyzer.http_action.whoami.WhoAmIAction;
import com.amazon.opendistro.opensearch.performanceanalyzer.listener.PerformanceAnalyzerSearchListener;
import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.EventLog;
import com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.EventLogFileHandler;
import com.amazon.opendistro.opensearch.performanceanalyzer.transport.PerformanceAnalyzerTransportInterceptor;
import com.amazon.opendistro.opensearch.performanceanalyzer.util.Utils;
import com.amazon.opendistro.opensearch.performanceanalyzer.writer.EventLogQueueProcessor;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Expand Down Expand Up @@ -111,6 +66,51 @@
import org.opensearch.env.NodeEnvironment;
import org.opensearch.index.IndexModule;
import org.opensearch.indices.breaker.CircuitBreakerService;
import org.opensearch.performanceanalyzer.action.PerformanceAnalyzerActionFilter;
import org.opensearch.performanceanalyzer.collectors.AdmissionControlMetricsCollector;
import org.opensearch.performanceanalyzer.collectors.CacheConfigMetricsCollector;
import org.opensearch.performanceanalyzer.collectors.CircuitBreakerCollector;
import org.opensearch.performanceanalyzer.collectors.ClusterApplierServiceStatsCollector;
import org.opensearch.performanceanalyzer.collectors.DisksCollector;
import org.opensearch.performanceanalyzer.collectors.ElectionTermCollector;
import org.opensearch.performanceanalyzer.collectors.FaultDetectionMetricsCollector;
import org.opensearch.performanceanalyzer.collectors.GCInfoCollector;
import org.opensearch.performanceanalyzer.collectors.HeapMetricsCollector;
import org.opensearch.performanceanalyzer.collectors.MasterServiceEventMetrics;
import org.opensearch.performanceanalyzer.collectors.MasterServiceMetrics;
import org.opensearch.performanceanalyzer.collectors.MasterThrottlingMetricsCollector;
import org.opensearch.performanceanalyzer.collectors.MetricsPurgeActivity;
import org.opensearch.performanceanalyzer.collectors.NetworkInterfaceCollector;
import org.opensearch.performanceanalyzer.collectors.NodeDetailsCollector;
import org.opensearch.performanceanalyzer.collectors.NodeStatsAllShardsMetricsCollector;
import org.opensearch.performanceanalyzer.collectors.NodeStatsFixedShardsMetricsCollector;
import org.opensearch.performanceanalyzer.collectors.OSMetricsCollector;
import org.opensearch.performanceanalyzer.collectors.ScheduledMetricCollectorsExecutor;
import org.opensearch.performanceanalyzer.collectors.ShardIndexingPressureMetricsCollector;
import org.opensearch.performanceanalyzer.collectors.ShardStateCollector;
import org.opensearch.performanceanalyzer.collectors.StatsCollector;
import org.opensearch.performanceanalyzer.collectors.ThreadPoolMetricsCollector;
import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController;
import org.opensearch.performanceanalyzer.config.PluginSettings;
import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper;
import org.opensearch.performanceanalyzer.config.setting.ClusterSettingsManager;
import org.opensearch.performanceanalyzer.config.setting.PerformanceAnalyzerClusterSettings;
import org.opensearch.performanceanalyzer.config.setting.handler.ConfigOverridesClusterSettingHandler;
import org.opensearch.performanceanalyzer.config.setting.handler.NodeStatsSettingHandler;
import org.opensearch.performanceanalyzer.config.setting.handler.PerformanceAnalyzerClusterSettingHandler;
import org.opensearch.performanceanalyzer.http_action.config.PerformanceAnalyzerClusterConfigAction;
import org.opensearch.performanceanalyzer.http_action.config.PerformanceAnalyzerConfigAction;
import org.opensearch.performanceanalyzer.http_action.config.PerformanceAnalyzerOverridesClusterConfigAction;
import org.opensearch.performanceanalyzer.http_action.config.PerformanceAnalyzerResourceProvider;
import org.opensearch.performanceanalyzer.http_action.whoami.TransportWhoAmIAction;
import org.opensearch.performanceanalyzer.http_action.whoami.WhoAmIAction;
import org.opensearch.performanceanalyzer.listener.PerformanceAnalyzerSearchListener;
import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
import org.opensearch.performanceanalyzer.reader_writer_shared.EventLog;
import org.opensearch.performanceanalyzer.reader_writer_shared.EventLogFileHandler;
import org.opensearch.performanceanalyzer.transport.PerformanceAnalyzerTransportInterceptor;
import org.opensearch.performanceanalyzer.util.Utils;
import org.opensearch.performanceanalyzer.writer.EventLogQueueProcessor;
import org.opensearch.plugins.ActionPlugin;
import org.opensearch.plugins.NetworkPlugin;
import org.opensearch.plugins.Plugin;
Expand All @@ -129,7 +129,7 @@ public final class PerformanceAnalyzerPlugin extends Plugin
public static final String PLUGIN_NAME = "opensearch-performance-analyzer";
private static final String ADD_FAULT_DETECTION_METHOD = "addFaultDetectionListener";
private static final String LISTENER_INJECTOR_CLASS_PATH =
"com.amazon.opendistro.opensearch.performanceanalyzer.listener.ListenerInjector";
"org.opensearch.performanceanalyzer.listener.ListenerInjector";
public static final int QUEUE_PURGE_INTERVAL_MS = 1000;
private static SecurityManager sm = null;
private final PerformanceAnalyzerClusterSettingHandler perfAnalyzerClusterSettingHandler;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@
* permissions and limitations under the License.
*/

package com.amazon.opendistro.opensearch.performanceanalyzer.action;
package org.opensearch.performanceanalyzer.action;


import com.amazon.opendistro.opensearch.performanceanalyzer.config.PerformanceAnalyzerController;
import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand All @@ -40,6 +38,8 @@
import org.opensearch.action.support.ActionFilter;
import org.opensearch.action.support.ActionFilterChain;
import org.opensearch.common.inject.Inject;
import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController;
import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
import org.opensearch.tasks.Task;

public class PerformanceAnalyzerActionFilter implements ActionFilter {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
* permissions and limitations under the License.
*/

package com.amazon.opendistro.opensearch.performanceanalyzer.action;
package org.opensearch.performanceanalyzer.action;


import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.HttpDimension;
import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics.HttpMetric;
import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsProcessor;
import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
import org.opensearch.OpenSearchException;
import org.opensearch.action.ActionListener;
import org.opensearch.action.bulk.BulkResponse;
import org.opensearch.action.search.SearchResponse;
import org.opensearch.performanceanalyzer.metrics.AllMetrics.HttpDimension;
import org.opensearch.performanceanalyzer.metrics.AllMetrics.HttpMetric;
import org.opensearch.performanceanalyzer.metrics.MetricsProcessor;
import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;

public class PerformanceAnalyzerActionListener<Response>
implements ActionListener<Response>, MetricsProcessor {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* permissions and limitations under the License.
*/

package com.amazon.opendistro.opensearch.performanceanalyzer.action;
package org.opensearch.performanceanalyzer.action;

enum RequestType {
bulk,
Expand Down
Loading