From: sgmitchell <steve@sgmitchell.net>
Date: Fri, 13 Apr 2018 18:57:07 +0000 (-0400)
Subject: Make the history limit a configurable flag (#308)
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=000755473aa1d4fb115b55ffd52bc748379a592a;p=blackbox_exporter.git

Make the history limit a configurable flag (#308)
---

diff --git a/history.go b/history.go
index 8bcec65..d567a4e 100644
--- a/history.go
+++ b/history.go
@@ -26,9 +26,10 @@ type result struct {
 }
 
 type resultHistory struct {
-	mu      sync.Mutex
-	nextId  int64
-	results []*result
+	mu         sync.Mutex
+	nextId     int64
+	results    []*result
+	maxResults uint
 }
 
 // Add a result to the history.
@@ -46,7 +47,7 @@ func (rh *resultHistory) Add(moduleName, target, debugOutput string, success boo
 	rh.nextId++
 
 	rh.results = append(rh.results, r)
-	if len(rh.results) > 100 {
+	if uint(len(rh.results)) > rh.maxResults {
 		results := make([]*result, len(rh.results)-1)
 		copy(results, rh.results[1:])
 		rh.results = results
diff --git a/main.go b/main.go
index 3520301..238ecd4 100644
--- a/main.go
+++ b/main.go
@@ -50,6 +50,7 @@ var (
 	listenAddress = kingpin.Flag("web.listen-address", "The address to listen on for HTTP requests.").Default(":9115").String()
 	timeoutOffset = kingpin.Flag("timeout-offset", "Offset to subtract from timeout in seconds.").Default("0.5").Float64()
 	configCheck   = kingpin.Flag("config.check", "If true validate the config file and then exit.").Default().Bool()
+	historyLimit  = kingpin.Flag("history.limit", "The maximum amount of items to keep in the history.").Default("100").Uint()
 
 	Probers = map[string]prober.ProbeFn{
 		"http": prober.ProbeHTTP,
@@ -209,7 +210,7 @@ func main() {
 	kingpin.HelpFlag.Short('h')
 	kingpin.Parse()
 	logger := promlog.New(allowedLevel)
-	rh := &resultHistory{}
+	rh := &resultHistory{maxResults: *historyLimit}
 
 	level.Info(logger).Log("msg", "Starting blackbox_exporter", "version", version.Info())
 	level.Info(logger).Log("msg", "Build context", version.BuildContext())