foreman_discovery 18.0.3 → 19.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13f251693b7208a8e223305e5c7013d3e54d79b7dc7b8ed2328b9677cb41e32b
-  data.tar.gz: fb711efac2b9b6f85a6f938f6f9ad9ca1e3f19bbc1f69c5ed2672b0fb8509ffe
+  metadata.gz: 427ba539a0f0044029faf7ffaca507c4091736f89a14de73559e81515295780a
+  data.tar.gz: 4f7a1b8fee20f9dd472a06b9dce2f385bc02246de5e592a2923e3156e332ee66
 SHA512:
-  metadata.gz: 5bcb5da5a5438284c887fa9bb6b880ff45d9eab74c845b135c6567371887c2d73ffcc02edb0d6b0571c40e809f73d63fa45234b74242ac5db3a8cd5606935ea8
-  data.tar.gz: 3b570a9ec8102c9008b81f8c7faac9946783d1ed50145db53c569280c74e21a27cf54dcf1ef232adb5bf0c5abb6be8d7dfbb0c179fe0fe82acacc02c12b440c0
+  metadata.gz: 6e2655e4136af4af6cd76fa3415ce0463ecc3984ed6e89d703e24eedc83f518b59481722fb232d008643f8e78beb4d523f95f80333c6ffac0e120fb49d91fe48
+  data.tar.gz: d18c12e3f57d69a80bf79ebfaa4e5de88a779c10aa12790ae057446fc3a4940c47f6654aa64edcec8fbfe430b9fa6a54e727476319ac61b11e61e78893b712c6

data/app/controllers/concerns/foreman/controller/parameters/discovered_host.rb

@@ -1,6 +1,9 @@
 module Foreman::Controller::Parameters::DiscoveredHost
   extend ActiveSupport::Concern
   include Foreman::Controller::Parameters::Host
+  if defined?(ForemanPuppet)
+    include ForemanPuppet::Extensions::ParametersHost
+  end
 
   class_methods do
     def discovered_host_params_filter
@@ -9,23 +12,32 @@ module Foreman::Controller::Parameters::DiscoveredHost
 
         add_host_base_params_filter(filter)
         add_host_common_params_filter(filter)
+        add_host_puppet_params_filter(filter) if defined?(ForemanPuppet)
       end
     end
   end
 
   def discovered_host_params
-    self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context)
+    filtered_params = self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context)
+    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+    filtered_params
   end
 
   def discovered_host_params_host
-    self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context, :host)
+    filtered_params = self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context, :host)
+    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+    filtered_params
   end
 
   def managed_host_params_host
-    self.class.host_params_filter.filter_params(params, parameter_filter_context, :host)
+    filtered_params = self.class.host_params_filter.filter_params(params, parameter_filter_context, :host)
+    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+    filtered_params
   end
 
   def managed_host_params
-    self.class.host_params_filter.filter_params(params, parameter_filter_context)
+    filtered_params = self.class.host_params_filter.filter_params(params, parameter_filter_context)
+    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+    filtered_params
   end
 end

data/app/controllers/discovered_hosts_controller.rb

@@ -15,7 +15,10 @@ class DiscoveredHostsController < ::ApplicationController
 
   helper :hosts
   if defined?(ForemanPuppet)
+    helper ForemanPuppet::HostsHelper
     helper ForemanPuppet::HostsAndHostgroupsHelper
+    helper ForemanPuppet::PuppetclassesHelper
+    helper ForemanPuppet::PuppetclassLookupKeysHelper
   end
 
   layout 'layouts/application'

data/app/helpers/discovered_hosts_helper.rb

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

data/app/models/host/discovered.rb

@@ -89,15 +89,21 @@ class Host::Discovered < ::Host::Base
     existing_discovery_hosts = Nic::Managed.joins(:host).where(:mac => bootif_mac, :provision => true, :hosts => {:type => "Host::Discovered"}).order('created_at DESC')
     if existing_discovery_hosts.empty?
       host = Host.new(:name => hostname, :type => "Host::Discovered")
+      send_notifications = true
     else
       Rails.logger.warn "Multiple (#{existing_discovery_hosts.count}) discovery hosts found with MAC address #{name_fact} - picking most recent NIC entry" if existing_discovery_hosts.count > 1
       host = existing_discovery_hosts.first.host
+      send_notifications = false
     end
 
     # and save (interfaces are created via puppet parser extension)
     host.save(:validate => false) if host.new_record?
     importer = ForemanDiscovery::HostFactImporter.new(host)
     raise ::Foreman::Exception.new(N_("Facts could not be imported")) unless importer.import_facts(facts)
+
+    # finally, send out notifications for new hosts
+    host.create_notification if send_notifications
+
     host
   end
 
@@ -118,7 +124,6 @@ class Host::Discovered < ::Host::Base
     super(parser, type, source_proxy)
 
     populate_discovery_fields_from_facts(facts)
-    create_notification
     parser
   end
 

data/app/services/foreman_discovery/subnet_suggestion.rb

@@ -14,7 +14,14 @@ module ForemanDiscovery
     def call
       return unless ip
 
