logstash-input-google-analytics-daily 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 807831c7ebd0fbddd9e3424cd7df4feeaf63185dcf2feba9ead6d012b6c90ed0
-  data.tar.gz: 6d9802cbcad8f8478865c76cfa2df5bb5fd9ebdba13dab40b56314b298977634
+  metadata.gz: 5471c06b1f81388b3cbbbe7cadcf3e354e61e5f09c53d56c3297b00d17a2e8cd
+  data.tar.gz: 2a8510d9363641750352dd1c9b1d9d6d04a7de64fd9965794bb1cf0d67720684
 SHA512:
-  metadata.gz: 7421f1331d6f63deaba5a755571aec4e14ebf2ec09d53acecea2a70eec0eb517847fbf5f4db2bfe4ceeb859f59ffdf08780dae87fc6274893ebd8d42cea3c962
-  data.tar.gz: ef4f89117062a12a8a8e3d6dbaacdf6379620f2e68a0b3b444f4c806b96c98608a6911459d90f7b20f89af56a9e9826c25f95f6099ec9e4fd94fcb3f8af52504
+  metadata.gz: 3c78a38bb95ee7045d97a188712264fe7e08c103f002dcfbd0ba531c57bc7bffc0615f1f3cd91c0a5c8bfbcebdbf78ad21e08812a9805c01e3f0fced513f08df
+  data.tar.gz: ee10c1d0aec27733e4a344152dd983ecc85db36865de934d040923ee26e73e2332b667040d13566606f6bc392d46ce5c6c07422b7dc067de1d49265518e7cf18

data/lib/logstash/inputs/google_analytics_daily.rb

@@ -29,9 +29,9 @@ class LogStash::Inputs::GoogleAnalyticsDaily < LogStash::Inputs::Base
 
   # This plugin will fetch daily reports for dates in the specified range
   # In the format YYYY-MM-DD
-  config :start_date, :validate => :string, :default => (Date.today - 1).to_s
+  config :start_date, :validate => :string, :default => nil
 
-  config :end_date, :validate => :string, :default => (Date.today - 1).to_s
+  config :end_date, :validate => :string, :default => nil
 
   # The aggregated statistics for user activity to your site, such as clicks or pageviews.
   # Maximum of 10 metrics for any query
@@ -83,7 +83,7 @@ class LogStash::Inputs::GoogleAnalyticsDaily < LogStash::Inputs::Base
 
   # Interval to run the command. Value is in seconds. If no interval is given,
   # this plugin only fetches data once.
-  config :interval, :validate => :number, :required => false, :default => 60 * 60 * 24 # Daily
+  config :interval, :validate => :number, :required => false, :default => 60 * 60 # Daily
 
 
   public
@@ -94,11 +94,16 @@ class LogStash::Inputs::GoogleAnalyticsDaily < LogStash::Inputs::Base
   def run(queue)
     # we abort the loop if stop? becomes true
     while !stop?
-      start_time = Time.now
+      plugin_start_time = Time.now
 
       analytics = get_service
 
-      @dates = (Date.parse(@start_date)..Date.parse(@end_date))
+      # Setting this here, not in the config at the top,
+      # because we need to reset the date for each new loop (new day)
+      start_date = @start_date || (Date.today - 1).to_s
+      end_date = @end_date || (Date.today - 1).to_s
+
+      @dates = (Date.parse(start_date)..Date.parse(end_date))
 
       @dates.each do |date|
         date = date.to_s
@@ -203,7 +208,7 @@ class LogStash::Inputs::GoogleAnalyticsDaily < LogStash::Inputs::Base
         break
       else
         # Otherwise we sleep till the next run
-        time_lapsed = Time.now - start_time
+        time_lapsed = Time.now - plugin_start_time
         # Sleep for the remainder of the interval, or 0 if the duration ran
         # longer than the interval.
         time_to_sleep_for = [0, @interval - time_lapsed].max
@@ -214,6 +219,9 @@ class LogStash::Inputs::GoogleAnalyticsDaily < LogStash::Inputs::Base
               :interval => @interval
           )
         else
+          @logger.info(
+              "Sleeping for #{@interval} seconds"
+          )
           Stud.stoppable_sleep(time_to_sleep_for) { stop? }
         end
       end

data/logstash-input-google-analytics-daily.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-google-analytics-daily'
-  s.version = '0.6.0'
+  s.version = '0.7.0'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Logstash plugin to pull daily reports from Google Analytics."
   s.description = "Logstash plugin to pull daily reports from the Google Analytics v3 Core Reporting API. Install into Logstash using $LS_HOME/bin/logstash-plugin install logstash-input-google-analytics-daily."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-google-analytics-daily
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Shalvah
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement