foreman_discovery 1.3.0 → 1.4.0.rc1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODM5ZGE4MTdiMTViZDllOTAxN2QzNDQzNmE4ZDI1NGVkOGIyOTUwZA==
+    OGNmNzE1ODY2NjM0ZWZmMmI0MzljNDI5NzkxZDllZDAxOTI5NzE3Zg==
   data.tar.gz: !binary |-
-    NTJlNWM3MTVjNTE5MTBiNGNmNmY2YmZiN2RmMWJjZjIzYjJlZDJkMg==
+    MDk2NTBhMjNhYWU5NWI0ZDhhMzRlYWU1NDVmMjdhN2RiMDI5ZjVmOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDQ0NzQxYjFmMDgyZTgzYmQ2NDg2OTBiZjExNDY2NmQ1OGVkNWMwZmI4ZmI2
-    NTNmYTc0N2VlMzliNWEzZTIyOTBhZDE4NGUxODkzZTc1Y2VhMDFkMGQ3ODZk
-    N2ViMTA2MjZjY2I5OWZkOTc4ZGQ1NGVmOGYxZjI3ZTU3NjBlODk=
+    ZjA4NTZmNjczZjBiODExN2Q1ZDcyYjA1ODg5NmJjZjY4NDlkYWUyYzUwY2I4
+    ZTU2Yzc5ZGQzNWY3MzBlNGI5ZmU3ODY1ZThmZTI1MDg4YThmZDgzY2E1MTgy
+    ODc2ZmVhZjhkOWQxMDAzYzc2YjQ4NzllNGE5NzFkYzgzNzQ3YmI=
   data.tar.gz: !binary |-
-    OGE0ZWM2ZWZlZDAxMjAwMDQ0MjhjNjFlOTk0MmVkMGY4MDk1MDIwZmNmZGJl
-    OWY3Y2Y3ZTI0ZjRkZjc5MDUwYTgzYzI2ZGYwZWNmNzcxZTdmM2U2ZDU0YTEy
-    YjI5MzVjNTA2MTMxNDdhOWFmYTY5ZTk4OTY1YmE5NDQwMGQyNTM=
+    MDMyNGQwYmJlYmZlODU0YWRjNzlkYjQ1YzFhMjE0ZTY4MDI0YjkxYWM1NmY0
+    OTRiMmM2NmJmNTYyY2M5MjA2ZjMyMDhiOTFkY2E0MDRiN2UwYzhmNjM5ZmIw
+    ZTA4NTQ4ZjE2ZTg3NWVlODU1Y2Q3NjRhNDZkNGNlYzE2YjcxMWI=

data/README.md

@@ -66,7 +66,7 @@ Discovery output. For a login prompt (nightly images only) use tty2.
 
 ### Download via installer
 
-As of Foreman 1.5, the foreman-installer is able to automatically download
+As of Foreman 1.6, the foreman-installer is able to automatically download
 latest stable CentOS6 images.  For this, re-run the installer with the
 following option:
 
@@ -145,7 +145,12 @@ This can still be overriden with the command line opts.
 
 It is important to have *IPAPPEND 2* option which adds BOOTIF=MAC option which
 is then reported via facter as `discovery_bootif` which is key fact which is
-used for provisioning.
+used for provisioning. Without this line, DNS will not work properly as well.
+
+It is important to know that DNS servers from DHCP are enabled only for the
+interface that was specified via the BOOTIF option. This means when a system
+have multiple NICs, DNS will work for the correct interface - the one that was
+booted from.
 
 _Warning_: For now, the selinux=0 option *must* be provided, the image is read
 only anyway but we plan to enable and test with SELinux too.
@@ -212,6 +217,16 @@ If the booted machine fails to register with Foreman, then there are a number of
   * Check DNS is working for that image, or use an IP in `foreman.url`
   * Check DHCP is handing IPs to the booted image correctly
 
+When working with production images (no root password set), it is still
+possible to log on as root. Generate some root password:
+
+    $ openssl passwd -salt RH redhat
+    RHhwCLrQXB8zE
+
+And then provide it as an kernel command line option:
+
+    ... stateless rootpw=RHhwCLrQXB8zE
+
 # API
 
 see the [API README](README.api.md)

data/app/controllers/api/v2/discovered_hosts_controller.rb

