foreman_discovery 11.0.0 → 12.0.0

data/locale/en/foreman_discovery.po

@@ -39,9 +39,6 @@ msgstr ""
 msgid "Auto Provision"
 msgstr ""
 
-msgid "Auto Provision All"
-msgstr ""
-
 msgid "Auto provisioning"
 msgstr ""
 
@@ -69,6 +66,9 @@ msgstr ""
 msgid "Clean all reported facts during provisioning (except discovery facts)"
 msgstr ""
 
+msgid "Collapse All"
+msgstr ""
+
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr ""
 
@@ -90,6 +90,9 @@ msgstr ""
 msgid "DHCP filename option (Grub2 or PXELinux by default)"
 msgstr ""
 
+msgid "Delete"
+msgstr ""
+
 msgid "Delete %s?"
 msgstr ""
 
@@ -99,9 +102,6 @@ msgstr ""
 msgid "Delete a rule"
 msgstr ""
 
-msgid "Delete hosts"
-msgstr ""
-
 msgid "Delete rule '%s'?"
 msgstr ""
 
@@ -120,6 +120,9 @@ msgstr ""
 msgid "Discovered Hosts"
 msgstr ""
 
+msgid "Discovered host '%{host}' has all NICs filtered out, filter: %{filter}"
+msgstr ""
+
 msgid "Discovered host: %s"
 msgstr ""
 
@@ -150,6 +153,9 @@ msgstr ""
 msgid "Discovery Rules"
 msgstr ""
 
+msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
+msgstr ""
+
 msgid "Discovery location"
 msgstr ""
 
@@ -183,10 +189,13 @@ msgstr ""
 msgid "Disks size"
 msgstr ""
 
+msgid "Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"
+msgstr ""
+
 msgid "Domain will be appended automatically. A hostname based on MAC address will be used when left blank."
 msgstr ""
 
-msgid "Edit Discovery Rule"
+msgid "Edit %s"
 msgstr ""
 
 msgid "Enable"
@@ -195,6 +204,9 @@ msgstr ""
 msgid "Enable rule '%s'?"
 msgstr ""
 
+msgid "Error on existing NIC"
+msgstr ""
+
 msgid "Errors during auto provisioning: %s"
 msgstr ""
 
@@ -207,9 +219,6 @@ msgstr ""
 msgid "Execute rules against all currently discovered hosts"
 msgstr ""
 
-msgid "Expand All"
-msgstr ""
-
 msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr ""
 
@@ -502,9 +511,6 @@ msgstr ""
 msgid "Reboot"
 msgstr ""
 
-msgid "Reboot All"
-msgstr ""
-
 msgid "Rebooting %s"
 msgstr ""
 
@@ -637,13 +643,10 @@ msgstr ""
 msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr ""
 
-msgid "Unable to assign subnet, primary interface is missing IP address"
-msgstr ""
-
-msgid "Unable to detect primary interface using MAC '%{mac}' specified by discovery_fact '%{fact}'"
+msgid "Unable to find a discovery rule, no host provided (check permissions)"
 msgstr ""
 
-msgid "Unable to find a discovery rule, no host provided (check permissions)"
+msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
 msgstr ""
 
 msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
@@ -688,6 +691,9 @@ msgstr ""
 msgid "location ID for provisioned hosts"
 msgstr ""
 
+msgid "must be present."
+msgstr ""
+
 msgid "must start with a letter or ERB."
 msgstr ""
 

data/locale/en_GB/foreman_discovery.edit.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the foreman_discovery package.
-# 
+#
 # Translators:
 # Andi Chandler <andi@gowling.com>, 2015-2017
 # Dominic Cleal <dominic@cleal.org>, 2013-2015
@@ -12,10 +12,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_discovery 10.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-11 10:28+0100\n"
 "PO-Revision-Date: 2017-12-25 01:46+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/foreman/foreman/language/en_GB/)\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/foreman/fore"
