logstash-input-google-analytics-daily 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3897194aa75ceeacb8a6c2d24fd4eaf7373acccd1330c16954ef663245d8eac
-  data.tar.gz: c9c29c463001bdbaef8c4331000738b02fe9bf03b7ff74cbcd5b8cfebaa46e35
+  metadata.gz: 65e1356004d4e415992c64aa350b9e8f9a32b9cc2caa16ffe8a5cc008e443ce8
+  data.tar.gz: 7f4b32c19012b211a713fe35f0df59a0fad1661dcc90b1c68d8b0bd229afdcbc
 SHA512:
-  metadata.gz: 6d911ed7d39a48cefdf2853c99c459e5f73fe7bbdce73de62e2d49a209ebb0ddbf6735d3efeebe61f914057cb57145efe7de1c8635b80acb55096904e29ef09e
-  data.tar.gz: 014f7087409e0b79bddd98ce720f97d7f87d54314e4317e339d307850b2ad52ece92051f9f6a11d03bc524f994e7044fcbf33a1439d6d106c80cb74635bfb7f6
+  metadata.gz: 5d79a8193223ef48ccd7c2666a7b23e8bb3237dc71b74e9f4fe5fbaab56a07f30ad3a7292ef82a4bc5cdc51faf20aa8525bb7d3a6ea84a39a4af1adcc9452cc9
+  data.tar.gz: e4bc122fceb88d8c852cc15043f6ca6bb709099a2b4dcc448749215348f668e37f93ace08d4fd42dee092b55dabb9f1f3794f77fe94fd68962e2ffd26239688b

data/README.md

@@ -6,7 +6,7 @@ Forked from https://github.com/russorat/logstash-input-googleanalytics.git.
 
 ## Documentation
 
-Documentation automatically generated by Logstash at 
+Documentation can be seen in [the docs folder](https://github.com/DeimosCloud/logstash-input-google-analytics-daily/blob/master/docs/index.asciidoc). 
 
 ## Developing
 

data/lib/logstash/inputs/google_analytics_daily.rb

@@ -111,30 +111,7 @@ class LogStash::Inputs::GoogleAnalyticsDaily < LogStash::Inputs::Base
             sort: options[:sort],
         )
 
-        query = results.query.to_h
-        profile_info = results.profile_info.to_h
-        column_headers = results.column_headers.map { |c| c.name }
-
-        event = LogStash::Event.new
-        decorate(event)
-        # Populate Logstash event fields
-        event.set('ga.contains_sampled_data', results.contains_sampled_data?)
-        event.set('ga.query', query) if @store_query
-        event.set('ga.profile_info', profile_info) if @store_profile
-
-        if date == 'today'
-          event.set('ga.date', Time.now.strftime("%F"))
-        elsif date == 'yesterday'
-          event.set('ga.date', Time.at(Time.now.to_i - 86400).strftime("%F"))
-        elsif date.include?('daysAgo')
-          days_ago = date.sub('daysAgo', '').to_i
-          event.set('ga.date', Time.at(Time.now.to_i - (days_ago * 86400)).strftime("%F"))
-        else
-          event.set('ga.date', date)
-        end
-
-        # Use date and metrics as ID to prevent duplicate entries in Elasticsearch
-        event.set('_id', event.get('ga.date') + options[:metrics])
+        column_headers = results.column_headers.map &:name
 
         rows = []
 
@@ -175,10 +152,47 @@ class LogStash::Inputs::GoogleAnalyticsDaily < LogStash::Inputs::Base
             rows << {metrics: metrics, dimensions: dimensions}
           end
 
-        end
-        event.set("ga.rows", rows)
+          query = results.query.to_h
+          profile_info = results.profile_info.to_h
+
+          # One event per metric
+          @metrics.each do |metric|
+            rows_for_this_metric = rows.clone.map do |row|
+              # Remove any rows that don't include this metric
+              new_row = row.clone
+              new_row[:metric] = row[:metrics].find { |m| m[:name] == metric }
+              new_row.delete(:metrics)
+              new_row
+            end
 
-        queue << event
+            event = LogStash::Event.new
+            decorate(event)
+            # Populate Logstash event fields
+            event.set('ga.contains_sampled_data', results.contains_sampled_data?)
+            event.set('ga.query', query) if @store_query
+            # We need to convert the date fields here to string because sometimes it's a relative date, so will cause mapping issues
+            event.set('ga.query.start_date', query["start_date"].to_s) if @store_query
+            event.set('ga.query.end_date', query["end_date"].to_s) if @store_query
+
+            event.set('ga.profile_info', profile_info) if @store_profile
+
+            if date == 'today'
+              event.set('ga.date', Time.now.strftime("%F"))
+            elsif date == 'yesterday'
+              event.set('ga.date', Time.at(Time.now.to_i - 86400).strftime("%F"))
+            elsif date.include?('daysAgo')
+              days_ago = date.sub('daysAgo', '').to_i
+              event.set('ga.date', Time.at(Time.now.to_i - (days_ago * 86400)).strftime("%F"))
+            else
+              event.set('ga.date', date)
+            end
+
+            event.set("ga.rows", rows_for_this_metric)
+            # Use date and metrics as ID to prevent duplicate entries in Elasticsearch
+            event.set('[@metadata][id]', event.get('ga.date') + metric)
+            queue << event
+          end
+        end
       end
 
       # If no interval was set, we're done
@@ -210,7 +224,7 @@ class LogStash::Inputs::GoogleAnalyticsDaily < LogStash::Inputs::Base
         :view_id => @view_id,
         :start_date => date,
         :end_date => date,
-        :metrics => @metrics.sort.join(','),
+        :metrics => @metrics.join(','),
         :output => 'json',
     }
     options.merge!({:dimensions => @dimensions.join(',')}) if (@dimensions and @dimensions.size)

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.1.1'
+  s.version = '0.2.1'
   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."
@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 2.0.0", "< 3.0.0"
   s.add_runtime_dependency 'stud', '>= 0.0.22'
-  s.add_runtime_dependency 'google-api-client', "0.37"
-  s.add_runtime_dependency 'googleauth'
+  s.add_runtime_dependency 'google-api-client', "~> 0.37"
+  s.add_runtime_dependency 'googleauth', ">= 0.10.0"
   s.add_development_dependency 'vcr'
   s.add_development_dependency 'webmock'
   s.add_development_dependency 'json'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-google-analytics-daily
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Shalvah
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -47,7 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.37'
   name: google-api-client
@@ -55,7 +55,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.37'
 - !ruby/object:Gem::Dependency
@@ -63,7 +63,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   name: googleauth
   type: :runtime
   prerelease: false
@@ -71,7 +71,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: