foreman_discovery 3.0.0 → 4.0.0

data/lib/foreman_discovery/engine.rb

@@ -45,16 +45,23 @@ module ForemanDiscovery
             :discovered_hosts          => [:index, :show, :auto_complete_search],
             :"api/v2/discovered_hosts" => [:index, :show]
           }, :resource_type => 'Host'
+          permission :submit_discovered_hosts, {
+            :"api/v2/discovered_hosts" => [:facts, :create]
+          }, :resource_type => 'Host'
+          permission :auto_provision_discovered_hosts, {
+            :discovered_hosts          => [:auto_provision, :auto_provision_all],
+            :"api/v2/discovered_hosts" => [:auto_provision, :auto_provision_all]
+          }, :resource_type => 'Host'
           permission :provision_discovered_hosts, {
-            :discovered_hosts          => [:new, :create, :auto_provision, :auto_provision_all],
-            :"api/v2/discovered_hosts" => [:create, :auto_provision, :auto_provision_all]
+            :discovered_hosts          => [:edit, :update],
+            :"api/v2/discovered_hosts" => [:update]
           }, :resource_type => 'Host'
           permission :edit_discovered_hosts, {
-            :discovered_hosts          => [:edit, :update, :update_multiple_location,
+            :discovered_hosts          => [:update_multiple_location,
                                            :select_multiple_organization,
                                            :update_multiple_organization,
-                                           :select_multiple_location, :refresh_facts, :reboot],
-            :"api/v2/discovered_hosts" => [:update, :facts, :refresh_facts, :reboot]
+                                           :select_multiple_location, :refresh_facts, :reboot, :reboot_all],
+            :"api/v2/discovered_hosts" => [:refresh_facts, :reboot, :reboot_all]
           }, :resource_type => 'Host'
           permission :destroy_discovered_hosts, {
             :discovered_hosts          => [:destroy, :submit_multiple_destroy, :multiple_destroy],
@@ -67,28 +74,48 @@ module ForemanDiscovery
           permission :view_discovery_rules, {
             :discovery_rules => [:index, :show, :auto_complete_search],
             :"api/v2/discovery_rules" => [:index, :show]
-          }
-          permission :new_discovery_rules, {
+          }, :resource_type => 'DiscoveryRule'
+          permission :create_discovery_rules, {
             :discovery_rules => [:new, :create],
             :"api/v2/discovery_rules" => [:create]
-          }
+          }, :resource_type => 'DiscoveryRule'
           permission :edit_discovery_rules, {
             :discovery_rules => [:edit, :update, :enable, :disable],
             :"api/v2/discovery_rules" => [:create, :update]
-          }
+          }, :resource_type => 'DiscoveryRule'
           permission :execute_discovery_rules, {
             :discovery_rules => [:auto_provision, :auto_provision_all],
             :"api/v2/discovery_rules" => [:auto_provision, :auto_provision_all]
-          }
-          permission :delete_discovery_rules, {
+          }, :resource_type => 'DiscoveryRule'
+          permission :destroy_discovery_rules, {
             :discovery_rules => [:destroy],
             :"api/v2/discovery_rules" => [:destroy]
-          }
+          }, :resource_type => 'DiscoveryRule'
         end
 
-        # roles (only added if they don't exist)
-        role "Discovery Manager", [:view_discovered_hosts, :provision_discovered_hosts, :edit_discovered_hosts, :destroy_discovered_hosts, :view_discovery_rules, :new_discovery_rules, :edit_discovery_rules, :execute_discovery_rules, :delete_discovery_rules]
-        role "Discovery Reader", [:view_discovered_hosts, :view_discovery_rules]
+        READER = [
+          :view_discovered_hosts,
+          :view_discovery_rules,
+          :view_organizations,
+          :view_locations,
+        ]
+        MANAGER = READER + [
+          :assign_organizations,
+          :assign_locations,
+          # discovered_hosts
+          :submit_discovered_hosts,
+          :provision_discovered_hosts,
+          :auto_provision_discovered_hosts,
+          :edit_discovered_hosts,
+          :destroy_discovered_hosts,
+          # discovered_rules
+          :create_discovery_rules,
+          :execute_discovery_rules,
+          :edit_discovery_rules,
+          :destroy_discovery_rules,
+        ]
+        role "Discovery Reader", READER
+        role "Discovery Manager", MANAGER
 
         # menu entries
         menu :top_menu, :discovered_hosts, :url_hash => {:controller => :discovered_hosts, :action => :index},
@@ -102,7 +129,7 @@ module ForemanDiscovery
           :after=> :hostgroups
 
         # add dashboard widget