-      subnet = Subnet.unscoped.subnet_for(ip)
+      begin
+        subnet = Subnet.unscoped.subnet_for(ip)
+      rescue Exception => e
+        Rails.logger.error "Error while detecting subnet for IP #{ip}"
+        Foreman::Logging.exception "Unable to detect subnet", e
+        subnet = nil
+      end
+
       if subnet
         Rails.logger.info "Detected #{kind} subnet: #{subnet} with taxonomy #{subnet.organizations.collect(&:name)}/#{subnet.locations.collect(&:name)}"
       else

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

@@ -10,5 +10,5 @@
 <% content_for(:content) do %>
   <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: discovery_doc_url ) %>
+  <%= react_component('DiscoveredHosts', docUrl: external_link_path(type: 'plugin_manual', name: 'foreman_discovery', version: discovery_doc_version)) %>
 <% end %>

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

@@ -10,5 +10,5 @@
 <% content_for(:content) do %>
   <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: discovery_doc_url + '/#4.3Automaticprovisioning' ) %>
+  <%= react_component('DiscoveryRules', docUrl: external_link_path(type: 'plugin_manual', name: 'foreman_discovery', version: discovery_doc_version, section: '#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 '>= 3.0'
+        requires_foreman '>= 3.1'
 
         # 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"
 
@@ -198,7 +199,7 @@ module ForemanDiscovery
     config.to_prepare do
 
       # Fact parsing
-      ::FactParser.register_fact_parser(:foreman_discovery, ForemanDiscovery::FactParser)
+      Foreman::Plugin.fact_parser_registry.register(:foreman_discovery, ForemanDiscovery::FactParser)
 
       # Taxonomy extensions
       ::Location.send :include, DiscoveryTaxonomyExtensions

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "18.0.3"
+  VERSION = "19.0.1"
 end

data/locale/ca/foreman_discovery.edit.po

@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the foreman_discovery package.
 #
 # Translators:
-# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2017
-# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015-2016
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 17.1.0\n"
+"Project-Id-Version: foreman_discovery 18.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 17:25+0200\n"
-"PO-Revision-Date: 2021-05-03 08:29+0000\n"
-"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>\n"
+"POT-Creation-Date: 2021-11-25 10:15+0100\n"
+"PO-Revision-Date: 2021-09-20 17:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Execute rules against a discovered host"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:136 ../app/controllers/discovered_hosts_controller.rb:160
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:136 ../app/controllers/discovered_hosts_controller.rb:163
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr "L'amfitrió %{host} va ser aprovisionat amb la regla %{rule}"
 
@@ -128,7 +128,7 @@ msgstr "L'amfitrió %{host} va ser aprovisionat amb la regla %{rule}"
 msgid "Unable to provision %{host}: %{errors}"
 msgstr "No es pot aprovisionar a %{host}: %{errors}"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:167
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:170
 msgid "No rule found for host %s"
 msgstr "No s'ha trobat cap regla per a l'amfitrió %s"
 
@@ -136,11 +136,11 @@ msgstr "No s'ha trobat cap regla per a l'amfitrió %s"
 msgid "Execute rules against all currently discovered hosts"
 msgstr "Executa les regles contra tots els amfitrions detectats actualment"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:156 ../app/controllers/discovered_hosts_controller.rb:173
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:156 ../app/controllers/discovered_hosts_controller.rb:176
 msgid "Errors during auto provisioning: %s"
 msgstr "Erros durant l'auto aprovisionament: %s"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:159 ../app/controllers/discovered_hosts_controller.rb:176
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:159 ../app/controllers/discovered_hosts_controller.rb:179
 msgid "No discovered hosts to provision"
 msgstr "Sense amfitrions descoberts per aprovisionar"
 
@@ -160,7 +160,7 @@ msgstr "S'està reiniciant un amfitrió descobert"
 msgid "Rebooting all discovered hosts"
 msgstr "S'estan reiniciant tots els amfitrions descoberts"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:221 ../app/controllers/discovered_hosts_controller.rb:129
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:221 ../app/controllers/discovered_hosts_controller.rb:132
 msgid "Discovered hosts are rebooting now"
 msgstr "Ara s'estan reiniciant els amfitrions descoberts"
 
@@ -240,75 +240,75 @@ msgstr "Errors durant el reinici: %s"
 msgid "No discovered hosts to reboot"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:63
+#: ../app/controllers/discovered_hosts_controller.rb:66
 msgid "Successfully provisioned %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:97
+#: ../app/controllers/discovered_hosts_controller.rb:100
 msgid "Facts refreshed for %s"
 msgstr "Els objectes d'interès que s'han refrescat per a %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:99
+#: ../app/controllers/discovered_hosts_controller.rb:102
 msgid "Failed to refresh facts for %s"
 msgstr "No s'ha pogut refrescar els objectes d'interès per a %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:102
+#: ../app/controllers/discovered_hosts_controller.rb:105
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:109
+#: ../app/controllers/discovered_hosts_controller.rb:112
 msgid "Host of type %s can not be rebooted"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:113
+#: ../app/controllers/discovered_hosts_controller.rb:116
 msgid "Rebooting host %s"
 msgstr "S'està reiniciant l'amfitrió %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:115
+#: ../app/controllers/discovered_hosts_controller.rb:118
 msgid "Failed to reboot host %s"
 msgstr "No s'ha pogut reiniciar l'amfitrió %s."
 
-#: ../app/controllers/discovered_hosts_controller.rb:118
+#: ../app/controllers/discovered_hosts_controller.rb:121
 msgid "Failed to reboot host %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:132
+#: ../app/controllers/discovered_hosts_controller.rb:135
 msgid "Failed to reboot hosts with error %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:150
+#: ../app/controllers/discovered_hosts_controller.rb:153
 msgid "Destroyed selected hosts"
 msgstr "S'han destruït els amfitrions seleccionats"
 
-#: ../app/controllers/discovered_hosts_controller.rb:152
+#: ../app/controllers/discovered_hosts_controller.rb:155
 msgid "The following hosts were not deleted: %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:164
+#: ../app/controllers/discovered_hosts_controller.rb:167
 msgid "Failed to auto provision host %s: %s"
 msgstr "No s'ha pogut auto aprovisionar l'amfitrió %s: %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:192
+#: ../app/controllers/discovered_hosts_controller.rb:195
 msgid "Discovered hosts are provisioning now"
 msgstr "Els amfitrions descoberts ara tenen aprovisionament"
 
-#: ../app/controllers/discovered_hosts_controller.rb:277
+#: ../app/controllers/discovered_hosts_controller.rb:280
 msgid "Discovered host reported from unknown subnet, communication will not be proxied."
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:282
+#: ../app/controllers/discovered_hosts_controller.rb:285
 msgid "Discovered hosts reported from unknown subnet are %s, communication will not be proxied."
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:296
+#: ../app/controllers/discovered_hosts_controller.rb:299
 msgid "No hosts were found with that id or name"
 msgstr "No s'ha trobat cap amfitrió amb aquest ID o nom"
 
-#: ../app/controllers/discovered_hosts_controller.rb:300
+#: ../app/controllers/discovered_hosts_controller.rb:303
 msgid "No hosts selected"
 msgstr "Cap amfitrió seleccionat"
 
-#: ../app/controllers/discovered_hosts_controller.rb:306
+#: ../app/controllers/discovered_hosts_controller.rb:309
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "Alguna cosa va anar malament mentre se seleccionaven els amfitrions - %s"
 
@@ -380,7 +380,7 @@ msgstr "Es va informar en els últims 7 dies"
 msgid "Provision"
 msgstr "Aprovisiona"
 
-#: ../app/helpers/discovery_rules_helper.rb:26 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:1 ../app/views/discovered_hosts/welcome.html.erb:8 ../lib/foreman_discovery/engine.rb:159 ../lib/foreman_discovery/engine.rb:174
+#: ../app/helpers/discovery_rules_helper.rb:26 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:1 ../app/views/discovered_hosts/welcome.html.erb:8 ../lib/foreman_discovery/engine.rb:160 ../lib/foreman_discovery/engine.rb:175
 msgid "Discovered Hosts"
 msgstr ""
 
@@ -468,27 +468,27 @@ msgstr ""
 msgid "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:100
+#: ../app/models/host/discovered.rb:102
 msgid "Facts could not be imported"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:155
+#: ../app/models/host/discovered.rb:160
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "No s'han pogut obtenir els objectes d'interès del servidor intermediari %{url}: %{error}"
 
-#: ../app/models/host/discovered.rb:173
+#: ../app/models/host/discovered.rb:178
 msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:177 ../app/models/host/discovered.rb:200
+#: ../app/models/host/discovered.rb:182 ../app/models/host/discovered.rb:205
 msgid "Unable to perform %{action} on %{ips}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:196
+#: ../app/models/host/discovered.rb:201
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:220
+#: ../app/models/host/discovered.rb:225
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
@@ -990,7 +990,7 @@ msgstr "Clona %s"
 msgid "Edit %s"
 msgstr "Edita %s"
 
-#: ../app/views/discovery_rules/index.html.erb:1 ../lib/foreman_discovery/engine.rb:164
+#: ../app/views/discovery_rules/index.html.erb:1 ../lib/foreman_discovery/engine.rb:165
 msgid "Discovery Rules"
 msgstr "Regles de descobriment"
 
@@ -1058,19 +1058,19 @@ msgstr ""
 msgid "Error message goes here"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:176
+#: ../lib/foreman_discovery/engine.rb:177
 msgid "Discovery Kexec template"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:185
+#: ../lib/foreman_discovery/engine.rb:186
 msgid "Discovery Proxy"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:186
+#: ../lib/foreman_discovery/engine.rb:187
 msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:187
+#: ../lib/foreman_discovery/engine.rb:188
 msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr ""
 

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 i Gelonch <rbuj@fedoraproject.org>, 2017
-# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015-2016
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 17.1.0\n"
+"Project-Id-Version: foreman_discovery 18.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-05-03 08:29+0000\n"
-"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>\n"
+"PO-Revision-Date: 2021-09-20 17:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
 "\n"
 "MIME-Version: 1.0\n"