foreman_statistics 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebe6e6bb3aad64251f7d191f3bc2cfcd6adca51bdffcb85901957a9074cff7e3
-  data.tar.gz: d4f425260d58b12cc0888a1b20cea07a4294f1a19cdcd0979ca6a7f2b4927797
+  metadata.gz: 3b5105654beef97a38bdfd0d60cadbea7e6c87e1014af59bee977d71e5959f16
+  data.tar.gz: 251ef1be910ff238a95274b149e46d57fecede17239c554fced4fbb2d49af859
 SHA512:
-  metadata.gz: 379d5362616632051dc1e6ac7e9b0919898cf59e5d90ddc4f832876469a6c52ae25a2b4e8aa8f71c409d969b873739342c517b53ad28b286fe6568beeae041af
-  data.tar.gz: 255b4e780195c26a59bdf7fff704df68a6ee0bdea94b0859857d91f5147562490eefa97032724bc14a3c6e2ba862574970ae71360573aa7a422e0c1f8c73d26f
+  metadata.gz: 82c347ab978fac4aee9d9eae8a19bc440a5dff19e405d04677d59128c23dd4889fcdacbe206e381acc95711cd9f5e4ca85edb51c31d8425ca1b792af85b77b6a
+  data.tar.gz: 1b57a17d198dacdc30ea0c798b87c758627edb04e38ecd36885c59e2eb14bbd9722bfc579437f45b59450abb8d926d23d78d8c6551fed1fd967248707fa8774a

data/Rakefile

@@ -20,8 +20,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -40,8 +38,8 @@ begin
   RuboCop::RakeTask.new
 rescue StandardError => _e
   puts 'Rubocop not loaded.'
-end
-
-task :default do
-  Rake::Task['rubocop'].execute
+else
+  task :default do
+    Rake::Task['rubocop'].execute
+  end
 end

data/app/services/foreman_statistics/statistics/count_hosts.rb

@@ -20,11 +20,12 @@ module ForemanStatistics
 
         output = []
         data = scope.reorder('').group(grouping).count
-        associations = klass.find_by(id: data.keys)
+        associations = klass.where(id: data.keys).to_a
         data.each do |k, v|
           output << { label: associations.detect { |a| a.id == k }.to_label, data: v } unless v.zero?
-        rescue StandardError
-          logger.info "skipped #{k} as it has has no label"
+        rescue StandardError => e
+          Rails.logger.info "skipped '#{association} - #{k}' as it has has no label"
+          Rails.logger.debug e
         end
         output
       end

data/app/views/foreman_statistics/layouts/application_react.html.erb

@@ -7,9 +7,8 @@
 <% end %>
 
 <% content_for(:content) do %>
-  <%= notifications %>
   <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
   <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
   <%= react_component('ForemanStatistics') %>
 <% end %>
-<%= render file: "layouts/base" %>
+<%= render template: "layouts/base" %>

data/lib/foreman_statistics/engine.rb

@@ -8,8 +8,6 @@ module ForemanStatistics
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/overrides"]
 
-    config.paths['db/migrate'] << 'db/migrate_foreman' unless Gem::Version.new(SETTINGS[:version]).release < Gem::Version.new('2.2')
-
     # Add any db migrations
     initializer 'foreman_statistics.load_app_instance_data' do |app|
       ForemanStatistics::Engine.paths['db/migrate'].existent.each do |path|
@@ -21,12 +19,6 @@ module ForemanStatistics
       Foreman::Plugin.register :foreman_statistics do
         requires_foreman '>= 3.1.0'
 
-        # ==== Core cleanups
-        # TODO: clean up when this gets removed from core
-        delete_menu_item :top_menu, :trends
-        delete_menu_item :top_menu, :statistics
-        # ====
-
         # Add Global JS file for extending foreman-core components and routes
         register_global_js_file 'fills'
 

data/lib/foreman_statistics/version.rb

@@ -1,3 +1,3 @@
 module ForemanStatistics
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/locale/ca/foreman_statistics.po

@@ -4,14 +4,15 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 # Translators:
-# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2021
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2021
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_statistics 1.1.1\n"
+"Project-Id-Version: foreman_statistics 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 22:59+0000\n"
-"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2021\n"
+"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2021\n"
 "Language-Team: Catalan (https://www.transifex.com/foreman/teams/114/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