-        widget 'discovery_widget', :name=>N_('Discovery widget'), :sizex => 7, :sizey =>1
+        widget 'discovery_widget', :name=>N_('Discovery widget'), :sizex => 6, :sizey =>1
 
         # add template helpers
         allowed_template_helpers :rand
@@ -139,6 +166,9 @@ module ForemanDiscovery
 
       # Include subnet extensions
       ::Subnet.send :include, DiscoverySubnet
+
+      # Include helper for dashboard
+      ::DashboardHelper.send(:include, DiscoveredHostsHelper)
     end
 
     rake_tasks do

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "3.0.0"
+  VERSION = "4.0.0"
 end

data/locale/de/foreman_discovery.po

@@ -4,16 +4,18 @@
 # 
 # Translators:
 # Arnold Bechtoldt <mail@arnoldbechtoldt.com>, 2014
+# Christina Gurski <Gurski_christina@yahoo.de>, 2015
 # Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
+# Lukáš Zapletal, 2015
 # simon11 <simon.stieger.98@live.de>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 2.0.0.rc1\n"
+"Project-Id-Version: foreman_discovery 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-28 17:53+0100\n"
-"PO-Revision-Date: 2015-03-08 13:12+0000\n"
-"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/foreman/language/de/)\n"
+"PO-Revision-Date: 2015-08-10 10:06+0000\n"
+"Last-Translator: Lukáš Zapletal\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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,15 +38,15 @@ msgid "Assign Organization"
 msgstr "Organisation zuweisen"
 
 msgid "Auto Provision"
-msgstr ""
+msgstr "Automatische Bereitstellung"
 
 msgid "Auto Provision All"
-msgstr ""
+msgstr "Alle automatisch bereitstellen"
 
 msgid ""
 "Automatically provision newly discovered hosts, according to the "
 "provisioning rules"
-msgstr ""
+msgstr "Automatisch neu entdeckte Hosts gemäß den Bereitstellungsregeln bereitstellen"
 
 msgid "CPUs"
 msgstr "CPUs"
@@ -53,13 +55,13 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 msgid "Could not get facts from proxy %{url}: %{error}"
-msgstr ""
+msgstr "Konnte keine Facts von Proxy %{url} empfangen: %{error}"
 
 msgid "Create a discovered host"
-msgstr ""
+msgstr "Einen entdeckten Host erstellen"
 
 msgid "Create a discovery rule"
-msgstr ""
+msgstr "Eine Entdeckungsregel erstellen"
 
 msgid "Delete"
 msgstr "Löschen"
@@ -68,7 +70,7 @@ msgid "Delete %s?"
 msgstr "%s löschen?"
 
 msgid "Delete a discovered host"
-msgstr ""
+msgstr "Einen entdeckten Host löschen"
 
 msgid "Delete a rule"
 msgstr "Regel löschen"
@@ -86,7 +88,7 @@ msgid "Disable rule?"
 msgstr "Regel deaktivieren?"
 
 msgid "Discovered Host Pool"
-msgstr ""
+msgstr "Entdeckter Host-Pool"
 
 msgid "Discovered host: %s"
 msgstr "Entdeckter Host: %s"
@@ -95,43 +97,43 @@ msgid "Discovered hosts"
 msgstr "Entdeckte Hosts"
 
 msgid "Discovered hosts are provisioning now"
-msgstr ""
+msgstr "Entdeckte Hosts werden jetzt bereitgestellt"
 
 msgid "Discovery Rules"
-msgstr ""
+msgstr "Entdeckungsregeln"
 
 msgid "Discovery rules"
-msgstr ""
+msgstr "Entdeckungsregeln"
 
 msgid "Discovery widget"
-msgstr ""
+msgstr "Entdeckungs-Widget"
 
 msgid "DiscoveryRule|Enabled"
-msgstr ""
+msgstr "Aktiviert"
 
 msgid "DiscoveryRule|Name"
-msgstr ""
+msgstr "Name"
 
 msgid "DiscoveryRule|Priority"
-msgstr ""
+msgstr "Priorität"
 
 msgid "DiscoveryRule|Query"
-msgstr ""
+msgstr "Abfrage"
 
 msgid "Disk count"
-msgstr ""
+msgstr "Festplattenanzahl"
 
 msgid "Disks size"
-msgstr ""
+msgstr "Festplattengröße"
 
 msgid ""
 "Domain will be appended automatically. A hostname based on MAC address will "
 "be used when left blank. In addition to @host attribute function rand for "
 "random integers is available. Examples:"
