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

discovery: move into top-level package

Browse source
This commit is contained in:
Fabian Reinartz 2016-11-21 15:59:03 +01:00
parent 7bd9508c9b
commit d19d1bcad3
24 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
retrieval/discovery/azure/azure.go → discovery/azure/azure.go
View file

0
retrieval/discovery/consul/consul.go → discovery/consul/consul.go
View file

18
retrieval/discovery/discovery.go → discovery/discovery.go
View file

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

0
retrieval/discovery/dns/dns.go → discovery/dns/dns.go
View file

0
retrieval/discovery/ec2/ec2.go → discovery/ec2/ec2.go
View file

0
retrieval/discovery/file/file.go → discovery/file/file.go
View file

0
retrieval/discovery/file/file_test.go → discovery/file/file_test.go
View file

11
discovery/file/fixtures/target_groups.json Normal file
View file

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

5
discovery/file/fixtures/target_groups.yml Normal file
View file

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

0
retrieval/discovery/gce/gce.go → discovery/gce/gce.go
View file

0
retrieval/discovery/kubernetes/endpoints.go → discovery/kubernetes/endpoints.go
View file

0
retrieval/discovery/kubernetes/endpoints_test.go → discovery/kubernetes/endpoints_test.go
View file

0
retrieval/discovery/kubernetes/kubernetes.go → discovery/kubernetes/kubernetes.go
View file

0
retrieval/discovery/kubernetes/node.go → discovery/kubernetes/node.go
View file

0
retrieval/discovery/kubernetes/node_test.go → discovery/kubernetes/node_test.go
View file

0
retrieval/discovery/kubernetes/pod.go → discovery/kubernetes/pod.go
View file

0
retrieval/discovery/kubernetes/pod_test.go → discovery/kubernetes/pod_test.go
View file

0
retrieval/discovery/kubernetes/service.go → discovery/kubernetes/service.go
View file

0
retrieval/discovery/kubernetes/service_test.go → discovery/kubernetes/service_test.go
View file

0
retrieval/discovery/marathon/marathon.go → discovery/marathon/marathon.go
View file

0
retrieval/discovery/marathon/marathon_test.go → discovery/marathon/marathon_test.go
View file

0
retrieval/discovery/zookeeper/zookeeper.go → discovery/zookeeper/zookeeper.go
View file

2
retrieval/targetmanager.go
View file

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

2
retrieval/targetmanager_test.go
View file

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