CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accept decimal point when parsing kibana uptime (#7768)

This commit is contained in:
Krzysztof Dąbrowski 2020-07-01 21:40:08 +02:00 committed by GitHub
parent 3fa4acf903
commit e81031dfd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/inputs/kibana/kibana.go
View File

@ -43,7 +43,7 @@ type overallStatus struct {
} }
type metrics struct { type metrics struct {
UptimeInMillis int64 `json:"uptime_in_millis"` UptimeInMillis float64 `json:"uptime_in_millis"`
ConcurrentConnections int64 `json:"concurrent_connections"` ConcurrentConnections int64 `json:"concurrent_connections"`
CollectionIntervalInMilles int64 `json:"collection_interval_in_millis"` CollectionIntervalInMilles int64 `json:"collection_interval_in_millis"`
ResponseTimes responseTimes `json:"response_times"` ResponseTimes responseTimes `json:"response_times"`
@ -59,7 +59,7 @@ type responseTimes struct {
type process struct { type process struct {
Mem mem `json:"mem"` Mem mem `json:"mem"`
Memory memory `json:"memory"` Memory memory `json:"memory"`
UptimeInMillis int64 `json:"uptime_in_millis"` UptimeInMillis float64 `json:"uptime_in_millis"`
} }
type requests struct { type requests struct {
@ -220,12 +220,12 @@ func (k *Kibana) gatherKibanaStatus(baseUrl string, acc telegraf.Accumulator) er
// Same value will be assigned to both the metrics [heap_max_bytes and heap_total_bytes ] // Same value will be assigned to both the metrics [heap_max_bytes and heap_total_bytes ]
// Which keeps the code backward compatible // Which keeps the code backward compatible
if versionNumber >= 6.4 { if versionNumber >= 6.4 {
fields["uptime_ms"] = kibanaStatus.Metrics.Process.UptimeInMillis fields["uptime_ms"] = int64(kibanaStatus.Metrics.Process.UptimeInMillis)
fields["heap_max_bytes"] = kibanaStatus.Metrics.Process.Memory.Heap.TotalInBytes fields["heap_max_bytes"] = kibanaStatus.Metrics.Process.Memory.Heap.TotalInBytes
fields["heap_total_bytes"] = kibanaStatus.Metrics.Process.Memory.Heap.TotalInBytes fields["heap_total_bytes"] = kibanaStatus.Metrics.Process.Memory.Heap.TotalInBytes
fields["heap_used_bytes"] = kibanaStatus.Metrics.Process.Memory.Heap.UsedInBytes fields["heap_used_bytes"] = kibanaStatus.Metrics.Process.Memory.Heap.UsedInBytes
} else { } else {
fields["uptime_ms"] = kibanaStatus.Metrics.UptimeInMillis fields["uptime_ms"] = int64(kibanaStatus.Metrics.UptimeInMillis)
fields["heap_max_bytes"] = kibanaStatus.Metrics.Process.Mem.HeapMaxInBytes fields["heap_max_bytes"] = kibanaStatus.Metrics.Process.Mem.HeapMaxInBytes
fields["heap_total_bytes"] = kibanaStatus.Metrics.Process.Mem.HeapMaxInBytes fields["heap_total_bytes"] = kibanaStatus.Metrics.Process.Mem.HeapMaxInBytes
fields["heap_used_bytes"] = kibanaStatus.Metrics.Process.Mem.HeapUsedInBytes fields["heap_used_bytes"] = kibanaStatus.Metrics.Process.Mem.HeapUsedInBytes

4
plugins/inputs/kibana/testdata_test6_5.go
View File

@ -166,7 +166,7 @@ const kibanaStatusResponse6_5 = `
}, },
"event_loop_delay": 0.5314235687255859, "event_loop_delay": 0.5314235687255859,
"pid": 6, "pid": 6,
"uptime_in_millis": 2173595336 "uptime_in_millis": 2173595336.9999999998
}, },
"os": { "os": {
"load": { "load": {
@ -219,7 +219,7 @@ var kibanaStatusExpected6_5 = map[string]interface{}{
"heap_total_bytes": int64(149954560), "heap_total_bytes": int64(149954560),
"heap_max_bytes": int64(149954560), "heap_max_bytes": int64(149954560),
"heap_used_bytes": int64(126274392), "heap_used_bytes": int64(126274392),
"uptime_ms": int64(2173595336), "uptime_ms": int64(2173595337),
"response_time_avg_ms": float64(12.5), "response_time_avg_ms": float64(12.5),
"response_time_max_ms": int64(123), "response_time_max_ms": int64(123),
"concurrent_connections": int64(10), "concurrent_connections": int64(10),