+"man/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,23 +26,19 @@ msgstr ""
 msgid "List all discovered hosts"
 msgstr "List all discovered hosts"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:17
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:15
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:17 ../app/controllers/api/v2/discovery_rules_controller.rb:15
 msgid "filter results"
 msgstr "filter results"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:18
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:16
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:18 ../app/controllers/api/v2/discovery_rules_controller.rb:16
 msgid "sort results"
 msgstr "sort results"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:19
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:17
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:19 ../app/controllers/api/v2/discovery_rules_controller.rb:17
 msgid "paginate results"
 msgstr "paginate results"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:20
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:18
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:20 ../app/controllers/api/v2/discovery_rules_controller.rb:18
 msgid "number of entries per request"
 msgstr "number of entries per request"
 
@@ -50,8 +46,7 @@ msgstr "number of entries per request"
 msgid "Show a discovered host"
 msgstr "Show a discovered host"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:37
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:79
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:37 ../app/controllers/api/v2/discovered_hosts_controller.rb:79
 msgid "DHCP filename option (Grub2 or PXELinux by default)"
 msgstr "DHCP filename option (Grub2 or PXELinux by default)"
 
@@ -72,14 +67,11 @@ msgid "not required if it's a virtual machine"
 msgstr "not required if it's a virtual machine"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:76
-msgid ""
-"UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
+msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:78
-msgid ""
-"required if value is not inherited from host group or default password in "
-"settings"
+msgid "required if value is not inherited from host group or default password in settings"
 msgstr "required if value is not inherited from host group or default password in settings"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:89
@@ -91,62 +83,54 @@ msgid "Upload facts for a host, creating the host if required"
 msgstr "Upload facts for a host, creating the host if required"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:97
-msgid ""
-"hash containing facts for the host with minimum set of facts: "
-"discovery_bootif, macaddress_eth0, ipaddress, ipaddress_eth0, interfaces: "
-"eth0 (example in case primary interface is named eth0)"
+msgid "hash containing facts for the host with minimum set of facts: discovery_bootif, macaddress_eth0, ipaddress, ipaddress_eth0, interfaces: eth0 (example in case primary interface is named eth0)"
 msgstr "hash containing facts for the host with minimum set of facts: discovery_bootif, macaddress_eth0, ipaddress, ipaddress_eth0, interfaces: eth0 (example in case primary interface is named eth0)"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:117
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:116
 msgid "Execute rules against a discovered host"
 msgstr "Execute rules against a discovered host"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:123
-#: ../app/controllers/discovered_hosts_controller.rb:150
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:122 ../app/controllers/discovered_hosts_controller.rb:159
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr "Host %{host} was provisioned with rule %{rule}"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:126
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:125
 msgid "Unable to provision %{host}: %{errors}"
 msgstr "Unable to provision %{host}: %{errors}"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:132
-#: ../app/controllers/discovered_hosts_controller.rb:157
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:131 ../app/controllers/discovered_hosts_controller.rb:166
 msgid "No rule found for host %s"
 msgstr "No rule found for host %s"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:139
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:138
 msgid "Execute rules against all currently discovered hosts"
 msgstr "Execute rules against all currently discovered hosts"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:143
-#: ../app/controllers/discovered_hosts_controller.rb:163
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:142 ../app/controllers/discovered_hosts_controller.rb:172
 msgid "Errors during auto provisioning: %s"
 msgstr "Errors during auto provisioning: %s"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:146
-#: ../app/controllers/discovered_hosts_controller.rb:166
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:175
 msgid "No discovered hosts to provision"
 msgstr "No discovered hosts to provision"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:168
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:167
 msgid "%s discovered hosts were provisioned"
 msgstr "%s discovered hosts were provisioned"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:179
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:178
 msgid "Refreshing the facts of a discovered host"
 msgstr "Refreshing the facts of a discovered host"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:188
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:187
 msgid "Rebooting a discovered host"
 msgstr "Rebooting a discovered host"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:197
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:196
 msgid "Rebooting all discovered hosts"
 msgstr "Rebooting all discovered hosts"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:208
-#: ../app/controllers/discovered_hosts_controller.rb:125
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:207 ../app/controllers/discovered_hosts_controller.rb:128
 msgid "Discovered hosts are rebooting now"
 msgstr "Discovered hosts are rebooting now"
 
