foreman_wreckingball 3.4.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5386e48704b4c0837fd34063239ead1bda9c7e2dd72cc60d82c15ac60334fea2
-  data.tar.gz: 4ed751665783de1efb8e25534cc32324f287c4611aa579d031873078b53ff7d1
+  metadata.gz: 69707f89619ebddac7ddefecc16e1a029f917acff12ebcd5b043f212b71ea1cc
+  data.tar.gz: 71db825c47159fb7e7a083b2b0555f32f1ee094239ee93b8d2cf8961d8e3eb5b
 SHA512:
-  metadata.gz: 2d6df272535f83e43c0889bce9655beb8b01f522269a85ebfbb7e5a6f1d332c407632e295234e12e7dc826897e8cc7eda587a322a57d265b3239ebbda54b4d4f
-  data.tar.gz: 3aea63d70aa6895ba153fdf32c370127ca8ee8a2b22ceb9099b4c8ded6fca3b8315561e4cd78854ec1977b6df73d7dee7e54e5943237de496dfaf1eebec179bd
+  metadata.gz: dddb50886e2f10627b4d4d0a7058c0daeabb8659f68e9b8c1499d94ad3c764840b536d3bda174f74e179a647507d0172996bf3be4be089721fdafb2e32993b7c
+  data.tar.gz: 508e576b9e2568f4804424712d71065e2a957417d32f703923d789040ac4490361a7855aaf278ab33c9b4b35c008f840361dc594c95ceab34a4aa022b7e600b3

data/README.md

@@ -11,7 +11,8 @@ This is a plugin for Foreman that adds several VMware related status checks to y
 | >= 1.15         | ~> 0.1         |
 | >= 1.16         | ~> 1.0         |
 | >= 1.17         | ~> 2.0         |
-| >= 1.18         | ~> 3.0         |
+| >= 1.21         | ~> 3.0         |
+| >= 2.3          | ~> 4.0         |
 
 ## Installation
 

data/app/assets/stylesheets/foreman_wreckingball/status_hosts_table.css.scss

@@ -11,3 +11,10 @@ div.status-hosts-container.ajax-error div.dataTables_wrapper,
 div.status-hosts-container.ajax-error p {
   display: none;
 }
+
+table.status-hosts.hide-puppet-environment {
+  th:nth-child(5),
+  td:nth-child(5) {
+    display: none;
+  }
+}

data/app/controllers/foreman_wreckingball/hosts_controller.rb

@@ -94,7 +94,7 @@ module ForemanWreckingball
       all_hosts = Host.authorized(:view_hosts, Host)
                       .joins(@status.host_association)
                       .try { |query| params[:owned_only] ? query.owned_by_current_user_or_group_with_current_user : query }
-                      .includes(@status.host_association, :vmware_facet, :environment)
+                      .includes([*(:environment if Host::Managed.reflect_on_environment?), @status.host_association, :vmware_facet])
                       .where.not('host_status.status': @status.global_ok_list)
                       .preload(:owner)
                       .order(:name)

data/app/lib/vsphere_os_identifiers/data.yaml

@@ -388,6 +388,13 @@ rhel7_64Guest:
   :name: RedHat
   :major: 7
   :since: 5.5
+rhel8_64Guest:
+  :description: Red Hat Enterprise Linux 8 (64-bit)
+  :architecture: x86_64
+  :osfamily: Redhat
+  :name: RedHat
+  :major: 8
+  :since: 6.5
 sjdsGuest:
   :description: Sun Java Desktop System
 sles10Guest:
@@ -426,6 +433,13 @@ sles12_64Guest:
   :name: SLES
   :major: 12
   :since: 5.5
+sles15_64Guest:
+  :description: SUSE Linux Enterprise 15 (64-bit)
+  :architecture: x86_64
+  :osfamily: Suse
+  :name: SLES
+  :major: 15
+  :since: 6.0
 sles64Guest:
   :description: SUSE Linux Enterprise 8/9 (64-bit)
   :architecture: x86_64

data/app/models/concerns/foreman_wreckingball/host_extensions.rb

@@ -16,6 +16,10 @@ module ForemanWreckingball
       scope :owned_by_current_user, -> { where(owner_type: 'User', owner_id: User.current.id) }
       scope :owned_by_group_with_current_user, -> { where(owner_type: 'Usergroup', owner_id: User.current.usergroup_ids_with_parents) }
       scope :owned_by_current_user_or_group_with_current_user, -> { owned_by_current_user.or(owned_by_group_with_current_user) }
+
+      def self.reflect_on_environment?
+        reflect_on_association(:environment).present?
+      end
     end
 
     def action_input_key

data/app/models/foreman_wreckingball/spectre_v2_status.rb

@@ -72,7 +72,7 @@ module ForemanWreckingball
     end
 
     def required_cpu_features_present?
-      !(host.vmware_facet.cpu_features & ['cpuid.IBRS', 'cpuid.IBPB', 'cpuid.STIBP']).empty?
+      !(host.vmware_facet.cpu_features.map(&:downcase) & ['cpuid.ibrs', 'cpuid.ibpb', 'cpuid.stibp']).empty?
     end
   end
 end

data/app/models/setting/wreckingball.rb

@@ -2,14 +2,18 @@
 
 class Setting
   class Wreckingball < ::Setting
+    def self.default_settings
+      [
+        set('min_vsphere_hardware_version', N_('Minimum required Hardware version for vSphere VMs'), 13, N_('Hardware version'))
+      ]
+    end
+
     def self.load_defaults
       return unless ActiveRecord::Base.connection.table_exists?('settings')
       return unless super
 
       Setting.transaction do
-        [
-          set('min_vsphere_hardware_version', N_('Minimum required Hardware version for vSphere VMs'), 13, N_('Hardware version'))
-        ].compact.each { |s| Setting::Wreckingball.create s.update(category: 'Setting::Wreckingball') }
+        default_settings.compact.each { |s| Setting::Wreckingball.create s.update(category: 'Setting::Wreckingball') }
       end
 
       true

data/app/views/foreman_wreckingball/hosts/_hosts.json.rabl

@@ -8,8 +8,10 @@ child owner: :owner do
   attribute :name
 end
 
-child :environment do
-  attribute :name
+if Host::Managed.reflect_on_environment?
+  child :environment do
+    attribute :name
+  end
 end
 
 node(:path) { |host| host_path(host) }

data/app/views/foreman_wreckingball/hosts/_status_row_hosts_table.html.erb

@@ -1,7 +1,7 @@
 <%= render :partial => 'status_row_hosts_table_actions', locals: { supports_remediate: supports_remediate } %>
 
 <%= content_tag :table, id: status,
-                        class: 'table table-striped table-fixed status-hosts',
+                        class: "table table-striped table-fixed status-hosts #{Host::Managed.reflect_on_environment? ? '' : 'hide-puppet-environment'}",
                         'data-hosts-url': ajax_status_dashboard_hosts_path(status, owned_only: params[:owned_only]) do %>
   <%= content_tag :thead do %>
     <%= content_tag :tr do %>

data/lib/foreman_wreckingball/engine.rb

@@ -42,7 +42,7 @@ module ForemanWreckingball
 
     initializer 'foreman_wreckingball.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_wreckingball do
-        requires_foreman '>= 1.21'
+        requires_foreman '>= 2.3'
 
         automatic_assets(false)
         precompile_assets(

data/lib/foreman_wreckingball/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanWreckingball
-  VERSION = '3.4.1'
+  VERSION = '4.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_wreckingball
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.28
 signing_key:
 specification_version: 4
 summary: Adds status checks of the VMWare VMs to Foreman.