data/locale/cs_CZ/foreman_statistics.po

@@ -8,9 +8,10 @@
 # mhulan <mhulan@redhat.com>, 2021
 # Pavel Borecki <pavel.borecki@gmail.com>, 2021
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_statistics 1.1.1\n"
+"Project-Id-Version: foreman_statistics 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 22:59+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2021\n"

data/locale/de/foreman_statistics.po

@@ -13,13 +13,15 @@
 # Martin Zimmermann <martin.zimmermann@gmx.com>, 2021
 # Bryan Kearney <bryan.kearney@gmail.com>, 2021
 # Crited <Alexander.Stoll@netways.de>, 2021
+# Patrick Dolinic, 2021
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_statistics 1.1.1\n"
+"Project-Id-Version: foreman_statistics 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 22:59+0000\n"
-"Last-Translator: Crited <Alexander.Stoll@netways.de>, 2021\n"
+"Last-Translator: Patrick Dolinic, 2021\n"
 "Language-Team: German (https://www.transifex.com/foreman/teams/114/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -139,7 +141,7 @@ msgid "Name"
 msgstr "Name"
 
 msgid "No Charts To Load"
-msgstr ""
+msgstr "Keine Diagramme zum Laden"
 
 msgid "No data available"
 msgstr "Keine Daten verfügbar"
@@ -178,13 +180,13 @@ msgid "Statistics"
 msgstr "Statistiken"
 
 msgid "Statistics and Trends for Foreman gives users overview of their infrastructure."
-msgstr ""
+msgstr "Statistiken und Trends für Foreman geben Benutzern einen Überblick über ihre Infrastruktur."
 
 msgid "Submit"
 msgstr "Absenden"
 
 msgid "Trend Counter Job"
-msgstr ""
+msgstr "Trendzähler-Job"
 
 msgid "Trend of the last %s days."
 msgstr "Trend der letzten %s Tage."

data/locale/en/foreman_statistics.po

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_statistics 1.1.1\n"
+"Project-Id-Version: foreman_statistics 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2014-08-20 08:54+0100\n"
 "Last-Translator: Foreman Team <foreman-dev@googlegroups.com>\n"

data/locale/en_GB/foreman_statistics.po

@@ -7,9 +7,10 @@
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2021
 # Andi Chandler <andi@gowling.com>, 2021
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_statistics 1.1.1\n"
+"Project-Id-Version: foreman_statistics 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 22:59+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>, 2021\n"

data/locale/es/foreman_statistics.po

@@ -10,20 +10,22 @@
 # elobato <elobatocs@gmail.com>, 2021
 # Bryan Kearney <bryan.kearney@gmail.com>, 2021
 # francis <hackgo@gmail.com>, 2021
-# Amit Upadhye <aupadhye@redhat.com>, 2021
+# Amit Upadhye <aupadhye@redhat.com>, 2022
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_statistics 1.1.1\n"
+"Project-Id-Version: foreman_statistics 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 22:59+0000\n"
-"Last-Translator: Amit Upadhye <aupadhye@redhat.com>, 2021\n"
+"Last-Translator: Amit Upadhye <aupadhye@redhat.com>, 2022\n"
 "Language-Team: Spanish (https://www.transifex.com/foreman/teams/114/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 :"
+" 2;\n"
 
 msgid "Action"
 msgstr "Acción"
@@ -65,10 +67,10 @@ msgid "Delete a trend counter"
 msgstr "Eliminar un contador de tendencias"
 
 msgid "Delete all the trend history for %s?"
-msgstr "¿Eliminar todo el historial de tendencias para %s?"
+msgstr "¿Borrar todo el historial de tendencias de %s?"
 
 msgid "Display Name"
-msgstr "Nombre para mostrar"
+msgstr "Mostrar nombre"
 
 msgid "Edit"
 msgstr "Editar"
@@ -113,7 +115,7 @@ msgid "Import facts"
 msgstr "Importar datos"
 
 msgid "Last update:"
-msgstr ""
+msgstr "Última actualización:"
 
 msgid "Learn more about this in the documentation."
 msgstr "Consulte la documentación para obtener más información."
