foreman_discovery 17.0.5 → 18.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3afee027ea27661c43f2c41f8b1048568f150f8d44b3706935e6419d5528398b
-  data.tar.gz: 409956591f74dcc37b242bf64caa2d5d295074915654b1fa73503867518a7370
+  metadata.gz: b89780a685ba935e63141f155eb8c1e5baaa4f9b36e4e71ac56c6eba33f11f26
+  data.tar.gz: 741a2c3b783fa20c2cea7450b359b91583fc7da6e7b3e441e6121d3b9bea910f
 SHA512:
-  metadata.gz: 4c3260d2118667b2fc1f32dd78fd5aff52ee1bb7ed0c884c369bab920cbc0a9484d1bd91cf8ddbb64dd3556ff51aaddf49f61604e465d23e4db6356e3c872003
-  data.tar.gz: 45c9f983ed01b5e1491285be3e9e6e7374dcb218d6c0437947d3d9c2fe6cf88d684a980978feacb11bc2fc6410467489628997b39f0e8ec32fde8a199b3b9b21
+  metadata.gz: de3dad2c43932edc1e6a0974094f7baa6608a4c25c0020a67dfa8db0ef1f6d2fb54c7d07e314951975658a659cc671a1f7977c255efd3d0bc243ccca4a35c526
+  data.tar.gz: ecdd28f538746981a162697f622861abf43513d3fdcbc5eaf5fda23fbebd73bfbd7334872396a52ac91a7cf17a4e1ef8784c89f5a33c523ac920d024b2aa78ab

data/app/controllers/discovered_hosts_controller.rb

@@ -14,6 +14,9 @@ class DiscoveredHostsController < ::ApplicationController
   around_action :skip_bullet, :only => [:edit]
 
   helper :hosts
+  if defined?(ForemanPuppet)
+    helper ForemanPuppet::HostsAndHostgroupsHelper
+  end
 
   layout 'layouts/application'
 
@@ -200,14 +203,16 @@ class DiscoveredHostsController < ::ApplicationController
       subnet6 = @host.hostgroup.subnet6 || @host.subnet6
       @architecture    = @host.hostgroup.architecture
       @operatingsystem = @host.hostgroup.operatingsystem
-      @environment     = @host.hostgroup.environment
+      if defined?(ForemanPuppet)
+        @environment     = @host.hostgroup.environment
+        @host.environment = @environment
+      end
       @domain          = @host.hostgroup.domain
       @subnet          = subnet
       @subnet6         = subnet6
       @compute_profile = @host.hostgroup.compute_profile
       @realm           = @host.hostgroup.realm
       @host.interfaces.first.assign_attributes(subnet: subnet, subnet6: subnet6, domain: @domain)
-      @host.environment = @environment
     end
   end
 
@@ -217,7 +222,9 @@ class DiscoveredHostsController < ::ApplicationController
 
   def load_vars_for_ajax
     return unless @host
-    @environment     = @host.environment
+    if defined?(ForemanPuppet)
+      @environment     = @host.environment
+    end
     @architecture    = @host.architecture
     @domain          = @host.domain
     @operatingsystem = @host.operatingsystem

data/app/helpers/discovered_hosts_helper.rb

@@ -98,7 +98,8 @@ module DiscoveredHostsHelper
     discovered_host_path(host)
   end
 
-  def discovery_doc_version
-    Foreman::Plugin.find(:foreman_discovery).version.scan(/\d+\.\d+/).first
+  def discovery_doc_url
+    doc_version = Foreman::Plugin.find(:foreman_discovery).version.scan(/\d+\.\d+/).first
+    "https://theforeman.org/plugins/foreman_discovery/#{doc_version}"
   end
 end

data/app/models/discovery_fact_name.rb

@@ -0,0 +1,9 @@
+class DiscoveryFactName < FactName
+  def origin
+    'Discovery'
+  end
+
+  def icon_path
+    "icons16x16/stub/darkred-d"
+  end
+end

data/app/services/discovery_fact_importer.rb

@@ -0,0 +1,5 @@
+class DiscoveryFactImporter < StructuredFactImporter
+  def fact_name_class
+    DiscoveryFactName
+  end
+end

data/app/services/foreman_discovery/host_converter.rb

@@ -21,10 +21,10 @@ class ForemanDiscovery::HostConverter
   def self.set_build_clean_facts(host)
     # fact cleaning
     if Setting['discovery_clean_facts']