@@ -5,17 +5,23 @@ module Api
       before_filter :find_resource, :except => %w{index create facts}
       skip_before_filter :authorize, :only => :facts
 
-      api :GET, "/discovered_hosts/", "List all discovered hosts"
-      param :search, String, :desc => "Filter results"
-      param :order, String, :desc => "Sort results"
-      param :page, String, :desc => "paginate results"
-      param :per_page, String, :desc => "number of entries per request"
+      resource_description do
+        resource_id 'discovered_hosts'
+        api_version 'v2'
+        api_base_url "/api/v2"
+      end
+
+      api :GET, "/discovered_hosts/", N_("List all discovered hosts")
+      param :search, String, :desc => N_("filter results")
+      param :order, String, :desc => N_("sort results")
+      param :page, String, :desc => N_("paginate results")
+      param :per_page, String, :desc => N_("number of entries per request")
 
       def index
         @discovered_hosts = resource_scope.search_for(*search_options).paginate(paginate_options)
       end
 
-      api :GET, "/discovered_hosts/:id/", "Show a discovered host"
+      api :GET, "/discovered_hosts/:id/", N_("Show a discovered host")
       param :id, :identifier_dottable, :required => true
 
       def show
@@ -29,7 +35,7 @@ module Api
         end
       end
 
-      api :POST, "/discovered_hosts/", "Create a discovered host"
+      api :POST, "/discovered_hosts/", N_("Create a discovered host")
       param_group :discovered_host, :as => :create
 
       def create
@@ -37,13 +43,13 @@ module Api
         process_response @discovered_host.save
       end
 
-      api :PUT, "/discovered_hosts/:id/", "Provision a discovered host"
+      api :PUT, "/discovered_hosts/:id/", N_("Provision a discovered host")
       param :id, :identifier, :required => true
       param :discovered_host, Hash, :action_aware => true do
         param :name, String
         param :environment_id, String
-        param :ip, String, :desc => "not required if using a subnet with dhcp proxy"
-        param :mac, String, :desc => "not required if its a virtual machine"
+        param :ip, String, :desc => N_("not required if using a subnet with DHCP proxy")
+        param :mac, String, :desc => N_("not required if it's a virtual machine")
         param :architecture_id, :number
         param :domain_id, :number
         param :puppet_proxy_id, :number
@@ -63,7 +69,7 @@ module Api
         param :enabled, :bool
         param :provision_method, String
         param :managed, :bool
-        param :progress_report_id, String, :desc => 'UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks'
+        param :progress_report_id, String, :desc => N_("UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks")
         param :capabilities, String
       end
 
@@ -76,15 +82,15 @@ module Api
         process_response @host.update_attributes(params[:discovered_host])
       end
 
-      api :DELETE, "/discovered_hosts/:id/", "Delete a discovered host"
+      api :DELETE, "/discovered_hosts/:id/", N_("Delete a discovered host")
       param :id, :identifier, :required => true
 
       def destroy
         process_response @discovered_host.destroy
       end
 
-      api :POST, "/discovered_hosts/facts", "Upload facts for a host, creating the host if required."
-      param :facts, Hash, :required => true, :desc => "hash containing the facts for the host"
+      api :POST, "/discovered_hosts/facts", N_("Upload facts for a host, creating the host if required")
+      param :facts, Hash, :required => true, :desc => N_("hash containing facts for the host")
 
       def facts
         @discovered_host, state = Host::Discovered.import_host_and_facts(params[:facts])

data/app/controllers/discovered_hosts_controller.rb

@@ -15,9 +15,11 @@ class DiscoveredHostsController < ::ApplicationController
   layout 'layouts/application'
 
   def index
-    hosts = ::Host::Discovered.search_for(params[:search], :order => params[:order])
+    search = resource_base.search_for(params[:search], :order => params[:order])
     respond_to do |format|
-      format.html { @hosts = hosts.list.paginate :page => params[:page] }
+      format.html do
+        @hosts = search.paginate(:page => params[:page])
+      end
       format.json { render :json => hosts }
     end
   end

data/app/models/host/discovered.rb

@@ -20,16 +20,21 @@ class Host::Discovered < ::Host::Base
   scoped_search :in => :organization, :on => :name, :rename => :organization, :complete_value => true if SETTINGS[:organizations_enabled]
   scoped_search :in => :subnet, :on => :network, :complete_value => true, :rename => :subnet
 
