Skip to content

Commit

Permalink
Merge pull request #79 from messagebird/update-deps
Browse files Browse the repository at this point in the history
Update deps
  • Loading branch information
marcel corso gonzalez authored Apr 16, 2020
2 parents 232a348 + 346a083 commit 3d8c67c
Show file tree
Hide file tree
Showing 6 changed files with 279 additions and 52 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12 AS builder
FROM golang:1.14 AS builder

WORKDIR /build

Expand Down
3 changes: 2 additions & 1 deletion cmd/sachet/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (

"github.com/prometheus/alertmanager/template"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"

"github.com/heptiolabs/healthcheck"
)
Expand Down Expand Up @@ -123,7 +124,7 @@ func main() {
requestTotal.WithLabelValues("200", receiverConf.Provider).Inc()
})

http.Handle("/metrics", prometheus.Handler())
http.Handle("/metrics", promhttp.Handler())

http.HandleFunc("/-/reload", func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
Expand Down
27 changes: 13 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,23 @@ module github.com/messagebird/sachet
go 1.12

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

0 comments on commit 3d8c67c

Please sign in to comment.