Changed the server utilization widget into the server availability wi…

…dget
ManageIQ · Mar 29, 2018 · f6fb0f3 · f6fb0f3
1 parent 8c3ce22
commit f6fb0f3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/app/models/physical_server.rb b/app/models/physical_server.rb
@@ -27,6 +27,9 @@ class PhysicalServer < ApplicationRecord
 
   scope :with_hosts, -> { where("physical_servers.id in (select hosts.physical_server_id from hosts)") }
 
+  virtual_column :v_availability, :type => :string
+  virtual_column :v_host_os, :type => :string
+
   def name_with_details
     details % {
       :name => name,
@@ -91,4 +94,12 @@ def refresh_ems
     end
     EmsRefresh.queue_refresh(self)
   end
+
+  def v_availability
+    host.try(:physical_server_id).nil? ? N_("Available") : N_("In use")
+  end
+
+  def v_host_os
+    host.try(:vmm_product).nil? ? N_("") : host.vmm_product
+  end
 end
diff --git a/...ard/widgets/chart_server_utilization.yaml → ...rd/widgets/chart_server_availability.yaml b/...ard/widgets/chart_server_utilization.yaml → ...rd/widgets/chart_server_availability.yaml
@@ -1,13 +1,13 @@
-description: chart_server_utilization
-title: "Physical Server Utilization"
+description: chart_server_availability
+title: "Physical Server Availability"
 content_type: chart
 options:
   :timezone_matters: false
 visibility:
   :roles:
   - _ALL_
 user_id:
-resource_name: Physical Server Utilization
+resource_name: Physical Server Availability
 resource_type: MiqReport
 miq_schedule_options:
   :run_at:

diff --git a/...sical Servers/030_Server Utilization.yaml → ...ical Servers/030_Server Availability.yaml b/...sical Servers/030_Server Utilization.yaml → ...ical Servers/030_Server Availability.yaml
@@ -1,18 +1,20 @@
 ---
-title: Physical Server Utilization
+title: Physical Server Availability
 order: Ascending
 graph:
   :type: Pie
   :count: 10
   :other: true
-menu_name: Physical Server Utilization
+menu_name: Physical Server Availability
 rpt_group: Custom
 rpt_type: Custom
 priority:
 col_order:
 - hostname
+- v_availability
 - health_state
 - power_state
+- v_host_os
 - product_name
 timeline:
 file_mtime:
@@ -21,27 +23,23 @@ filename:
 db: PhysicalServer
 cols:
 - hostname
+- v_availability
 - health_state
 - power_state
+- v_host_os
 - product_name
 include:
   host:
     columns:
     - physical_server_id
 template_type: report
 sortby:
-- host.physical_server_id
+- v_availability
 - hostname
 headers:
 - Hostname
+- Availability
 - Health State
 - Power State
+- Host OS
 - Product Name
-conditions: !ruby/object:MiqExpression
-  exp:
-    or:
-      - IS NOT NULL:
-          field: PhysicalServer.host-physical_server_id
-      - IS NULL:
-          field: PhysicalServer.host-physical_server_id
-  context_type: