Merge pull request #26 from yabetsu93/enh0002

Enh0002

go.mod

@@ -0,0 +1,10 @@
+module qvl.io/promplot
+
+go 1.15
+
+require (
+	github.com/prometheus/client_golang v1.9.0 // indirect
+	github.com/prometheus/common v0.15.0
+	github.com/slack-go/slack v0.7.4 // indirect
+	gonum.org/v1/plot v0.8.1
+)

promplot/metrics.go

@@ -5,25 +5,27 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/prometheus/client_golang/api/prometheus"
+	"github.com/prometheus/client_golang/api"
+	v1 "github.com/prometheus/client_golang/api/prometheus/v1"
 	"github.com/prometheus/common/model"
 )
 
 // Metrics fetches data from Prometheus.
 func Metrics(server, query string, queryTime time.Time, duration, step time.Duration) (model.Matrix, error) {
-	client, err := prometheus.New(prometheus.Config{Address: server})
+	client, err := api.NewClient(api.Config{Address: server})
 	if err != nil {
-		return nil, fmt.Errorf("failed to create Prometheus client: %v", err)
+		return nil, fmt.Errorf("failed to create prometheus api client: %v", err)
 	}
 
-	api := prometheus.NewQueryAPI(client)
-	value, err := api.QueryRange(context.Background(), query, prometheus.Range{
+	promAPI := v1.NewAPI(client)
+
+	value, _, err := promAPI.QueryRange(context.Background(), query, v1.Range{
 		Start: queryTime.Add(-duration),
 		End:   queryTime,
 		Step:  duration / step,
 	})
 	if err != nil {
-		return nil, fmt.Errorf("failed to query Prometheus: %v", err)
+		return nil, fmt.Errorf("failed to query prometheus api: %v", err)
 	}
 
 	metrics, ok := value.(model.Matrix)

promplot/plot.go

@@ -6,12 +6,12 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/gonum/plot"
-	"github.com/gonum/plot/palette/brewer"
-	"github.com/gonum/plot/plotter"
-	"github.com/gonum/plot/vg"
-	"github.com/gonum/plot/vg/draw"
 	"github.com/prometheus/common/model"
+	"gonum.org/v1/plot"
+	"gonum.org/v1/plot/palette/brewer"
+	"gonum.org/v1/plot/plotter"
+	"gonum.org/v1/plot/vg"
+	"gonum.org/v1/plot/vg/draw"
 )
 
 // Only show important part of metric name

promplot/slack.go

@@ -1,51 +1,51 @@
 package promplot
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
 
-	"github.com/nlopes/slack"
+	"github.com/slack-go/slack"
 )
 
 // Slack posts a file to a Slack channel.
 func Slack(token, channel, title string, plot io.WriterTo) error {
 	api := slack.New(token)
 
-	_, _, err := api.PostMessage(channel, title, slack.PostMessageParameters{
-		Username:  "Promplot",
-		IconEmoji: ":chart_with_upwards_trend:",
-	})
-	if err != nil {
+	if _, _, err := api.PostMessageContext(context.Background(), channel, slack.MsgOptionPostMessageParameters(
+		slack.PostMessageParameters{
+			Username:  "Promplot",
+			IconEmoji: ":chart_with_upwards_trend:",
+		},
+	)); err != nil {
 		return fmt.Errorf("failed to post message: %v", err)
 	}
 
 	f, err := ioutil.TempFile("", "promplot-")
 	if err != nil {
 		return fmt.Errorf("failed to create tmp file: %v", err)
 	}
+
 	defer func() {
-		err = f.Close()
-		if err != nil {
+		if err = f.Close(); err != nil {
 			panic(fmt.Errorf("failed to close tmp file: %v", err))
 		}
-		err := os.Remove(f.Name())
-		if err != nil {
+		if err = os.Remove(f.Name()); err != nil {
 			panic(fmt.Errorf("failed to delete tmp file: %v", err))
 		}
 	}()
-	_, err = plot.WriteTo(f)
-	if err != nil {
+
+	if _, err = plot.WriteTo(f); err != nil {
 		return fmt.Errorf("failed to write plot to file: %v", err)
 	}
 
-	_, err = api.UploadFile(slack.FileUploadParameters{
+	if _, err = api.UploadFile(slack.FileUploadParameters{
 		Title:    title,
 		File:     f.Name(),
 		Channels: []string{channel},
-	})
-	if err != nil {
+	}); err != nil {
 		return fmt.Errorf("failed to upload file: %v", err)
 	}