@@ -185,7 +187,7 @@ msgid "Trend Counter Job"
 msgstr ""
 
 msgid "Trend of the last %s days."
-msgstr "Tendencia de los últimos %s días"
+msgstr "Tendencia de los últimos %s días."
 
 msgid "Trends"
 msgstr "Tendencias"

data/locale/fr/foreman_statistics.po

@@ -10,20 +10,22 @@
 # Hartmel . <hartmel@laposte.net>, 2021
 # Baptiste Agasse <baptiste.agasse@gmail.com>, 2021
 # Bryan Kearney <bryan.kearney@gmail.com>, 2021
-# Amit Upadhye <aupadhye@redhat.com>, 2021
+# Amit Upadhye <aupadhye@redhat.com>, 2022
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_statistics 1.1.1\n"
+"Project-Id-Version: foreman_statistics 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 22:59+0000\n"
-"Last-Translator: Amit Upadhye <aupadhye@redhat.com>, 2021\n"
+"Last-Translator: Amit Upadhye <aupadhye@redhat.com>, 2022\n"
 "Language-Team: French (https://www.transifex.com/foreman/teams/114/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 100000"
+"0 == 0 ? 1 : 2;\n"
 
 msgid "Action"
 msgstr "Action"
@@ -65,10 +67,10 @@ msgid "Delete a trend counter"
 msgstr "Supprimer un compteur de tendance"
 
 msgid "Delete all the trend history for %s?"
-msgstr "Supprimer l'historique des tendances pour %s?"
+msgstr "Supprimer l'historique des tendances pour %s ?"
 
 msgid "Display Name"
-msgstr "Nom affiché"
+msgstr "Nom d'affichage"
 
 msgid "Edit"
 msgstr "Modifier"
@@ -92,7 +94,7 @@ msgid "Facts"
 msgstr "Faits"
 
 msgid "Get statistics"
-msgstr "Voir les statistiques"
+msgstr "Obtenir des statistiques"
 
 msgid "Hardware"
 msgstr "Matériel"
@@ -113,7 +115,7 @@ msgid "Import facts"
 msgstr "Importer des faits"
 
 msgid "Last update:"
-msgstr "Dernière mise à jour:"
+msgstr "Dernière mise à jour :"
 
 msgid "Learn more about this in the documentation."
 msgstr "Approfondissez ce sujet dans la documentation."
@@ -176,13 +178,13 @@ msgid "Statistics"
 msgstr "Statistiques"
 
 msgid "Statistics and Trends for Foreman gives users overview of their infrastructure."
-msgstr ""
+msgstr "Les statistiques et les tendances pour Foreman donnent aux utilisateurs une vue d'ensemble de leur infrastructure."
 
 msgid "Submit"
 msgstr "Envoyer"
 
 msgid "Trend Counter Job"
-msgstr ""
+msgstr "emploi du compteur de tendance"
 
 msgid "Trend of the last %s days."
 msgstr "Tendances pour les %s derniers jours."
@@ -201,8 +203,9 @@ msgstr "mémoire libre"
 
 msgid "last %s day"
 msgid_plural "last %s days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s dernier jour"
+msgstr[1] "%s derniers jours"
+msgstr[2] "%s derniers jours"
 
 msgid "used memory"
 msgstr "mémoire utilisée"

data/locale/gl/foreman_statistics.po

@@ -6,9 +6,10 @@
 # Translators:
 # Carmela Rubiños <carmela.rubinos@gmail.com>, 2021
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_statistics 1.1.1\n"
+"Project-Id-Version: foreman_statistics 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 22:59+0000\n"
 "Last-Translator: Carmela Rubiños <carmela.rubinos@gmail.com>, 2021\n"

data/locale/it/foreman_statistics.po

@@ -8,9 +8,10 @@
 # Bryan Kearney <bryan.kearney@gmail.com>, 2021
 # Andrea Perotti, 2021
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_statistics 1.1.1\n"
+"Project-Id-Version: foreman_statistics 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 22:59+0000\n"
 "Last-Translator: Andrea Perotti, 2021\n"
@@ -19,7 +20,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 :"
+" 2;\n"
 
 msgid "Action"
 msgstr "Azione"

data/locale/ja/foreman_statistics.po