-  # This `where` shouldn't be necessary, but randomly the sql query on the line above
-  # sometimes loses the `where` clause, leading to all Hosts on the Discovery index
-  # this seems like a rails bug, TODO: figure out whats really wrong here
-  scope :list, lambda { where(:type => "Host::Discovered").includes(:model, :location, :organization) }
+  default_scope lambda {
+    org = Organization.current
+    loc = Location.current
+    conditions = {}
+    conditions[:organization_id] = org.subtree_ids if org
+    conditions[:location_id]     = loc.subtree_ids if loc
+    where(conditions)
+  }
 
   def self.import_host_and_facts facts
     raise(::Foreman::Exception.new(N_("Invalid facts, must be a Hash"))) unless facts.is_a?(Hash)
     fact_name = Setting[:discovery_fact] || 'macaddress'
-    hostname   = facts[fact_name].try(:downcase).try(:gsub,/:/,'').try(:sub,/^/,'mac')
+    hostname = facts[fact_name].try(:downcase).try(:gsub,/:/,'').try(:sub,/^/,'mac')
     raise(::Foreman::Exception.new(N_("Invalid facts: hash does not contain the required fact '%s'"), fact_name)) unless hostname
+    raise(::Foreman::Exception.new(N_("Invalid facts: hash does not contain IP address"))) unless facts['ipaddress']
 
     # filter facts
     facts.reject!{|k,v| k =~ /kernel|operatingsystem|osfamily|ruby|path|time|swap|free|filesystem/i }
@@ -70,13 +75,13 @@ class Host::Discovered < ::Host::Base
     super + [:ip]
   end
 
-  def populate_fields_from_facts facts = self.facts_hash
+  def populate_fields_from_facts facts = self.facts_hash, type = 'puppet'
     importer = super
     self.subnet = Subnet.subnet_for(importer.ip)
     self.save
   end
 
-# no need to store anything in the db if the password is our default
+  # no need to store anything in the db if the password is our default
   def root_pass
     read_attribute(:root_pass).blank? ? (hostgroup.try(:root_pass) || Setting[:root_pass]) : read_attribute(:root_pass)
   end

data/app/views/dashboard/_discovery_widget.html.erb

@@ -0,0 +1,16 @@
+<h4 class="ca"><%= _('Discovered Host Pool') %> - <%= @current_permission %></h4>
+<% all_hosts = Host::Discovered.search_for '' %>
+<% hosts = all_hosts.limit(5) %>
+<% if hosts.empty? %>
+  <p class="ca"><%= _("No discovered hosts available") %></p>
+<% else %>
+  <table class="table table-striped ellipsis">
+    <% hosts.each do |host| %>
+      <tr>
+        <td><%= link_to h(host.name), discovered_host_path(host) %></td>
+        <td><%= host.ip  %></td>
+      </tr>
+    <% end %>
+  </table>
+  <p class="ca"><%= link_to n_("Total pool size","Total pool size", all_hosts.size), discovered_hosts_path %> - <%= all_hosts.size %> </p>
+<% end %>

data/config/routes.rb

@@ -26,7 +26,7 @@ Rails.application.routes.draw do
   ## API
   namespace :api, :defaults => {:format => 'json'} do
     scope "(:apiv)", :module => :v2, :defaults => {:apiv => 'v2'}, :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
-      resources :discovered_hosts do
+      resources :discovered_hosts, :except => [:new, :edit] do
         collection do
           post 'facts'
         end

data/lib/foreman_discovery/engine.rb

@@ -1,4 +1,3 @@
-require 'deface'
 require 'fast_gettext'
 require 'gettext_i18n_rails'
 
@@ -19,25 +18,36 @@ module ForemanDiscovery
 
     initializer 'foreman_discovery.register_gettext', :after => :load_config_initializers do |app|
       locale_dir = File.join(File.expand_path('../../..', __FILE__), 'locale')
-      locale_domain = 'discovery'
+      locale_domain = 'foreman_discovery'
 
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
 
     initializer 'foreman_discovery.register_plugin', :after=> :finisher_hook do |app|
       Foreman::Plugin.register :foreman_discovery do
-        requires_foreman '> 1.4'
+        requires_foreman '> 1.5'
 
         # Add permissions
         security_block :discovery do