@@ -171,8 +155,7 @@ msgid "the hostgroup that is used to auto provision a host"
 msgstr "the hostgroup that is used to auto provision a host"
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:35
-msgid ""
-"defines a pattern to assign human-readable hostnames to the matching hosts"
+msgid "defines a pattern to assign human-readable hostnames to the matching hosts"
 msgstr "defines a pattern to assign human-readable hostnames to the matching hosts"
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:36
@@ -180,8 +163,7 @@ msgid "enables to limit maximum amount of provisioned hosts per rule"
 msgstr "enables to limit maximum amount of provisioned hosts per rule"
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:37
-msgid ""
-"puts the rules in order, low numbers go first. Must be greater then zero"
+msgid "puts the rules in order, low numbers go first. Must be greater then zero"
 msgstr "puts the rules in order, low numbers go first. Must be greater then zero"
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:38
@@ -228,95 +210,95 @@ msgstr "Errors during reboot: %s"
 msgid "No discovered hosts to reboot"
 msgstr "No discovered hosts to reboot"
 
-#: ../app/controllers/discovered_hosts_controller.rb:61
+#: ../app/controllers/discovered_hosts_controller.rb:63
 msgid "Successfully provisioned %s"
 msgstr "Successfully provisioned %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:93
+#: ../app/controllers/discovered_hosts_controller.rb:96
 msgid "Facts refreshed for %s"
 msgstr "Facts refreshed for %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:95
+#: ../app/controllers/discovered_hosts_controller.rb:98
 msgid "Failed to refresh facts for %s"
 msgstr "Failed to refresh facts for %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:98
+#: ../app/controllers/discovered_hosts_controller.rb:101
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr "Failed to refresh facts for %{hostname} with error %{error_message}"
 
-#: ../app/controllers/discovered_hosts_controller.rb:105
+#: ../app/controllers/discovered_hosts_controller.rb:108
 msgid "Host of type %s can not be rebooted"
 msgstr "Host of type %s can not be rebooted"
 
-#: ../app/controllers/discovered_hosts_controller.rb:109
+#: ../app/controllers/discovered_hosts_controller.rb:112
 msgid "Rebooting host %s"
 msgstr "Rebooting host %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:111
+#: ../app/controllers/discovered_hosts_controller.rb:114
 msgid "Failed to reboot host %s"
 msgstr "Failed to reboot host %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:114
+#: ../app/controllers/discovered_hosts_controller.rb:117
 msgid "Failed to reboot host %{hostname} with error %{error_message}"
 msgstr "Failed to reboot host %{hostname} with error %{error_message}"
 
-#: ../app/controllers/discovered_hosts_controller.rb:128
+#: ../app/controllers/discovered_hosts_controller.rb:131
 msgid "Failed to reboot hosts with error %s"
 msgstr "Failed to reboot hosts with error %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:140
+#: ../app/controllers/discovered_hosts_controller.rb:149
 msgid "Destroyed selected hosts"
 msgstr "Destroyed selected hosts"
 
-#: ../app/controllers/discovered_hosts_controller.rb:142
+#: ../app/controllers/discovered_hosts_controller.rb:151
 msgid "The following hosts were not deleted: %s"
 msgstr "The following hosts were not deleted: %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:154
+#: ../app/controllers/discovered_hosts_controller.rb:163
 msgid "Failed to auto provision host %s: %s"
 msgstr "Failed to auto provision host %s: %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:182
+#: ../app/controllers/discovered_hosts_controller.rb:191
 msgid "Discovered hosts are provisioning now"
 msgstr "Discovered hosts are provisioning now"
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Highlights"
 msgstr "Highlights"
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Storage"
 msgstr "Storage"
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Network"
 msgstr "Network"
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Software"
 msgstr "Software"
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "IPMI"
 msgstr "IPMI"
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 
-#: ../app/controllers/discovered_hosts_controller.rb:291
+#: ../app/controllers/discovered_hosts_controller.rb:301
 msgid "No hosts were found with that id or name"
 msgstr "No hosts were found with that id or name"
 
-#: ../app/controllers/discovered_hosts_controller.rb:295
+#: ../app/controllers/discovered_hosts_controller.rb:305
 msgid "No hosts selected"
 msgstr "No hosts selected"
 
-#: ../app/controllers/discovered_hosts_controller.rb:301
+#: ../app/controllers/discovered_hosts_controller.rb:311
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "Something went wrong while selecting hosts - %s"
 