@@ -7,14 +7,15 @@
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2021
 # Transifex Bot <>, 2021
 # Bryan Kearney <bryan.kearney@gmail.com>, 2021
-# Amit Upadhye <aupadhye@redhat.com>, 2021
+# Amit Upadhye <aupadhye@redhat.com>, 2022
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_statistics 1.1.1\n"
+"Project-Id-Version: foreman_statistics 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 22:59+0000\n"
-"Last-Translator: Amit Upadhye <aupadhye@redhat.com>, 2021\n"
+"Last-Translator: Amit Upadhye <aupadhye@redhat.com>, 2022\n"
 "Language-Team: Japanese (https://www.transifex.com/foreman/teams/114/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,10 +45,10 @@ msgid "Cancel"
 msgstr "取り消し"
 
 msgid "Class Distribution"
-msgstr "クラス分布"
+msgstr "クラスの分布"
 
 msgid "Compute Resource Distribution"
-msgstr "コンピュートリソースディストリビューション"
+msgstr "コンピュートリソースの分布"
 
 msgid "Compute resource"
 msgstr "コンピュートリソース"
@@ -71,13 +72,13 @@ msgid "Edit"
 msgstr "編集"
 
 msgid "Edit Trend %s"
-msgstr "%sトレンド  の編集"
+msgstr "トレンド %s の編集"
 
 msgid "Environment"
 msgstr "環境"
 
 msgid "Environment Distribution"
-msgstr "環境ディストリビューション"
+msgstr "環境の分布"
 
 msgid "Expand the chart"
 msgstr "チャートを拡大"
@@ -95,7 +96,7 @@ msgid "Hardware"
 msgstr "ハードウェア"
 
 msgid "Host Group Distribution"
-msgstr "ホストグループディストリビューション"
+msgstr "ホストグループの分布"
 
 msgid "Host group"
 msgstr "ホストグループ"
@@ -119,7 +120,7 @@ msgid "List of trends counters"
 msgstr "トレンドカウンターのリスト"
 
 msgid "Location Distribution"
-msgstr "場所ディストリビューション"
+msgstr "ロケーションの分布"
 
 msgid "Max days for Trends graphs"
 msgstr "トレンドグラフの最大日数"
@@ -152,7 +153,7 @@ msgid "Operating system"
 msgstr "オペレーティングシステム"
 
 msgid "Organization Distribution"
-msgstr "組織ディストリビューション"
+msgstr "組織の分布"
 
 msgid "Please Select"
 msgstr "選択してください"
@@ -173,13 +174,13 @@ msgid "Statistics"
 msgstr "統計"
 
 msgid "Statistics and Trends for Foreman gives users overview of their infrastructure."
-msgstr ""
+msgstr "Foreman の統計とトレンドは、ユーザーにインフラストラクチャーの概要を提供します。"
 
 msgid "Submit"
 msgstr "送信"
 
 msgid "Trend Counter Job"
-msgstr ""
+msgstr "トレンドカウンタージョブ"
 
 msgid "Trend of the last %s days."
 msgstr "過去 %s 日間のトレンドです。"
@@ -191,15 +192,14 @@ msgid "Trends for %s"
 msgstr "%s のトレンド"
 
 msgid "Trends in Foreman allow you to track changes in your infrastructure over time. It allows you to track both Foreman related information and to any fact. The Trend pages give a graph of how the number of hosts with that value have changed over time, and list the current hosts."
-msgstr "Foreman のトレンドを使用すると、インフラストラクチャー内における長期での変更を追跡できます。Foreman 関連の情報とファクトの両方が追跡できます。トレンドページでは、その値のホスト数が長期でどのように変化したかというグラフと、現行ホストの一覧が確認できます。"
+msgstr "Foreman のトレンドを使用すると、インフラストラクチャー内における長期での変更を追跡できます。Foreman 関連の情報とファクトの両方を追跡できます。トレンドページでは、その値のホスト数が長期でどのように変化したかというグラフと、現行ホストの一覧が確認できます。"
 
 msgid "free memory"
 msgstr "空きメモリー"
 
 msgid "last %s day"
 msgid_plural "last %s days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "最終 %s 日"
 
 msgid "used memory"
 msgstr "使用済みメモリー"