discovery: move into top-level package

discovery/discovery.go

@@ -18,15 +18,15 @@ import (
 
 	"github.com/prometheus/common/log"
 	"github.com/prometheus/prometheus/config"
-	"github.com/prometheus/prometheus/retrieval/discovery/azure"
-	"github.com/prometheus/prometheus/retrieval/discovery/consul"
-	"github.com/prometheus/prometheus/retrieval/discovery/dns"
-	"github.com/prometheus/prometheus/retrieval/discovery/ec2"
-	"github.com/prometheus/prometheus/retrieval/discovery/file"
-	"github.com/prometheus/prometheus/retrieval/discovery/gce"
-	"github.com/prometheus/prometheus/retrieval/discovery/kubernetes"
-	"github.com/prometheus/prometheus/retrieval/discovery/marathon"
-	"github.com/prometheus/prometheus/retrieval/discovery/zookeeper"
+	"github.com/prometheus/prometheus/discovery/azure"
+	"github.com/prometheus/prometheus/discovery/consul"
+	"github.com/prometheus/prometheus/discovery/dns"
+	"github.com/prometheus/prometheus/discovery/ec2"
+	"github.com/prometheus/prometheus/discovery/file"
+	"github.com/prometheus/prometheus/discovery/gce"
+	"github.com/prometheus/prometheus/discovery/kubernetes"
+	"github.com/prometheus/prometheus/discovery/marathon"
+	"github.com/prometheus/prometheus/discovery/zookeeper"
 	"golang.org/x/net/context"
 )
 

discovery/file/fixtures/target_groups.json

@@ -0,0 +1,11 @@
+[
+	{
+		"targets": ["localhost:9090", "example.org:443"],
+		"labels": {
+			"foo": "bar"
+		}
+	},
+	{
+		"targets": ["my.domain"]
+	}
+]

discovery/file/fixtures/target_groups.yml

@@ -0,0 +1,5 @@
+- targets: ['localhost:9090', 'example.org:443']
+  labels:
+    foo: bar
+
+- targets: ['my.domain']

retrieval/targetmanager.go

@@ -26,8 +26,8 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/prometheus/prometheus/config"
+	"github.com/prometheus/prometheus/discovery"
 	"github.com/prometheus/prometheus/relabel"
-	"github.com/prometheus/prometheus/retrieval/discovery"
 	"github.com/prometheus/prometheus/storage"
 )
 

retrieval/targetmanager_test.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/config"
-	"github.com/prometheus/prometheus/retrieval/discovery"
+	"github.com/prometheus/prometheus/discovery"
 	"github.com/prometheus/prometheus/storage/local"
 )