Skip to content

Commit 8a6ffc2

Browse files
zhyuanqizhyuanqi
authored
2.12 release in dev (#209)
Signed-off-by: Yuanqi(Ella) Zhu <zhyuanqi@amazon.com>
1 parent 425fa67 commit 8a6ffc2

File tree

5 files changed

+59
-13
lines changed

5 files changed

+59
-13
lines changed

‎.github/workflows/deployment-template.yml

+22-4
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,12 @@ on:
3838
required: false
3939
kibanaserver:
4040
required: true
41-
query_datasources_master_key:
42-
required: false
41+
esnode_cert:
42+
required: false
43+
esnode_key_cert:
44+
required: false
45+
root_ca_cert:
46+
required: false
4347
jobs:
4448

4549
OS-OSD-Deployment:
@@ -64,15 +68,29 @@ jobs:
6468
KIBANASERVER: ${{ secrets.kibanaserver }}
6569

6670
- name: Step 2 - Replace Token in opensearch.yml
67-
if: ${{ (inputs.deploy-env == 'observability') || (inputs.deploy-env == 'dev') }}
71+
if: ${{ (inputs.deploy-env == 'dev') || (inputs.deploy-env == 'prod') }}
6872
uses: cschleiden/replace-tokens@v1
6973
with:
7074
files: '["${{ github.workspace }}/config/playground/helm/${{inputs.deploy-env}}/helm-opensearch.yaml"]'
7175
tokenPrefix: '${'
7276
tokenSuffix: '}'
7377
env:
74-
QUERY_DATASOURCES_MASTER_KEY: ${{ secrets.query_datasources_master_key }}
78+
ESNODE_CERT: ${{ secrets.esnode_cert }}
79+
ESNODE_KEY_CERT: ${{ secrets.esnode_key_cert }}
80+
ROOT_CA_CERT: ${{ secrets.root_ca_cert }}
7581

82+
- name: Step 2.1 - Replace Token in machinelearning.yml
83+
if: ${{ (inputs.deploy-env == 'dev') || (inputs.deploy-env == 'prod') }}
84+
uses: cschleiden/replace-tokens@v1
85+
with:
86+
files: '["${{ github.workspace }}/config/playground/helm/${{inputs.deploy-env}}/helm-machinelearning.yaml"]'
87+
tokenPrefix: '${'
88+
tokenSuffix: '}'
89+
env:
90+
ESNODE_CERT: ${{ secrets.esnode_cert }}
91+
ESNODE_KEY_CERT: ${{ secrets.esnode_key_cert }}
92+
ROOT_CA_CERT: ${{ secrets.root_ca_cert }}
93+
7694
- name: Step 3 - Replace Tokens for dashboards
7795
uses: cschleiden/replace-tokens@v1
7896
with:

‎.github/workflows/os-osd-deployment.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ jobs:
4646
kube-config: ${{ secrets.KUBE_CONFIG_DATA_DEV }}
4747
ga-tracking-id: ${{ secrets.GA_TRACKING_ID }}
4848
kibanaserver: ${{ secrets.KIBANASERVER }}
49-
query_datasources_master_key: ${{ secrets.QUERY_DATASOURCES_MASTER_KEY }}
49+
esnode_cert: ${{ secrets.ESNODE_CERT }}
50+
esnode_key_cert: ${{ secrets.ESNODE_KEY_CERT }}
51+
root_ca_cert: ${{ secrets.ROOT_CA_CERT }}
52+
5053

5154
OS-OSD-Prod-Deployment:
5255
needs: Pre-Deployment
@@ -62,6 +65,9 @@ jobs:
6265
kube-config: ${{ secrets.KUBE_CONFIG_DATA_PROD }}
6366
kibanaserver: ${{ secrets.KIBANASERVER }}
6467
ga-tracking-id: ${{ secrets.GA_TRACKING_ID_PROD }}
68+
esnode_cert: ${{ secrets.ESNODE_CERT }}
69+
esnode_key_cert: ${{ secrets.ESNODE_KEY_CERT }}
70+
root_ca_cert: ${{ secrets.ROOT_CA_CERT }}
6571

6672
OS-OSD-ML-Deployment:
6773
needs: Pre-Deployment

‎config/playground/helm/dev/helm-machinelearning.yaml

+9-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ majorVersion: "7"
2525
opensearchHome: /usr/share/opensearch
2626
# such as opensearch.yml
2727
config:
28+
esnode.pem: |-
29+
${ESNODE_CERT}
30+
esnode-key.pem: |-
31+
${ESNODE_KEY_CERT}
32+
root-ca.pem: |-
33+
${ROOT_CA_CERT}
2834
opensearch.yml: |
2935
cluster.name: opensearch-cluster
3036
# Bind to all interfaces because we don't know what IP address Docker will assign to us.
@@ -89,7 +95,7 @@ extraEnvs:
8995
# - name: MY_ENVIRONMENT_VAR
9096
# value: the_value_goes_here
9197
- name: DISABLE_INSTALL_DEMO_CONFIG
92-
value: "false"
98+
value: "true"
9399

94100
# Allows you to load environment variables from kubernextes secret or config map
95101
envFrom: []
@@ -104,7 +110,7 @@ hostAliases: []
104110
image:
105111
repository: "opensearchproject/opensearch"
106112
# override image tag, which is .Chart.AppVersion by default
107-
tag: ""
113+
tag: "2.12.0"
108114
# Always/Never/IfNotPresent
109115
pullPolicy: "Always"
110116

@@ -706,6 +712,7 @@ securityConfig:
706712
- cluster:admin/opensearch/securityanalytics/findings/get
707713
- cluster:admin/opensearch/securityanalytics/alerts/get
708714
- cluster:admin/opensearch/securityanalytics/detector/get
715+
- cluster:admin/opensearch/securityanalytics/logtype/search
709716
# For using sql join query
710717
- "indices:data/read/scroll*"
711718
index_permissions:

‎config/playground/helm/dev/helm-opensearch-dashboards.yaml

+12-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ opensearchHosts: "https://opensearch-cluster-leader:9200"
99
replicaCount: 2
1010

1111
image:
12-
repository: "opensearchproject/opensearch-dashboards"
12+
repository: "opensearchplayground/opensearch-dashboards"
1313
# override image tag, which is .Chart.AppVersion by default
14-
tag: ""
14+
tag: "2.12.0"
1515
# Always/Never/IfNotPresent
1616
pullPolicy: "Always"
1717

@@ -78,6 +78,15 @@ config:
7878
# Use the consolidated menu and global header bar
7979
opensearchDashboards.branding.useExpandedHeader: false
8080

81+
home.hero.title: 'Try the Query Assistant'
82+
home.hero.body: 'Automatically generate complex queries using simple conversational prompts. AI assisted summary helps you navigate and understand errors from your logs.{br}{br}You will be redirected to the AI playground where you will need to login. All the {terms} of the playground still apply.'
83+
home.hero.externalActionButton: {
84+
text: 'Login to try',
85+
link: 'https://ai.playground.opensearch.org/'
86+
}
87+
home.hero.img.link: 'https://www.youtube.com/watch?v=VTiJtGI2Sr4&autoplay=1'
88+
home.hero.secondaryButton.link: 'https://opensearch.org/blog/opensearch-adds-new-generative-ai-assistant-toolkit/'
89+
8190
uiSettings:
8291
overrides:
8392
"theme:next": true
@@ -185,4 +194,4 @@ extraObjects: []
185194
# specify the external plugins to install.
186195
plugins:
187196
enabled: true
188-
installList: ["https://github.com/BionIT/google-analytics-plugin/releases/download/2.11.0/googleAnalytics-2.11.0.zip"]
197+
installList: ["https://github.com/BionIT/google-analytics-plugin/releases/download/2.12.0/googleAnalytics-2.12.0.zip"]

‎config/playground/helm/dev/helm-opensearch.yaml

+9-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,14 @@ majorVersion: "7"
2828
opensearchHome: /usr/share/opensearch
2929
# such as opensearch.yml
3030
config:
31+
esnode.pem: |-
32+
${ESNODE_CERT}
33+
esnode-key.pem: |-
34+
${ESNODE_KEY_CERT}
35+
root-ca.pem: |-
36+
${ROOT_CA_CERT}
3137
opensearch.yml: |
3238
cluster.name: opensearch-cluster
33-
plugins.query.datasources.encryption.masterkey: ${QUERY_DATASOURCES_MASTER_KEY}
3439
# Bind to all interfaces because we don't know what IP address Docker will assign to us.
3540
network.host: 0.0.0.0
3641
# # minimum_master_nodes need to be explicitly set when bound on a public IP
@@ -93,7 +98,7 @@ extraEnvs:
9398
# - name: MY_ENVIRONMENT_VAR
9499
# value: the_value_goes_here
95100
- name: DISABLE_INSTALL_DEMO_CONFIG
96-
value: "false"
101+
value: "true"
97102

98103
# Allows you to load environment variables from kubernextes secret or config map
99104
envFrom: []
@@ -108,7 +113,7 @@ hostAliases: []
108113
image:
109114
repository: "opensearchproject/opensearch"
110115
# override image tag, which is .Chart.AppVersion by default
111-
tag: ""
116+
tag: "2.12.0"
112117
# Always/Never/IfNotPresent
113118
pullPolicy: "Always"
114119

@@ -708,6 +713,7 @@ securityConfig:
708713
- cluster:admin/opensearch/securityanalytics/findings/get
709714
- cluster:admin/opensearch/securityanalytics/alerts/get
710715
- cluster:admin/opensearch/securityanalytics/detector/get
716+
- cluster:admin/opensearch/securityanalytics/logtype/search
711717
# For using sql join query
712718
- "indices:data/read/scroll*"
713719
index_permissions:

0 commit comments

Comments
 (0)