foreman_statistics 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b95468f6ef7bf5f7cc61869bd23e46bf7a64331aa2d162962178b7c186df6f8a
-  data.tar.gz: 62baddb120c01c609e1e8a62d30e785a8ee12c3dcdbe4591468822d1fe464d6e
+  metadata.gz: ebe6e6bb3aad64251f7d191f3bc2cfcd6adca51bdffcb85901957a9074cff7e3
+  data.tar.gz: d4f425260d58b12cc0888a1b20cea07a4294f1a19cdcd0979ca6a7f2b4927797
 SHA512:
-  metadata.gz: 455324c4b0fcb964e4db90d36da2c0ccf74323298bac57def3197af5b71e12c80cc7b835e16262cd7fa27d7bd96d15e8ca0f9ac454299835367863c3c5fb30bc
-  data.tar.gz: 66f4bcf63408b04889e53ed846753bd34e5e3c83ecb17fdd9694181a5aa7322ef12b68ba26378aa6a21d3b6a2ae1195a1a6c52e506e715a4f5d18a3b7db97d96
+  metadata.gz: 379d5362616632051dc1e6ac7e9b0919898cf59e5d90ddc4f832876469a6c52ae25a2b4e8aa8f71c409d969b873739342c517b53ad28b286fe6568beeae041af
+  data.tar.gz: 255b4e780195c26a59bdf7fff704df68a6ee0bdea94b0859857d91f5147562490eefa97032724bc14a3c6e2ba862574970ae71360573aa7a422e0c1f8c73d26f

data/app/controllers/foreman_statistics/api/v2/statistics_controller.rb

@@ -11,10 +11,12 @@ module ForemanStatistics
 
         api :GET, '/statistics/', N_('Get statistics')
         def index
-          @os_count    = Host.authorized(:view_hosts).count_distribution :operatingsystem
-          @arch_count  = Host.authorized(:view_hosts).count_distribution :architecture
-          @env_count   = Host.authorized(:view_hosts).count_distribution :environment
-          @klass_count = Host.authorized(:view_hosts).count_habtm 'puppetclass'
+          @os_count    = Statistics::CountHosts.new(count_by: :operatingsystem)
+          @arch_count  = Statistics::CountHosts.new(count_by: :architecture)
+          if defined?(ForemanPuppet)
+            @env_count   = Statistics::CountHosts.new(count_by: :environment)
+            @klass_count = Statistics::CountPuppetClasses.new(id: :puppetclass)
+          end
           @cpu_count   = FactValue.authorized(:view_facts).my_facts.count_each 'processorcount'
           @model_count = FactValue.authorized(:view_facts).my_facts.count_each 'manufacturer'
           @mem_size    = FactValue.authorized(:view_facts).my_facts.mem_average 'memorysize'
@@ -23,8 +25,8 @@ module ForemanStatistics
           @swap_free   = FactValue.authorized(:view_facts).my_facts.mem_average 'swapfree'
           @mem_totsize = FactValue.authorized(:view_facts).my_facts.mem_sum 'memorysize'
           @mem_totfree = FactValue.authorized(:view_facts).my_facts.mem_sum 'memoryfree'
