feat(titus): add resources to server group sidebar and omit some unch…

…angeable labels
spinnaker · Mar 10, 2017 · d79cc35 · d79cc35
1 parent 1851a7b
commit d79cc35
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/app/scripts/modules/titus/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/titus/serverGroup/details/serverGroupDetails.html
@@ -135,6 +135,18 @@ <h4 class="text-center" ng-if="serverGroup.isDisabled">[TITUS JOB IS DISABLED]</
         </li>
       </ul>
     </collapsible-section>
+    <collapsible-section heading="Resources" expanded="true">
+      <dl class="dl-horizontal dl-flex">
+        <dt>CPU(s)</dt>
+        <dd>{{serverGroup.resources.cpu}}</dd>
+        <dt>Memory</dt>
+        <dd>{{serverGroup.resources.memory}} MB</dd>
+        <dt>Disk</dt>
+        <dd>{{serverGroup.resources.disk}} MB</dd>
+        <dt>Network</dt>
+        <dd>{{serverGroup.resources.networkMbps}} Mbps</dd>
+      </dl>
+    </collapsible-section>
     <collapsible-section heading="Environment">
       <div ng-if="!serverGroup.env">No environment parameters associated with this
         server group</div>
@@ -146,8 +158,8 @@ <h4 class="text-center" ng-if="serverGroup.isDisabled">[TITUS JOB IS DISABLED]</
     <collapsible-section heading="Labels">
       <div ng-if="!serverGroup.labels">No labels associated with this
         server group</div>
-      <dl ng-if="serverGroup.labels">
-        <dt ng-repeat-start="(key, val) in serverGroup.labels">{{key}}</dt>
+      <dl ng-if="labels">
+        <dt ng-repeat-start="(key, val) in labels">{{key}}</dt>
         <dd ng-repeat-end>{{val}}</dd>
       </dl>
     </collapsible-section>

diff --git a/app/scripts/modules/titus/serverGroup/details/serverGroupDetails.titus.controller.js b/app/scripts/modules/titus/serverGroup/details/serverGroupDetails.titus.controller.js
@@ -59,6 +59,13 @@ module.exports = angular.module('spinnaker.serverGroup.details.titus.controller'
         angular.extend(details, summary);
 
         $scope.serverGroup = details;
+        var labels = $scope.serverGroup.labels;
+        delete labels['name'];
+        delete labels['source'];
+        delete labels['spinnakerAccount'];
+        delete labels['NETFLIX_APP_METADATA'];
+        delete labels['NETFLIX_APP_METADATA_SIG'];
+        $scope.labels = labels;
 
         if (!_.isEmpty($scope.serverGroup)) {
           if (details.securityGroups) {