Skip to content

Commit 3d8c67c

Browse files
author
marcel corso gonzalez
authored
Merge pull request #79 from messagebird/update-deps
Update deps
2 parents 232a348 + 346a083 commit 3d8c67c

File tree

6 files changed

+279
-52
lines changed

6 files changed

+279
-52
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.12 AS builder
1+
FROM golang:1.14 AS builder
22

33
WORKDIR /build
44

cmd/sachet/main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333

3434
"github.com/prometheus/alertmanager/template"
3535
"github.com/prometheus/client_golang/prometheus"
36+
"github.com/prometheus/client_golang/prometheus/promhttp"
3637

3738
"github.com/heptiolabs/healthcheck"
3839
)
@@ -123,7 +124,7 @@ func main() {
123124
requestTotal.WithLabelValues("200", receiverConf.Provider).Inc()
124125
})
125126

126-
http.Handle("/metrics", prometheus.Handler())
127+
http.Handle("/metrics", promhttp.Handler())
127128

128129
http.HandleFunc("/-/reload", func(w http.ResponseWriter, r *http.Request) {
129130
defer r.Body.Close()

go.mod

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,23 @@ module github.com/messagebird/sachet
33
go 1.12
44

55
require (
6-
github.com/aliyun/alibaba-cloud-sdk-go v1.60.327
7-
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
8-
github.com/carlosdp/twiliogo v0.0.0-20140102225436-f61c8230fa91
6+
github.com/aliyun/alibaba-cloud-sdk-go v1.61.122
7+
github.com/carlosdp/twiliogo v0.0.0-20161027183705-b26045ebb9d1
98
github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible // indirect
10-
github.com/golang/protobuf v1.1.0 // indirect
9+
github.com/golang/protobuf v1.4.0 // indirect
1110
github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40
12-
github.com/matttproud/golang_protobuf_extensions v1.0.0 // indirect
13-
github.com/messagebird/go-rest-api v0.0.0-20180517131710-a9514230491e
11+
github.com/jmespath/go-jmespath v0.3.0 // indirect
12+
github.com/messagebird/go-rest-api v5.3.0+incompatible
1413
github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014
15-
github.com/prometheus/alertmanager v0.14.0
16-
github.com/prometheus/client_golang v0.8.0
17-
github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5 // indirect
18-
github.com/prometheus/common v0.0.0-20180426121432-d811d2e9bf89 // indirect
19-
github.com/prometheus/procfs v0.0.0-20180408092902-8b1c2da0d56d // indirect
14+
github.com/prometheus/alertmanager v0.20.0
15+
github.com/prometheus/client_golang v1.5.1
16+
github.com/prometheus/procfs v0.0.11 // indirect
2017
github.com/technoweenie/multipartstreamer v1.0.1 // indirect
2118
github.com/xconstruct/go-pushbullet v0.0.0-20171206132031-67759df45fbb
22-
golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
19+
golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 // indirect
20+
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
21+
gopkg.in/ini.v1 v1.55.0 // indirect
2322
gopkg.in/njern/gonexmo.v1 v1.0.1
24-
gopkg.in/telegram-bot-api.v4 v4.6.2
25-
gopkg.in/yaml.v2 v2.2.1
23+
gopkg.in/telegram-bot-api.v4 v4.6.4
24+
gopkg.in/yaml.v2 v2.2.8
2625
)

0 commit comments

Comments
 (0)