-msgstr ""
+msgstr "Domäne wird automatisch angefügt. Bei Freilassung wird ein auf einer MAC-Adresse basierender Hostname verwendet. Zusätzlich zum @host-Attribut ist die Funktion \"rand\" für Random Integers verfügbar. Beispiele:"
 
 msgid "Edit Discovery Rule"
-msgstr ""
+msgstr "Entdeckungsregel bearbeiten"
 
 msgid "Enable"
 msgstr "Aktivieren"
@@ -140,13 +142,13 @@ msgid "Enable rule?"
 msgstr "Regel aktivieren?"
 
 msgid "Errors during auto provisioning: %s"
-msgstr ""
+msgstr "Fehler bei der automatischen Bereitstellung: %s"
 
 msgid "Execute rules against a discovered host"
-msgstr ""
+msgstr "Anwenden der Regeln auf alle entdeckten Hosts"
 
 msgid "Execute rules against all currently discovered hosts"
-msgstr ""
+msgstr "Anwenden der Regeln auf alle gegenwärtig entdeckten Hosts"
 
 msgid "Fact"
 msgstr "Fakt"
@@ -158,55 +160,55 @@ msgid "Facts refreshed for %s"
 msgstr "Fakten für %s erneuert"
 
 msgid "Failed to auto provision host %s: %s"
-msgstr ""
+msgstr "Fehler bei der automatischen Bereitstellung von Host %s: %s"
 
 msgid "Failed to import facts for discovered host"
-msgstr ""
+msgstr "Importieren von Fakten für entdeckten Host fehlgeschlagen"
 
 msgid "Failed to import facts for discovered host: %s"
-msgstr ""
+msgstr "Importieren von Fakten für entdeckten Host fehlgeschlagen: %s"
 
 msgid "Failed to reboot host %s"
-msgstr ""
+msgstr "Neustart von Host %s fehlgeschlagen"
 
 msgid "Failed to reboot host %{hostname} with error %{error_message}"
-msgstr ""
+msgstr "Neustart von Host %{hostname} fehlgeschlagen mit Fehler %{error_message}"
 
 msgid "Failed to refresh facts for %s"
-msgstr "Fakten für %s konnten nicht erneuert werden"
+msgstr "Fakten für %s konnten nicht aktualisiert werden"
 
 msgid "Host"
 msgstr "Host"
 
 msgid "Host %{host} was provisioned with rule %{rule}"
-msgstr ""
+msgstr "Host %{host} wurde mit Regel %{rule} bereitgestellt"
 
 msgid "Host group"
 msgstr "Hostgruppe"
 
 msgid "Host of type %s can not be rebooted"
-msgstr ""
+msgstr "Host vom Typ %s kann nicht neu gestartet werden"
 
 msgid "Hostname for provisioned hosts"
-msgstr ""
+msgstr "Hostname für bereitgestellte Hosts"
 
 msgid "Hosts limit"
-msgstr ""
+msgstr "Host-Limit"
 
 msgid "Hosts/limit"
-msgstr ""
+msgstr "Hosts/Limit"
 
 msgid "IP Address"
 msgstr "IP-Adresse"
 
 msgid "Imported discovered host"
-msgstr ""
+msgstr "Entdeckter Host importiert"
 
 msgid "Invalid facts, must be a Hash"
 msgstr "Ungültige Fakten, es muss sich um einen Hash handeln"
 
 msgid "Invalid facts: hash does not contain IP address"
-msgstr ""
+msgstr "Ungültige Fakten: Hash enthält keine IP-Adresse"
 
 msgid "Invalid facts: hash does not contain the required fact '%s'"
 msgstr "Ungültige Fakten: Der Hash enthält den benötigten Fakt nicht: %s"
@@ -215,16 +217,16 @@ msgid "Last facts upload"
 msgstr "Letzter Fakten-Upload"
 
 msgid "List all discovered hosts"
-msgstr ""
+msgstr "Alle entdeckten Hosts auflisten"
 
 msgid "List all discovery rules"
-msgstr ""
+msgstr "Alle Entdeckungsregeln auflisten"
 
 msgid "Location"
 msgstr "Ort"
 
 msgid "Maximum hosts provisioned with this rule (0 = unlimited)"
-msgstr ""
+msgstr "Maximale Anzahl Hosts, die mit dieser Regel bereitgestellt werden (0 = unendlich)"
 
 msgid "Memory"
 msgstr "Speicher"
@@ -239,16 +241,16 @@ msgid "Name"
 msgstr "Name"
 
 msgid "New Discovery Rule"
