This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by
this push:
new 1ce5883 AMBARI-24328. PostTrunkMerge : UI Host page API call is
broken.
1ce5883 is described below
commit 1ce5883984e75749a425eff77bc29049b7368f50
Author: Swapan Shridhar <[email protected]>
AuthorDate: Fri Jul 20 13:36:31 2018 -0700
AMBARI-24328. PostTrunkMerge : UI Host page API call is broken.
---
.../app/controllers/global/update_controller.js | 48 ++++++----------------
1 file changed, 13 insertions(+), 35 deletions(-)
diff --git a/ambari-web/app/controllers/global/update_controller.js
b/ambari-web/app/controllers/global/update_controller.js
index 08ab275..7dcac8c 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -221,40 +221,6 @@ App.UpdateController = Em.Controller.extend({
/**
*
- * @param {boolean} loadMetricsSeparately
- * @returns {string|*}
- */
- getUpdateHostUrlWithParams: function (loadMetricsSeparately) {
- let url =
'/hosts?fields=Hosts/rack_info,Hosts/host_name,Hosts/maintenance_state,Hosts/public_host_name,'
+
-
'Hosts/cpu_count,Hosts/ph_cpu_count,<lastAgentEnv>alerts_summary,Hosts/host_status,Hosts/host_state,'
+
- 'Hosts/last_heartbeat_time,Hosts/ip,host_components/HostRoles/state,' +
-
'host_components/HostRoles/maintenance_state,host_components/HostRoles/stale_configs,'
+
-
'host_components/HostRoles/service_name,host_components/HostRoles/display_name,'
+
- 'host_components/HostRoles/desired_admin_state,<nameNodeMetrics>' +
-
'<metrics>Hosts/total_mem<hostDetailsParams><stackVersions>&minimal_response=true';
- const stackVersionInfo = ',stack_versions/HostStackVersions,' +
-
'stack_versions/repository_versions/RepositoryVersions/repository_version,' +
- 'stack_versions/repository_versions/RepositoryVersions/id,' +
- 'stack_versions/repository_versions/RepositoryVersions/display_name',
- loggingResource = ',host_components/logging',
- isHostDetailPage = App.router.get('currentState.parentState.name') ===
'hostDetails',
- isHostsPage = App.router.get('currentState.parentState.name') ===
'hosts',
- hostDetailsParams =
',Hosts/os_arch,Hosts/os_type,metrics/cpu/cpu_system,metrics/cpu/cpu_user,' +
- 'metrics/memory/mem_total,metrics/memory/mem_free',
- nameNodeMetrics = 'host_components/metrics/dfs/namenode/ClusterId,' +
- 'host_components/metrics/dfs/FSNamesystem/HAState,';
-
- url = url.replace("<stackVersions>", stackVersionInfo);
- url = url.replace("<metrics>", loadMetricsSeparately ? "" :
"metrics/disk,metrics/load/load_one,");
- url = url.replace('<hostDetailsParams>', isHostsPage ? '' :
hostDetailsParams);
- url = url.replace('<lastAgentEnv>', isHostDetailPage ?
'Hosts/last_agent_env,' : '');
- url = url.replace('<nameNodeMetrics>',
App.Service.find('HDFS').get('isLoaded') ? nameNodeMetrics : '');
- url = App.get('supports.logSearch') ? url + loggingResource : url;
- return url;
- },
-
- /**
- *
* @param {Function} callback
* @param {Function} error
* @param {boolean} lazyLoadMetrics
@@ -263,16 +229,23 @@ App.UpdateController = Em.Controller.extend({
var testUrl = this.get('HOSTS_TEST_URL'),
self = this,
hostDetailsFilter = '',
+ realUrl =
'/hosts?fields=Hosts/rack_info,Hosts/host_name,Hosts/maintenance_state,Hosts/public_host_name,Hosts/cpu_count,Hosts/ph_cpu_count,Hosts/last_agent_env,'
+
+
'alerts_summary,Hosts/host_status,Hosts/host_state,Hosts/last_heartbeat_time,Hosts/ip,host_components/HostRoles/state,host_components/HostRoles/maintenance_state,'
+
+
'host_components/HostRoles/stale_configs,host_components/HostRoles/service_name,host_components/HostRoles/display_name,host_components/HostRoles/desired_admin_state,'
+
+ (App.Service.find().someProperty('serviceName', 'HDFS') ?
'host_components/metrics/dfs/namenode/ClusterId,host_components/metrics/dfs/FSNamesystem/HAState,'
: '') +
+
'<metrics>Hosts/total_mem<hostDetailsParams><stackVersions>&minimal_response=true',
hostDetailsParams =
',Hosts/os_arch,Hosts/os_type,metrics/cpu/cpu_system,metrics/cpu/cpu_user,metrics/memory/mem_total,metrics/memory/mem_free',
stackVersionInfo = '',
mainHostController = App.router.get('mainHostController'),
sortProperties = mainHostController.getSortProps(),
+ loggingResource = ',host_components/logging',
isHostsLoaded = false,
// load hosts metrics separately of lazyLoadMetrics=true, but metrics
in current request if we are sorting
loadMetricsSeparately = lazyLoadMetrics && !(sortProperties.length &&
['loadAvg', 'diskUsage'].contains(sortProperties[0].name));
this.get('queryParams').set('Hosts',
mainHostController.getQueryParameters(true));
if (App.router.get('currentState.parentState.name') === 'hosts') {
App.updater.updateInterval('updateHost',
App.get('contentUpdateInterval'));
+ hostDetailsParams = '';
}
else {
if (App.router.get('currentState.parentState.name') === 'hostDetails') {
@@ -298,7 +271,12 @@ App.UpdateController = Em.Controller.extend({
}
}
- let realUrl = this.getUpdateHostUrlWithParams(loadMetricsSeparately);
+ realUrl = realUrl.replace("<stackVersions>", stackVersionInfo);
+ realUrl = realUrl.replace("<metrics>", loadMetricsSeparately ? "" :
"metrics/disk,metrics/load/load_one,");
+ realUrl = realUrl.replace('<hostDetailsParams>', hostDetailsParams);
+ if (App.get('supports.logSearch')) {
+ realUrl += loggingResource;
+ }
var clientCallback = function (skipCall, queryParams, itemTotal) {
var completeCallback = function () {
