github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

discovery: move into top-level package

pull/2212/head
Fabian Reinartz 8 years ago
parent
7bd9508c9b
commit
d19d1bcad3
24 changed files with 27 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 0
      discovery/azure/azure.go
  2. 0
      discovery/consul/consul.go
  3. 18
      discovery/discovery.go
  4. 0
      discovery/dns/dns.go
  5. 0
      discovery/ec2/ec2.go
  6. 0
      discovery/file/file.go
  7. 0
      discovery/file/file_test.go
  8. 11
      discovery/file/fixtures/target_groups.json
  9. 5
      discovery/file/fixtures/target_groups.yml
  10. 0
      discovery/gce/gce.go
  11. 0
      discovery/kubernetes/endpoints.go
  12. 0
      discovery/kubernetes/endpoints_test.go
  13. 0
      discovery/kubernetes/kubernetes.go
  14. 0
      discovery/kubernetes/node.go
  15. 0
      discovery/kubernetes/node_test.go
  16. 0
      discovery/kubernetes/pod.go
  17. 0
      discovery/kubernetes/pod_test.go
  18. 0
      discovery/kubernetes/service.go
  19. 0
      discovery/kubernetes/service_test.go
  20. 0
      discovery/marathon/marathon.go
  21. 0
      discovery/marathon/marathon_test.go
  22. 0
      discovery/zookeeper/zookeeper.go
  23. 2
      retrieval/targetmanager.go
  24. 2
      retrieval/targetmanager_test.go

0
retrieval/discovery/azure/azure.go → discovery/azure/azure.go
Unescape View File

0
retrieval/discovery/consul/consul.go → discovery/consul/consul.go
Unescape View File

18
retrieval/discovery/discovery.go → discovery/discovery.go
Unescape View File

@ -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"
)

0
retrieval/discovery/dns/dns.go → discovery/dns/dns.go
Unescape View File

0
retrieval/discovery/ec2/ec2.go → discovery/ec2/ec2.go
Unescape View File

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

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

11
discovery/file/fixtures/target_groups.json
Unescape 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
Unescape 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
Unescape View File

0
retrieval/discovery/kubernetes/endpoints.go → discovery/kubernetes/endpoints.go
Unescape View File

0
retrieval/discovery/kubernetes/endpoints_test.go → discovery/kubernetes/endpoints_test.go
Unescape View File

0
retrieval/discovery/kubernetes/kubernetes.go → discovery/kubernetes/kubernetes.go
Unescape View File

0
retrieval/discovery/kubernetes/node.go → discovery/kubernetes/node.go
Unescape View File

0
retrieval/discovery/kubernetes/node_test.go → discovery/kubernetes/node_test.go
Unescape View File

0
retrieval/discovery/kubernetes/pod.go → discovery/kubernetes/pod.go
Unescape View File

0
retrieval/discovery/kubernetes/pod_test.go → discovery/kubernetes/pod_test.go
Unescape View File

0
retrieval/discovery/kubernetes/service.go → discovery/kubernetes/service.go
Unescape View File

0
retrieval/discovery/kubernetes/service_test.go → discovery/kubernetes/service_test.go
Unescape View File

0
retrieval/discovery/marathon/marathon.go → discovery/marathon/marathon.go
Unescape View File

0
retrieval/discovery/marathon/marathon_test.go → discovery/marathon/marathon_test.go
Unescape View File

0
retrieval/discovery/zookeeper/zookeeper.go → discovery/zookeeper/zookeeper.go
Unescape View File

2
retrieval/targetmanager.go
Unescape View File

@ -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"
)

2
retrieval/targetmanager_test.go
Unescape View File

@ -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"
)

Write Preview
Loading…
Cancel
Save