mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0

Browse source
This commit is contained in:
Fabian Reinartz 2017-09-04 13:10:50 +02:00
parent fffe51fb03 64973f5c65
commit c70379e1c7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/prometheus/main.go
View file

@ -337,7 +337,7 @@ func main() {
// Set web server to ready. // Set web server to ready.
webHandler.Ready() webHandler.Ready()
log.Info("Server is Ready to receive requests.") log.Info("Server is ready to receive requests.")
term := make(chan os.Signal) term := make(chan os.Signal)
signal.Notify(term, os.Interrupt, syscall.SIGTERM) signal.Notify(term, os.Interrupt, syscall.SIGTERM)

2
web/api/v2/api.go
View file

@ -176,7 +176,7 @@ func (s *Admin) TSDBSnapshot(_ context.Context, _ *pb.TSDBSnapshotRequest) (*pb.
return &pb.TSDBSnapshotResponse{Name: name}, nil return &pb.TSDBSnapshotResponse{Name: name}, nil
} }
// DeleteSeries imeplements pb.AdminServer. // DeleteSeries implements pb.AdminServer.
func (s *Admin) DeleteSeries(_ context.Context, r *pb.SeriesDeleteRequest) (*pb.SeriesDeleteResponse, error) { func (s *Admin) DeleteSeries(_ context.Context, r *pb.SeriesDeleteRequest) (*pb.SeriesDeleteResponse, error) {
mint, maxt, err := extractTimeRange(r.MinTime, r.MaxTime) mint, maxt, err := extractTimeRange(r.MinTime, r.MaxTime)
if err != nil { if err != nil {