From 406757d75146dbc76240b662d78ff35ab4c6f133 Mon Sep 17 00:00:00 2001
From: "Miguel A. C" <30386061+doncicuto@users.noreply.github.com>
Date: Mon, 4 Dec 2017 18:01:07 +0100
Subject: [PATCH] feat(swarm-visualizer): add ram and cpu info to nodes &
 limits to tasks (#1458)

---
 app/components/swarmVisualizer/swarmVisualizer.html | 4 ++++
 app/filters/filters.js                              | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/components/swarmVisualizer/swarmVisualizer.html b/app/components/swarmVisualizer/swarmVisualizer.html
index 95148417e..098a854ee 100644
--- a/app/components/swarmVisualizer/swarmVisualizer.html
+++ b/app/components/swarmVisualizer/swarmVisualizer.html
@@ -73,6 +73,8 @@
                 </div>
               </div>
               <div>{{ node.Role }}</div>
+              <div>CPU: {{ node.CPUs / 1000000000 }}</div>
+              <div>Memory: {{ node.Memory|humansize: 2 }}</div>
             </div>
             <div class="tasks">
               <div class="task task_{{ task.Status.State | visualizerTask }}" ng-repeat="task in node.Tasks | filter: (state.DisplayOnlyRunningTasks || '') && { Status: { State: 'running' } }">
@@ -80,6 +82,8 @@
                 <div>Image: {{ task.Spec.ContainerSpec.Image | hideshasum }}</div>
                 <div>Status: {{ task.Status.State }}</div>
                 <div>Update: {{ task.Updated | getisodate }}</div>
+                <div ng-if="task.Spec.Resources.Limits.MemoryBytes">Memory limit: {{ task.Spec.Resources.Limits.MemoryBytes | humansize: 2:2 }}</div>
+                <div ng-if="task.Spec.Resources.Limits.NanoCPUs">CPU limit: {{ task.Spec.Resources.Limits.NanoCPUs / 1000000000 }}</div>
               </div>
             </div>
           </div>
diff --git a/app/filters/filters.js b/app/filters/filters.js
index ee3b6435a..2c78e8dd3 100644
--- a/app/filters/filters.js
+++ b/app/filters/filters.js
@@ -177,12 +177,15 @@ angular.module('portainer.filters', [])
 })
 .filter('humansize', function () {
   'use strict';
-  return function (bytes, round) {
+  return function (bytes, round, base) {
     if (!round) {
       round = 1;
     }
+    if (!base) {
+      base = 10;
+    }
     if (bytes || bytes === 0) {
-      return filesize(bytes, {base: 10, round: round});
+      return filesize(bytes, {base: base, round: round});
     }
   };
 })