@@ -332,19 +314,15 @@ msgstr "Rule disabled"
 msgid "%s ago"
 msgstr "%s ago"
 
-#: ../app/helpers/discovered_hosts_helper.rb:14
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:46
+#: ../app/helpers/discovered_hosts_helper.rb:14 ../app/helpers/discovered_hosts_helper.rb:29 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:46
 msgid "Auto Provision"
 msgstr "Auto Provision"
 
-#: ../app/helpers/discovered_hosts_helper.rb:15
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:47
+#: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:47
 msgid "Refresh facts"
 msgstr "Refresh facts"
 
-#: ../app/helpers/discovered_hosts_helper.rb:16
-#: ../app/models/setting/discovered.rb:23
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
+#: ../app/helpers/discovered_hosts_helper.rb:16 ../app/helpers/discovered_hosts_helper.rb:30 ../app/models/setting/discovered.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
 msgid "Reboot"
 msgstr "Reboot"
 
@@ -352,62 +330,51 @@ msgstr "Reboot"
 msgid "Back"
 msgstr "Back"
 
-#: ../app/helpers/discovered_hosts_helper.rb:21
-#: ../app/helpers/discovered_hosts_helper.rb:37
+#: ../app/helpers/discovered_hosts_helper.rb:21 ../app/helpers/discovered_hosts_helper.rb:35
 msgid "Select Action"
 msgstr "Select Action"
 
-#: ../app/helpers/discovered_hosts_helper.rb:23
-msgid "Expand All"
-msgstr "Expand All"
-
-#: ../app/helpers/discovered_hosts_helper.rb:27
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
+#: ../app/helpers/discovered_hosts_helper.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
 msgid "Delete %s?"
 msgstr "Delete %s?"
 
-#: ../app/helpers/discovered_hosts_helper.rb:33
-msgid "Delete hosts"
-msgstr "Delete hosts"
-
-#: ../app/helpers/discovered_hosts_helper.rb:34
+#: ../app/helpers/discovered_hosts_helper.rb:31
 msgid "Assign Organization"
 msgstr "Assign Organisation"
 
-#: ../app/helpers/discovered_hosts_helper.rb:35
+#: ../app/helpers/discovered_hosts_helper.rb:32
 msgid "Assign Location"
 msgstr "Assign Location"
 
-#: ../app/helpers/discovered_hosts_helper.rb:39
+#: ../app/helpers/discovered_hosts_helper.rb:33
+msgid "Delete"
+msgstr ""
+
+#: ../app/helpers/discovered_hosts_helper.rb:37
 msgid "%s - The following hosts are about to be changed"
 msgstr "%s - The following hosts are about to be changed"
 
-#: ../app/helpers/discovered_hosts_helper.rb:48
-#: ../app/views/dashboard/_discovery_widget_host.html.erb:2
+#: ../app/helpers/discovered_hosts_helper.rb:46 ../app/views/dashboard/_discovery_widget_host.html.erb:2
 msgid "N/A"
 msgstr "N/A"
 
-#: ../app/helpers/discovered_hosts_helper.rb:60
+#: ../app/helpers/discovered_hosts_helper.rb:58
 msgid "New in the last 24 hours"
 msgstr "New in the last 24 hours"
 
-#: ../app/helpers/discovered_hosts_helper.rb:64
+#: ../app/helpers/discovered_hosts_helper.rb:62
 msgid "Not reported in more than 7 days"
 msgstr "Not reported in more than 7 days"
 
-#: ../app/helpers/discovered_hosts_helper.rb:68
+#: ../app/helpers/discovered_hosts_helper.rb:66
 msgid "Reported in the last 7 days"
 msgstr "Reported in the last 7 days"
 
-#: ../app/helpers/discovered_hosts_helper.rb:92
+#: ../app/helpers/discovered_hosts_helper.rb:90
 msgid "Provision"
 msgstr "Provision"
 
