Skip to content

Commit 9969c13

Browse files
feat(opensearch): Upgrade to version 2.19.0
1 parent be90d10 commit 9969c13

File tree

3 files changed

+104
-25
lines changed

3 files changed

+104
-25
lines changed

opensearch/stackable/patches/2.18.0/01-opensearch_home.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
diff --git a/config/jvm.options b/config/jvm.options
2+
index bcaa277..df9c34e 100644
3+
--- a/config/jvm.options
4+
+++ b/config/jvm.options
5+
@@ -89,5 +89,5 @@
6+
## OpenDistro Performance Analyzer
7+
-Dclk.tck=100
8+
-Djdk.attach.allowAttachSelf=true
9+
--Djava.security.policy=/usr/share/opensearch/config/opensearch-performance-analyzer/opensearch_security.policy
10+
+-Djava.security.policy=/stackable/opensearch/config/opensearch-performance-analyzer/opensearch_security.policy
11+
--add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED
12+
diff --git a/config/opensearch-performance-analyzer/supervisord.conf b/config/opensearch-performance-analyzer/supervisord.conf
13+
index e4c061c..b67886f 100644
14+
--- a/config/opensearch-performance-analyzer/supervisord.conf
15+
+++ b/config/opensearch-performance-analyzer/supervisord.conf
16+
@@ -1,13 +1,13 @@
17+
; supervisor config file
18+
19+
[unix_http_server]
20+
-file=/usr/share/supervisor/performance_analyzer/supervisord.sock
21+
+file=/stackable/supervisor/performance_analyzer/supervisord.sock
22+
chmod=0770
23+
24+
[supervisord]
25+
-logfile=/usr/share/supervisor/performance_analyzer/supervisord.log ; (main log file;default $CWD/supervisord.log)
26+
-pidfile=/usr/share/supervisor/performance_analyzer/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
27+
-childlogdir=/usr/share/supervisor/performance_analyzer ; ('AUTO' child log dir, default $TEMP)
28+
+logfile=/stackable/supervisor/performance_analyzer/supervisord.log ; (main log file;default $CWD/supervisord.log)
29+
+pidfile=/stackable/supervisor/performance_analyzer/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
30+
+childlogdir=/stackable/supervisor/performance_analyzer ; ('AUTO' child log dir, default $TEMP)
31+
32+
; the below section must remain in the config file for RPC
33+
; (supervisorctl/web interface) to work, additional interfaces may be
34+
@@ -16,7 +16,7 @@ childlogdir=/usr/share/supervisor/performance_analyzer ; ('AUTO' chi
35+
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
36+
37+
[supervisorctl]
38+
-serverurl=/usr/share/supervisord.sock
39+
+serverurl=/stackable/supervisord.sock
40+
41+
; The [include] section can just contain the "files" setting. This
42+
; setting can list multiple files (separated by whitespace or
43+
@@ -27,7 +27,7 @@ serverurl=/usr/share/supervisord.sock
44+
files = /etc/supervisor/conf.d/*.conf
45+
46+
[program:performance_analyzer]
47+
-command=/usr/share/opensearch/performance-analyzer-rca/bin/performance-analyzer-agent /usr/share/opensearch
48+
+command=/stackable/opensearch/performance-analyzer-rca/bin/performance-analyzer-agent /stackable/opensearch
49+
user=1000
50+
autostart=true ; start at supervisord start (default: true)
51+
autorestart=unexpected ; autorestart if exited after running (def: unexpected)
52+
diff --git a/opensearch-docker-entrypoint.sh b/opensearch-docker-entrypoint.sh
53+
index d998663..45ef018 100755
54+
--- a/opensearch-docker-entrypoint.sh
55+
+++ b/opensearch-docker-entrypoint.sh
56+
@@ -9,7 +9,6 @@
57+
# in favor of a newly started container
58+
59+
# Export OpenSearch Home
60+
-export OPENSEARCH_HOME=/usr/share/opensearch
61+
export OPENSEARCH_PATH_CONF=$OPENSEARCH_HOME/config
62+
63+
# The virtual file /proc/self/cgroup should list the current cgroup
64+
diff --git a/performance-analyzer-rca/config/supervisord.conf b/performance-analyzer-rca/config/supervisord.conf
65+
index e4c061c..b67886f 100644
66+
--- a/performance-analyzer-rca/config/supervisord.conf
67+
+++ b/performance-analyzer-rca/config/supervisord.conf
68+
@@ -1,13 +1,13 @@
69+
; supervisor config file
70+
71+
[unix_http_server]
72+
-file=/usr/share/supervisor/performance_analyzer/supervisord.sock
73+
+file=/stackable/supervisor/performance_analyzer/supervisord.sock
74+
chmod=0770
75+
76+
[supervisord]
77+
-logfile=/usr/share/supervisor/performance_analyzer/supervisord.log ; (main log file;default $CWD/supervisord.log)
78+
-pidfile=/usr/share/supervisor/performance_analyzer/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
79+
-childlogdir=/usr/share/supervisor/performance_analyzer ; ('AUTO' child log dir, default $TEMP)
80+
+logfile=/stackable/supervisor/performance_analyzer/supervisord.log ; (main log file;default $CWD/supervisord.log)
81+
+pidfile=/stackable/supervisor/performance_analyzer/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
82+
+childlogdir=/stackable/supervisor/performance_analyzer ; ('AUTO' child log dir, default $TEMP)
83+
84+
; the below section must remain in the config file for RPC
85+
; (supervisorctl/web interface) to work, additional interfaces may be
86+
@@ -16,7 +16,7 @@ childlogdir=/usr/share/supervisor/performance_analyzer ; ('AUTO' chi
87+
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
88+
89+
[supervisorctl]
90+
-serverurl=/usr/share/supervisord.sock
91+
+serverurl=/stackable/supervisord.sock
92+
93+
; The [include] section can just contain the "files" setting. This
94+
; setting can list multiple files (separated by whitespace or
95+
@@ -27,7 +27,7 @@ serverurl=/usr/share/supervisord.sock
96+
files = /etc/supervisor/conf.d/*.conf
97+
98+
[program:performance_analyzer]
99+
-command=/usr/share/opensearch/performance-analyzer-rca/bin/performance-analyzer-agent /usr/share/opensearch
100+
+command=/stackable/opensearch/performance-analyzer-rca/bin/performance-analyzer-agent /stackable/opensearch
101+
user=1000
102+
autostart=true ; start at supervisord start (default: true)
103+
autorestart=unexpected ; autorestart if exited after running (def: unexpected)

opensearch/versions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
versions = [
22
{
3-
"product": "2.18.0",
3+
"product": "2.19.0",
44
# The performance analyzer works with JDK 17, but not with 21.
55
# https://github.com/opensearch-project/performance-analyzer-rca/issues/545
66
"java-devel": "17",

0 commit comments

Comments
 (0)