Skip to content

Modify namespace to opensearch #14

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

Merged
sruti1312 merged 1 commit into from
May 18, 2021
Merged

Modify namespace to opensearch #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
24 changes: 12 additions & 12 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ plugins {
}

application {
mainClassName = 'com.amazon.opendistro.opensearch.performanceanalyzer.PerformanceAnalyzerApp'
mainClassName = 'org.opensearch.performanceanalyzer.PerformanceAnalyzerApp'
applicationDefaultJvmArgs = ['-Xms64M',
'-Xmx64M',
'-XX:+UseSerialGC',
Expand Down Expand Up @@ -173,12 +173,12 @@ jacocoTestReport {
classDirectories.from = files(classDirectories.files.collect {
fileTree(dir: it,
include: [
'**/com/amazon/opendistro/opensearch/performanceanalyzer/**'
'**/org/opensearch/performanceanalyzer/**'
],
exclude: [
'**/com/amazon/opendistro/opensearch/performanceanalyzer/grpc/**',
'**/com/amazon/opendistro/opensearch/performanceanalyzer/rca/framework/api/metrics/**',
'**/com/amazon/opendistro/opensearch/performanceanalyzer/rca/net/requests**'
'**/org/opensearch/performanceanalyzer/grpc/**',
'**/org/opensearch/performanceanalyzer/rca/framework/api/metrics/**',
'**/org/opensearch/performanceanalyzer/rca/net/requests**'
])
})
}
Expand All @@ -189,11 +189,11 @@ jacocoTestCoverageVerification {
classDirectories.from = files(classDirectories.files.collect {
fileTree(dir: it,
include: [
'**/com/amazon/opendistro/opensearch/performanceanalyzer/rca/**',
'**/com/amazon/opendistro/opensearch/performanceanalyzer/reader/**'
'**/org/opensearch/performanceanalyzer/rca/**',
'**/org/opensearch/performanceanalyzer/reader/**'
],
exclude: [
'**/com/amazon/opendistro/opensearch/performanceanalyzer/grpc/**'])
'**/org/opensearch/performanceanalyzer/grpc/**'])
})
}
violationRules {
Expand All @@ -217,9 +217,9 @@ if (isSnapshot) {
test {
filter { // Ignore failing tests
// Test testMissingHeapMetrics failed
excludeTestsMatching 'com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.HeapSizeIncreaseMissingMetricsTest'
excludeTestsMatching 'org.opensearch.performanceanalyzer.rca.integTests.tests.jvmsizing.HeapSizeIncreaseMissingMetricsTest'
// Test testJvmActions failed
excludeTestsMatching 'com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.consolidate_tuning.JvmFlipFlopITest'
excludeTestsMatching 'org.opensearch.performanceanalyzer.rca.integTests.tests.consolidate_tuning.JvmFlipFlopITest'
}
enabled = true
retry {
Expand All @@ -229,15 +229,15 @@ test {

task rcaTest(type: Test) {
useJUnit {
includeCategories 'com.amazon.opendistro.opensearch.performanceanalyzer.rca.GradleTaskForRca'
includeCategories 'org.opensearch.performanceanalyzer.rca.GradleTaskForRca'
}
testLogging.showStandardStreams = true
}

task rcaIt(type: Test) {
dependsOn spotbugsMain
useJUnit {
includeCategories 'com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker'
includeCategories 'org.opensearch.performanceanalyzer.rca.integTests.framework.RcaItMarker'
}
//testLogging.showStandardStreams = true
}
Expand Down
42 changes: 21 additions & 21 deletions checkstyle/findbugs-exclude.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,88 +3,88 @@
<Bug pattern="DM_DEFAULT_ENCODING"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.hwnet.Disks"/>
<Class name="org.opensearch.performanceanalyzer.hwnet.Disks"/>
<Bug pattern="DMI_HARDCODED_ABSOLUTE_FILENAME"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor"/>
<Class name="org.opensearch.performanceanalyzer.reader.ReaderMetricsProcessor"/>
<Bug pattern="MS_CANNOT_BE_FINAL"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.hwnet.NetworkInterface"/>
<Class name="org.opensearch.performanceanalyzer.hwnet.NetworkInterface"/>
<Bug pattern="LI_LAZY_INIT_STATIC"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.hwnet.NetworkInterface"/>
<Class name="org.opensearch.performanceanalyzer.hwnet.NetworkInterface"/>
<Bug pattern="REC_CATCH_EXCEPTION"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector"/>
<Class name="org.opensearch.performanceanalyzer.collectors.StatsCollector"/>
<Bug pattern="LI_LAZY_INIT_STATIC"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector"/>
<Class name="org.opensearch.performanceanalyzer.collectors.StatsCollector"/>
<Bug pattern="MS_CANNOT_BE_FINAL"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector"/>
<Class name="org.opensearch.performanceanalyzer.collectors.StatsCollector"/>
<Bug pattern="MS_SHOULD_BE_FINAL"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector"/>
<Class name="org.opensearch.performanceanalyzer.collectors.StatsCollector"/>
<Bug pattern="REC_CATCH_EXCEPTION"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.collectors.StatsCollector"/>
<Class name="org.opensearch.performanceanalyzer.collectors.StatsCollector"/>
<Bug pattern="DC_DOUBLECHECK"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator"/>
<Class name="org.opensearch.performanceanalyzer.rca.stats.collectors.SampleAggregator"/>
<Bug pattern="EI_EXPOSE_REP2"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.jvm.ThreadList"/>
<Class name="org.opensearch.performanceanalyzer.jvm.ThreadList"/>
<Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.rest.QueryRcaRequestHandler"/>
<Class name="org.opensearch.performanceanalyzer.rest.QueryRcaRequestHandler"/>
<Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.rest.QueryMetricsRequestHandler"/>
<Class name="org.opensearch.performanceanalyzer.rest.QueryMetricsRequestHandler"/>
<Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.rest.QueryBatchRequestHandler"/>
<Class name="org.opensearch.performanceanalyzer.rest.QueryBatchRequestHandler"/>
<Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.reader_writer_shared.EventLogFileHandler"/>
<Class name="org.opensearch.performanceanalyzer.reader_writer_shared.EventLogFileHandler"/>
<Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.metricsdb.MetricsDB"/>
<Class name="org.opensearch.performanceanalyzer.metricsdb.MetricsDB"/>
<Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.metrics.MetricsConfiguration"/>
<Class name="org.opensearch.performanceanalyzer.metrics.MetricsConfiguration"/>
<Bug pattern="MS_MUTABLE_COLLECTION"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.rca.persistence.FileRotate"/>
<Class name="org.opensearch.performanceanalyzer.rca.persistence.FileRotate"/>
<Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.rca.samplers.MetricsDBFileSampler"/>
<Class name="org.opensearch.performanceanalyzer.rca.samplers.MetricsDBFileSampler"/>
<Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
</Match>
<Match>
<Class name="com.amazon.opendistro.opensearch.performanceanalyzer.reader.AdmissionControlProcessor"/>
<Class name="org.opensearch.performanceanalyzer.reader.AdmissionControlProcessor"/>
<Bug pattern="URF_UNREAD_FIELD"/>
</Match>
<!--Exclude gRPC generated classes-->
<Match>
<Package name="com.amazon.opendistro.opensearch.performanceanalyzer.grpc"/>
<Package name="org.opensearch.performanceanalyzer.grpc"/>
<Or>
<Bug pattern="SE_BAD_FIELD"/>
<Bug pattern="UCF_USELESS_CONTROL_FLOW"/>
Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ RUN cp -r performance-analyzer-rca/* plugins/opensearch-performance-analyzer/
RUN chmod 755 /usr/share/opensearch/plugins/opensearch-performance-analyzer/pa_bin/performance-analyzer-agent
RUN chmod -R 755 /dev/shm
################################################################################
# Build stage 1 (the actual opendistroforelasticsearch image):
# Copy opendistroforelasticsearch from stage 0
# Build stage 1 (the actual OpenSearch image):
# Copy OpenSearch from stage 0
# Add entrypoint
################################################################################

Expand Down Expand Up @@ -143,10 +143,10 @@ RUN sed -i "s|#webservice-bind-host =|webservice-bind-host = 0.0.0.0|g" /usr/sha
EXPOSE 9200 9300 9600 9650

LABEL org.label-schema.schema-version="1.0" \
org.label-schema.name="opendistroforelasticsearch" \
org.label-schema.name="opensearch" \
org.label-schema.version="1.2.0" \
org.label-schema.url="https://opendistro.github.io" \
org.label-schema.vcs-url="https://github.com/opendistro-for-elasticsearch/opendistro-build" \
org.label-schema.vcs-url="https://github.com/opensearch-project/opensearch-build" \
org.label-schema.license="Apache-2.0" \
org.label-schema.vendor="Amazon" \
org.label-schema.build-date="19.12.13"
Expand Down
4 changes: 2 additions & 2 deletions docs/gauntlet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Let's see an example:
```

- _name_ : The Metric graph node that will be emitting these values. The expected parameter is one of the metrics classes
in `com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.api.metrics`. The
in `org.opensearch.performanceanalyzer.rca.framework.api.metrics`. The
metrics class that you specify, should have a `static final` field called `NAME` (`CPU_Utilization`)
and that will be used to determine the name of the metric table.
- _dimensionNames_ : For the dimension names for a metric, please refer to the docs
Expand Down Expand Up @@ -169,7 +169,7 @@ Host IDs | Host Tags
### Examples

Some of the examples for how to write the integ tests can be found here:
`src/test/java/com/amazon/opendistro/opensearch/performanceanalyzer/rca/integTests/tests/poc/*`
`src/test/java/org/opensearch/performanceanalyzer/rca/integTests/tests/poc/*`

### Running the integ tests
1. All integration tests written using this framework can be run by using the command
Expand Down
2 changes: 1 addition & 1 deletion pa_config/rca.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"analysis-graph-implementor": "com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph",
"analysis-graph-implementor": "org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph",
// it can be file:// or s3://
"rca-store-location": "s3://sifi-store/rcas/",

Expand Down
2 changes: 1 addition & 1 deletion pa_config/rca_idle_master.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"analysis-graph-implementor": "com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph",
"analysis-graph-implementor": "org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph",
// it can be file:// or s3://
"rca-store-location": "s3://sifi-store/rcas/",

Expand Down
2 changes: 1 addition & 1 deletion pa_config/rca_master.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"analysis-graph-implementor": "com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph",
"analysis-graph-implementor": "org.opensearch.performanceanalyzer.rca.store.OpenSearchAnalysisGraph",
// it can be file:// or s3://
"rca-store-location": "s3://sifi-store/rcas/",

Expand Down
10 changes: 5 additions & 5 deletions ...earch/performanceanalyzer/AppContext.java → ...earch/performanceanalyzer/AppContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@
* permissions and limitations under the License.
*/

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


import com.amazon.opendistro.opensearch.performanceanalyzer.metrics.AllMetrics;
import com.amazon.opendistro.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
import com.amazon.opendistro.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
import com.amazon.opendistro.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import org.opensearch.performanceanalyzer.metrics.AllMetrics;
import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;
import org.opensearch.performanceanalyzer.rca.store.collector.NodeConfigCache;
import org.opensearch.performanceanalyzer.reader.ClusterDetailsEventProcessor;

/**
* The PA agent process is composed of multiple components. The PA Reader and RCA are two such
Expand Down
4 changes: 2 additions & 2 deletions ...performanceanalyzer/CertificateUtils.java → ...performanceanalyzer/CertificateUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@
* permissions and limitations under the License.
*/

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


import com.amazon.opendistro.opensearch.performanceanalyzer.config.PluginSettings;
import java.io.File;
import java.io.FileReader;
import java.security.KeyStore;
Expand All @@ -45,6 +44,7 @@
import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.openssl.PEMParser;
import org.opensearch.performanceanalyzer.config.PluginSettings;

public class CertificateUtils {

Expand Down
6 changes: 3 additions & 3 deletions ...ch/performanceanalyzer/ClientServers.java → ...ch/performanceanalyzer/ClientServers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
* permissions and limitations under the License.
*/

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


import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetClient;
import com.amazon.opendistro.opensearch.performanceanalyzer.net.NetServer;
import com.sun.net.httpserver.HttpServer;
import org.opensearch.performanceanalyzer.net.NetClient;
import org.opensearch.performanceanalyzer.net.NetServer;

/** A wrapper class to return all the server created by the App. */
public class ClientServers {
Expand Down
2 changes: 1 addition & 1 deletion ...rch/performanceanalyzer/ConfigStatus.java → ...rch/performanceanalyzer/ConfigStatus.java
View file
Open in desktop
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;

public final class ConfigStatus {
private boolean configMissingOrIncorrect = false;
Expand Down
2 changes: 1 addition & 1 deletion ...ensearch/performanceanalyzer/DBUtils.java → ...ensearch/performanceanalyzer/DBUtils.java
View file
Open in desktop
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 java.util.Collection;
Expand Down
6 changes: 3 additions & 3 deletions ...ceanalyzer/OSMetricsGeneratorFactory.java → ...ceanalyzer/OSMetricsGeneratorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
* permissions and limitations under the License.
*/

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


import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
import com.amazon.opendistro.opensearch.performanceanalyzer.metrics_generator.linux.LinuxOSMetricsGenerator;
import org.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
import org.opensearch.performanceanalyzer.metrics_generator.linux.LinuxOSMetricsGenerator;

public class OSMetricsGeneratorFactory {

Expand Down
Loading