change configuration file

Signed-off-by: Tao Liu <liutaoaz@amazon.com>
opensearch-project · Dec 6, 2022 · ca2040b · ca2040b
1 parent 68620a7
commit ca2040b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 19 deletions.
diff --git a/.github/workflows/deployment-template.yml b/.github/workflows/deployment-template.yml
@@ -36,7 +36,8 @@ on:
         required: false
       otel_data_prepper_cert:
         required: false
-
+      kibanaserver:
+        required: true
 jobs:
 
   OS-OSD-Deployment:
@@ -59,7 +60,16 @@ jobs:
           OPENID_LOGOUT_URL: ${{ secrets.openid_logout_url }}
           GA_TRACKING_ID: ${{ secrets.ga-tracking-id }}
 
-      - name: Step 2 - Replace Tokens for logstash configuration
+      - name: Step 2 - Replace Tokens for dashboards
+        uses: cschleiden/replace-tokens@v1
+        with:
+          files: '["${{ github.workspace }}/config/playground/helm/${{inputs.deploy-env}}/helm-opensearch-dashboards.yaml"]'
+          tokenPrefix: '${'
+          tokenSuffix: '}'
+        env:
+          KIBANASERVER: ${{ secrets.kibanaserver }}
+
+      - name: Step 3 - Replace Tokens for logstash configuration
         if: ${{ inputs.deploy-env == 'preview' }}
         uses: cschleiden/replace-tokens@v1
         with:
@@ -70,7 +80,7 @@ jobs:
           OSD_USER: ${{ secrets.osd_user }}
           OSD_USER_PASSWORD: ${{ secrets.osd_user_password }}
 
-      - name: Step 3 - Replace Tokens for tracing configuration
+      - name: Step 4 - Replace Tokens for tracing configuration
         if: ${{ inputs.deploy-env == 'preview' }}
         uses: cschleiden/replace-tokens@v1
         with:
@@ -83,14 +93,14 @@ jobs:
           OTEL_ROOT_CA: ${{ secrets.otel_root_ca }}
           OTEL_DATA_PREPPER_CERT: ${{ secrets.otel_data_prepper_cert }}
 
-      - name: Step 4 - Configure AWS Credentials
+      - name: Step 5 - Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.access-key-id }}
           aws-secret-access-key: ${{ secrets.secret-access-key }}
           aws-region: ${{ secrets.region }}
 
-      - name: Step 5 - Delete Logstash
+      - name: Step 6 - Delete Logstash
         if: ${{ inputs.deploy-env == 'preview' }}
         uses: elastic-analytics/dashboards-action@main
         env:
@@ -100,7 +110,7 @@ jobs:
           command: |
             kubectl delete ns logstash
 
-      - name: Step 6 - Delete Tracing
+      - name: Step 7 - Delete Tracing
         if: ${{ inputs.deploy-env == 'preview' }}
         uses: elastic-analytics/dashboards-action@main
         env:
@@ -113,7 +123,7 @@ jobs:
             kubectl delete -f config/playground/metrics/tracing/${{inputs.deploy-env}}/otel-collector.yaml
             kubectl delete -f config/playground/metrics/tracing/${{inputs.deploy-env}}/data-prepper.yaml
 
-      - name: Step 7 - Deploy OpenSearch and OpenSearch Dashboards By Helm Chart
+      - name: Step 8 - Deploy OpenSearch and OpenSearch Dashboards By Helm Chart
         uses: elastic-analytics/dashboards-action@main
         env:
           KUBE_CONFIG_DATA: ${{ secrets.kube-config }}
@@ -133,7 +143,7 @@ jobs:
             helm install opensearch opensearch/opensearch -f config/playground/helm/${{inputs.deploy-env}}/helm-opensearch.yaml
             helm install dashboards opensearch/opensearch-dashboards -f config/playground/helm/${{inputs.deploy-env}}/helm-opensearch-dashboards.yaml
 
-      - name: Step 8 - Install Logstash
+      - name: Step 9 - Install Logstash
         if: ${{ inputs.deploy-env == 'preview' }}
         uses: elastic-analytics/dashboards-action@main
         env:
@@ -145,7 +155,7 @@ jobs:
             kubectl create -f config/playground/metrics/logstash/${{inputs.deploy-env}}/logstash-configmap.yaml
             kubectl apply -f config/playground/metrics/logstash/${{inputs.deploy-env}}/logstash.yaml
 
-      - name: Step 9 - Install Tracing
+      - name: Step 10 - Install Tracing
         if: ${{ inputs.deploy-env == 'preview' }}
         uses: elastic-analytics/dashboards-action@main
         env:

diff --git a/.github/workflows/os-osd-deployment.yml b/.github/workflows/os-osd-deployment.yml
@@ -42,6 +42,7 @@ jobs:
       region: ${{ secrets.AWS_REGION_DEV }}
       kube-config: ${{ secrets.KUBE_CONFIG_DATA_DEV }}
       ga-tracking-id: ${{ secrets.GA_TRACKING_ID }}
+      kibanaserver: ${{ secrets.KIBANASERVER }}
 
   OS-OSD-Prod-Deployment:
     needs: Pre-Deployment
