merge with master

moira-alert · Oct 27, 2023 · a0f858d · a0f858d
2 parents a8e30c3 + 8a9a727
commit a0f858d
Show file tree

Hide file tree

Showing 27 changed files with 1,140 additions and 202 deletions.
diff --git a/Dockerfile.api b/Dockerfile.api
@@ -1,4 +1,4 @@
-FROM golang:1.18 as builder
+FROM golang:1.19 as builder
 
 COPY go.mod go.sum /go/src/github.com/moira-alert/moira/
 WORKDIR /go/src/github.com/moira-alert/moira

diff --git a/Dockerfile.checker b/Dockerfile.checker
@@ -1,4 +1,4 @@
-FROM golang:1.18 as builder
+FROM golang:1.19 as builder
 
 COPY go.mod go.sum /go/src/github.com/moira-alert/moira/
 WORKDIR /go/src/github.com/moira-alert/moira

diff --git a/Dockerfile.cli b/Dockerfile.cli
@@ -1,4 +1,4 @@
-FROM golang:1.18 as builder
+FROM golang:1.19 as builder
 
 COPY go.mod go.sum /go/src/github.com/moira-alert/moira/
 WORKDIR /go/src/github.com/moira-alert/moira

diff --git a/Dockerfile.filter b/Dockerfile.filter
@@ -1,4 +1,4 @@
-FROM golang:1.18 as builder
+FROM golang:1.19 as builder
 
 COPY go.mod go.sum /go/src/github.com/moira-alert/moira/
 WORKDIR /go/src/github.com/moira-alert/moira

diff --git a/Dockerfile.notifier b/Dockerfile.notifier
@@ -1,4 +1,4 @@
-FROM golang:1.18 as builder
+FROM golang:1.19 as builder
 
 COPY go.mod go.sum /go/src/github.com/moira-alert/moira/
 WORKDIR /go/src/github.com/moira-alert/moira

diff --git a/api/controller/trigger_metrics.go b/api/controller/trigger_metrics.go
@@ -65,7 +65,7 @@ func GetTriggerMetrics(dataBase moira.Database, metricSourceProvider *metricSour
 			for i, l := 0, len(timeSeries.Values); i < l; i++ {
 				timestamp := timeSeries.StartTime + int64(i)*timeSeries.StepTime
 				value := timeSeries.GetTimestampValue(timestamp)
-				if moira.IsValidFloat64(value) {
+				if moira.IsFiniteNumber(value) {
 					values = append(values, moira.MetricValue{Value: value, Timestamp: timestamp})
 				}
 			}

diff --git a/api/handler/contact.go b/api/handler/contact.go
@@ -100,7 +100,7 @@ func createNewContact(writer http.ResponseWriter, request *http.Request) {
 	}
 	userLogin := middleware.GetLogin(request)
 
-	if err := controller.CreateContact(database, contact, userLogin, ""); err != nil {
+	if err := controller.CreateContact(database, contact, userLogin, contact.TeamID); err != nil {
 		render.Render(writer, request, err) //nolint
 		return
 	}
@@ -176,7 +176,7 @@ func updateContact(writer http.ResponseWriter, request *http.Request) {
 //	@router		/contact/{contactID} [delete]
 func removeContact(writer http.ResponseWriter, request *http.Request) {
 	contactData := request.Context().Value(contactKey).(moira.ContactData)
-	err := controller.RemoveContact(database, contactData.ID, contactData.User, "")
+	err := controller.RemoveContact(database, contactData.ID, contactData.User, contactData.Team)
 	if err != nil {
 		render.Render(writer, request, err) //nolint
 	}