-      # clean all facts except those starting with "discovery_"
+      # clean all facts except those from Discovery
       host.define_singleton_method(:clear_facts) do
-          keep_ids = FactValue.where("host_id = #{host.id}").joins(:fact_name).where("fact_names.name like 'discovery_%'").pluck("fact_values.id")
-          FactValue.where("host_id = #{host.id} and id not in (?)", keep_ids).delete_all
+        keep_ids = FactValue.where(host_id: host.id, fact_names: { type: 'DiscoveryFactName' }).where("fact_names.name like 'discovery_%'").joins(:fact_name).pluck("fact_values.id")
+        FactValue.where.not(id: keep_ids).delete_all
       end
     else
       # clean no facts (default behavior)

data/app/views/discovered_hosts/welcome.html.erb

@@ -8,8 +8,7 @@
 <% content_for(:title, _("Discovered Hosts")) %>
 
 <% content_for(:content) do %>
-  <%= notifications %>
   <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
   <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
-  <%= react_component('DiscoveredHosts', docUrl: external_link_path(type: 'plugin_manual', name: 'foreman_discovery', version: discovery_doc_version)) %>
+  <%= react_component('DiscoveredHosts', docUrl: discovery_doc_url ) %>
 <% end %>

data/app/views/discovery_rules/welcome.html.erb

@@ -8,8 +8,7 @@
 <% content_for(:title, _("Discovered Rules")) %>
 
 <% content_for(:content) do %>
-  <%= notifications %>
   <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
   <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
-  <%= react_component('DiscoveryRules', docUrl: external_link_path(type: 'plugin_manual', name: 'foreman_discovery', version: discovery_doc_version, section: '#4.3Automaticprovisioning') ) %>
+  <%= react_component('DiscoveryRules', docUrl: discovery_doc_url + '/#4.3Automaticprovisioning' ) %>
 <% end %>

data/lib/foreman_discovery/engine.rb

@@ -43,7 +43,7 @@ module ForemanDiscovery
 
     initializer 'foreman_discovery.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_discovery do
-        requires_foreman '>= 2.4'
+        requires_foreman '>= 3.0'
 
         # discovered hosts permissions
         security_block :discovery do
@@ -126,14 +126,12 @@ module ForemanDiscovery
           :assign_locations,
           :view_architectures,
           :view_domains,
-          :view_environments,
           :view_hostgroups,
           :view_media,
           :view_models,
           :view_operatingsystems,
           :view_provisioning_templates,
           :view_ptables,
-          :view_puppetclasses,
           :view_realms,
           :view_smart_proxies,
           :view_subnets,
@@ -149,6 +147,9 @@ module ForemanDiscovery
           :edit_discovery_rules,
           :destroy_discovery_rules,
         ]
+        if defined?(ForemanPuppet::VERSION) 
+          MANAGER += [ :view_environments, :view_puppetclasses ]
+        end
         role "Discovery Reader", READER, "Role granting permissions to view discovered hosts"
         role "Discovery Manager", MANAGER, "Role granting permissions to perform provisioning of discovered hosts"
 
@@ -212,6 +213,8 @@ module ForemanDiscovery
       # Controller extensions
       ::HostsController.send :include, ForemanDiscovery::Concerns::HostsControllerExtensions
       ::Api::V2::FactValuesController.send :include, Api::V2::FactValuesControllerExtensions
+
+      Foreman::Plugin.fact_importer_registry.register(:foreman_discovery, DiscoveryFactImporter)
     end
 
     rake_tasks do

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "17.0.5"
+  VERSION = "18.0.4"
 end

data/locale/ca/foreman_discovery.po

@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the foreman_discovery package.
 #
 # Translators:
-# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017
-# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2017
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.3.4\n"
+"Project-Id-Version: foreman_discovery 17.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-01-25 08:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-05-03 08:29+0000\n"
+"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -80,10 +80,10 @@ msgid "Clean all reported facts during provisioning (except discovery facts)"
 msgstr ""
 
 msgid "Clone"
-msgstr ""
+msgstr "Clona"
 
 msgid "Clone %s"
-msgstr ""
+msgstr "Clona %s"
 
 msgid "Collapse All"
 msgstr ""
@@ -565,6 +565,12 @@ msgstr "Valor del paràmetre"
 msgid "Please Confirm"
 msgstr "Si us plau, confirmeu"
 
+msgid "Prefer IPv6"
+msgstr ""
+
+msgid "Prefer IPv6 to IPv4 when calling discovered nodes"
+msgstr ""
+
 msgid "Primary"
 msgstr "Primària"
 

