From 5676534a63fd515fe660fe161c437ac10021a572 Mon Sep 17 00:00:00 2001
From: Kevin Hellemun <17928966+OGKevin@users.noreply.github.com>
Date: Tue, 15 Sep 2020 12:06:06 +0200
Subject: [PATCH 1/2] prometheus/alertmanager#2372 Move config reload metrics
 to Coordinator.Reload()

Signed-off-by: Kevin Hellemun <17928966+OGKevin@users.noreply.github.com>
---
 config/coordinator.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/config/coordinator.go b/config/coordinator.go
index 0e6e00c52d..3d63a79390 100644
--- a/config/coordinator.go
+++ b/config/coordinator.go
@@ -16,12 +16,11 @@ package config
 import (
 	"crypto/md5"
 	"encoding/binary"
-	"sync"
-	"time"
-
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
+	"sync"
+	"time"
 )
 
 // Coordinator coordinates Alertmanager configurations beyond the lifetime of a
@@ -97,15 +96,10 @@ func (c *Coordinator) notifySubscribers() error {
 func (c *Coordinator) loadFromFile() error {
 	conf, err := LoadFile(c.configFilePath)
 	if err != nil {
-		c.configSuccessMetric.Set(0)
 		return err
 	}
 
 	c.config = conf
-	c.configSuccessMetric.Set(1)
-	c.configSuccessTimeMetric.Set(float64(time.Now().Unix()))
-	hash := md5HashAsMetricValue([]byte(c.config.original))
-	c.configHashMetric.Set(hash)
 
 	return nil
 }
@@ -126,6 +120,7 @@ func (c *Coordinator) Reload() error {
 			"file", c.configFilePath,
 			"err", err,
 		)
+		c.configSuccessMetric.Set(0)
 		return err
 	}
 	level.Info(c.logger).Log(
@@ -139,9 +134,15 @@ func (c *Coordinator) Reload() error {
 			"file", c.configFilePath,
 			"err", err,
 		)
+		c.configSuccessMetric.Set(0)
 		return err
 	}
 
+	c.configSuccessMetric.Set(1)
+	c.configSuccessTimeMetric.Set(float64(time.Now().Unix()))
+	hash := md5HashAsMetricValue([]byte(c.config.original))
+	c.configHashMetric.Set(hash)
+
 	return nil
 }
 

From 1ca31d1cdcf7ea7bd4be2f75c979d40007568847 Mon Sep 17 00:00:00 2001
From: Kevin Hellemun <17928966+OGKevin@users.noreply.github.com>
Date: Sat, 26 Sep 2020 22:21:05 +0200
Subject: [PATCH 2/2] #2372 Minor refactoring.

Signed-off-by: Kevin Hellemun <17928966+OGKevin@users.noreply.github.com>
---
 config/coordinator.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/coordinator.go b/config/coordinator.go
index 3d63a79390..e8fa785035 100644
--- a/config/coordinator.go
+++ b/config/coordinator.go
@@ -16,11 +16,11 @@ package config
 import (
 	"crypto/md5"
 	"encoding/binary"
+	"sync"
+
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
-	"sync"
-	"time"
 )
 
 // Coordinator coordinates Alertmanager configurations beyond the lifetime of a
@@ -139,7 +139,7 @@ func (c *Coordinator) Reload() error {
 	}
 
 	c.configSuccessMetric.Set(1)
-	c.configSuccessTimeMetric.Set(float64(time.Now().Unix()))
+	c.configSuccessTimeMetric.SetToCurrentTime()
 	hash := md5HashAsMetricValue([]byte(c.config.original))
 	c.configHashMetric.Set(hash)