-msgstr ""
+msgstr "Neue Entdeckungsregel"
 
 msgid "New Rule"
 msgstr "Neue Regel"
 
 msgid "No discovered hosts available"
-msgstr ""
+msgstr "Keine entdeckten Hosts verfügbar"
 
 msgid "No discovered hosts to provision"
-msgstr ""
+msgstr "Keine entdeckten Hosts bereitzustellen"
 
 msgid "No hosts selected"
 msgstr "Keine Hosts ausgewählt"
@@ -257,7 +259,7 @@ msgid "No hosts were found with that id or name"
 msgstr "Es wurden keine Systeme mit dieser Kennung oder diesem Namen gefunden"
 
 msgid "No rule found for host %s"
-msgstr ""
+msgstr "Keine Regel gefunden für Host %s"
 
 msgid "Organization"
 msgstr "Organisation"
@@ -269,25 +271,25 @@ msgid "Provision"
 msgstr "Bereitstellen"
 
 msgid "Provision a discovered host"
-msgstr ""
+msgstr "Einen entdeckten Host bereitstellen"
 
 msgid "Reboot"
-msgstr ""
+msgstr "Neustart"
 
 msgid "Rebooting %s"
 msgstr "%s wird neu gestartet"
 
 msgid "Rebooting a discovered host"
-msgstr ""
+msgstr "Neustart eine entdeckten Hosts"
 
 msgid "Rebooting host %s"
-msgstr ""
+msgstr "Starte Host %s neu"
 
 msgid "Refresh facts"
-msgstr "Fakten erneuern"
+msgstr "Fakten aktualisieren"
 
 msgid "Refreshing the facts of a discovered host"
-msgstr ""
+msgstr "Aktualisiere Fakten eines entdeckten Hosts"
 
 msgid "Rule disabled"
 msgstr "Regel deaktiviert"
@@ -296,7 +298,7 @@ msgid "Rule enabled"
 msgstr "Regel aktiviert"
 
 msgid "Rule priority (lower integer means higher priority)"
-msgstr ""
+msgstr "Regelpriorität (ein kleinerer Integer bedeutet höhere Priorität)"
 
 msgid "Select Action"
 msgstr "Aktion auswählen"
@@ -311,13 +313,13 @@ msgid "Select organization"
 msgstr "Organisation auswählen"
 
 msgid "Show a discovered host"
-msgstr ""
+msgstr "Einen entdeckten Host anzeigen"
 
 msgid "Show a discovery rule"
-msgstr ""
+msgstr "Einen Entdeckungsregel anzeigen"
 
 msgid "Show fact as an extra column in the discovered hosts list"
-msgstr ""
+msgstr "Fakt als zusätzliche Spalte in der Liste entdeckter Hosts anzeigen"
 
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "Beim Auswählen der Hosts ist ein Fehler aufgetreten - %s"
@@ -325,7 +327,7 @@ msgstr "Beim Auswählen der Hosts ist ein Fehler aufgetreten - %s"
 msgid ""
 "Specify target hostname template pattern in the same syntax as in "
 "Provisioning Templates (ERB)."
-msgstr ""
+msgstr "Spezifizieren Sie die Ziel-Hostnamen-Bereitstellungsvorlage in derselben Syntax wie in Bereitstellungstabellen (ERB). "
 
 msgid "Submit"
 msgstr "Absenden"
@@ -334,7 +336,7 @@ msgid "Subnet"
 msgstr "Subnetz"
 
 msgid "Target host group for this rule with all properties set"
-msgstr ""
+msgstr "Ziel-Hostgruppe für diese Regel mit allen gesetzten Eigenschaften"
 
 msgid "Template"
 msgstr "Vorlage"
@@ -349,7 +351,7 @@ msgid "The default organization to place discovered hosts in"
 msgstr "Standard-Organisation zum Platzieren entdeckter Hosts"
 
 msgid "The default prefix to use for the host name, must start with a letter"
-msgstr ""
+msgstr "Das für den Hostnamen zu verwendende Standard-Präfix, muss mit einem Buchstaben beginnen"
 
 msgid "The following hosts were not deleted: %s"
 msgstr "Die folgenden Systeme wurden nicht gelöscht: %s"
@@ -361,18 +363,18 @@ msgstr "Dies kann eine Weile dauern, weil alle Systeme, Fakten und Reporte auch
 
 msgid "Total pool size"
 msgid_plural "Total pool size"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Gesamt-Pool-Größe"
+msgstr[1] "Gesamt-Pool-Größe"
 
 msgid ""
 "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
