fluent-plugin-aggregate 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f1c9f42d9ebe69daf7ee5ddf227c408ff1163c6d893ad6b2647856c3749aed0
-  data.tar.gz: e826daa48e38022a94f149f711da5e814f7eb10b7797e3276f158fb9a63ab050
+  metadata.gz: ff4262edfbc1945927d465b1f34e38278d13484d398aad2b9173d7c220fa84f2
+  data.tar.gz: 2420c8fe2fc068c687f079160b715f5a2aff241ea93e683778914a013d368480
 SHA512:
-  metadata.gz: ea597e2e46f2c4dabf878b9cf821fba7b245af07870450bc9596e2aed50f3729cf9f08df08a43afb28420f719818d0ad8c4e4cb3fdd134b23ff3046c7565f255
-  data.tar.gz: b1c93692beaeeda9c90987ecd7207f6e9a3554fdeaf3eedecdc46efbd636fc6fa8065d2b57031cc040079187da1e584f82c7ae7aaddbe851c322d80a2862d3a7
+  metadata.gz: 9709940af312a262d055e5385778152cc9311db64b7d367d2c8b6af09c96ef1a7190c95efb23096ffb02b1c6f6865cf8a43adbb67a0f0e5274d40e296dcce5cf
+  data.tar.gz: a47d4d91bf545dfd2d914aa623cffb4484851a4a0080c7da01327babeca1188cf81a31c8ed7da989d2418526226b130a75070242bb284bf05a5ab189fc2f397b

data/lib/fluent/plugin/filter_aggregate.rb

@@ -20,14 +20,17 @@ module Fluent
     config_param :emit_original_message, :bool, :default => true
     config_param :aggregate_event_tag, :string, :default => 'aggregate'
     config_param :aggregations, :array, :default => ['sum','min','max','mean','median','variance','standard_deviation'], value_type: :string
-    config_param :buckets, :array, :default => [], value_type: :integer
-    config_param :bucket_metrics, :array, :default => [], value_type: :string
+    config_param :histogram_buckets, :array, :default => [], value_type: :integer
+    config_param :histogram_fields, :array, :default => [], value_type: :string
+    config_param :histogram_cumulative, :bool, :default => false
+    config_param :histogram_bucket_infinite_enabled, :bool, :default => false
+    config_param :histogram_bucket_comparation, :string, :default => 'less_or_equal'
     config_param :temporary_status_file_path, :string, :default => nil, :desc => 'File to store aggregate information when the agent down'
     config_param :load_temporarystatus_file_enabled, :bool, :default => true, :desc => 'Enable load saved data from file (if exist status file)'
     config_param :processing_mode, :string, :default => 'online', :desc => 'Processing mode (batch/online)'
     config_param :time_started_mode, :string, :default => 'first_event', :desc => 'Time started mode (first_event/last_event)'
 
-    VALID_AGGREGATIONS = ['sum','min','max','mean','median','variance','standard_deviation','bucket']
+    VALID_AGGREGATIONS = ['sum','min','max','mean','median','variance','standard_deviation','histogram']
 
     def initialize
       super
@@ -60,14 +63,14 @@ module Fluent
 
       @aggregation_names.each {|operation|
         if ! VALID_AGGREGATIONS.include?(operation)
-          raise Fluent::ConfigError, "aggregations must set any combination of sum,min,max,mean,median,variance,standard_deviation "
+          raise Fluent::ConfigError, "aggregations must set any combination of sum,min,max,mean,median,variance,standard_deviation,histogram"
         end
       }
 
-      if @aggregation_names.include?("bucket") && (buckets.empty? || bucket_metrics.empty?)
-        log.warn "bucket aggregation disabled, need buckets & bucket_metrics parameters to work, please review documentation."
+      if @aggregation_names.include?("histogram") && (histogram_buckets.empty? || histogram_fields.empty?)
+        log.warn "histogram aggregation disabled, need histogram_buckets & histogram_fields parameters to work, please review documentation."
       else
-        log.info "bucket aggregation enabled, bucket count bucket_metrics with values <= buckets parameter"
+        log.info "histogram aggregation enabled, bucket count histogram_fields with values (le|ge) histogram_buckets parameter"
       end
 
       @aggregator = {}
@@ -90,6 +93,7 @@ module Fluent
       @aggregator_mutex = Mutex.new
       @processing_mode_type=@processing_mode=='batch' ? :batch : :online
       @time_started_mode_type=@time_started_mode=='first_event' ? :fist_event : :last_event
+      @histogram_bucket_comparation_mode=@histogram_bucket_comparation=='less_or_equal' ? :less_or_equal : :greater_or_equal
       @data_operations = DataOperations::Aggregate.new(aggregator: @aggregator,
                           time_format: @time_format,
                           time_field: @time_field,
@@ -105,8 +109,11 @@ module Fluent
                           aggregation_names: @aggregation_names,
                           group_field_names: @group_field_names,
                           aggregate_field_names: @aggregate_field_names,
-                          buckets: @buckets,
-                          bucket_metrics: @bucket_metrics
+                          histogram_buckets: @histogram_buckets,
+                          histogram_fields: @histogram_fields,
+                          histogram_cumulative: @histogram_cumulative,
+                          histogram_bucket_infinite_enabled: @histogram_bucket_infinite_enabled,
+                          histogram_bucket_comparation: @histogram_bucket_comparation_mod
                          )
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-aggregate
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - superguillen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-08 00:00:00.000000000 Z
+date: 2023-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd