netuitived 0.9.12 → 0.10.0
Sign up to get free protection for your applications and to get access to all the features.
@@ -19,7 +19,7 @@ class APIEmissary
|
|
19
19
|
http.request req
|
20
20
|
end
|
21
21
|
NetuitiveLogger.log.debug "post finished"
|
22
|
-
if (response.code != "202")
|
22
|
+
if (response.code != "202" or response.code != "200")
|
23
23
|
NetuitiveLogger.log.error "Response from submitting netuitive metrics to api
|
24
24
|
code: #{response.code}
|
25
25
|
message: #{response.message}
|
@@ -44,6 +44,14 @@ class MetricAggregator
|
|
44
44
|
end
|
45
45
|
|
46
46
|
def addSample(metricId, val)
|
47
|
+
addSampleWithType(metricId, val, "GAUGE")
|
48
|
+
end
|
49
|
+
|
50
|
+
def addCounterSample(metricId, val)
|
51
|
+
addSampleWithType(metricId, val, "COUNTER")
|
52
|
+
end
|
53
|
+
|
54
|
+
def addSampleWithType(metricId, val, type)
|
47
55
|
@metricMutex.synchronize{
|
48
56
|
NetuitiveLogger.log.debug "start addSample method"
|
49
57
|
NetuitiveLogger.log.debug "Thread: #{Thread.current.object_id}"
|
@@ -63,7 +71,7 @@ class MetricAggregator
|
|
63
71
|
end
|
64
72
|
if not metricExists metricId
|
65
73
|
NetuitiveLogger.log.info "adding new metric: #{metricId}"
|
66
|
-
@metrics.push(IngestMetric.new(metricId, metricId, nil,
|
74
|
+
@metrics.push(IngestMetric.new(metricId, metricId, nil, type, nil, false))
|
67
75
|
end
|
68
76
|
@samples.push(IngestSample.new(metricId, Time.new, val, nil, nil, nil, nil, nil))
|
69
77
|
NetuitiveLogger.log.info "netuitive sample added #{metricId} val: #{val}"
|
@@ -83,6 +91,14 @@ class MetricAggregator
|
|
83
91
|
end
|
84
92
|
|
85
93
|
def aggregateMetric(metricId, val)
|
94
|
+
aggregateMetricWithType(metricId, val, "GAUGE")
|
95
|
+
end
|
96
|
+
|
97
|
+
def aggregateCounterMetric(metricId, val)
|
98
|
+
aggregateMetricWithType(metricId, val, "COUNTER")
|
99
|
+
end
|
100
|
+
|
101
|
+
def aggregateMetricWithType(metricId, val, type)
|
86
102
|
@metricMutex.synchronize{
|
87
103
|
NetuitiveLogger.log.debug "start addSample method"
|
88
104
|
NetuitiveLogger.log.debug "Thread: #{Thread.current.object_id}"
|
@@ -102,7 +118,7 @@ class MetricAggregator
|
|
102
118
|
end
|
103
119
|
if not metricExists metricId
|
104
120
|
NetuitiveLogger.log.info "adding new metric: #{metricId}"
|
105
|
-
@metrics.push(IngestMetric.new(metricId, metricId, nil,
|
121
|
+
@metrics.push(IngestMetric.new(metricId, metricId, nil, type, nil, false))
|
106
122
|
@aggregatedSamples["#{metricId}"]=IngestSample.new(metricId, Time.new, val, nil, nil, nil, nil, nil)
|
107
123
|
else
|
108
124
|
if @aggregatedSamples["#{metricId}"] == nil
|
@@ -15,10 +15,18 @@ class NetuitivedServer
|
|
15
15
|
@metricAggregator.addSample(metricId, val)
|
16
16
|
end
|
17
17
|
|
18
|
+
def addCounterSample(metricId, val)
|
19
|
+
@metricAggregator.addCounterSample(metricId, val)
|
20
|
+
end
|
21
|
+
|
18
22
|
def aggregateMetric(metricId, val)
|
19
23
|
@metricAggregator.aggregateMetric(metricId, val)
|
20
24
|
end
|
21
25
|
|
26
|
+
def aggregateCounterMetric(metricId, val)
|
27
|
+
@metricAggregator.aggregateCounterMetric(metricId, val)
|
28
|
+
end
|
29
|
+
|
22
30
|
def clearMetrics
|
23
31
|
@metricAggregator.clearMetrics
|
24
32
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: netuitived
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.10.0
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2016-01-13 00:00:00.000000000 Z
|
13
13
|
dependencies: []
|
14
14
|
description: Collects metrics over a certain interval and then sends them to Netuitive
|
15
15
|
email: jking@netuitive.com
|