-          permission :view_discovered_hosts, {:discovered_hosts => [:index, :show, :auto_complete_search, :refresh_facts] }, :resource_type => 'Host'
-          permission :provision_discovered_hosts, {:discovered_hosts => [:new, :create] }, :resource_type => 'Host'
-          permission :edit_discovered_hosts, {:discovered_hosts => [:edit, :update, :update_multiple_location,
-                                                             :select_multiple_organization,
-                                                             :update_multiple_organization,
-                                                             :select_multiple_location] }, :resource_type => 'Host'
-          permission :destroy_discovered_hosts, {:discovered_hosts => [:destroy, :submit_multiple_destroy, :multiple_destroy] }, :resource_type => 'Host'
-
+          permission :view_discovered_hosts, {
+            :discovered_hosts          => [:index, :show, :auto_complete_search],
+            :"api/v2/discovered_hosts" => [:index, :show]
+          }, :resource_type => 'Host'
+          permission :provision_discovered_hosts, {
+            :discovered_hosts          => [:new, :create],
+            :"api/v2/discovered_hosts" => [:create]
+          }, :resource_type => 'Host'
+          permission :edit_discovered_hosts, {
+            :discovered_hosts          => [:edit, :update, :update_multiple_location,
+                                           :select_multiple_organization,
+                                           :update_multiple_organization,
+                                           :select_multiple_location, :refresh_facts],
+                                           :"api/v2/discovered_hosts" => [:update, :facts]
+          }, :resource_type => 'Host'
+          permission :destroy_discovered_hosts, {
+            :discovered_hosts          => [:destroy, :submit_multiple_destroy, :multiple_destroy],
+            :"api/v2/discovered_hosts" => [:destroy]
+          }, :resource_type => 'Host'
         end
 
         # Add a new role called 'Discovery' if it doesn't exist
@@ -45,9 +55,20 @@ module ForemanDiscovery
 
         #add menu entry
         menu :top_menu, :discovery, :url_hash => {:controller=> :discovered_hosts, :action=>:index},
-             :caption=> N_('Discovered hosts'),
-             :parent => :hosts_menu,
-             :after=>:hosts
+          :caption=> N_('Discovered hosts'),
+          :parent => :hosts_menu,
+          :after=>:hosts
+
+        # add dashboard widget
+        widget 'discovery_widget', :name=>N_('Discovery widget'), :sizex => 4, :sizey =>1
+
+      end
+    end
+    initializer "foreman_discovery.apipie" do
+      # this condition is here for compatibility reason to work with Foreman 1.4.x
+      if Apipie.configuration.api_controllers_matcher.is_a?(Array) && Apipie.configuration.respond_to?(:checksum_path)
+        Apipie.configuration.api_controllers_matcher << "#{ForemanDiscovery::Engine.root}/app/controllers/api/v2/*.rb"
+        Apipie.configuration.checksum_path += ['/discovered_hosts/']
       end
     end
     # Include extensions to models in this config.to_prepare block

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "1.3.0"
+  VERSION = "1.4.0.rc1"
 end

data/locale/Makefile

@@ -0,0 +1,62 @@
+#
+# Makefile for PO merging and MO generation. More info in the README.
+#
+# make all-mo (default) - generate MO files
+# make check - check translations using translate-tool
+# make tx-update - download and merge translations from Transifex
+# make clean - clean everything
+#
+DOMAIN = foreman_discovery
+VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load(Dir.glob("../*.gemspec")[0]);puts spec.version')
+POTFILE = $(DOMAIN).pot
+MOFILE = $(DOMAIN).mo
+POFILES = $(shell find . -name '*.po')
+MOFILES = $(patsubst %.po,%.mo,$(POFILES))
+POXFILES = $(patsubst %.po,%.pox,$(POFILES))
+
+%.mo: %.po
+	mkdir -p $(shell dirname $@)/LC_MESSAGES
+	msgfmt -o $(shell dirname $@)/LC_MESSAGES/$(MOFILE) $<
+
+# Generate MO files from PO files
+all-mo: $(MOFILES)
+
+# Check for malformed strings
+%.pox: %.po
+	msgfmt -c $<
+	pofilter --nofuzzy -t variables -t blank -t urls -t emails -t long -t newlines \
+		-t endwhitespace -t endpunc -t puncspacing -t options -t printf -t validchars --gnome $< > $@
+	cat $@
+	! grep -q msgid $@
+
+check: $(POXFILES)
+	msgfmt -c ${POTFILE}
+
+# Merge PO files
+update-po:
+	for f in $(shell find ./ -name "*.po") ; do \
+		msgmerge -N --backup=none -U $$f ${POTFILE} ; \
+	done
+
+# Unify duplicate translations
+uniq-po:
+	for f in $(shell find ./ -name "*.po") ; do \
+		msguniq $$f -o $$f ; \
+	done
+
+tx-pull:
+	tx pull -f
+	for f in $(POFILES) ; do \
+		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
+	done
+	-git commit -a -m "i18n - pulling from tx"
+
+reset-po:
+	# merging po files is unnecessary when using transifex.com
+	git checkout -- ../locale/*/*po
+
+tx-update: tx-pull reset-po $(MOFILES)
+	# amend mo files
+	git add ../locale/*/LC_MESSAGES
+	git commit -a --amend -m "i18n - pulling from tx"
+	-echo Changes commited!