data/locale/de/foreman_discovery.po

@@ -14,10 +14,10 @@
 # stbenjam <stephen@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.3.4\n"
+"Project-Id-Version: foreman_discovery 17.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-01-25 08:35+0000\n"
-"Last-Translator: Crited <Alexander.Stoll@netways.de>\n"
+"PO-Revision-Date: 2021-05-03 08:29+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
 "Language-Team: German (http://www.transifex.com/foreman/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,10 +86,10 @@ msgid "Clean all reported facts during provisioning (except discovery facts)"
 msgstr "Alle berichteten Fakten während der Bereitstellung löschen (ausgenommen Entdeckungsfakten)"
 
 msgid "Clone"
-msgstr ""
+msgstr "Klonen"
 
 msgid "Clone %s"
-msgstr ""
+msgstr "%s klonen"
 
 msgid "Collapse All"
 msgstr "Alle einklappen"
@@ -571,6 +571,12 @@ msgstr "Parameterwert"
 msgid "Please Confirm"
 msgstr "Bitte bestätigen"
 
+msgid "Prefer IPv6"
+msgstr ""
+
+msgid "Prefer IPv6 to IPv4 when calling discovered nodes"
+msgstr ""
+
 msgid "Primary"
 msgstr "Primär"
 

data/locale/en/foreman_discovery.po

@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the foreman_discovery package.
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.3.4\n"
+"Project-Id-Version: foreman_discovery 17.1.0\n"
 "Report-Msgid-Bugs-To: foreman-dev@googlegroups.com\n"
 "PO-Revision-Date: 2015-12-27 01:18+0000\n"
 "Last-Translator: \n"
@@ -558,6 +558,12 @@ msgstr ""
 msgid "Please Confirm"
 msgstr ""
 
+msgid "Prefer IPv6"
+msgstr ""
+
+msgid "Prefer IPv6 to IPv4 when calling discovered nodes"
+msgstr ""
+
 msgid "Primary"
 msgstr ""
 

data/locale/en_GB/foreman_discovery.po

@@ -10,9 +10,9 @@
 # Lukáš Zapletal, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.3.4\n"
+"Project-Id-Version: foreman_discovery 17.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-01-25 08:35+0000\n"
+"PO-Revision-Date: 2021-05-03 08:28+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/foreman/fore"
 "man/language/en_GB/)\n"
@@ -568,6 +568,12 @@ msgstr ""
 msgid "Please Confirm"
 msgstr "Please Confirm"
 
+msgid "Prefer IPv6"
+msgstr ""
+
+msgid "Prefer IPv6 to IPv4 when calling discovered nodes"
+msgstr ""
+
 msgid "Primary"
 msgstr "Primary"
 

data/locale/es/foreman_discovery.po

@@ -11,10 +11,10 @@
 # Sergio Ocón-Cárdenas <sergio.ocon@redhat.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.3.4\n"
+"Project-Id-Version: foreman_discovery 17.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-01-25 08:35+0000\n"
-"Last-Translator: Amit Upadhye <aupadhye@redhat.com>\n"
+"PO-Revision-Date: 2021-05-03 08:29+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Spanish (http://www.transifex.com/foreman/foreman/language/es/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -84,10 +84,10 @@ msgid "Clean all reported facts during provisioning (except discovery facts)"
 msgstr "Eliminar todos los eventos informados durante el aprovisionamiento (excepto los eventos de detección)"
 
 msgid "Clone"
-msgstr ""
+msgstr "Clonar"
 
 msgid "Clone %s"
-msgstr ""
+msgstr "Clonar %s"
 
 msgid "Collapse All"
 msgstr "Contraer todo"
@@ -569,6 +569,12 @@ msgstr "Valor del parámetro"
 msgid "Please Confirm"
 msgstr "Confirmar"
 
+msgid "Prefer IPv6"
+msgstr ""
+
+msgid "Prefer IPv6 to IPv4 when calling discovered nodes"
+msgstr ""
+
 msgid "Primary"
 msgstr "Primario"
 

data/locale/foreman_discovery.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_discovery 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-03 08:46+0200\n"
-"PO-Revision-Date: 2021-05-03 08:46+0200\n"
+"POT-Creation-Date: 2021-09-20 17:25+0200\n"
+"PO-Revision-Date: 2021-09-20 17:25+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -135,7 +135,7 @@ msgid "Execute rules against a discovered host"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:136
-#: ../app/controllers/discovered_hosts_controller.rb:157
+#: ../app/controllers/discovered_hosts_controller.rb:160
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgid "Unable to provision %{host}: %{errors}"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:145
-#: ../app/controllers/discovered_hosts_controller.rb:164
+#: ../app/controllers/discovered_hosts_controller.rb:167
 msgid "No rule found for host %s"
 msgstr ""
 
