[ARVADOS] updated: 1.3.0-1086-g6b9eafb0d

[Git user]

Summary of changes:
 .../app/views/projects/_compute_node_summary.html.erb | 19 ++++---------------
 ...e_summary.html.erb => _container_summary.html.erb} | 12 ++++++------
 .../app/views/projects/_show_dashboard.html.erb       | 10 ++++++++++
 3 files changed, 20 insertions(+), 21 deletions(-)
 copy apps/workbench/app/views/projects/{_compute_node_summary.html.erb => _container_summary.html.erb} (55%)

       via  6b9eafb0de63da57e7b1a3945e7d16823e1c25df (commit)
      from  641552ee206524115aa63d68432ee23bf9d05278 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 6b9eafb0de63da57e7b1a3945e7d16823e1c25df
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Jun 14 10:00:06 2019 -0400

    15087: Make container status a separate panel
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/app/views/projects/_compute_node_summary.html.erb b/apps/workbench/app/views/projects/_compute_node_summary.html.erb
index 613751cb0..40a212e5b 100644
--- a/apps/workbench/app/views/projects/_compute_node_summary.html.erb
+++ b/apps/workbench/app/views/projects/_compute_node_summary.html.erb
@@ -9,23 +9,12 @@ SPDX-License-Identifier: AGPL-3.0 %>
         <col width="50%">
       </colgroup>
       <tr>
-	<% queued_containers = Container.order("modified_at asc").filter([["state", "in", ["Queued", "Locked"]], ["priority", ">", 0]]).limit(1) %>
-	<% running_containers = Container.order("started_at desc").where(state: "Running").limit(1) %>
-        <td><%= queued_containers.items_available %></td>
-        <td><%= running_containers.items_available %></td>
+        <td><%= nodes.select {|n| n.crunch_worker_state == "busy" }.size %></td>
+        <td><%= nodes.select {|n| n.crunch_worker_state == "idle" }.size %></td>
       </tr>
       <tr>
-        <th>Pending containers</th>
-        <th>Running containers</th>
-      </tr>
-      <tr>
-        <th><%= if queued_containers.first then render_runtime(Time.now - queued_containers.first.modified_at, false, false) else "-" end %></th>
-        <th><%= if running_containers.first then render_runtime(Time.now - running_containers.first.started_at, false, false) else "-" end %></th>
-      </tr>
-      <tr>
-        <th>Queue wait</th>
-        <th>Last start</th>
+        <th>Busy nodes</th>
+        <th>Idle nodes</th>
       </tr>
     </table>
-
 </div>
diff --git a/apps/workbench/app/views/projects/_compute_node_summary.html.erb b/apps/workbench/app/views/projects/_container_summary.html.erb
similarity index 55%
copy from apps/workbench/app/views/projects/_compute_node_summary.html.erb
copy to apps/workbench/app/views/projects/_container_summary.html.erb
index 613751cb0..1a411afc9 100644
--- a/apps/workbench/app/views/projects/_compute_node_summary.html.erb
+++ b/apps/workbench/app/views/projects/_container_summary.html.erb
@@ -9,9 +9,9 @@ SPDX-License-Identifier: AGPL-3.0 %>
         <col width="50%">
       </colgroup>
       <tr>
-	<% queued_containers = Container.order("modified_at asc").filter([["state", "in", ["Queued", "Locked"]], ["priority", ">", 0]]).limit(1) %>
-	<% running_containers = Container.order("started_at desc").where(state: "Running").limit(1) %>
-        <td><%= queued_containers.items_available %></td>
+	<% pending_containers = Container.order("modified_at asc").filter([["state", "in", ["Queued", "Locked"]], ["priority", ">", 0]]).limit(1) %>
+	<% running_containers = Container.order("started_at asc").where(state: "Running").limit(1) %>
+        <td><%= pending_containers.items_available %></td>
         <td><%= running_containers.items_available %></td>
       </tr>
       <tr>
@@ -19,12 +19,12 @@ SPDX-License-Identifier: AGPL-3.0 %>
         <th>Running containers</th>
       </tr>
       <tr>
-        <th><%= if queued_containers.first then render_runtime(Time.now - queued_containers.first.modified_at, false, false) else "-" end %></th>
+        <th><%= if pending_containers.first then render_runtime(Time.now - pending_containers.first.modified_at, false, false) else "-" end %></th>
         <th><%= if running_containers.first then render_runtime(Time.now - running_containers.first.started_at, false, false) else "-" end %></th>
       </tr>
       <tr>
-        <th>Queue wait</th>
-        <th>Last start</th>
+        <th>Oldest pending</th>
+        <th>Longest running</th>
       </tr>
     </table>
 
diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index d4ea2de15..3152af774 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -187,6 +187,16 @@ SPDX-License-Identifier: AGPL-3.0 %>
         </div>
       </div>
       <% end %>
+       <% if Container.api_exists?(:index) %>
+      <div class="panel panel-default" style="min-height: 10.5em">
+        <div class="panel-heading"><span class="panel-title">Container status</span></div>
+        <div class="panel-body compute-node-summary-pane">
+          <div>
+            <%= render partial: 'container_summary' %>
+	  </div>
+	</div>
+      </div>
+      <% end %>
       <% if Rails.configuration.show_recent_collections_on_dashboard %>
       <div class="panel panel-default">
         <div class="panel-heading"><span class="panel-title">Recent collections</span>

-----------------------------------------------------------------------


hooks/post-receive
--