telemetry 1.3.4 → 1.3.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/telemetryd +0 -4
- data/lib/telemetry/api.rb +7 -4
- data/lib/telemetry/daemon_config_parser.rb +1 -10
- data/lib/telemetry/flows.rb +8 -8
- data/lib/telemetry/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 96234d4025145d4e4fbcf26b06bf25a7a9ef0254
|
4
|
+
data.tar.gz: 7843c644cba8b9140d7afefab9d687be4f269012
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9ac9328464c45d9a9da1d213070f2732c0266d48e2547d6eb777e79cbb58e666c0c204fab58a53a4d16b72c79c344b1165382bfdf784e6859f41097c189e1fcc
|
7
|
+
data.tar.gz: 7d52ce029557d48aa86f8ec01e656ffedc518abf28668ebf88dfe1deb16e88355712669b91ccf19d772cfe19445fa7bdf88e81baca2a6b63d115964b18f57288
|
data/bin/telemetryd
CHANGED
@@ -18,9 +18,6 @@ runner.with_options do |opts|
|
|
18
18
|
opts.on("-o", "--once", "Run once") do |o|
|
19
19
|
options[:once] = o
|
20
20
|
end
|
21
|
-
opts.on("-f", "--logfile PATH", "Log to a logfile") do |l|
|
22
|
-
options[:logfile] = l
|
23
|
-
end
|
24
21
|
end
|
25
22
|
|
26
23
|
runner.execute do |opts|
|
@@ -36,7 +33,6 @@ runner.execute do |opts|
|
|
36
33
|
exit
|
37
34
|
end
|
38
35
|
|
39
|
-
Telemetry::logfile = opts[:logfile] if opts[:logfile]
|
40
36
|
Telemetry::logger.info "Starting telemetryd"
|
41
37
|
|
42
38
|
# Loop Forever
|
data/lib/telemetry/api.rb
CHANGED
@@ -206,13 +206,13 @@ module Telemetry
|
|
206
206
|
case response.code
|
207
207
|
when "200"
|
208
208
|
rj = MultiJson.load(response.body)
|
209
|
-
|
210
|
-
|
209
|
+
Telemetry::logger.info "Updated: #{rj['updated'].join(', ')}" if rj.is_a?(Hash) && rj['updated'] && rj['updated'].is_a?(Array) && rj['updated'].count > 0
|
210
|
+
Telemetry::logger.info "Skipped: #{rj['skipped'].join(', ')}" if rj.is_a?(Hash) && rj['skipped'] && rj['skipped'].is_a?(Array) && rj['skipped'].count > 0
|
211
211
|
return rj
|
212
212
|
when "201"
|
213
213
|
rj = MultiJson.load(response.body)
|
214
|
-
|
215
|
-
|
214
|
+
Telemetry::logger.info "Updated: #{rj['updated'].join(', ')}" if rj.is_a?(Hash) && rj['updated'] && rj['updated'].is_a?(Array) && rj['updated'].count > 0
|
215
|
+
Telemetry::logger.info "Skipped: #{rj['skipped'].join(', ')}" if rj.is_a?(Hash) && rj['skipped'] && rj['skipped'].is_a?(Array) && rj['skipped'].count > 0
|
216
216
|
return rj
|
217
217
|
when "204"
|
218
218
|
return "No Body"
|
@@ -278,6 +278,9 @@ module Telemetry
|
|
278
278
|
|
279
279
|
rescue Exception => e
|
280
280
|
raise e
|
281
|
+
|
282
|
+
ensure
|
283
|
+
http.shutdown
|
281
284
|
end
|
282
285
|
end
|
283
286
|
end
|
@@ -211,8 +211,6 @@ module TelemetryDaemon
|
|
211
211
|
def run_scheduled_flow_updates
|
212
212
|
@@buffer = {}
|
213
213
|
@@tasks ||= {}
|
214
|
-
@@last_values ||= {}
|
215
|
-
@@values_expires_at ||= {}
|
216
214
|
@@next_run_at ||= {}
|
217
215
|
|
218
216
|
@@tasks.each do |task|
|
@@ -269,14 +267,7 @@ module TelemetryDaemon
|
|
269
267
|
|
270
268
|
# Telemetry.logger.debug "LV\n\n #{@@last_values}\n\n"
|
271
269
|
|
272
|
-
|
273
|
-
if @@last_values[tag] != values || @@values_expires_at[tag] < now.to_i
|
274
|
-
@@buffer[tag] = values
|
275
|
-
@@last_values[tag] = values.clone # Save the value so we dont update unless it changes
|
276
|
-
@@values_expires_at[tag] = now.to_i + 86400 # Force an update 1/day
|
277
|
-
else
|
278
|
-
Telemetry.logger.debug " - Skipping update for unchanged #{task[0]} #{task[1]}:\n#{@@last_values[tag]}"
|
279
|
-
end
|
270
|
+
@@buffer[tag] = values
|
280
271
|
end
|
281
272
|
|
282
273
|
@@buffer
|
data/lib/telemetry/flows.rb
CHANGED
@@ -228,6 +228,7 @@ module Telemetry
|
|
228
228
|
property :gauge_color
|
229
229
|
property :link
|
230
230
|
property :title
|
231
|
+
property :layout
|
231
232
|
property :gauges, :default => []
|
232
233
|
end
|
233
234
|
|
@@ -372,16 +373,15 @@ module Telemetry
|
|
372
373
|
property :title
|
373
374
|
property :expires_at
|
374
375
|
property :priority
|
375
|
-
property :
|
376
|
-
property :link
|
377
|
-
property :value, :required => true
|
378
|
-
property :type, :required => true
|
379
|
-
property :label
|
380
|
-
property :labels
|
376
|
+
property :aggregation
|
381
377
|
property :color
|
382
|
-
property :
|
383
|
-
property :
|
378
|
+
property :interval
|
379
|
+
property :interval_count
|
380
|
+
property :label
|
381
|
+
property :renderer
|
382
|
+
property :value
|
384
383
|
property :value_type
|
384
|
+
property :values
|
385
385
|
end
|
386
386
|
|
387
387
|
# Upstatus
|
data/lib/telemetry/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: telemetry
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.3.
|
4
|
+
version: 1.3.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- W. Gersham Meharg
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-05-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: oj
|
@@ -173,3 +173,4 @@ summary: Telemetry Data Submission API Gem
|
|
173
173
|
test_files:
|
174
174
|
- spec/flows_spec.rb
|
175
175
|
- spec/spec_helper.rb
|
176
|
+
has_rdoc:
|