-#: ../app/helpers/discovery_rules_helper.rb:26
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2
-#: ../app/views/discovered_hosts/welcome.html.erb:1
-#: ../app/views/discovered_hosts/welcome.html.erb:6
-#: ../lib/foreman_discovery/engine.rb:166
+#: ../app/helpers/discovery_rules_helper.rb:26 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2 ../app/views/discovered_hosts/welcome.html.erb:1 ../app/views/discovered_hosts/welcome.html.erb:6 ../lib/foreman_discovery/engine.rb:173
 msgid "Discovered Hosts"
 msgstr "Discovered Hosts"
 
@@ -443,66 +410,59 @@ msgstr "Must specify a user with email enabled"
 msgid "Discovered hosts summary"
 msgstr "Discovered hosts summary"
 
-#: ../app/models/discovery_rule.rb:9
+#: ../app/models/discovery_rule.rb:10
 msgid "can't contain white spaces."
 msgstr "can't contain white spaces."
 
-#: ../app/models/discovery_rule.rb:11
+#: ../app/models/discovery_rule.rb:12
 msgid "must start with a letter or ERB."
 msgstr "must start with a letter or ERB."
 
-#: ../app/models/discovery_rule.rb:45
-msgid ""
-"Host group organization %s must also be associated to the discovery rule"
-msgid_plural ""
-"Host group organizations %s must also be associated to the discovery rule"
+#: ../app/models/discovery_rule.rb:15
+msgid "must be present."
+msgstr ""
+
+#: ../app/models/discovery_rule.rb:48
+msgid "Host group organization %s must also be associated to the discovery rule"
+msgid_plural "Host group organizations %s must also be associated to the discovery rule"
 msgstr[0] "Host group organisation %s must also be associated to the discovery rule"
 msgstr[1] "Host group organisations %s must also be associated to the discovery rule"
 
-#: ../app/models/discovery_rule.rb:51
+#: ../app/models/discovery_rule.rb:54
 msgid "Host group location %s must also be associated to the discovery rule"
-msgid_plural ""
-"Host group locations %s must also be associated to the discovery rule"
+msgid_plural "Host group locations %s must also be associated to the discovery rule"
 msgstr[0] "Host group location %s must also be associated to the discovery rule"
 msgstr[1] "Host group locations %s must also be associated to the discovery rule"
 
-#: ../app/models/host/discovered.rb:37
+#: ../app/models/host/discovered.rb:51
 msgid "Invalid facts, must be a Hash"
 msgstr "Invalid facts, must be a Hash"
 
-#: ../app/models/host/discovered.rb:42
-msgid ""
-"Expected discovery_fact '%s' is missing, unable to detect primary interface "
-"and set hostname"
+#: ../app/models/host/discovered.rb:56
+msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 
-#: ../app/models/host/discovered.rb:49
-msgid ""
-"Invalid facts: hash does not contain a valid value for any of the facts in "
-"the discovery_hostname setting: %s"
+#: ../app/models/host/discovered.rb:63
+msgid "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
 msgstr "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
 
-#: ../app/models/host/discovered.rb:66
+#: ../app/models/host/discovered.rb:89
 msgid "Facts could not be imported"
 msgstr "Facts could not be imported"
 
-#: ../app/models/host/discovered.rb:133
-msgid "Unable to assign subnet, primary interface is missing IP address"
-msgstr "Unable to assign subnet, primary interface is missing IP address"
-
-#: ../app/models/host/discovered.rb:190
+#: ../app/models/host/discovered.rb:212
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "Could not get facts from proxy %{url}: %{error}"
 
-#: ../app/models/host/discovered.rb:198
+#: ../app/models/host/discovered.rb:220
 msgid "Unable to reboot %{name} via %{url}: %{msg}"
 msgstr "Unable to reboot %{name} via %{url}: %{msg}"
 
-#: ../app/models/host/discovered.rb:206
+#: ../app/models/host/discovered.rb:228
 msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
 msgstr "Unable to perform kexec on %{name} via %{url}: %{msg}"
 
-#: ../app/models/host/discovered.rb:225
+#: ../app/models/host/discovered.rb:247
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr "Invalid hostname: Could not normalise the hostname"
 
@@ -555,9 +515,7 @@ msgid "Hostname facts"
 msgstr "Hostname facts"
 
 #: ../app/models/setting/discovered.rb:22
