Update vendoring and common; Allow the AWS backend to get credentials from its environment.

Gopkg.toml

@@ -6,6 +6,17 @@
   name = "github.com/aws/aws-sdk-go"
   version = "v1.10.8"
 
+# Need an override on jaeger-lib as it has a ^0.8.0 contraint on client_golang.
+[[override]]
+  name = "github.com/uber/jaeger-lib"
+  version = ">=v1.5.0"
+
+# Pin to master branch until there is a more recent stable release:
+#   https://github.com/prometheus/client_golang/issues/375
+[[override]]
+  name = "github.com/prometheus/client_golang"
+  branch = "master"
+
 [[constraint]]
   name = "github.com/prometheus/alertmanager"
   revision = "fb713f6d8239b57c646cae30f78e8b4b8861a1aa"
@@ -26,11 +37,11 @@
 
 [[override]]
   name = "k8s.io/client-go"
-  revision = "3627aeb7d4f6ade38f995d2c923e459146493c7e"
+  revision = "7d04d0e2a0a1a4d4a1cd6baa432a2301492e4e65"
 
 [[override]]
   name = "k8s.io/apimachinery"
-  revision = "75b8dd260ef0469d96d578705a87cffd0e09dab8"
+  revision = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"
 
 [[override]]
   name = "github.com/Azure/azure-sdk-for-go"
@@ -39,9 +50,3 @@
 [[override]]
   name = "github.com/weaveworks/mesh"
   revision = "5015f896ab62d3e9fe757456c757521ce0c3faff"
-
-# Pin to master branch until there is a more recent stable release:
-#   https://github.com/prometheus/client_golang/issues/375
-[[constraint]]
-  name = "github.com/prometheus/client_golang"
-  branch = "master"

cmd/lite/main.go

@@ -155,6 +155,7 @@ func main() {
 		func() *tsdb.DB { return nil }, // Only needed for admin APIs.
 		false, // Disable admin APIs.
 		util.Logger,
+		querier.DummyRulesRetriever{},
 	)
 	promRouter := route.New().WithPrefix("/api/prom/api/v1")
 	api.Register(promRouter)

cmd/querier/main.go

@@ -98,6 +98,7 @@ func main() {
 		func() *tsdb.DB { return nil }, // Only needed for admin APIs.
 		false, // Disable admin APIs.
 		util.Logger,
+		querier.DummyRulesRetriever{},
 	)
 	promRouter := route.New().WithPrefix("/api/prom/api/v1")
 	api.Register(promRouter)

pkg/configs/configs.go

@@ -208,6 +208,7 @@ func (c RulesConfig) parseV2() (map[string][]rules.Rule, error) {
 						time.Duration(rl.For),
 						labels.FromMap(rl.Labels),
 						labels.FromMap(rl.Annotations),
+						false,
 						log.With(util.Logger, "alert", rl.Alert),
 					))
 					continue
@@ -244,7 +245,7 @@ func (c RulesConfig) parseV1() (map[string][]rules.Rule, error) {
 
 			switch r := stmt.(type) {
 			case *promql.AlertStmt:
-				rule = rules.NewAlertingRule(r.Name, r.Expr, r.Duration, r.Labels, r.Annotations, util.Logger)
+				rule = rules.NewAlertingRule(r.Name, r.Expr, r.Duration, r.Labels, r.Annotations, false, util.Logger)
 
 			case *promql.RecordStmt:
 				rule = rules.NewRecordingRule(r.Name, r.Expr, r.Labels)

pkg/querier/dummy.go

@@ -3,23 +3,37 @@ package querier
 import (
 	"net/url"
 
+	"github.com/prometheus/prometheus/rules"
 	"github.com/prometheus/prometheus/scrape"
 )
 
 // DummyTargetRetriever implements github.com/prometheus/prometheus/web/api/v1.targetRetriever.
 type DummyTargetRetriever struct{}
 
 // TargetsActive implements targetRetriever.
-func (r DummyTargetRetriever) TargetsActive() []*scrape.Target { return nil }
+func (DummyTargetRetriever) TargetsActive() []*scrape.Target { return nil }
 
 // TargetsDropped implements targetRetriever.
-func (r DummyTargetRetriever) TargetsDropped() []*scrape.Target { return nil }
+func (DummyTargetRetriever) TargetsDropped() []*scrape.Target { return nil }
 
 // DummyAlertmanagerRetriever implements AlertmanagerRetriever.
 type DummyAlertmanagerRetriever struct{}
 
 // Alertmanagers implements AlertmanagerRetriever.
-func (r DummyAlertmanagerRetriever) Alertmanagers() []*url.URL { return nil }
+func (DummyAlertmanagerRetriever) Alertmanagers() []*url.URL { return nil }
 
 // DroppedAlertmanagers implements AlertmanagerRetriever.
-func (r DummyAlertmanagerRetriever) DroppedAlertmanagers() []*url.URL { return nil }
+func (DummyAlertmanagerRetriever) DroppedAlertmanagers() []*url.URL { return nil }
+
+// DummyRulesRetriever implements RulesRetriever.
+type DummyRulesRetriever struct{}
+
+// RuleGroups implements RulesRetriever.
+func (DummyRulesRetriever) RuleGroups() []*rules.Group {
+	return nil
+}
+
+// AlertingRules implements RulesRetriever.
+func (DummyRulesRetriever) AlertingRules() []*rules.AlertingRule {
+	return nil
+}

pkg/ruler/group.go

@@ -16,7 +16,7 @@ type group struct {
 
 func newGroup(name string, rls []rules.Rule, appendable *appendableAppender, opts *rules.ManagerOptions) *group {
 	delay := 0 * time.Second // Unused, so 0 value is fine.
-	promGroup := rules.NewGroup(name, "none", delay, rls, opts)
+	promGroup := rules.NewGroup(name, "none", delay, rls, false, opts)
 	return &group{promGroup, appendable}
 }
 

pkg/ruler/ruler.go

@@ -297,7 +297,7 @@ func (r *Ruler) newGroup(userID string, groupName string, rls []rules.Rule) (*gr
 //
 // Copied from Prometheus's main.go.
 func sendAlerts(n *notifier.Manager, externalURL string) rules.NotifyFunc {
-	return func(ctx native_ctx.Context, expr string, alerts ...*rules.Alert) error {
+	return func(ctx native_ctx.Context, expr string, alerts ...*rules.Alert) {
 		var res []*notifier.Alert
 
 		for _, alert := range alerts {
@@ -320,7 +320,6 @@ func sendAlerts(n *notifier.Manager, externalURL string) rules.NotifyFunc {
 		if len(alerts) > 0 {
 			n.Send(res...)
 		}
-		return nil
 	}
 }