-          render :json => { :os_count => @os_count, :arch_count => @arch_count, :swap_size => @swap_size,
-                            :env_count => @env_count, :klass_count => @klass_count, :cpu_count => @cpu_count,
+          render :json => { :os_count => @os_count.calculate, :arch_count => @arch_count.calculate, :swap_size => @swap_size,
+                            :env_count => @env_count&.calculate, :klass_count => @klass_count&.calculate, :cpu_count => @cpu_count,
                             :model_count => @model_count, :mem_size => @mem_size, :mem_free => @mem_free,
                             :swap_free => @swap_free, :mem_totsize => @mem_totsize, :mem_totfree => @mem_totfree }
         end

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

@@ -2,7 +2,31 @@ module ForemanStatistics
   module Statistics
     class CountHosts < Base
       def calculate
-        Host.authorized(:view_hosts, Host).count_distribution(count_by)
+        count_distribution(Host.authorized(:view_hosts, Host), count_by)
+      end
+
+      private
+
+      def count_distribution(scope, association)
+        case association.to_sym
+        when :environment
+          klass = ForemanPuppet::Environment
+          scope = scope.joins(:puppet)
+          grouping = ForemanPuppet::HostPuppetFacet.arel_table[:environment_id]
+        else
+          klass = association.to_s.camelize.constantize
+          grouping = Host::Managed.arel_table["#{association}_id"]
+        end
+
+        output = []
+        data = scope.reorder('').group(grouping).count
+        associations = klass.find_by(id: data.keys)
+        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"
+        end
+        output
       end
     end
   end

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

@@ -9,7 +9,7 @@ module ForemanStatistics
       end
 
       def calculate
-        Puppetclass.authorized(:view_puppetclasses).map do |pc|
+        ForemanPuppet::Puppetclass.authorized(:view_puppetclasses).map do |pc|
           count = pc.hosts_count
           next if count.zero?
           {

data/app/services/foreman_statistics/statistics.rb

@@ -4,17 +4,19 @@ module ForemanStatistics
       charts = [
         CountHosts.new(:count_by => :operatingsystem, :title => 'OS Distribution', :search => 'os_title=~VAL~', :organization_id => org_id, :location_id => loc_id),
         CountHosts.new(:count_by => :architecture, :title => _('Architecture Distribution'), :search => 'facts.architecture=~VAL~', :organization_id => org_id, :location_id => loc_id),
-        CountHosts.new(:count_by => :environment, :title => _('Environment Distribution'), :search => 'environment=~VAL~', :organization_id => org_id, :location_id => loc_id),
         CountHosts.new(:count_by => :hostgroup, :title => _('Host Group Distribution'), :search => 'hostgroup_title=~VAL~', :organization_id => org_id, :location_id => loc_id),
         CountHosts.new(:count_by => :compute_resource, :title => _('Compute Resource Distribution'), :search => 'compute_resource=~VAL~', :organization_id => org_id, :location_id => loc_id),
         CountFacts.new(:count_by => :processorcount, :unit => Nn_('%s core', '%s cores'), :title => _('Number of CPUs'), :search => 'facts.processorcount=~VAL1~', :organization_id => org_id, :location_id => loc_id),
         CountFacts.new(:count_by => :manufacturer, :title => _('Hardware'), :search => 'facts.manufacturer~~VAL~', :organization_id => org_id, :location_id => loc_id),
         CountNumericalFactPair.new(:count_by => :memory, :title => _('Average Memory Usage'), :organization_id => org_id, :location_id => loc_id),
         CountNumericalFactPair.new(:count_by => :swap, :title => _('Average Swap Usage'), :organization_id => org_id, :location_id => loc_id),
-        CountPuppetClasses.new(:id => :puppetclass, :title => _('Class Distribution'), :search => 'class=~VAL1~', :organization_id => org_id, :location_id => loc_id),
         CountHosts.new(:count_by => :location, :title => _('Location Distribution'), :search => 'location=~VAL~', :organization_id => org_id, :location_id => loc_id),
         CountHosts.new(:count_by => :organization, :title => _('Organization Distribution'), :search => 'organization=~VAL~', :organization_id => org_id, :location_id => loc_id)
       ]
+      if defined?(ForemanPuppet)
+        charts << CountHosts.new(:count_by => :environment, :title => _('Environment Distribution'), :search => 'environment=~VAL~', :organization_id => org_id, :location_id => loc_id)
+        charts << CountPuppetClasses.new(:id => :puppetclass, :title => _('Class Distribution'), :search => 'class=~VAL1~', :organization_id => org_id, :location_id => loc_id)
+      end
       charts
     end
   end

data/lib/foreman_statistics/engine.rb

@@ -19,7 +19,7 @@ module ForemanStatistics
 
     initializer 'foreman_statistics.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_statistics do
-        requires_foreman '>= 2.1.0'
+        requires_foreman '>= 3.1.0'
 
         # ==== Core cleanups
         # TODO: clean up when this gets removed from core
@@ -70,6 +70,17 @@ module ForemanStatistics
           :engine => ForemanStatistics::Engine, :parent => :monitor_menu, :after => :trends,
           :url_hash => { :controller => 'foreman_statistics/statistics', :action => :index }
         }
+
+        settings do
+          category(:general) do
+            setting('max_trend',
+              type: :integer,
+              default: 30,
+              description: N_('Max days for Trends graphs'),
+              full_name: N_('Max trends'),
+              validate: { numericality: { greater_than: 0 } })
+          end
+        end
       end
     end
 
@@ -91,15 +102,7 @@ module ForemanStatistics
       ::Hostgroup.include ForemanStatistics::HasManyTrends
       ::Model.include ForemanStatistics::HasManyTrends
       ::Operatingsystem.include ForemanStatistics::HasManyTrends
-      '::Environment'.safe_constantize&.include ForemanStatistics::HasManyTrends
       'ForemanPuppet::Environment'.safe_constantize&.include ForemanStatistics::HasManyTrends
-      ::Setting.include ForemanStatistics::SettingDecorations
-      ::Setting::General.prepend ForemanStatistics::GeneralSettingDecorations
-      begin
-        ::Setting::General.load_defaults
-      rescue ActiveRecord::NoDatabaseError => e
-        Rails.logger.warn e
-      end
     end
 
     rake_tasks do

data/lib/foreman_statistics/version.rb

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

data/test/functional/foreman_statistics/trends_controller_test.rb

@@ -4,7 +4,6 @@ module ForemanStatistics
   class TrendsControllerTest < ActionController::TestCase
     setup do
       @routes = ForemanStatistics::Engine.routes
-      Setting::General.create(:name => 'max_trend', :default => 30, :description => 'Max days for Trends graphs')
     end
 
     let(:os_trend) { FactoryBot.create(:foreman_statistics_trend_os) }

data/test/unit/foreman_statistics/statistics_test.rb

@@ -55,14 +55,18 @@ module ForemanStatistics
       assert_kind_of Array, stat.calculate
     end
 
-    test 'it should fail to calculate a puppet class counter statistics object without an id' do
-      assert_raise(ArgumentError) { Statistics::CountPuppetClasses.new }
-    end
+    context 'with puppet plugin' do
+      test 'it should fail to calculate a puppet class counter statistics object without an id' do
+        skip('no puppet plugin') unless Foreman::Plugin.find(:foreman_puppet)
+        assert_raise(ArgumentError) { Statistics::CountPuppetClasses.new }
+      end
 
-    test 'it should initialize a puppet class counter statistics object' do
-      stat = Statistics::CountPuppetClasses.new(:id => :classes)
-      assert_equal '/foreman_statistics/statistics/classes', stat.url
-      assert_kind_of Array, stat.calculate
+      test 'it should initialize a puppet class counter statistics object' do
+        skip('no puppet plugin') unless Foreman::Plugin.find(:foreman_puppet)
+        stat = Statistics::CountPuppetClasses.new(:id => :classes)
+        assert_equal '/foreman_statistics/statistics/classes', stat.url
+        assert_kind_of Array, stat.calculate
+      end
     end
 
     test 'it should fail to calculate a Fact class counter statistics object without count_by' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_statistics
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ondrej Ezr
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -42,9 +42,7 @@ files:
 - app/controllers/foreman_statistics/trends_controller.rb
 - app/helpers/foreman_statistics/trends_helper.rb
 - app/jobs/foreman_statistics/trend_counter_job.rb
-- app/models/concerns/foreman_statistics/general_setting_decorations.rb
 - app/models/concerns/foreman_statistics/has_many_trends.rb
-- app/models/concerns/foreman_statistics/setting_decorations.rb
 - app/models/foreman_statistics/fact_trend.rb
 - app/models/foreman_statistics/foreman_trend.rb
 - app/models/foreman_statistics/trend.rb
@@ -208,7 +206,7 @@ homepage: https://theforeman.org
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -224,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Add Statistics and Trends.
 test_files:

data/app/models/concerns/foreman_statistics/general_setting_decorations.rb

@@ -1,17 +0,0 @@
-module ForemanStatistics
-  module GeneralSettingDecorations
-    def self.prepended(base)
-      class << base
-        prepend ClassMethodsPrepend
-      end
-    end
-
-    module ClassMethodsPrepend
-      def default_settings
-        super.concat([
-                       set('max_trend', N_('Max days for Trends graphs'), 30, N_('Max trends'))
-                     ])
-      end
-    end
-  end
-end

data/app/models/concerns/foreman_statistics/setting_decorations.rb

@@ -1,9 +0,0 @@
-module ForemanStatistics
-  module SettingDecorations
-    extend ActiveSupport::Concern
-
-    included do
-      Setting::NONZERO_ATTRS.push('max_trend')
-    end
-  end
-end