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

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1f77de4fea72f6c2172717186fcc823959b2e55dd42a99a990cc95c05f69c806
4
- data.tar.gz: 15aa34e39adee6b5ee7a3ca37cbcc94f923f30d4b4bd11eb2c62743df7298c94
3
+ metadata.gz: 65e1356004d4e415992c64aa350b9e8f9a32b9cc2caa16ffe8a5cc008e443ce8
4
+ data.tar.gz: 7f4b32c19012b211a713fe35f0df59a0fad1661dcc90b1c68d8b0bd229afdcbc
5
5
  SHA512:
6
- metadata.gz: 3a578250682fe2c5b75c74bf3b2d85197e911eefe4dd00c59d53fc59df64c67b035e56e9a6da85fd6bf34b9ad66ba7fc041b6a2624f6c9f3338370429367ddef
7
- data.tar.gz: 1dbbc2951b6e54912f93ca3ae640c66657e9c1819fb9f9eb1c980934cac0dde18d4d783f40c1d6f92739779f7c56fc66eb54c529b8bb70d32491e60a895ff590
6
+ metadata.gz: 5d79a8193223ef48ccd7c2666a7b23e8bb3237dc71b74e9f4fe5fbaab56a07f30ad3a7292ef82a4bc5cdc51faf20aa8525bb7d3a6ea84a39a4af1adcc9452cc9
7
+ data.tar.gz: e4bc122fceb88d8c852cc15043f6ca6bb709099a2b4dcc448749215348f668e37f93ace08d4fd42dee092b55dabb9f1f3794f77fe94fd68962e2ffd26239688b
@@ -111,34 +111,7 @@ class LogStash::Inputs::GoogleAnalyticsDaily < LogStash::Inputs::Base
111
111
  sort: options[:sort],
112
112
  )
113
113
 
114
- query = results.query.to_h
115
- profile_info = results.profile_info.to_h
116
- column_headers = results.column_headers.map { |c| c.name }
117
-
118
- event = LogStash::Event.new
119
- decorate(event)
120
- # Populate Logstash event fields
121
- event.set('ga.contains_sampled_data', results.contains_sampled_data?)
122
- event.set('ga.query', query) if @store_query
123
- # We need to convert the date fields here to string because sometimes it's a relative date
124
- event.set('ga.query.start_date', query["start_date"].to_s) if @store_query
125
- event.set('ga.query.end_date', query["end_date"].to_s) if @store_query
126
-
127
- event.set('ga.profile_info', profile_info) if @store_profile
128
-
129
- if date == 'today'
130
- event.set('ga.date', Time.now.strftime("%F"))
131
- elsif date == 'yesterday'
132
- event.set('ga.date', Time.at(Time.now.to_i - 86400).strftime("%F"))
133
- elsif date.include?('daysAgo')
134
- days_ago = date.sub('daysAgo', '').to_i
135
- event.set('ga.date', Time.at(Time.now.to_i - (days_ago * 86400)).strftime("%F"))
136
- else
137
- event.set('ga.date', date)
138
- end
139
-
140
- # Use date and metrics as ID to prevent duplicate entries in Elasticsearch
141
- event.set('[@metadata][id]', event.get('ga.date') + options[:metrics])
114
+ column_headers = results.column_headers.map &:name
142
115
 
143
116
  rows = []
144
117
 
@@ -179,10 +152,47 @@ class LogStash::Inputs::GoogleAnalyticsDaily < LogStash::Inputs::Base
179
152
  rows << {metrics: metrics, dimensions: dimensions}
180
153
  end
181
154
 
182
- end
183
- event.set("ga.rows", rows)
155
+ query = results.query.to_h
156
+ profile_info = results.profile_info.to_h
157
+
158
+ # One event per metric
159
+ @metrics.each do |metric|
160
+ rows_for_this_metric = rows.clone.map do |row|
161
+ # Remove any rows that don't include this metric
162
+ new_row = row.clone
163
+ new_row[:metric] = row[:metrics].find { |m| m[:name] == metric }
164
+ new_row.delete(:metrics)
165
+ new_row
166
+ end
184
167
 
185
- queue << event
168
+ event = LogStash::Event.new
169
+ decorate(event)
170
+ # Populate Logstash event fields
171
+ event.set('ga.contains_sampled_data', results.contains_sampled_data?)
172
+ event.set('ga.query', query) if @store_query
173
+ # We need to convert the date fields here to string because sometimes it's a relative date, so will cause mapping issues
174
+ event.set('ga.query.start_date', query["start_date"].to_s) if @store_query
175
+ event.set('ga.query.end_date', query["end_date"].to_s) if @store_query
176
+
177
+ event.set('ga.profile_info', profile_info) if @store_profile
178
+
179
+ if date == 'today'
180
+ event.set('ga.date', Time.now.strftime("%F"))
181
+ elsif date == 'yesterday'
182
+ event.set('ga.date', Time.at(Time.now.to_i - 86400).strftime("%F"))
183
+ elsif date.include?('daysAgo')
184
+ days_ago = date.sub('daysAgo', '').to_i
185
+ event.set('ga.date', Time.at(Time.now.to_i - (days_ago * 86400)).strftime("%F"))
186
+ else
187
+ event.set('ga.date', date)
188
+ end
189
+
190
+ event.set("ga.rows", rows_for_this_metric)
191
+ # Use date and metrics as ID to prevent duplicate entries in Elasticsearch
192
+ event.set('[@metadata][id]', event.get('ga.date') + metric)
193
+ queue << event
194
+ end
195
+ end
186
196
  end
187
197
 
188
198
  # If no interval was set, we're done
@@ -214,7 +224,7 @@ class LogStash::Inputs::GoogleAnalyticsDaily < LogStash::Inputs::Base
214
224
  :view_id => @view_id,
215
225
  :start_date => date,
216
226
  :end_date => date,
217
- :metrics => @metrics.sort.join(','),
227
+ :metrics => @metrics.join(','),
218
228
  :output => 'json',
219
229
  }
220
230
  options.merge!({:dimensions => @dimensions.join(',')}) if (@dimensions and @dimensions.size)
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'logstash-input-google-analytics-daily'
3
- s.version = '0.1.5'
3
+ s.version = '0.2.1'
4
4
  s.licenses = ['Apache License (2.0)']
5
5
  s.summary = "Logstash plugin to pull daily reports from Google Analytics."
6
6
  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 CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-input-google-analytics-daily
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.5
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Shalvah
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-04-08 00:00:00.000000000 Z
11
+ date: 2020-04-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement