Elastic: fix memory (show heap) and cluster selection

opserver · Sep 20, 2017 · b4116d9 · b4116d9
1 parent 158292f
commit b4116d9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Opserver/Views/Elastic/AllClusters.cshtml b/Opserver/Views/Elastic/AllClusters.cshtml
@@ -135,15 +135,21 @@
                             {
                                 <td class="text-muted">n/a</td>
                             }
+                            @if (stats?.JVM?.Memory!= null)
+                            {
+                                <td>@stats.JVM.Memory.HeapCommittedInBytes.ToSize()</td>
+                            }
+                            else
+                            {
+                                <td class="text-muted">n/a</td>
+                            }
                             @if (stats?.Process?.Memory != null)
                             {
-                                <td>@stats.Process.Memory.ResidentInBytes.ToSize()</td>
                                 <td>@stats.Process.Memory.TotalVirtualInBytes.ToSize()</td>
                             }
                             else
                             {
                                 <td class="text-muted">n/a</td>
-                                <td class="text-muted">n/a</td>
                             }
                             @if (stats?.Process != null)
                             {

diff --git a/Opserver/Views/Elastic/Cluster.Selector.cshtml b/Opserver/Views/Elastic/Cluster.Selector.cshtml
@@ -14,7 +14,7 @@
                         var nodeInfos = c.Nodes.SafeData(true).Nodes;
                         if (nodeInfos == null) { continue; }
                         var info = nodeInfos.FirstOrDefault();
-                        <a class="list-group-item" href="[email protected]()">
+                        <a class="list-group-item" href="[email protected]()&[email protected]">
                             @c.IconSpan() @c.Name 
                             <span class="badge">@nodeInfos.Count.Pluralize("node") - @(info?.Version.ToString() ?? "")</span>
                         </a>