From 00880f3a889ebdbe07adf26ef1bd7d9e2439dfb4 Mon Sep 17 00:00:00 2001 From: Kristen Tian Date: Tue, 11 Oct 2022 15:05:38 -0700 Subject: [PATCH] [MD]Add data source config to opensearch-dashboards-docker Signed-off-by: Kristen Tian --- CHANGELOG.md | 1 + config/opensearch_dashboards.yml | 4 ++-- .../resources/bin/opensearch-dashboards-docker | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64a618d3d8b..caa64f0f661 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) * [Multi DataSource] Add data source column into index pattern table ([#2542](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2542)) * [Multi DataSource] UX enhancement for Data source management creation page ([#2051](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2501)) * [Multi DataSource] Add experimental callout for index pattern section ([#2523](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2523)) +* [Multi DataSource] Add data source config to opensearch-dashboards-docker ([#2557](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2557)) ### 🐛 Bug Fixes * [Vis Builder] Fixes auto bounds for timeseries bar chart visualization ([2401](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2401)) diff --git a/config/opensearch_dashboards.yml b/config/opensearch_dashboards.yml index 4f23dc42c05..8c592f7f698 100644 --- a/config/opensearch_dashboards.yml +++ b/config/opensearch_dashboards.yml @@ -224,10 +224,10 @@ # functionality in Visualization. # wizard.enabled: false -# Set the value of this setting to true to enables the experimental multiple data source +# Set the value of this setting to true to enable the experimental multiple data source # support feature. Use with caution. #data_source.enabled: false -# Set the value of these settings to custermize crypto materials to encryption saved credentials +# Set the value of these settings to customize crypto materials to encryption saved credentials # in data sources. #data_source.encryption.wrappingKeyName: 'changeme' #data_source.encryption.wrappingKeyNamespace: 'changeme' diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/bin/opensearch-dashboards-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/bin/opensearch-dashboards-docker index cd81f8d16c3..dc05bf8e091 100755 --- a/src/dev/build/tasks/os_packages/docker_generator/resources/bin/opensearch-dashboards-docker +++ b/src/dev/build/tasks/os_packages/docker_generator/resources/bin/opensearch-dashboards-docker @@ -150,6 +150,16 @@ opensearch_dashboards_vars=( telemetry.optInStatusUrl telemetry.sendUsageFrom wizard.enabled + data_source.enabled + data_source.encryption.wrappingKeyName + data_source.encryption.wrappingKeyNamespace + data_source.encryption.wrappingKey + data_source.audit.enabled + data_source.audit.appender.kind + data_source.audit.appender.path + data_source.audit.appender.layout.kind + data_source.audit.appender.layout.highlight + data_source.audit.appender.layout.pattern ) longopts=''