Skip to content

Commit 4c469bb

Browse files
committed
Update PA directories from plugins to root
Signed-off-by: sruti1312 <[email protected]>
1 parent c020cc9 commit 4c469bb

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ This document walks you through the process of building and deploying the RCA fr
3939
This will not currently enforce client authentication. This feature, including full support for TLS is
4040
planned for an upcoming release.
4141

42-
a. Open config/performance-analyzer.properties
42+
a. Open $OPENSEARCH-HOME/config/opensearch-performance-analyzer/performance-analyzer.properties
4343

4444
b. Modify the certificate-file-path, private-key-file-path, and https-enabled entries
4545

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ __Metrics__: Metrics are typically served as continuous datastreams to downstrea
4949

5050
### Components
5151

52-
__Framework__: The RCA runtime operates on an `AnalysisGraph`. You can extend this class and override the `construct` method to build your own RCAs. You should specify the path to the class in the `analysis-graph-implementor` section of `config/rca.conf`. The `addLeaf` and `addAllUpstreams` helper methods are useful when you define the dependencies between nodes of the graph.
52+
__Framework__: The RCA runtime operates on an `AnalysisGraph`. You can extend this class and override the `construct` method to build your own RCAs. You should specify the path to the class in the `analysis-graph-implementor` section of `config/opensearch-performance-analyzer/rca.conf`. The `addLeaf` and `addAllUpstreams` helper methods are useful when you define the dependencies between nodes of the graph.
5353

5454
__Scheduler__: The scheduler invokes the `operate` method on each graph node in topological order as defined in the `AnalysisGraph`. Nodes with no dependencies can be executed in parallel. Use flow-units to share data between RCA nodes instead of shared objects to avoid data races and performance bottlenecks.
5555

docker/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ RUN chown -R opensearch:0 . && \
5353

5454
RUN unzip config/performance-analyzer-rca-2.0.0.0-rc1-SNAPSHOT.zip
5555

56-
RUN cp -r performance-analyzer-rca/* plugins/opensearch-performance-analyzer/
57-
RUN chmod 755 /usr/share/opensearch/plugins/opensearch-performance-analyzer/bin/performance-analyzer-agent
5856
RUN chmod -R 755 /dev/shm
5957
################################################################################
6058
# Build stage 1 (the actual OpenSearch image):
@@ -118,7 +116,7 @@ RUN chgrp 0 /usr/local/bin/docker-entrypoint.sh && \
118116
chmod 0775 /usr/local/bin/docker-entrypoint.sh
119117

120118
# Bind to all interfaces so that the docker container is accessible from the host machine
121-
RUN sed -i "s|#webservice-bind-host =|webservice-bind-host = 0.0.0.0|g" /usr/share/opensearch/plugins/opensearch-performance-analyzer/config/performance-analyzer.properties
119+
RUN sed -i "s|#webservice-bind-host =|webservice-bind-host = 0.0.0.0|g" /usr/share/opensearch/config/opensearch-performance-analyzer/performance-analyzer.properties
122120

123121
EXPOSE 9200 9300 9600 9650
124122

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
true

src/main/java/org/opensearch/performanceanalyzer/config/PluginSettings.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package org.opensearch.performanceanalyzer.config;
77

8+
import static org.opensearch.performanceanalyzer.core.Util.OPENSEARCH_HOME;
89

910
import com.google.common.annotations.VisibleForTesting;
1011
import java.io.File;
@@ -23,7 +24,13 @@ public class PluginSettings {
2324
private static PluginSettings instance;
2425
public static final String CONFIG_FILES_PATH = "config/";
2526
private static final String DEFAULT_CONFIG_FILE_PATH =
26-
Util.PLUGIN_LOCATION + "config/performance-analyzer.properties";
27+
OPENSEARCH_HOME
28+
+ File.separator
29+
+ "config"
30+
+ File.separator
31+
+ "opensearch-performance-analyzer"
32+
+ File.separator
33+
+ "performance-analyzer.properties";
2734
private static final String METRICS_LOCATION_KEY = "metrics-location";
2835
private static final String METRICS_LOCATION_DEFAULT = "/dev/shm/performanceanalyzer/";
2936
private static final String DELETION_INTERVAL_KEY = "metrics-deletion-interval";

0 commit comments

Comments
 (0)