-msgstr ""
+msgstr "UUID zum Tracken des Status der Orchestrierungsaufgaben, GET /api/orchestration/:UUID/tasks"
 
 msgid "Update a rule"
 msgstr "Regel aktualisieren"
 
 msgid "Upload facts for a host, creating the host if required"
-msgstr ""
+msgstr "Fakten für einen Host hochladen mit Erstellung des Hosts, wenn erforderlich"
 
 msgid "Value"
 msgstr "Wert"
@@ -384,39 +386,39 @@ msgid ""
 "When creating hostname patterns, make sure the resulting host names are "
 "unique. Hostnames must not start with numbers. A good approach is to use "
 "unique information provided by facter (MAC address, BIOS or serial ID)."
-msgstr ""
+msgstr "Versichern Sie sich beim Erstellen von Hostnamen-Patterns, dass die resultierenden Hostnamen eindeutig sind. Hostnamen dürfen nicht mit Zahlen beginnen. Ein guter Ansatz besteht darin, eindeutige vom Facter gelieferte Informationen (MAC-Adresse, BIOS oder serielle Kennung) zu verwenden."
 
 msgid "can't contain white spaces."
-msgstr ""
+msgstr "kann keine Leerzeichen enthalten"
 
 msgid "filter results"
 msgstr "Ergebnisse filtern"
 
 msgid "hash containing facts for the host"
-msgstr ""
+msgstr "Hash, der Fakten für den Host enthält"
 
 msgid "items selected. Uncheck to Clear"
 msgstr "Elemente ausgewählt. Zum Leeren abwählen"
 
 msgid "must start with a letter or ERB."
-msgstr ""
+msgstr "muss mit einem Buchstaben oder ERB beginnen"
 
 msgid "not required if it's a virtual machine"
-msgstr ""
+msgstr "nicht erforderlich, wenn es sich um eine virtuelle Maschine handelt"
 
 msgid "not required if using a subnet with DHCP proxy"
-msgstr ""
+msgstr "nicht erforderlich, wenn ein Subnetz mit DHCP-Proxy verwendet wird"
 
 msgid "number of entries per request"
 msgstr "Anzahl der Einträge pro Anfrage"
 
 msgid "paginate results"
-msgstr ""
+msgstr "Ergebnisse nummerieren"
 
 msgid ""
 "required if value is not inherited from host group or default password in "
 "settings"
-msgstr ""
+msgstr "erforderlich, wenn der Wert nicht von einer Hostgruppe oder einem Standardpasswort in den Einstellungen vererbt ist"
 
 msgid "sort results"
 msgstr "Ergebnisse sortieren"

data/locale/de/foreman_discovery.pox

@@ -0,0 +1,40 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: foreman_discovery 3.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-01-28 17:53+0100\n"
+"PO-Revision-Date: 2015-06-29 19:06+0000\n"
+"Last-Translator: Christina Gurski <Gurski_christina@yahoo.de>\n"
+"Language-Team: German "
+"(http://www.transifex.com/foreman/foreman/language/de/)\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
+
+# (pofilter) puncspacing: Different spacing around punctuation
+msgid "Could not get facts from proxy %{url}: %{error}"
+msgstr "Konnte keine Facts von Proxy %{url} empfangen: %{error}"
+
+# (pofilter) endwhitespace: Different whitespace at the end
+msgid ""
+"Specify target hostname template pattern in the same syntax as in "
+"Provisioning Templates (ERB)."
+msgstr "Spezifizieren Sie die Ziel-Hostnamen-Bereitstellungsvorlage in derselben Syntax wie in Bereitstellungstabellen (ERB). "
+
+# (pofilter) puncspacing: Different spacing around punctuation
+msgid ""
+"When creating hostname patterns, make sure the resulting host names are "
+"unique. Hostnames must not start with numbers. A good approach is to use "
+"unique information provided by facter (MAC address, BIOS or serial ID)."
+msgstr "Versichern Sie sich beim Erstellen von Hostnamen-Patterns, dass die resultierenden Hostnamen eindeutig sind. Hostnamen dürfen nicht mit Zahlen beginnen. Ein guter Ansatz besteht darin, eindeutige vom Facter gelieferte Informationen (MAC-Adresse, BIOS oder serielle Kennung) zu verwenden."
+
+# (pofilter) endpunc: Different punctuation at the end
+msgid "can't contain white spaces."
+msgstr "kann keine Leerzeichen enthalten"
+
+# (pofilter) endpunc: Different punctuation at the end
+msgid "must start with a letter or ERB."
+msgstr "muss mit einem Buchstaben oder ERB beginnen"