Merge branch 'release-2.7' into beorn7/release

Signed-off-by: beorn7 <beorn@soundcloud.com>
6 years ago · d26e134bd4
1 changed files with 1 additions and 1 deletions
--- a/rules/manager.go
+++ b/rules/manager.go
@ -385,7 +385,7 @@ func (g *Group) GetEvaluationTimestamp() time.Time {

 // setEvaluationTimestamp updates evaluationTimestamp to the timestamp of when the rule group was last evaluated.
 func (g *Group) setEvaluationTimestamp(ts time.Time) {
-	g.metrics.groupLastEvalTime.WithLabelValues(groupKey(g.file, g.name)).Set(float64(ts.Second()))
+	g.metrics.groupLastEvalTime.WithLabelValues(groupKey(g.file, g.name)).Set(float64(ts.UnixNano()) / 1e9)

 	g.mtx.Lock()
 	defer g.mtx.Unlock()