From ced447a1feed6d0f044df18327923fc960df8ad2 Mon Sep 17 00:00:00 2001 From: Hang Du Date: Tue, 25 Sep 2018 10:56:10 -0700 Subject: [PATCH 1/4] Update system.go Minor typo fixes for system load 5m and 15m --- collector/system.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/collector/system.go b/collector/system.go index 4afddb1..641977d 100644 --- a/collector/system.go +++ b/collector/system.go @@ -54,7 +54,7 @@ func NewSystemCollector(beatInfo *BeatInfo, stats *Stats) prometheus.Collector { { desc: prometheus.NewDesc( prometheus.BuildFQName(beatInfo.Beat, "system", "load"), - "system load 1m", + "system load 5m", nil, prometheus.Labels{"period": "5"}, ), eval: func(stats *Stats) float64 { return stats.System.Load.M5 }, @@ -63,7 +63,7 @@ func NewSystemCollector(beatInfo *BeatInfo, stats *Stats) prometheus.Collector { { desc: prometheus.NewDesc( prometheus.BuildFQName(beatInfo.Beat, "system", "load"), - "system load 1m", + "system load 15m", nil, prometheus.Labels{"period": "15"}, ), eval: func(stats *Stats) float64 { return stats.System.Load.M15 }, @@ -81,7 +81,7 @@ func NewSystemCollector(beatInfo *BeatInfo, stats *Stats) prometheus.Collector { { desc: prometheus.NewDesc( prometheus.BuildFQName(beatInfo.Beat, "system_load", "norm"), - "system load 1m", + "system load 5m", nil, prometheus.Labels{"period": "5"}, ), eval: func(stats *Stats) float64 { return stats.System.Load.Norm.M5 }, @@ -90,7 +90,7 @@ func NewSystemCollector(beatInfo *BeatInfo, stats *Stats) prometheus.Collector { { desc: prometheus.NewDesc( prometheus.BuildFQName(beatInfo.Beat, "system_load", "norm"), - "system load 1m", + "system load 15m", nil, prometheus.Labels{"period": "15"}, ), eval: func(stats *Stats) float64 { return stats.System.Load.Norm.M15 }, From 88df4e631fb10bc3a9dfa715c4043ee35706cf9d Mon Sep 17 00:00:00 2001 From: Hang Du Date: Tue, 25 Sep 2018 10:57:24 -0700 Subject: [PATCH 2/4] Update filebeat.go Replace "prospector" with "input" in order to match with 0.0.0.0:5066/stats output. (Tested on FB 6.4.1) --- collector/filebeat.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collector/filebeat.go b/collector/filebeat.go index 7c58fa0..d76e2b6 100644 --- a/collector/filebeat.go +++ b/collector/filebeat.go @@ -27,7 +27,7 @@ type Filebeat struct { Truncated float64 `json:"truncated"` } `json:"files"` } `json:"log"` - } `json:"prospector"` + } `json:"input"` } type filebeatCollector struct { From a283057ecc5c9765581196086f9adf50783be5d4 Mon Sep 17 00:00:00 2001 From: Hang Du Date: Tue, 25 Sep 2018 22:25:44 -0700 Subject: [PATCH 3/4] Update system.go --- collector/system.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/collector/system.go b/collector/system.go index 641977d..490a641 100644 --- a/collector/system.go +++ b/collector/system.go @@ -45,7 +45,7 @@ func NewSystemCollector(beatInfo *BeatInfo, stats *Stats) prometheus.Collector { { desc: prometheus.NewDesc( prometheus.BuildFQName(beatInfo.Beat, "system", "load"), - "system load 1m", + "system load", nil, prometheus.Labels{"period": "1"}, ), eval: func(stats *Stats) float64 { return stats.System.Load.M1 }, @@ -54,7 +54,7 @@ func NewSystemCollector(beatInfo *BeatInfo, stats *Stats) prometheus.Collector { { desc: prometheus.NewDesc( prometheus.BuildFQName(beatInfo.Beat, "system", "load"), - "system load 5m", + "system load", nil, prometheus.Labels{"period": "5"}, ), eval: func(stats *Stats) float64 { return stats.System.Load.M5 }, @@ -63,7 +63,7 @@ func NewSystemCollector(beatInfo *BeatInfo, stats *Stats) prometheus.Collector { { desc: prometheus.NewDesc( prometheus.BuildFQName(beatInfo.Beat, "system", "load"), - "system load 15m", + "system load", nil, prometheus.Labels{"period": "15"}, ), eval: func(stats *Stats) float64 { return stats.System.Load.M15 }, @@ -72,7 +72,7 @@ func NewSystemCollector(beatInfo *BeatInfo, stats *Stats) prometheus.Collector { { desc: prometheus.NewDesc( prometheus.BuildFQName(beatInfo.Beat, "system_load", "norm"), - "system load 1m", + "system load", nil, prometheus.Labels{"period": "1"}, ), eval: func(stats *Stats) float64 { return stats.System.Load.Norm.M1 }, @@ -81,7 +81,7 @@ func NewSystemCollector(beatInfo *BeatInfo, stats *Stats) prometheus.Collector { { desc: prometheus.NewDesc( prometheus.BuildFQName(beatInfo.Beat, "system_load", "norm"), - "system load 5m", + "system load", nil, prometheus.Labels{"period": "5"}, ), eval: func(stats *Stats) float64 { return stats.System.Load.Norm.M5 }, @@ -90,7 +90,7 @@ func NewSystemCollector(beatInfo *BeatInfo, stats *Stats) prometheus.Collector { { desc: prometheus.NewDesc( prometheus.BuildFQName(beatInfo.Beat, "system_load", "norm"), - "system load 15m", + "system load", nil, prometheus.Labels{"period": "15"}, ), eval: func(stats *Stats) float64 { return stats.System.Load.Norm.M15 }, From 1e008d2c359725f6496ca70cf07a5bf564ba84b4 Mon Sep 17 00:00:00 2001 From: Hang Du Date: Tue, 25 Sep 2018 22:30:55 -0700 Subject: [PATCH 4/4] Update filebeat.go --- collector/filebeat.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/collector/filebeat.go b/collector/filebeat.go index d76e2b6..ee04b6d 100644 --- a/collector/filebeat.go +++ b/collector/filebeat.go @@ -20,7 +20,7 @@ type Filebeat struct { Started float64 `json:"started"` } `json:"harvester"` - Prospector struct { + Input struct { Log struct { Files struct { Renamed float64 `json:"renamed"` @@ -116,20 +116,20 @@ func NewFilebeatCollector(beatInfo *BeatInfo, stats *Stats) prometheus.Collector }, { desc: prometheus.NewDesc( - prometheus.BuildFQName(beatInfo.Beat, "filebeat", "prospector_log"), - "filebeat.prospector_log", + prometheus.BuildFQName(beatInfo.Beat, "filebeat", "input_log"), + "filebeat.input_log", nil, prometheus.Labels{"files": "renamed"}, ), - eval: func(stats *Stats) float64 { return stats.Filebeat.Prospector.Log.Files.Renamed }, + eval: func(stats *Stats) float64 { return stats.Filebeat.Input.Log.Files.Renamed }, valType: prometheus.UntypedValue, }, { desc: prometheus.NewDesc( - prometheus.BuildFQName(beatInfo.Beat, "filebeat", "prospector_log"), - "filebeat.prospector_log", + prometheus.BuildFQName(beatInfo.Beat, "filebeat", "input_log"), + "filebeat.input_log", nil, prometheus.Labels{"files": "truncated"}, ), - eval: func(stats *Stats) float64 { return stats.Filebeat.Prospector.Log.Files.Truncated }, + eval: func(stats *Stats) float64 { return stats.Filebeat.Input.Log.Files.Truncated }, valType: prometheus.UntypedValue, }, },