Merge branch 'annotations-created' of https://github.com/ryantxu/grafana into ryantxu-annotations-created

2018-04-20 17:14:06 +02:00
parent e168bfe03e 5ca972542b
commit 3451f9a9db
7 changed files with 70 additions and 18 deletions
@@ -77,7 +77,7 @@ func (handler *DefaultResultHandler) Handle(evalContext *EvalContext) error {
 			Text:        "",
 			NewState:    string(evalContext.Rule.State),
 			PrevState:   string(evalContext.PrevAlertState),
-			Epoch:       time.Now().Unix(),
+			Epoch:       time.Now().UnixNano() / int64(time.Millisecond),
 			Data:        annotationData,
 		}