Skip to content

Commit 08c7b51

Browse files
committed
test workflow
Signed-off-by: Tao Liu <liutaoaz@amazon.com>
1 parent 0f29eef commit 08c7b51

File tree

4 files changed

+18
-69
lines changed

4 files changed

+18
-69
lines changed

.github/workflows/deployment-template.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ on:
4343
esnode_key_cert:
4444
required: false
4545
root_ca_cert:
46-
required: false
46+
required: false
4747
jobs:
4848

4949
OS-OSD-Deployment:
@@ -68,7 +68,7 @@ jobs:
6868
KIBANASERVER: ${{ secrets.kibanaserver }}
6969

7070
- name: Step 2 - Replace Token in opensearch.yml
71-
if: ${{ (inputs.deploy-env == 'dev') || (inputs.deploy-env == 'prod') }}
71+
if: ${{ (inputs.deploy-env == 'dev') || (inputs.deploy-env == 'prod') || (inputs.deploy-env == 'preview') }}
7272
uses: cschleiden/replace-tokens@v1
7373
with:
7474
files: '["${{ github.workspace }}/config/playground/helm/${{inputs.deploy-env}}/helm-opensearch.yaml"]'

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

+8-66
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ on:
77
workflow_dispatch:
88
# Adds schdeule event trigger for daily reset.
99
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
10-
schedule:
11-
# Run daily at 04:30 UTC.
12-
- cron: '30 04 * * *'
10+
# schedule:
11+
# # Run daily at 04:30 UTC.
12+
# - cron: '30 04 * * *'
1313
jobs:
1414

1515
OS-OSD-Preview-Scheduled-Deployment:
16-
uses: opensearch-project/dashboards-anywhere/.github/workflows/deployment-template.yml@main
16+
uses: opensearch-project/dashboards-anywhere/.github/workflows/deployment-template.yml@release-218
1717
with:
1818
helm-repo: https://opensearch-project.github.io/helm-charts/
1919
deploy-env: preview
@@ -32,49 +32,9 @@ jobs:
3232
otel_root_ca: ${{ secrets.OTEL_ROOT_CA }}
3333
otel_data_prepper_cert: ${{ secrets.OTEL_DATA_PREPPER_CERT }}
3434
kibanaserver: ${{ secrets.KIBANASERVER }}
35-
36-
OS-OSD-SearchApps-Scheduled-Deployment:
37-
uses: opensearch-project/dashboards-anywhere/.github/workflows/deployment-template.yml@main
38-
with:
39-
helm-repo: https://opensearch-project.github.io/helm-charts/
40-
deploy-env: searchapps
41-
secrets:
42-
access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_SEARCHAPPS }}
43-
secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_SEARCHAPPS }}
44-
region: ${{ secrets.AWS_REGION_SEARCHAPPS }}
45-
kube-config: ${{ secrets.KUBE_CONFIG_DATA_SEARCHAPPS }}
46-
openid_client_id: ${{ secrets.OPENID_CLIENT_ID_SEARCHAPPS }}
47-
openid_client_secret: ${{ secrets.OPENID_CLIENT_SECRET_SEARCHAPPS }}
48-
openid_base_redirect_url: ${{ secrets.OPENID_BASE_REDIRECT_URL_SEARCHAPPS }}
49-
openid_logout_url: ${{ secrets.OPENID_LOGOUT_URL_SEARCHAPPS }}
50-
ga-tracking-id: ${{ secrets.GA_TRACKING_ID }}
51-
osd_user: ${{ secrets.OSD_USER_SEARCHAPPS }}
52-
osd_user_password: ${{ secrets.OSD_USER_PASSWORD_SEARCHAPPS }}
53-
otel_root_ca: ${{ secrets.OTEL_ROOT_CA }}
54-
otel_data_prepper_cert: ${{ secrets.OTEL_DATA_PREPPER_CERT }}
55-
kibanaserver: ${{ secrets.KIBANASERVER }}
56-
57-
OS-OSD-Observability-Scheduled-Deployment:
58-
uses: opensearch-project/dashboards-anywhere/.github/workflows/deployment-template.yml@main
59-
with:
60-
helm-repo: https://opensearch-project.github.io/helm-charts/
61-
deploy-env: observability
62-
secrets:
63-
access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_OBSERVABILITY }}
64-
secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_OBSERVABILITY }}
65-
region: ${{ secrets.AWS_REGION_OBSERVABILITY }}
66-
kube-config: ${{ secrets.KUBE_CONFIG_DATA_OBSERVABILITY }}
67-
openid_client_id: ${{ secrets.OPENID_CLIENT_ID_OBSERVABILITY }}
68-
openid_client_secret: ${{ secrets.OPENID_CLIENT_SECRET_OBSERVABILITY }}
69-
openid_base_redirect_url: ${{ secrets.OPENID_BASE_REDIRECT_URL_OBSERVABILITY }}
70-
openid_logout_url: ${{ secrets.OPENID_LOGOUT_URL_OBSERVABILITY }}
71-
ga-tracking-id: ${{ secrets.GA_TRACKING_ID }}
72-
osd_user: ${{ secrets.OSD_USER_OBSERVABILITY }}
73-
osd_user_password: ${{ secrets.OSD_USER_PASSWORD_OBSERVABILITY }}
74-
otel_root_ca: ${{ secrets.OTEL_ROOT_CA }}
75-
otel_data_prepper_cert: ${{ secrets.OTEL_DATA_PREPPER_CERT }}
76-
kibanaserver: ${{ secrets.KIBANASERVER }}
77-
query_datasources_master_key: ${{ secrets.QUERY_DATASOURCES_MASTER_KEY }}
35+
esnode_cert: ${{ secrets.ESNODE_CERT }}
36+
esnode_key_cert: ${{ secrets.ESNODE_KEY_CERT }}
37+
root_ca_cert: ${{ secrets.ROOT_CA_CERT }}
7838

