Repository: ambari Updated Branches: refs/heads/trunk a0d3b5e86 -> dcfe0d462
AMBARI-10687 Display stack version in config history UI. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dcfe0d46 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dcfe0d46 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dcfe0d46 Branch: refs/heads/trunk Commit: dcfe0d46233e2c4ef498c4646976a2e59860ddc8 Parents: a0d3b5e Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Thu Apr 23 13:21:39 2015 +0300 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Thu Apr 23 13:21:39 2015 +0300 ---------------------------------------------------------------------- .../0.96.0.2.0/configuration/hbase-site.xml | 6 +- .../HDP/2.2/services/HBASE/themes/theme.json | 2 +- .../data/configurations/service_versions.json | 66 +++++++++++++------- .../mappers/service_config_version_mapper.js | 5 +- .../models/configs/service_config_version.js | 1 + ambari-web/app/styles/config_history_flow.less | 25 ++++---- .../common/configs/config_history_flow.hbs | 1 + .../common/configs/service_version_box.hbs | 2 + ambari-web/app/utils/ajax/ajax.js | 2 +- ambari-web/app/utils/config.js | 4 +- .../widgets/toggle_config_widget_view.js | 6 +- 11 files changed, 74 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/dcfe0d46/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml index 9e67bf6..3093a60 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml @@ -341,10 +341,12 @@ <type>value-list</type> <entries> <entry> - <value>true</value> + <label>Simple</label> + <value>simple</value> </entry> <entry> - <value>false</value> + <label>Kerberos</label> + <value>kerberos</value> </entry> </entries> <selection-cardinality>1</selection-cardinality> http://git-wip-us.apache.org/repos/asf/ambari/blob/dcfe0d46/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json index e803292..d5917c0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json @@ -381,7 +381,7 @@ { "config":"hbase-site/hbase.security.authentication", "widget":{ - "type":"checkbox" + "type":"toggle" } }, { http://git-wip-us.apache.org/repos/asf/ambari/blob/dcfe0d46/ambari-web/app/assets/data/configurations/service_versions.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/configurations/service_versions.json b/ambari-web/app/assets/data/configurations/service_versions.json index 4628d4d..5b30903 100644 --- a/ambari-web/app/assets/data/configurations/service_versions.json +++ b/ambari-web/app/assets/data/configurations/service_versions.json @@ -7,7 +7,8 @@ "configurations" : [ { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "ganglia-env", "tag" : "version1414410959005", @@ -34,7 +35,8 @@ "service_config_version" : 1, "service_config_version_note" : "Initial configurations for Ganglia", "service_name" : "GANGLIA", - "user" : "admin" + "user" : "admin", + "stack_id": "HDP-2.0.6" }, { "href" : "http://192.168.56.101:8080/api/v1/clusters/tdk/configurations/service_config_versions?service_name=HDFS&service_config_version=2";, @@ -42,7 +44,8 @@ "configurations" : [ { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "core-site", "tag" : "version1", @@ -71,7 +74,8 @@ }, { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "hadoop-policy", "tag" : "version1", @@ -105,7 +109,8 @@ }, { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "hdfs-site", "tag" : "version1", @@ -167,7 +172,8 @@ }, { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "hadoop-env", "tag" : "version1414314983497", @@ -199,7 +205,8 @@ "service_config_version" : 2, "service_config_version_note" : "", "service_name" : "HDFS", - "user" : "admin" + "user" : "admin", + "stack_id": "HDP-2.0.6" }, { "href" : "http://192.168.56.101:8080/api/v1/clusters/tdk/configurations/service_config_versions?service_name=HDFS&service_config_version=1";, @@ -207,7 +214,8 @@ "configurations" : [ { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "hadoop-env", "tag" : "version1", @@ -232,7 +240,8 @@ }, { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "hdfs-log4j", "tag" : "version1", @@ -244,7 +253,8 @@ }, { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "hdfs-site", "tag" : "version1", @@ -306,7 +316,8 @@ }, { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "hadoop-policy", "tag" : "version1", @@ -328,7 +339,8 @@ }, { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "core-site", "tag" : "version1", @@ -364,7 +376,8 @@ "service_config_version" : 1, "service_config_version_note" : "Initial configurations for HDFS", "service_name" : "HDFS", - "user" : "admin" + "user" : "admin", + "stack_id": "HDP-2.0.6" }, { "href" : "http://192.168.56.101:8080/api/v1/clusters/tdk/configurations/service_config_versions?service_name=HDFS&service_config_version=3";, @@ -372,7 +385,8 @@ "configurations" : [ { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "hadoop-env", "tag" : "version1414314983497", @@ -397,7 +411,8 @@ }, { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "hadoop-policy", "tag" : "version1", @@ -419,7 +434,8 @@ }, { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "hdfs-log4j", "tag" : "version1", @@ -431,7 +447,8 @@ }, { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "hdfs-site", "tag" : "version1", @@ -493,7 +510,8 @@ }, { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "core-site", "tag" : "version1414410959005", @@ -529,7 +547,8 @@ "service_config_version" : 3, "service_config_version_note" : null, "service_name" : "HDFS", - "user" : "admin" + "user" : "admin", + "stack_id": "HDP-2.0.6" }, { "href" : "http://192.168.56.101:8080/api/v1/clusters/tdk/configurations/service_config_versions?service_name=ZOOKEEPER&service_config_version=1";, @@ -537,7 +556,8 @@ "configurations" : [ { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "zookeeper-env", "tag" : "version1", @@ -557,7 +577,8 @@ }, { "Config" : { - "cluster_name" : "tdk" + "cluster_name" : "tdk", + "stack_id": "HDP-2.0.6" }, "type" : "zookeeper-log4j", "tag" : "version1", @@ -576,7 +597,8 @@ "service_config_version" : 1, "service_config_version_note" : "Initial configurations for ZooKeeper", "service_name" : "ZOOKEEPER", - "user" : "admin" + "user" : "admin", + "stack_id": "HDP-2.0.6" } ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/dcfe0d46/ambari-web/app/mappers/service_config_version_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/service_config_version_mapper.js b/ambari-web/app/mappers/service_config_version_mapper.js index 8f2e606..fbec4dc 100644 --- a/ambari-web/app/mappers/service_config_version_mapper.js +++ b/ambari-web/app/mappers/service_config_version_mapper.js @@ -31,7 +31,8 @@ App.serviceConfigVersionsMapper = App.QuickDataMapper.create({ author: 'user', notes: 'service_config_version_note', is_current: 'is_current', - index: 'index' + index: 'index', + stack_version: 'stack_id' }, map: function (json) { var result = []; @@ -63,7 +64,7 @@ App.serviceConfigVersionsMapper = App.QuickDataMapper.create({ App.router.set('mainConfigHistoryController.filteredCount', itemTotal); } /** - * this code sets hostNames for default confg group + * this code sets hostNames for default config group * by excluding hostNames that belongs to not default groups * from list of all hosts */ http://git-wip-us.apache.org/repos/asf/ambari/blob/dcfe0d46/ambari-web/app/models/configs/service_config_version.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/configs/service_config_version.js b/ambari-web/app/models/configs/service_config_version.js index 6729cfe..7c864dd 100644 --- a/ambari-web/app/models/configs/service_config_version.js +++ b/ambari-web/app/models/configs/service_config_version.js @@ -37,6 +37,7 @@ App.ServiceConfigVersion = DS.Model.extend({ index: DS.attr('number'), isCurrent: DS.attr('boolean'), isDisplayed: DS.attr('boolean'), + stackVersion: DS.attr('string'), isDefault: function() { return this.get('groupName') === 'default'; }.property('groupName'), http://git-wip-us.apache.org/repos/asf/ambari/blob/dcfe0d46/ambari-web/app/styles/config_history_flow.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/config_history_flow.less b/ambari-web/app/styles/config_history_flow.less index a68ec61..ad34696 100644 --- a/ambari-web/app/styles/config_history_flow.less +++ b/ambari-web/app/styles/config_history_flow.less @@ -37,10 +37,10 @@ margin-top: -5px; .version-slider { width: 100%; - height: 58px; + height: 69px; margin: 5px 0; .flow-element { - height: 58px; + height: 69px; width: 15.2%; max-width: 146px; .version-box { @@ -81,6 +81,11 @@ text-align: center; padding: 2px 5px; } + .stack-label { + margin-right: 6px; + text-align: right; + line-height: 11px; + } } .version-box .version-popover { display: none; @@ -161,7 +166,7 @@ } .icon-chevron-box { - margin-top: 10px; + margin-top: 15px; width: 4%; cursor: pointer; .icon-chevron-right, @@ -172,14 +177,8 @@ .icon-chevron-right:hover{ color: #808080; } - } - .icon-chevron-box.disabled { - margin-top: 10px; - width: 4%; - cursor: not-allowed; - .icon-chevron-right, - .icon-chevron-left{ - color: #d2d9dd; + &.disabled { + cursor: not-allowed; } } } @@ -295,6 +294,10 @@ } } } + .stack { + padding: 1px 10px; + font-size: 11px; + } } #config_history { http://git-wip-us.apache.org/repos/asf/ambari/blob/dcfe0d46/ambari-web/app/templates/common/configs/config_history_flow.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/config_history_flow.hbs b/ambari-web/app/templates/common/configs/config_history_flow.hbs index 5be8ce3..866ee11 100644 --- a/ambari-web/app/templates/common/configs/config_history_flow.hbs +++ b/ambari-web/app/templates/common/configs/config_history_flow.hbs @@ -72,6 +72,7 @@ <ul class="dropdown-menu version-info-operations"> <div class="content"> <span class="label label-info">{{serviceVersion.versionText}}</span> + <span class="stack">{{serviceVersion.stackVersion}}</span> <div class="group"><strong>{{serviceVersion.configGroupName}}</strong></div> <div class="date"><strong>{{serviceVersion.author}}</strong> {{t dashboard.configHistory.info-bar.authoredOn}} <strong>{{serviceVersion.createdDate}}</strong></div> <div class="notes">{{{serviceVersion.fullNotes}}}</div> http://git-wip-us.apache.org/repos/asf/ambari/blob/dcfe0d46/ambari-web/app/templates/common/configs/service_version_box.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/service_version_box.hbs b/ambari-web/app/templates/common/configs/service_version_box.hbs index 3b4c490..132a8ab 100644 --- a/ambari-web/app/templates/common/configs/service_version_box.hbs +++ b/ambari-web/app/templates/common/configs/service_version_box.hbs @@ -25,6 +25,7 @@ <span class="author pull-right">{{serviceVersion.author}}</span> </div> <div class="content">{{serviceVersion.timeSinceCreated}}</div> + <div class="stack-label">{{serviceVersion.stackVersion}}</div> {{#if serviceVersion.isCurrent}} <div class="current-label"> <span class="label label-success"> @@ -38,6 +39,7 @@ <div class="version-popover"> <div class="content"> <span class="label label-info">{{serviceVersion.versionText}}</span> <span class="pull-right"><strong>{{serviceVersion.configGroupName}}</strong></span> + <span class="stack">{{serviceVersion.stackVersion}}</span> <div class="date"><strong>{{serviceVersion.author}}</strong> {{t dashboard.configHistory.info-bar.authoredOn}} <strong>{{serviceVersion.createdDate}}</strong></div> <div class="notes">{{{serviceVersion.fullNotes}}}</div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/dcfe0d46/ambari-web/app/utils/ajax/ajax.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js index 5328272..21dc116 100644 --- a/ambari-web/app/utils/ajax/ajax.js +++ b/ambari-web/app/utils/ajax/ajax.js @@ -2302,7 +2302,7 @@ var urls = { } }, 'service.serviceConfigVersions.get': { - real: '/clusters/{clusterName}/configurations/service_config_versions?service_name={serviceName}&fields=service_config_version,user,hosts,group_id,group_name,is_current,createtime,service_name,service_config_version_note&minimal_response=true', + real: '/clusters/{clusterName}/configurations/service_config_versions?service_name={serviceName}&fields=service_config_version,user,hosts,group_id,group_name,is_current,createtime,service_name,service_config_version_note,stack_id&minimal_response=true', mock: '/data/configurations/service_versions.json' }, 'service.serviceConfigVersions.get.current': { http://git-wip-us.apache.org/repos/asf/ambari/blob/dcfe0d46/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 4b84872..e3d784b 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -393,10 +393,10 @@ App.config = Em.Object.create({ switch (type) { case 'int': var res = parseInt(value); - return Number.isNaN(res) ? "" : res.toString(); + return isNaN(res) ? "" : res.toString(); case 'float': var res = parseFloat(value); - return Number.isNaN(res) ? "" : res.toString(); + return isNaN(res) ? "" : res.toString(); default: return value; } http://git-wip-us.apache.org/repos/asf/ambari/blob/dcfe0d46/ambari-web/app/views/common/configs/widgets/toggle_config_widget_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/widgets/toggle_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/toggle_config_widget_view.js index 7a78c6b..24eb4a1 100644 --- a/ambari-web/app/views/common/configs/widgets/toggle_config_widget_view.js +++ b/ambari-web/app/views/common/configs/widgets/toggle_config_widget_view.js @@ -154,11 +154,7 @@ App.ToggleConfigWidgetView = App.ConfigWidgetView.extend({ */ restoreValue: function () { this._super(); - var value = this.getNewSwitcherValue(this.get('config.value')); - this.set('skipRequestForDependencies', true); - this.get('switcher').bootstrapSwitch('toggleState', value); - this.set('skipRequestForDependencies', false); - this.set('switcherValue', value); + this.setValue(this.get('config.value')); }, /**
