logstash-input-google-analytics-daily 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1acf86c6fbba654cc2b169ba1a37b37a5e3c7287f95dd31b0b0cdea4eb5b278c
-  data.tar.gz: 967c8c040e7e02a1e7293817e24837a71fdad9530ca629a168f6a0810cc1250e
+  metadata.gz: 1f77de4fea72f6c2172717186fcc823959b2e55dd42a99a990cc95c05f69c806
+  data.tar.gz: 15aa34e39adee6b5ee7a3ca37cbcc94f923f30d4b4bd11eb2c62743df7298c94
 SHA512:
-  metadata.gz: 8ef569d8ed0f2cec8365c6ff7acbc98aaeba8662159d611962db63eb3ef5b6661991cb8c09923106635385384e76f49f30995f9c166a664e4770f56f413b4650
-  data.tar.gz: d3b9e1e1bcad5ad20b7bf57f7152c395a2dca7eafea0fc12ad2bf667262383f4d8a56d22f9a613948a5b9980f59be1fdbf10a4727b734f72c2ed2bb220dd5b89
+  metadata.gz: 3a578250682fe2c5b75c74bf3b2d85197e911eefe4dd00c59d53fc59df64c67b035e56e9a6da85fd6bf34b9ad66ba7fc041b6a2624f6c9f3338370429367ddef
+  data.tar.gz: 1dbbc2951b6e54912f93ca3ae640c66657e9c1819fb9f9eb1c980934cac0dde18d4d783f40c1d6f92739779f7c56fc66eb54c529b8bb70d32491e60a895ff590

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

@@ -120,6 +120,10 @@ class LogStash::Inputs::GoogleAnalyticsDaily < LogStash::Inputs::Base
         # 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
+        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'
@@ -134,7 +138,7 @@ class LogStash::Inputs::GoogleAnalyticsDaily < LogStash::Inputs::Base
         end
 
         # Use date and metrics as ID to prevent duplicate entries in Elasticsearch
-        event.set('_id', event.get('ga.date') + options[:metrics])
+        event.set('[@metadata][id]', event.get('ga.date') + options[:metrics])
 
         rows = []
 
@@ -213,7 +217,7 @@ class LogStash::Inputs::GoogleAnalyticsDaily < LogStash::Inputs::Base
         :metrics => @metrics.sort.join(','),
         :output => 'json',
     }
-    options.merge!({:dimensions => @dimensions.join(',')}) if (@dimensions and @dimensions.size?)
+    options.merge!({:dimensions => @dimensions.join(',')}) if (@dimensions and @dimensions.size)
     options.merge!({:filters => @filters}) if @filters
     options.merge!({:sort => @sort}) if @sort
     options.merge!({:segment => @segment}) if @segment

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

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-google-analytics-daily'
-  s.version = '0.1.0'
+  s.version = '0.1.5'
   s.licenses = ['Apache License (2.0)']
-  s.summary = "Logstash plugin to pull daily reports from the Google Analytics v3 Core Reporting API."
-  s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install logstash-input-google-analytics-daily."
+  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."
   s.authors = ["Shalvah"]
-  s.email = 'hello@shalvah.me'
-  s.homepage = "http://www.elastic.co/guide/en/logstash/current/index.html"
+  s.email = 'shalvah.adebayo@gmail.com'
+  s.homepage = "http://www.elastic.co/guide/en/logstash/current/plugins-inputs-google_analytics_daily.html.html"
   s.require_paths = ["lib"]
 
   # Files
@@ -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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-google-analytics-daily
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Shalvah
@@ -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:
@@ -114,9 +114,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This gem is a logstash plugin required to be installed on top of the
-  Logstash core pipeline using $LS_HOME/bin/plugin install logstash-input-google-analytics-daily.
-email: hello@shalvah.me
+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.
+email: shalvah.adebayo@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -130,7 +131,7 @@ files:
 - lib/logstash/inputs/google_analytics_daily.rb
 - logstash-input-google-analytics-daily.gemspec
 - spec/inputs/google_analytics_daily_spec.rb
-homepage: http://www.elastic.co/guide/en/logstash/current/index.html
+homepage: http://www.elastic.co/guide/en/logstash/current/plugins-inputs-google_analytics_daily.html.html
 licenses:
 - Apache License (2.0)
 metadata:
@@ -154,7 +155,6 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
-summary: Logstash plugin to pull daily reports from the Google Analytics v3 Core Reporting
-  API.
+summary: Logstash plugin to pull daily reports from Google Analytics.
 test_files:
 - spec/inputs/google_analytics_daily_spec.rb