data/locale/de/foreman_discovery.po

@@ -4,13 +4,14 @@
 # 
 # 
 # Translators:
-# bechtoldt <mail@arnoldbechtoldt.com>, 2014
+# Arnold Bechtoldt <mail@arnoldbechtoldt.com>, 2014
+# simon11 <simon.stieger.98@live.de>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Foreman\n"
+"Project-Id-Version: foreman_discovery 1.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-08 15:59+0200\n"
-"PO-Revision-Date: 2014-04-09 10:00+0000\n"
+"POT-Creation-Date: 2014-08-07 10:19+0100\n"
+"PO-Revision-Date: 2014-08-08 09:41+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: German (http://www.transifex.com/projects/p/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -20,13 +21,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "%s - The following hosts are about to be changed"
-msgstr "%s - Die folgenden Hosts werden gerade geändert"
+msgstr "%s - Die folgenden Hosts werden  geändert"
 
 msgid "%s ago"
 msgstr "vor %s"
 
 msgid "Are you sure?"
-msgstr "Sind Sie sicher?"
+msgstr "Bist du sicher?"
 
 msgid "Assign Location"
 msgstr "Standort zuweisen"
@@ -40,20 +41,26 @@ msgstr "Abbrechen"
 msgid "Could not get facts from proxy: %s"
 msgstr "Konnte keine Fakten vom Proxy empfangen: %s"
 
+msgid "Create a discovered host"
+msgstr ""
+
 msgid "Delete"
 msgstr "Löschen"
 
 msgid "Delete %s?"
-msgstr "Löschen %s?"
+msgstr "%s löschen?"
+
+msgid "Delete a discovered host"
+msgstr ""
 
 msgid "Delete hosts"
-msgstr "Lösche Hosts"
+msgstr "Hosts löschen"
 
 msgid "Destroyed selected hosts"
-msgstr "ausgewählte gelöschte Systeme"
+msgstr "Ausgewählte Hosts gelöscht"
 
 msgid "Discovered host: %s"
-msgstr "Entdeckte Hosts: %s"
+msgstr "Entdeckter Host: %s"
 
 msgid "Discovered hosts"
 msgstr "Entdeckte Hosts"
@@ -62,10 +69,10 @@ msgid "Fact"
 msgstr "Fakt"
 
 msgid "Facts discovered on this host"
-msgstr "Auf diesem Host entdeckte Fakten:"
+msgstr "Auf diesem Host entdeckte Fakten"
 
 msgid "Facts refreshed for %s"
-msgstr "Fakten erneuert für %s"
+msgstr "Fakten für %s erneuert"
 
 msgid "Failed to import facts for Host::Discovered"
 msgstr "Fakten für Host::Discovered konnten nicht importiert werden"
@@ -77,7 +84,7 @@ msgid "Failed to reboot: %s"
 msgstr "Neustart fehlgeschlagen: %s"
 
 msgid "Failed to refresh facts for %s"
-msgstr "Konnte für %s keine Fakten erneuern"
+msgstr "Fakten für %s konnten nicht erneuert werden"
 
 msgid "Host Pool"
 msgstr "Host-Pool"
@@ -86,16 +93,19 @@ msgid "Imported Host::Discovered"
 msgstr "Host::Discovered wurde importiert"
 
 msgid "Invalid facts, must be a Hash"
