From 11f5d57087da33f38dd2d64fee615db195110425 Mon Sep 17 00:00:00 2001 From: Lu Yu Date: Mon, 24 Oct 2022 23:43:38 -0700 Subject: [PATCH 1/6] set up workflow to install plugins Signed-off-by: Lu Yu --- .../workflows/build-custom-docker-image.yml | 38 +++++++++++++++++ .github/workflows/os-osd-deployment.yml | 2 +- config/playground/docker/dev/Dockerfile | 4 ++ .../docker/dev/extra_config/osd.yml | 20 +++++++++ .../docker/dev/scripts/custom_osd_entry.py | 41 +++++++++++++++++++ .../docker/dev/scripts/install-plugins.sh | 12 ++++++ .../helm/dev/helm-opensearch-dashboards.yaml | 22 +--------- 7 files changed, 118 insertions(+), 21 deletions(-) create mode 100644 .github/workflows/build-custom-docker-image.yml create mode 100644 config/playground/docker/dev/Dockerfile create mode 100644 config/playground/docker/dev/extra_config/osd.yml create mode 100644 config/playground/docker/dev/scripts/custom_osd_entry.py create mode 100755 config/playground/docker/dev/scripts/install-plugins.sh diff --git a/.github/workflows/build-custom-docker-image.yml b/.github/workflows/build-custom-docker-image.yml new file mode 100644 index 0000000..1873304 --- /dev/null +++ b/.github/workflows/build-custom-docker-image.yml @@ -0,0 +1,38 @@ +name: OpenSearch Dashboards Build Custom Docker Image + +on: + workflow_dispatch: + +jobs: + Build-Custom-Docker-Image: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: append config and custom command + env: + TRACKING_ID: ${{secrets.GA_TRACKING_ID}} + PLUGINS: ${{secrets.PLUGINS}} + run: | + if [[ $TRACKING_ID ]]; then + echo -e "\r\n" >> config/playground/docker/dev/extra_config/osd.yml + echo google_analytics_plugin.trackingID: $TRACKING_ID >> config/playground/docker/dev/extra_config/osd.yml + fi + echo -e "\r\n" >> config/playground/docker/dev/Dockerfile + echo CMD [\"python\", \"/opt/opensearch-dashboards/scripts/custom_osd_entry.py\", \"$PLUGINS\"] >> config/playground/docker/dev/Dockerfile + + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push + env: + DOCKER_HUB_REPO: ${{secrets.DOCKER_HUB_REPO}} + DOCKER_HUB_TAG: ${{secrets.DOCKER_HUB_TAG}} + run: | + chmod -R 777 config/playground/docker/dev/scripts/ + docker build -t $DOCKER_HUB_REPO:$DOCKER_HUB_TAG config/playground/docker/dev + docker push $DOCKER_HUB_REPO:$DOCKER_HUB_TAG + diff --git a/.github/workflows/os-osd-deployment.yml b/.github/workflows/os-osd-deployment.yml index 68c917e..9c730f1 100644 --- a/.github/workflows/os-osd-deployment.yml +++ b/.github/workflows/os-osd-deployment.yml @@ -22,7 +22,7 @@ jobs: - uses: dorny/paths-filter@v2 id: filter with: - # creats filters for tracking dev and prod changes + # creates filters to check if any dev or prod changes filters: | dev: - 'config/playground/helm/dev/**' diff --git a/config/playground/docker/dev/Dockerfile b/config/playground/docker/dev/Dockerfile new file mode 100644 index 0000000..a157c45 --- /dev/null +++ b/config/playground/docker/dev/Dockerfile @@ -0,0 +1,4 @@ +FROM opensearchproject/opensearch-dashboards:latest + +COPY . /opt/opensearch-dashboards/ + diff --git a/config/playground/docker/dev/extra_config/osd.yml b/config/playground/docker/dev/extra_config/osd.yml new file mode 100644 index 0000000..eaf3a82 --- /dev/null +++ b/config/playground/docker/dev/extra_config/osd.yml @@ -0,0 +1,20 @@ +opensearch.hosts: [https://localhost:9200] +opensearch.ssl.verificationMode: none +opensearch.username: kibanaserver +opensearch.password: kibanaserver +opensearch.requestHeadersWhitelist: [authorization, securitytenant] +opensearch_security.auth.anonymous_auth_enabled: true +opensearch_security.multitenancy.enabled: false +opensearch_security.multitenancy.tenants.preferred: [Global, Private] +opensearch_security.readonly_mode.roles: [kibana_read_only] +# Use this setting if you are running opensearch-dashboards without https +opensearch_security.cookie.secure: false +server.host: '0.0.0.0' +# Use the consolidated menu and global header bar +opensearchDashboards.branding.useExpandedHeader: false +# Enable wizard feature +wizard.enabled: true + +#csp settings +csp.rules: ["connect-src 'self' www.google-analytics.com maps.opensearch.org;"] +csp.warnLegacyBrowsers: false \ No newline at end of file diff --git a/config/playground/docker/dev/scripts/custom_osd_entry.py b/config/playground/docker/dev/scripts/custom_osd_entry.py new file mode 100644 index 0000000..33306c3 --- /dev/null +++ b/config/playground/docker/dev/scripts/custom_osd_entry.py @@ -0,0 +1,41 @@ +#!/usr/bin/python + +import os +import sys + +def run(): + source_file = "/opt/opensearch-dashboards/extra_config/osd.yml" + target_file = "/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml" + + s_keys = set() + nc = [] + with open(source_file, "r") as s: + for r in s: + nc += [r] + kv = r.split(":") + if len(kv) < 2 or r.strip().startswith("#"): + continue + s_keys.add(kv[0]) + + nt = [] + with open(target_file, "r") as t: + for r in t: + kv = r.split(":") + if len(kv) < 2 or r.strip().startswith("#"): + nt += [r] + elif kv[0] in s_keys: + # skip to use src value + continue + else: + nt += [r] + + with open(target_file, "w") as f: + f.write("\n".join(nt + nc)) + + for i in range(1, len(sys.argv)): + os.system("/opt/opensearch-dashboards/scripts/install-plugins.sh " + sys.argv[i]) + + os.system("./opensearch-dashboards-docker-entrypoint.sh opensearch-dashboards") + +if __name__ == "__main__": + run() \ No newline at end of file diff --git a/config/playground/docker/dev/scripts/install-plugins.sh b/config/playground/docker/dev/scripts/install-plugins.sh new file mode 100755 index 0000000..42d9c77 --- /dev/null +++ b/config/playground/docker/dev/scripts/install-plugins.sh @@ -0,0 +1,12 @@ +#!/bin/bash +set -e + +echo "Start plugin installation" +cnt=0 + +for var in "$@" +do + /usr/share/opensearch-dashboards/bin/opensearch-dashboards-plugin install $var + cnt=$((cnt+1)) +done +echo "Finished installing $cnt plugins" \ No newline at end of file diff --git a/config/playground/helm/dev/helm-opensearch-dashboards.yaml b/config/playground/helm/dev/helm-opensearch-dashboards.yaml index 2c3f675..faf1595 100644 --- a/config/playground/helm/dev/helm-opensearch-dashboards.yaml +++ b/config/playground/helm/dev/helm-opensearch-dashboards.yaml @@ -9,9 +9,9 @@ opensearchHosts: "https://opensearch-cluster-leader:9200" replicaCount: 2 image: - repository: "opensearchproject/opensearch-dashboards" + repository: "opensearchplayground/opensearch-dashboards" # override image tag, which is .Chart.AppVersion by default - tag: "" + tag: "latest" pullPolicy: "IfNotPresent" imagePullSecrets: [] @@ -60,24 +60,6 @@ securityContext: runAsUser: 1000 config: - # Default OpenSearch Dashboards configuration from docker image of Dashboards - opensearch_dashboards.yml: - opensearch.hosts: [https://localhost:9200] - opensearch.ssl.verificationMode: none - opensearch.username: kibanaserver - opensearch.password: kibanaserver - opensearch.requestHeadersWhitelist: [authorization, securitytenant] - opensearch_security.auth.anonymous_auth_enabled: true - opensearch_security.multitenancy.enabled: false - opensearch_security.multitenancy.tenants.preferred: [Global, Private] - opensearch_security.readonly_mode.roles: [kibana_read_only] - # Use this setting if you are running opensearch-dashboards without https - opensearch_security.cookie.secure: false - server.host: '0.0.0.0' - # Use the consolidated menu and global header bar - opensearchDashboards.branding.useExpandedHeader: false - # Enable wizard feature - wizard.enabled: true priorityClassName: "" From d3fb29f28eb993f65f38537b077716d8db2dd0f2 Mon Sep 17 00:00:00 2001 From: Lu Yu Date: Tue, 25 Oct 2022 10:13:12 -0700 Subject: [PATCH 2/6] change to const and change permission level Signed-off-by: Lu Yu --- .github/workflows/build-custom-docker-image.yml | 2 +- .../playground/docker/dev/scripts/custom_osd_entry.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-custom-docker-image.yml b/.github/workflows/build-custom-docker-image.yml index 1873304..0778c22 100644 --- a/.github/workflows/build-custom-docker-image.yml +++ b/.github/workflows/build-custom-docker-image.yml @@ -32,7 +32,7 @@ jobs: DOCKER_HUB_REPO: ${{secrets.DOCKER_HUB_REPO}} DOCKER_HUB_TAG: ${{secrets.DOCKER_HUB_TAG}} run: | - chmod -R 777 config/playground/docker/dev/scripts/ + chmod -R 755 config/playground/docker/dev/scripts/ docker build -t $DOCKER_HUB_REPO:$DOCKER_HUB_TAG config/playground/docker/dev docker push $DOCKER_HUB_REPO:$DOCKER_HUB_TAG diff --git a/config/playground/docker/dev/scripts/custom_osd_entry.py b/config/playground/docker/dev/scripts/custom_osd_entry.py index 33306c3..5cd11c1 100644 --- a/config/playground/docker/dev/scripts/custom_osd_entry.py +++ b/config/playground/docker/dev/scripts/custom_osd_entry.py @@ -4,12 +4,12 @@ import sys def run(): - source_file = "/opt/opensearch-dashboards/extra_config/osd.yml" - target_file = "/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml" + SOURCE_FILE = "/opt/opensearch-dashboards/extra_config/osd.yml" + TARGET_FILE = "/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml" s_keys = set() nc = [] - with open(source_file, "r") as s: + with open(SOURCE_FILE, "r") as s: for r in s: nc += [r] kv = r.split(":") @@ -18,7 +18,7 @@ def run(): s_keys.add(kv[0]) nt = [] - with open(target_file, "r") as t: + with open(TARGET_FILE, "r") as t: for r in t: kv = r.split(":") if len(kv) < 2 or r.strip().startswith("#"): @@ -29,7 +29,7 @@ def run(): else: nt += [r] - with open(target_file, "w") as f: + with open(TARGET_FILE, "w") as f: f.write("\n".join(nt + nc)) for i in range(1, len(sys.argv)): From afa1c7d57264e293228d81b98676ddfc36f9cac4 Mon Sep 17 00:00:00 2001 From: Lu Yu Date: Tue, 25 Oct 2022 21:29:06 -0700 Subject: [PATCH 3/6] change to use checkout v3 and use always pull due to latest tag and check file exist before updating config Signed-off-by: Lu Yu --- .github/workflows/build-custom-docker-image.yml | 2 +- .github/workflows/deployment-template.yml | 2 +- .github/workflows/os-osd-deployment.yml | 2 +- config/playground/docker/dev/extra_config/osd.yml | 2 +- .../playground/docker/dev/scripts/custom_osd_entry.py | 10 +++++++--- .../helm/dev/helm-opensearch-dashboards.yaml | 3 ++- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-custom-docker-image.yml b/.github/workflows/build-custom-docker-image.yml index 0778c22..37bdb85 100644 --- a/.github/workflows/build-custom-docker-image.yml +++ b/.github/workflows/build-custom-docker-image.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: append config and custom command env: TRACKING_ID: ${{secrets.GA_TRACKING_ID}} diff --git a/.github/workflows/deployment-template.yml b/.github/workflows/deployment-template.yml index 48c6834..005c5e1 100644 --- a/.github/workflows/deployment-template.yml +++ b/.github/workflows/deployment-template.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Step 1 - Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 diff --git a/.github/workflows/os-osd-deployment.yml b/.github/workflows/os-osd-deployment.yml index 9c730f1..8b2cba8 100644 --- a/.github/workflows/os-osd-deployment.yml +++ b/.github/workflows/os-osd-deployment.yml @@ -18,7 +18,7 @@ jobs: config_change_prod: ${{steps.filter.outputs.prod}} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: dorny/paths-filter@v2 id: filter with: diff --git a/config/playground/docker/dev/extra_config/osd.yml b/config/playground/docker/dev/extra_config/osd.yml index eaf3a82..8a0c5e4 100644 --- a/config/playground/docker/dev/extra_config/osd.yml +++ b/config/playground/docker/dev/extra_config/osd.yml @@ -15,6 +15,6 @@ opensearchDashboards.branding.useExpandedHeader: false # Enable wizard feature wizard.enabled: true -#csp settings +#Content security policy(csp) settings csp.rules: ["connect-src 'self' www.google-analytics.com maps.opensearch.org;"] csp.warnLegacyBrowsers: false \ No newline at end of file diff --git a/config/playground/docker/dev/scripts/custom_osd_entry.py b/config/playground/docker/dev/scripts/custom_osd_entry.py index 5cd11c1..be10840 100644 --- a/config/playground/docker/dev/scripts/custom_osd_entry.py +++ b/config/playground/docker/dev/scripts/custom_osd_entry.py @@ -3,10 +3,10 @@ import os import sys -def run(): - SOURCE_FILE = "/opt/opensearch-dashboards/extra_config/osd.yml" - TARGET_FILE = "/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml" +SOURCE_FILE = "/opt/opensearch-dashboards/extra_config/osd.yml" +TARGET_FILE = "/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml" +def update_config(): s_keys = set() nc = [] with open(SOURCE_FILE, "r") as s: @@ -32,6 +32,10 @@ def run(): with open(TARGET_FILE, "w") as f: f.write("\n".join(nt + nc)) +def run(): + if os.path.exists(SOURCE_FILE): + update_config() + for i in range(1, len(sys.argv)): os.system("/opt/opensearch-dashboards/scripts/install-plugins.sh " + sys.argv[i]) diff --git a/config/playground/helm/dev/helm-opensearch-dashboards.yaml b/config/playground/helm/dev/helm-opensearch-dashboards.yaml index faf1595..cd2c20d 100644 --- a/config/playground/helm/dev/helm-opensearch-dashboards.yaml +++ b/config/playground/helm/dev/helm-opensearch-dashboards.yaml @@ -12,7 +12,8 @@ image: repository: "opensearchplayground/opensearch-dashboards" # override image tag, which is .Chart.AppVersion by default tag: "latest" - pullPolicy: "IfNotPresent" + # Always/Never/IfNotPresent + pullPolicy: "Always" imagePullSecrets: [] nameOverride: "" From 6458665438fb5538564e3fd2a5e5190caeac19a1 Mon Sep 17 00:00:00 2001 From: Lu Yu Date: Tue, 25 Oct 2022 21:30:56 -0700 Subject: [PATCH 4/6] added padding for varibales Signed-off-by: Lu Yu --- .github/workflows/build-custom-docker-image.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-custom-docker-image.yml b/.github/workflows/build-custom-docker-image.yml index 37bdb85..8be1379 100644 --- a/.github/workflows/build-custom-docker-image.yml +++ b/.github/workflows/build-custom-docker-image.yml @@ -11,8 +11,8 @@ jobs: - uses: actions/checkout@v3 - name: append config and custom command env: - TRACKING_ID: ${{secrets.GA_TRACKING_ID}} - PLUGINS: ${{secrets.PLUGINS}} + TRACKING_ID: ${{ secrets.GA_TRACKING_ID }} + PLUGINS: ${{ secrets.PLUGINS }} run: | if [[ $TRACKING_ID ]]; then echo -e "\r\n" >> config/playground/docker/dev/extra_config/osd.yml @@ -29,8 +29,8 @@ jobs: - name: Build and push env: - DOCKER_HUB_REPO: ${{secrets.DOCKER_HUB_REPO}} - DOCKER_HUB_TAG: ${{secrets.DOCKER_HUB_TAG}} + DOCKER_HUB_REPO: ${{ secrets.DOCKER_HUB_REPO }} + DOCKER_HUB_TAG: ${{ secrets.DOCKER_HUB_TAG }} run: | chmod -R 755 config/playground/docker/dev/scripts/ docker build -t $DOCKER_HUB_REPO:$DOCKER_HUB_TAG config/playground/docker/dev From f040d023582c47d0b74cce5d1a3c890f55d171df Mon Sep 17 00:00:00 2001 From: Lu Yu Date: Thu, 27 Oct 2022 12:18:00 -0700 Subject: [PATCH 5/6] move config from extra config folder to chart values yaml and set tracking id when install chart Signed-off-by: Lu Yu --- .../workflows/build-custom-docker-image.yml | 5 ----- .github/workflows/deployment-template.yml | 10 ++++++++- .github/workflows/os-osd-deployment.yml | 1 + .../docker/dev/extra_config/osd.yml | 20 ------------------ .../docker/dev/scripts/custom_osd_entry.py | 5 +++++ .../helm/dev/helm-opensearch-dashboards.yaml | 21 +++++++++++++++++++ 6 files changed, 36 insertions(+), 26 deletions(-) mode change 100644 => 100755 config/playground/docker/dev/scripts/custom_osd_entry.py diff --git a/.github/workflows/build-custom-docker-image.yml b/.github/workflows/build-custom-docker-image.yml index 8be1379..befab91 100644 --- a/.github/workflows/build-custom-docker-image.yml +++ b/.github/workflows/build-custom-docker-image.yml @@ -11,13 +11,8 @@ jobs: - uses: actions/checkout@v3 - name: append config and custom command env: - TRACKING_ID: ${{ secrets.GA_TRACKING_ID }} PLUGINS: ${{ secrets.PLUGINS }} run: | - if [[ $TRACKING_ID ]]; then - echo -e "\r\n" >> config/playground/docker/dev/extra_config/osd.yml - echo google_analytics_plugin.trackingID: $TRACKING_ID >> config/playground/docker/dev/extra_config/osd.yml - fi echo -e "\r\n" >> config/playground/docker/dev/Dockerfile echo CMD [\"python\", \"/opt/opensearch-dashboards/scripts/custom_osd_entry.py\", \"$PLUGINS\"] >> config/playground/docker/dev/Dockerfile diff --git a/.github/workflows/deployment-template.yml b/.github/workflows/deployment-template.yml index 005c5e1..401168e 100644 --- a/.github/workflows/deployment-template.yml +++ b/.github/workflows/deployment-template.yml @@ -18,6 +18,9 @@ on: required: true kube-config: required: true + ga-tracking-id: + required: false + default: '' jobs: @@ -38,6 +41,7 @@ jobs: uses: elastic-analytics/dashboards-action@main env: KUBE_CONFIG_DATA: ${{ secrets.kube-config }} + TRACKING_ID: ${{ secrets.ga-tracking-id }} with: plugins: "" # optional, list of Helm plugins. eg. helm-secrets or helm-diff. # Teardown the current OS and OSD and then install the lastest version @@ -52,4 +56,8 @@ jobs: helm uninstall dashboards --namespace default kubectl delete pvc --all 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 \ No newline at end of file + args="" + if [[ $TRACKING_ID ]]; then + args='--set config."opensearch_dashboards\.yml"."google_analytics_plugin\.trackingID"='"$TRACKING_ID"'' + fi + helm install dashboards opensearch/opensearch-dashboards -f config/playground/helm/${{inputs.deploy-env}}/helm-opensearch-dashboards.yaml $args \ No newline at end of file diff --git a/.github/workflows/os-osd-deployment.yml b/.github/workflows/os-osd-deployment.yml index 8b2cba8..8ae09ba 100644 --- a/.github/workflows/os-osd-deployment.yml +++ b/.github/workflows/os-osd-deployment.yml @@ -41,6 +41,7 @@ jobs: secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_DEV }} region: ${{ secrets.AWS_REGION_DEV }} kube-config: ${{ secrets.KUBE_CONFIG_DATA_DEV }} + ga-tracking-id: ${{ secrets.GA_TRACKING_ID }} OS-OSD-Prod-Deployment: needs: Pre-Deployment diff --git a/config/playground/docker/dev/extra_config/osd.yml b/config/playground/docker/dev/extra_config/osd.yml index 8a0c5e4..e69de29 100644 --- a/config/playground/docker/dev/extra_config/osd.yml +++ b/config/playground/docker/dev/extra_config/osd.yml @@ -1,20 +0,0 @@ -opensearch.hosts: [https://localhost:9200] -opensearch.ssl.verificationMode: none -opensearch.username: kibanaserver -opensearch.password: kibanaserver -opensearch.requestHeadersWhitelist: [authorization, securitytenant] -opensearch_security.auth.anonymous_auth_enabled: true -opensearch_security.multitenancy.enabled: false -opensearch_security.multitenancy.tenants.preferred: [Global, Private] -opensearch_security.readonly_mode.roles: [kibana_read_only] -# Use this setting if you are running opensearch-dashboards without https -opensearch_security.cookie.secure: false -server.host: '0.0.0.0' -# Use the consolidated menu and global header bar -opensearchDashboards.branding.useExpandedHeader: false -# Enable wizard feature -wizard.enabled: true - -#Content security policy(csp) settings -csp.rules: ["connect-src 'self' www.google-analytics.com maps.opensearch.org;"] -csp.warnLegacyBrowsers: false \ No newline at end of file diff --git a/config/playground/docker/dev/scripts/custom_osd_entry.py b/config/playground/docker/dev/scripts/custom_osd_entry.py old mode 100644 new mode 100755 index be10840..dfe16a2 --- a/config/playground/docker/dev/scripts/custom_osd_entry.py +++ b/config/playground/docker/dev/scripts/custom_osd_entry.py @@ -11,12 +11,17 @@ def update_config(): nc = [] with open(SOURCE_FILE, "r") as s: for r in s: + if not r.strip(): + continue nc += [r] kv = r.split(":") if len(kv) < 2 or r.strip().startswith("#"): continue s_keys.add(kv[0]) + if not nc: + return + nt = [] with open(TARGET_FILE, "r") as t: for r in t: diff --git a/config/playground/helm/dev/helm-opensearch-dashboards.yaml b/config/playground/helm/dev/helm-opensearch-dashboards.yaml index cd2c20d..fc41c1a 100644 --- a/config/playground/helm/dev/helm-opensearch-dashboards.yaml +++ b/config/playground/helm/dev/helm-opensearch-dashboards.yaml @@ -61,6 +61,27 @@ securityContext: runAsUser: 1000 config: + # Default OpenSearch Dashboards configuration from docker image of Dashboards + opensearch_dashboards.yml: + opensearch.hosts: [https://localhost:9200] + opensearch.ssl.verificationMode: none + opensearch.username: kibanaserver + opensearch.password: kibanaserver + opensearch.requestHeadersWhitelist: [authorization, securitytenant] + opensearch_security.auth.anonymous_auth_enabled: true + opensearch_security.multitenancy.enabled: false + opensearch_security.multitenancy.tenants.preferred: [Global, Private] + opensearch_security.readonly_mode.roles: [kibana_read_only] + # Use this setting if you are running opensearch-dashboards without https + opensearch_security.cookie.secure: false + server.host: '0.0.0.0' + # Use the consolidated menu and global header bar + opensearchDashboards.branding.useExpandedHeader: false + #Content security policy(csp) settings + csp.rules: [ "connect-src 'self' www.google-analytics.com maps.opensearch.org;" ] + csp.warnLegacyBrowsers: false + # Google analytics plugin settings + google_analytics_plugin.enabled: false priorityClassName: "" From 66ebcdc95642ec58426eae6e5c42f59ad9fc4c80 Mon Sep 17 00:00:00 2001 From: Lu Yu Date: Fri, 28 Oct 2022 11:41:33 -0700 Subject: [PATCH 6/6] enable ga in dev Signed-off-by: Lu Yu --- config/playground/helm/dev/helm-opensearch-dashboards.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/playground/helm/dev/helm-opensearch-dashboards.yaml b/config/playground/helm/dev/helm-opensearch-dashboards.yaml index fc41c1a..fa23eb1 100644 --- a/config/playground/helm/dev/helm-opensearch-dashboards.yaml +++ b/config/playground/helm/dev/helm-opensearch-dashboards.yaml @@ -81,7 +81,7 @@ config: csp.rules: [ "connect-src 'self' www.google-analytics.com maps.opensearch.org;" ] csp.warnLegacyBrowsers: false # Google analytics plugin settings - google_analytics_plugin.enabled: false + google_analytics_plugin.enabled: true priorityClassName: ""