7939
OSD-Functional-Test-Preview:
8040
needs: OS-OSD-Preview-Scheduled-Deployment
@@ -83,22 +43,4 @@ jobs:
8343
endpoint: https://reinvent.playground.opensearch.org
8444
secrets:
8545
osd-user: ${{ secrets.OSD_USER_PREVIEW }}
86-
osd-user-password: ${{ secrets.OSD_USER_PASSWORD_PREVIEW }}
87-
88-
OSD-Functional-Test-SearchApps:
89-
needs: OS-OSD-SearchApps-Scheduled-Deployment
90-
uses: opensearch-project/dashboards-anywhere/.github/workflows/functional-test-template.yml@searchapps
91-
with:
92-
endpoint: https://searchapps.playground.opensearch.org
93-
secrets:
94-
osd-user: ${{ secrets.OSD_USER_SEARCHAPPS }}
95-
osd-user-password: ${{ secrets.OSD_USER_PASSWORD_SEARCHAPPS }}
96-
97-
OSD-Functional-Test-Observability:
98-
needs: OS-OSD-Observability-Scheduled-Deployment
99-
uses: opensearch-project/dashboards-anywhere/.github/workflows/functional-test-template.yml@observability
100-
with:
101-
endpoint: https://observability.playground.opensearch.org
102-
secrets:
103-
osd-user: ${{ secrets.OSD_USER_OBSERVABILITY }}
104-
osd-user-password: ${{ secrets.OSD_USER_PASSWORD_OBSERVABILITY }}
46+
osd-user-password: ${{ secrets.OSD_USER_PASSWORD_PREVIEW }}

config/playground/helm/preview/helm-opensearch-dashboards.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,4 @@ extraObjects: []
201201
# specify the external plugins to install
202202
plugins:
203203
enabled: true
204-
installList: ["https://github.com/BionIT/google-analytics-plugin/releases/download/2.11.0/googleAnalytics-2.11.0.zip"]
204+
installList: ["https://github.com/BionIT/google-analytics-plugin/releases/download/2.18.0/googleAnalytics-2.18.0.zip"]

config/playground/helm/preview/helm-opensearch.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ 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
3339
# Bind to all interfaces because we don't know what IP address Docker will assign to us.
@@ -723,6 +729,7 @@ securityConfig:
723729
- cluster:admin/opensearch/securityanalytics/findings/get
724730
- cluster:admin/opensearch/securityanalytics/alerts/get
725731
- cluster:admin/opensearch/securityanalytics/detector/get
732+
- cluster:admin/opensearch/securityanalytics/logtype/search
726733
# For using sql join query
727734
- "indices:data/read/scroll*"
728735
index_permissions:

0 commit comments

Comments
 (0)