-msgstr ""
+msgstr "Ungültige Fakten, es muss sich um einen Hash handeln"
 
 msgid "Invalid facts: hash does not contain the required fact '%s'"
-msgstr ""
+msgstr "Ungültige Fakten: Der Hash enthält den benötigten Fakt nicht: %s"
 
 msgid "Last facts upload"
 msgstr "Letzter Fakten-Upload"
 
+msgid "List all discovered hosts"
+msgstr ""
+
 msgid "Location"
-msgstr "Lokation"
+msgstr "Ort"
 
 msgid "Model"
 msgstr "Modell"
@@ -104,22 +114,25 @@ msgid "Name"
 msgstr "Name"
 
 msgid "No hosts selected"
-msgstr "Keine Systeme ausgewählt"
+msgstr "Keine Hosts ausgewählt"
 
 msgid "No hosts were found with that id or name"
-msgstr "es wurden keine Systeme mit dieser ID oder Namen gefunden"
+msgstr "Es wurden keine Systeme mit dieser ID oder diesem Namen gefunden"
 
 msgid "Organization"
 msgstr "Organisation"
 
 msgid "Please Confirm"
-msgstr "bitte bestätigen"
+msgstr "Bitte bestätigen"
 
 msgid "Provision"
 msgstr "Bereitstellen"
 
+msgid "Provision a discovered host"
+msgstr ""
+
 msgid "Rebooting %s"
-msgstr "Starte %s neu"
+msgstr "%s wird neu gestartet"
 
 msgid "Refresh facts"
 msgstr "Fakten erneuern"
@@ -131,13 +144,16 @@ msgid "Select all items in this page"
 msgstr "Alle Elemente auf dieser Seite auswählen"
 
 msgid "Select location"
-msgstr "Lokation auswählen"
+msgstr "Ort auswählen"
 
 msgid "Select organization"
 msgstr "Organisation auswählen"
 
+msgid "Show a discovered host"
+msgstr ""
+
 msgid "Something went wrong while selecting hosts - %s"
-msgstr "Bei der Systemauswahl von %s ist ein Fehler aufgetreten"
+msgstr "Beim Auswählen der Hosts ist ein Fehler aufgetreten - %s"
 
 msgid "Submit"
 msgstr "Absenden"
@@ -149,21 +165,28 @@ msgid "The default fact name to use for the MAC of the system"
 msgstr "Der Standard-Faktenname zum Verwenden für die MAC des Systems"
 
 msgid "The default location to place discovered hosts in"
-msgstr "Standard-Lokation zum Platzieren entdeckter Hosts"
+msgstr "Standard-Ort zum Platzieren entdeckter Hosts"
 
 msgid "The default organization to place discovered hosts in"
 msgstr "Standard-Organisation zum Platzieren entdeckter Hosts"
 
 msgid "The following hosts were not deleted: %s"
-msgstr "Die folgende Systeme wurden nicht gelöscht: %s"
+msgstr "Die folgenden Systeme wurden nicht gelöscht: %s"
 
 msgid ""
 "This might take a while, as all hosts, facts and reports will be destroyed "
 "as well"
 msgstr "Dies kann eine Weile dauern, weil alle Systeme, Fakten und Reporte auch gelöscht werden"
 
+msgid ""
+"UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
+msgstr ""
+
 msgid "Unassigned hosts"
-msgstr "Unzugeordnete Hosts"
+msgstr "Nicht zugeordnete Hosts"
+
+msgid "Upload facts for a host, creating the host if required"
+msgstr ""
 
 msgid "Value"
 msgstr "Wert"
@@ -171,5 +194,26 @@ msgstr "Wert"
 msgid "Warning"
 msgstr "Warnung"
 
+msgid "filter results"
+msgstr ""
+
+msgid "hash containing facts for the host"
+msgstr ""
+
 msgid "items selected. Uncheck to Clear"
-msgstr "Elemente ausgewählt. Abwählen um zu Leeren"
+msgstr "Elemente ausgewählt. Zum Leeren abwählen"
+
+msgid "not required if it's a virtual machine"
+msgstr ""
+
+msgid "not required if using a subnet with DHCP proxy"
+msgstr ""
+
+msgid "number of entries per request"
+msgstr ""
+
+msgid "paginate results"
+msgstr ""
+
+msgid "sort results"
+msgstr ""