@@ -55,6 +56,7 @@ jobs:
       secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_PROD }}
       region: ${{ secrets.AWS_REGION_PROD }}
       kube-config: ${{ secrets.KUBE_CONFIG_DATA_PROD }}
+      kibanaserver: ${{ secrets.KIBANASERVER }}
 
   OSD-Functional-Test-Dev:
         needs: OS-OSD-Dev-Deployment

diff --git a/config/playground/helm/dev/helm-opensearch.yaml b/config/playground/helm/dev/helm-opensearch.yaml
@@ -403,12 +403,12 @@ securityConfig:
           description: "Demo admin user"
 
         kibanaserver:
-          hash: "$2a$12$4AcgAt3xwOWadA5s5blL6ev39OXDNhmOesEoo33eZtrq2N0YrU3H."
+          hash: "$2y$12$fYudyhWT/xks1IZhko5Osuja3yrpt8NrQjXN.HdACfIs4uMy5TGKC"
           reserved: true
           description: "Demo OpenSearch Dashboards user"
 
         kibanaro:
-          hash: "$2a$12$JJSXNfTowz7Uu5ttXfeYpeYE0arACvcwlPBStB1F.MI7f0U9Z4DGC"
+          hash: "$2y$12$O7ZpyD71zss2i.KafEA9GeRtKs8Ch2hSN8HtbcT1xCUwJPWVN7Y3u"
           reserved: false
           backend_roles:
           - "kibanauser"
@@ -420,21 +420,21 @@ securityConfig:
           description: "Demo OpenSearch Dashboards read only user"
 
         logstash:
-          hash: "$2a$12$u1ShR4l4uBS3Uv59Pa2y5.1uQuZBrZtmNfqB3iM/.jL0XoV9sghS2"
+          hash: "$2y$12$.iY36ILKEixrPF1ioV8in.vNlFVCW8wsy1Gf9m.mXlbT0U9QmvBK2"
           reserved: false
           backend_roles:
           - "logstash"
           description: "Demo logstash user"
 
         readall:
-          hash: "$2a$12$ae4ycwzwvLtZxwZ82RmiEunBbIPiAmGZduBAjKN0TXdwQFtCwARz2"
+          hash: "$2y$12$15huaUhaiNxHiP0JIhf.QeB9NVsB/nTiSytIT1DQJfXCEKKJaIy8C"
           reserved: false
           backend_roles:
           - "readall"
           description: "Demo readall user"
 
         snapshotrestore:
-          hash: "$2y$12$DpwmetHKwgYnorbgdvORCenv4NAK8cPUg8AI6pxLCuWf/ALc0.v7W"
+          hash: "$2y$12$dyT.lMC1GdPwOVBSxfnS5ebGBH9S2.SkVI/F6D6ASy90oX8SdAxV."
           reserved: false
           backend_roles:
           - "snapshotrestore"

diff --git a/config/playground/helm/preview/helm-opensearch.yaml b/config/playground/helm/preview/helm-opensearch.yaml
@@ -417,12 +417,12 @@ securityConfig:
           description: "Demo admin user"
 
         kibanaserver:
-          hash: "$2a$12$4AcgAt3xwOWadA5s5blL6ev39OXDNhmOesEoo33eZtrq2N0YrU3H."
+          hash: "$2y$12$fYudyhWT/xks1IZhko5Osuja3yrpt8NrQjXN.HdACfIs4uMy5TGKC"
           reserved: true
           description: "Demo OpenSearch Dashboards user"
 
         kibanaro:
-          hash: "$2a$12$JJSXNfTowz7Uu5ttXfeYpeYE0arACvcwlPBStB1F.MI7f0U9Z4DGC"
+          hash: "$2y$12$O7ZpyD71zss2i.KafEA9GeRtKs8Ch2hSN8HtbcT1xCUwJPWVN7Y3u"
           reserved: false
           backend_roles:
           - "kibanauser"
@@ -434,21 +434,21 @@ securityConfig:
           description: "Demo OpenSearch Dashboards read only user"
 
         logstash:
-          hash: "$2a$12$u1ShR4l4uBS3Uv59Pa2y5.1uQuZBrZtmNfqB3iM/.jL0XoV9sghS2"
+          hash: "$2y$12$.iY36ILKEixrPF1ioV8in.vNlFVCW8wsy1Gf9m.mXlbT0U9QmvBK2"
           reserved: false
           backend_roles:
           - "logstash"
           description: "Demo logstash user"
 
         readall:
-          hash: "$2a$12$ae4ycwzwvLtZxwZ82RmiEunBbIPiAmGZduBAjKN0TXdwQFtCwARz2"
+          hash: "$2y$12$15huaUhaiNxHiP0JIhf.QeB9NVsB/nTiSytIT1DQJfXCEKKJaIy8C"
           reserved: false
           backend_roles:
           - "readall"
           description: "Demo readall user"
 
         snapshotrestore:
-          hash: "$2y$12$DpwmetHKwgYnorbgdvORCenv4NAK8cPUg8AI6pxLCuWf/ALc0.v7W"
+          hash: "$2y$12$dyT.lMC1GdPwOVBSxfnS5ebGBH9S2.SkVI/F6D6ASy90oX8SdAxV."
           reserved: false
           backend_roles:
           - "snapshotrestore"