-msgid ""
-"Automatically provision newly discovered hosts, according to the "
-"provisioning rules"
+msgid "Automatically provision newly discovered hosts, according to the provisioning rules"
 msgstr "Automatically provision newly discovered hosts, according to the provisioning rules"
 
 #: ../app/models/setting/discovered.rb:22
@@ -633,9 +591,7 @@ msgid "IPMI facts"
 msgstr "IPMI facts"
 
 #: ../app/models/setting/discovered.rb:32
-msgid ""
-"Automatically generate PXE configuration to pin a newly discovered host to "
-"discovery"
+msgid "Automatically generate PXE configuration to pin a newly discovered host to discovery"
 msgstr "Automatically generate PXE configuration to pin a newly discovered host to discovery"
 
 #: ../app/models/setting/discovered.rb:32
@@ -674,27 +630,41 @@ msgstr "Force DNS entries creation when provisioning discovered host"
 msgid "Force DNS"
 msgstr "Force DNS"
 
-#: ../app/models/setting/discovered.rb:43
+#: ../app/models/setting/discovered.rb:37
+msgid "Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:37
+msgid "Error on existing NIC"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:44
 msgid "The default location to place discovered hosts in"
 msgstr "The default location to place discovered hosts in"
 
-#: ../app/models/setting/discovered.rb:43
+#: ../app/models/setting/discovered.rb:44
 msgid "Discovery location"
 msgstr "Discovery location"
 
-#: ../app/models/setting/discovered.rb:51
+#: ../app/models/setting/discovered.rb:52
 msgid "The default organization to place discovered hosts in"
 msgstr "The default organisation to place discovered hosts in"
 
-#: ../app/models/setting/discovered.rb:51
+#: ../app/models/setting/discovered.rb:52
 msgid "Discovery organization"
 msgstr "Discovery organisation"
 
-#: ../app/services/foreman_discovery/fact_parser.rb:9
-msgid ""
-"Unable to detect primary interface using MAC '%{mac}' specified by "
-"discovery_fact '%{fact}'"
-msgstr "Unable to detect primary interface using MAC '%{mac}' specified by discovery_fact '%{fact}'"
+#: ../app/services/foreman_discovery/fact_parser.rb:4
+msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
+msgstr ""
+
+#: ../app/services/foreman_discovery/fact_parser.rb:6
+msgid "Discovered host '%{host}' has all NICs filtered out, filter: %{filter}"
+msgstr ""
+
+#: ../app/services/foreman_discovery/fact_parser.rb:12
+msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
+msgstr ""
 
 #: ../app/services/foreman_discovery/node_api/node_resource.rb:75
 msgid "Image API returned HTTP/%{code} with '%{body}"
@@ -712,25 +682,15 @@ msgstr "No discovered hosts available"
 msgid "Host"
 msgstr "Host"
 
-#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7
-#: ../app/views/discovered_hosts/_selected_hosts.html.erb:8
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:18
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:10
+#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7 ../app/views/discovered_hosts/_selected_hosts.html.erb:8 ../app/views/discovered_mailer/discovered_summary.html.erb:18 ../app/views/discovered_mailer/discovered_summary.text.erb:10
 msgid "Model"
 msgstr "Model"
 
-#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:9
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:20
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:12
+#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:9 ../app/views/discovered_mailer/discovered_summary.html.erb:20 ../app/views/discovered_mailer/discovered_summary.text.erb:12
 msgid "CPUs"
 msgstr "CPUs"
 
-#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:21
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:13
+#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10 ../app/views/discovered_mailer/discovered_summary.html.erb:21 ../app/views/discovered_mailer/discovered_summary.text.erb:13
 msgid "Memory"
 msgstr "Memory"
 
@@ -750,16 +710,11 @@ msgstr "Select all items in this page"
 msgid "items selected. Uncheck to Clear"
 msgstr "items selected. Uncheck to Clear"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6
-#: ../app/views/discovered_hosts/_selected_hosts.html.erb:7
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:17
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:9
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6 ../app/views/discovered_hosts/_selected_hosts.html.erb:7 ../app/views/discovered_mailer/discovered_summary.html.erb:17 ../app/views/discovered_mailer/discovered_summary.text.erb:9
 msgid "Name"
 msgstr "Name"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:19
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:11
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8 ../app/views/discovered_mailer/discovered_summary.html.erb:19 ../app/views/discovered_mailer/discovered_summary.text.erb:11
 msgid "IP Address"
 msgstr "IP Address"
 
