AMBARI-22274. use different names for superset and druid metadata storage config sections. (nishantmonu51)
(cherry picked from commit 35d6f09743fc08fc11c330d6720d3509434192e4) Change-Id: I7c923a49018b52eca0e11e36ee4b711baca09788 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/305fa46a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/305fa46a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/305fa46a Branch: refs/heads/AMBARI-2.6.0.0 Commit: 305fa46a98d85ed7ca0488019c1ee3148de0a299 Parents: e1f9630 Author: Nishant <nishant.mon...@gmail.com> Authored: Fri Oct 20 01:32:14 2017 +0530 Committer: Zuul <rel...@hortonworks.com> Committed: Fri Oct 20 06:05:10 2017 -0700 ---------------------------------------------------------------------- .../DRUID/0.10.1/themes/theme.json | 26 ++++++++++---------- .../SUPERSET/0.15.0/themes/theme.json | 22 ++++++++--------- 2 files changed, 24 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/305fa46a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/themes/theme.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/themes/theme.json b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/themes/theme.json index 7033e19..46a953a 100644 --- a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/themes/theme.json +++ b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/themes/theme.json @@ -7,24 +7,24 @@ "name": "default", "tabs": [ { - "name": "metadata_storage", - "display-name": "META DATA STORAGE CONFIG", + "name": "druid_metadata_storage", + "display-name": "DRUID META DATA STORAGE CONFIG", "layout": { - "tab-columns": "", + "tab-columns": "1", "tab-rows": "1", "sections": [ { - "name": "section-metadata-storage", + "name": "section-druid-metadata-storage", "display-name": "", "row-index": "0", "column-index": "0", - "row-span": "2", + "row-span": "1", "column-span": "1", "section-columns": "1", "section-rows": "1", "subsections": [ { - "name": "subsection-metadata-storage-row1-col1", + "name": "subsection-druid-metadata-storage-row1-col1", "display-name": "DRUID META DATA STORAGE", "row-index": "0", "column-index": "0", @@ -44,31 +44,31 @@ "configs": [ { "config": "druid-common/database_name", - "subsection-name": "subsection-metadata-storage-row1-col1" + "subsection-name": "subsection-druid-metadata-storage-row1-col1" }, { "config": "druid-common/druid.metadata.storage.type", - "subsection-name": "subsection-metadata-storage-row1-col1" + "subsection-name": "subsection-druid-metadata-storage-row1-col1" }, { "config": "druid-common/druid.metadata.storage.connector.user", - "subsection-name": "subsection-metadata-storage-row1-col1" + "subsection-name": "subsection-druid-metadata-storage-row1-col1" }, { "config": "druid-common/druid.metadata.storage.connector.password", - "subsection-name": "subsection-metadata-storage-row1-col1" + "subsection-name": "subsection-druid-metadata-storage-row1-col1" }, { "config": "druid-common/metastore_hostname", - "subsection-name": "subsection-metadata-storage-row1-col1" + "subsection-name": "subsection-druid-metadata-storage-row1-col1" }, { "config": "druid-common/druid.metadata.storage.connector.port", - "subsection-name": "subsection-metadata-storage-row1-col1" + "subsection-name": "subsection-druid-metadata-storage-row1-col1" }, { "config": "druid-common/druid.metadata.storage.connector.connectURI", - "subsection-name": "subsection-metadata-storage-row1-col1" + "subsection-name": "subsection-druid-metadata-storage-row1-col1" } ] }, http://git-wip-us.apache.org/repos/asf/ambari/blob/305fa46a/ambari-server/src/main/resources/common-services/SUPERSET/0.15.0/themes/theme.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SUPERSET/0.15.0/themes/theme.json b/ambari-server/src/main/resources/common-services/SUPERSET/0.15.0/themes/theme.json index a2c6001..6f1cc17 100644 --- a/ambari-server/src/main/resources/common-services/SUPERSET/0.15.0/themes/theme.json +++ b/ambari-server/src/main/resources/common-services/SUPERSET/0.15.0/themes/theme.json @@ -7,14 +7,14 @@ "name": "default", "tabs": [ { - "name": "metadata_storage", - "display-name": "META DATA STORAGE CONFIG", + "name": "superset_metadata_storage", + "display-name": "SUPERSET META DATA STORAGE CONFIG", "layout": { "tab-columns": "1", "tab-rows": "1", "sections": [ { - "name": "section-metadata-storage", + "name": "section-superset-metadata-storage", "display-name": "", "row-index": "0", "column-index": "0", @@ -24,7 +24,7 @@ "section-rows": "1", "subsections": [ { - "name": "subsection-metadata-storage-row1-col1", + "name": "subsection-superset-metadata-storage-row1-col1", "display-name": "SUPERSET META DATA STORAGE", "row-index": "0", "column-index": "0", @@ -44,31 +44,31 @@ "configs": [ { "config": "superset/SUPERSET_DATABASE_NAME", - "subsection-name": "subsection-metadata-storage-row1-col1" + "subsection-name": "subsection-superset-metadata-storage-row1-col1" }, { "config": "superset/SUPERSET_DATABASE_TYPE", - "subsection-name": "subsection-metadata-storage-row1-col1" + "subsection-name": "subsection-superset-metadata-storage-row1-col1" }, { "config": "superset/SUPERSET_DATABASE_USER", - "subsection-name": "subsection-metadata-storage-row1-col1" + "subsection-name": "subsection-superset-metadata-storage-row1-col1" }, { "config": "superset/SUPERSET_DATABASE_PASSWORD", - "subsection-name": "subsection-metadata-storage-row1-col1" + "subsection-name": "subsection-superset-metadata-storage-row1-col1" }, { "config": "superset/SUPERSET_DATABASE_HOSTNAME", - "subsection-name": "subsection-metadata-storage-row1-col1" + "subsection-name": "subsection-superset-metadata-storage-row1-col1" }, { "config": "superset/SUPERSET_DATABASE_PORT", - "subsection-name": "subsection-metadata-storage-row1-col1" + "subsection-name": "subsection-superset-metadata-storage-row1-col1" }, { "config": "superset/SECRET_KEY", - "subsection-name": "subsection-metadata-storage-row1-col1" + "subsection-name": "subsection-superset-metadata-storage-row1-col1" } ] },