@@ -153,12 +153,12 @@ msgid "Execute rules against all currently discovered hosts"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:156
-#: ../app/controllers/discovered_hosts_controller.rb:170
+#: ../app/controllers/discovered_hosts_controller.rb:173
 msgid "Errors during auto provisioning: %s"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:159
-#: ../app/controllers/discovered_hosts_controller.rb:173
+#: ../app/controllers/discovered_hosts_controller.rb:176
 msgid "No discovered hosts to provision"
 msgstr ""
 
@@ -179,7 +179,7 @@ msgid "Rebooting all discovered hosts"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:221
-#: ../app/controllers/discovered_hosts_controller.rb:126
+#: ../app/controllers/discovered_hosts_controller.rb:129
 msgid "Discovered hosts are rebooting now"
 msgstr ""
 
@@ -259,79 +259,79 @@ msgstr ""
 msgid "No discovered hosts to reboot"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:60
+#: ../app/controllers/discovered_hosts_controller.rb:63
 msgid "Successfully provisioned %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:94
+#: ../app/controllers/discovered_hosts_controller.rb:97
 msgid "Facts refreshed for %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:96
+#: ../app/controllers/discovered_hosts_controller.rb:99
 msgid "Failed to refresh facts for %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:99
+#: ../app/controllers/discovered_hosts_controller.rb:102
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:106
+#: ../app/controllers/discovered_hosts_controller.rb:109
 msgid "Host of type %s can not be rebooted"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:110
+#: ../app/controllers/discovered_hosts_controller.rb:113
 msgid "Rebooting host %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:112
+#: ../app/controllers/discovered_hosts_controller.rb:115
 msgid "Failed to reboot host %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:115
+#: ../app/controllers/discovered_hosts_controller.rb:118
 msgid "Failed to reboot host %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:129
+#: ../app/controllers/discovered_hosts_controller.rb:132
 msgid "Failed to reboot hosts with error %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:147
+#: ../app/controllers/discovered_hosts_controller.rb:150
 msgid "Destroyed selected hosts"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:149
+#: ../app/controllers/discovered_hosts_controller.rb:152
 msgid "The following hosts were not deleted: %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:161
+#: ../app/controllers/discovered_hosts_controller.rb:164
 msgid "Failed to auto provision host %s: %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:189
+#: ../app/controllers/discovered_hosts_controller.rb:192
 msgid "Discovered hosts are provisioning now"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:270
+#: ../app/controllers/discovered_hosts_controller.rb:277
 msgid ""
 "Discovered host reported from unknown subnet, communication will not be proxie"
 "d."
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:275
+#: ../app/controllers/discovered_hosts_controller.rb:282
 msgid ""
 "Discovered hosts reported from unknown subnet are %s, communication will not b"
 "e proxied."
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:289
+#: ../app/controllers/discovered_hosts_controller.rb:296
 msgid "No hosts were found with that id or name"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:293
+#: ../app/controllers/discovered_hosts_controller.rb:300
 msgid "No hosts selected"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:299
+#: ../app/controllers/discovered_hosts_controller.rb:306
 msgid "Something went wrong while selecting hosts - %s"
 msgstr ""
 
@@ -512,23 +512,23 @@ msgstr ""
 msgid "Facts could not be imported"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:146
+#: ../app/models/host/discovered.rb:155
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:160
+#: ../app/models/host/discovered.rb:173
 msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:164 ../app/models/host/discovered.rb:183
+#: ../app/models/host/discovered.rb:177 ../app/models/host/discovered.rb:200
 msgid "Unable to perform %{action} on %{ips}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:179
+#: ../app/models/host/discovered.rb:196
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:203
+#: ../app/models/host/discovered.rb:220
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
@@ -744,6 +744,14 @@ msgstr ""
 msgid "Type of name generator"
 msgstr ""
 
+#: ../app/models/setting/discovered.rb:40
+msgid "Prefer IPv6 to IPv4 when calling discovered nodes"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:40
+msgid "Prefer IPv6"
+msgstr ""
+
 #: ../app/services/foreman_discovery/fact_parser.rb:4
 msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
 msgstr ""