@@ -771,13 +726,11 @@ msgstr "Disk Count"
 msgid "Disks Size"
 msgstr "Disks Size"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17
-#: ../app/views/discovered_hosts/_selected_hosts.html.erb:10
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17 ../app/views/discovered_hosts/_selected_hosts.html.erb:10
 msgid "Location"
 msgstr "Location"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20
-#: ../app/views/discovered_hosts/_selected_hosts.html.erb:13
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20 ../app/views/discovered_hosts/_selected_hosts.html.erb:13
 msgid "Organization"
 msgstr "Organisation"
 
@@ -805,18 +758,8 @@ msgstr "Submit"
 msgid "Provision %s"
 msgstr "Provision %s"
 
-#: ../app/views/discovered_hosts/index.html.erb:2
-msgid "Reboot All"
-msgstr "Reboot All"
-
-#: ../app/views/discovered_hosts/index.html.erb:3
-msgid "Auto Provision All"
-msgstr "Auto Provision All"
-
 #: ../app/views/discovered_hosts/multiple_destroy.html.erb:3
-msgid ""
-"This might take a while, as all hosts, facts and reports will be destroyed "
-"as well"
+msgid "This might take a while, as all hosts, facts and reports will be destroyed as well"
 msgstr "This might take a while, as all hosts, facts and reports will be destroyed as well"
 
 #: ../app/views/discovered_hosts/select_multiple_location.html.erb:5
@@ -831,34 +774,36 @@ msgstr "Select organisation"
 msgid "Discovered host: %s"
 msgstr "Discovered host: %s"
 
-#: ../app/views/discovered_hosts/show.html.erb:34
+#: ../app/views/discovered_hosts/show.html.erb:37
 msgid "Interfaces"
 msgstr "Interfaces"
 
-#: ../app/views/discovered_hosts/show.html.erb:41
+#: ../app/views/discovered_hosts/show.html.erb:44
 msgid "Type"
 msgstr "Type"
 
-#: ../app/views/discovered_hosts/show.html.erb:42
+#: ../app/views/discovered_hosts/show.html.erb:45
 msgid "Identifier"
 msgstr "Identifier"
 
-#: ../app/views/discovered_hosts/show.html.erb:43
+#: ../app/views/discovered_hosts/show.html.erb:46
 msgid "MAC address"
 msgstr "MAC address"
 
-#: ../app/views/discovered_hosts/show.html.erb:44
+#: ../app/views/discovered_hosts/show.html.erb:47
 msgid "IP address"
 msgstr "IP address"
 
+#: ../app/views/discovered_hosts/show.html.erb:66
+msgid "Collapse All"
+msgstr ""
+
 #: ../app/views/discovered_hosts/welcome.html.erb:7
 msgid "No discovered hosts found in this context."
 msgstr "No discovered hosts found in this context."
 
 #: ../app/views/discovered_hosts/welcome.html.erb:8
-msgid ""
-"This page shows discovered bare-metal or virtual nodes waiting to be "
-"provisioned."
+msgid "This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
 msgstr "This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
 
 #: ../app/views/discovered_hosts/welcome.html.erb:9
@@ -873,23 +818,19 @@ msgstr "Summary report for discovered hosts from Foreman"
 msgid "<b>Foreman</b> Discovered hosts summary"
 msgstr "<b>Foreman</b> Discovered hosts summary"
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:10
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:5
+#: ../app/views/discovered_mailer/discovered_summary.html.erb:10 ../app/views/discovered_mailer/discovered_summary.text.erb:5
 msgid "Summary from %{time} ago to %{now}"
 msgstr "Summary from %{time} ago to %{now}"
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:11
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:3
+#: ../app/views/discovered_mailer/discovered_summary.html.erb:11 ../app/views/discovered_mailer/discovered_summary.text.erb:3
 msgid "Discovered hosts from Foreman server at %{foreman_url}"
 msgstr "Discovered hosts from Foreman server at %{foreman_url}"
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:22
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:14
+#: ../app/views/discovered_mailer/discovered_summary.html.erb:22 ../app/views/discovered_mailer/discovered_summary.text.erb:14
 msgid "Disk count"
 msgstr "Disk count"
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:23
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:15
+#: ../app/views/discovered_mailer/discovered_summary.html.erb:23 ../app/views/discovered_mailer/discovered_summary.text.erb:15
 msgid "Disks size"
 msgstr "Disks size"
 
