Bladeren bron

AMBARI-2725. FE Hostcheck should use installedPackages instead of using rpm to get list of installed packages. (Andrii Babiichuk via yusaku)

Yusaku Sako 12 jaren geleden
bovenliggende
commit
a2dd81eb0a

+ 3 - 4
ambari-web/app/controllers/wizard/step3_controller.js

@@ -722,16 +722,16 @@ App.WizardStep3Controller = Em.Controller.extend({
       }, this);
 
       //parse all package warnings for host
-      _host.Hosts.last_agent_env.rpms.forEach(function (_package) {
-
-        if (_package.installed) {
+      _host.Hosts.last_agent_env.installedPackages.forEach(function (_package) {
           warning = warnings.filterProperty('category', 'packages').findProperty('name', _package.name);
           if (warning) {
             warning.hosts.push(_host.Hosts.host_name);
+            warning.version = _package.version,
             warning.onSingleHost = false;
           } else {
             warning = {
               name: _package.name,
+              version: _package.version,
               hosts: [_host.Hosts.host_name],
               category: 'packages',
               onSingleHost: true
@@ -739,7 +739,6 @@ App.WizardStep3Controller = Em.Controller.extend({
             warnings.push(warning);
           }
           host.warnings.push(warning);
-        }
       }, this);
 
       //parse all process warnings for host

+ 3 - 0
ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs

@@ -69,6 +69,9 @@
             {{#each warning in category.warnings}}
             <tr>
               <td class="warning-name" {{bindAttr data-original-title="warning.command"}} >{{warning.name}}</td>
+              {{#if warning.version}}
+                  <td class="package-version">{{warning.version}}</td>
+              {{/if}}
               <td>{{category.action}}
                 <a href="javascript:void(null);" rel='HostsListTooltip' {{bindAttr data-original-title="warning.hostsList"}} {{action showHostsPopup warning.hosts}}>
                   {{warning.hosts.length}}