@@ -938,38 +879,28 @@ msgid "Rule priority (lower integer means higher priority)"
 msgstr "Rule priority (lower integer means higher priority)"
 
 #: ../app/views/discovery_rules/_template_inline.erb:2
-msgid ""
-"Specify target hostname template pattern in the same syntax as in "
-"Provisioning Templates (ERB)."
+msgid "Specify target hostname template pattern in the same syntax as in Provisioning Templates (ERB)."
 msgstr "Specify target hostname template pattern in the same syntax as in Provisioning Templates (ERB)."
 
 #: ../app/views/discovery_rules/_template_inline.erb:4
-msgid ""
-"Domain will be appended automatically. A hostname based on MAC address will "
-"be used when left blank."
+msgid "Domain will be appended automatically. A hostname based on MAC address will be used when left blank."
 msgstr "Domain will be appended automatically. A hostname based on MAC address will be used when left blank."
 
 #: ../app/views/discovery_rules/_template_inline.erb:5
-msgid ""
-"In addition to @host attribute function rand for random integers is "
-"available. Examples:"
+msgid "In addition to @host attribute function rand for random integers is available. Examples:"
 msgstr "In addition to @host attribute function rand for random integers is available. Examples:"
 
 #: ../app/views/discovery_rules/_template_inline.erb:8
-msgid ""
-"When creating hostname patterns, make sure the resulting host names are "
-"unique."
+msgid "When creating hostname patterns, make sure the resulting host names are unique."
 msgstr "When creating hostname patterns, make sure the resulting host names are unique."
 
 #: ../app/views/discovery_rules/_template_inline.erb:9
-msgid ""
-"Hostnames must not start with numbers. A good approach is to use unique "
-"information provided by facter (MAC address, BIOS or serial ID)."
+msgid "Hostnames must not start with numbers. A good approach is to use unique information provided by facter (MAC address, BIOS or serial ID)."
 msgstr "Hostnames must not start with numbers. A good approach is to use unique information provided by facter (MAC address, BIOS or serial ID)."
 
 #: ../app/views/discovery_rules/edit.html.erb:1
-msgid "Edit Discovery Rule"
-msgstr "Edit Discovery Rule"
+msgid "Edit %s"
+msgstr ""
 
 #: ../app/views/discovery_rules/index.html.erb:1
 msgid "Discovery Rules"
@@ -1023,30 +954,26 @@ msgstr "One or more hosts have been discovered"
 msgid "Details"
 msgstr "Details"
 
-#: ../lib/foreman_discovery/engine.rb:151
+#: ../lib/foreman_discovery/engine.rb:158
 msgid "Discovered hosts"
 msgstr "Discovered hosts"
 
-#: ../lib/foreman_discovery/engine.rb:156
+#: ../lib/foreman_discovery/engine.rb:163
 msgid "Discovery rules"
 msgstr "Discovery rules"
 
-#: ../lib/foreman_discovery/engine.rb:172
+#: ../lib/foreman_discovery/engine.rb:179
 msgid "Discovery Kexec template"
 msgstr "Discovery Kexec template"
 
-#: ../lib/foreman_discovery/engine.rb:181
+#: ../lib/foreman_discovery/engine.rb:188
 msgid "Discovery Proxy"
 msgstr "Discovery Proxy"
 
-#: ../lib/foreman_discovery/engine.rb:182
-msgid ""
-"Discovery Proxy to use within this subnet for managing connection to "
-"discovered hosts"
+#: ../lib/foreman_discovery/engine.rb:189
+msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 
-#: ../lib/foreman_discovery/engine.rb:183
-msgid ""
-"ID of Discovery Proxy to use within this subnet for managing connection to "
-"discovered hosts"
+#: ../lib/foreman_discovery/engine.rb:190
+msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"