mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-03 18:07:27 -08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity
4498 commits 274 branches 448 tags 658 MiB
Commit graph

3 commits

Author SHA1 Message Date
Julius Volz 099df0c5f0 Migrate "golang.org/x/net/context" -> "context" (#3333) 
In some places, where ctxhttp or gRPC are concerned, we still need to use the
old contexts.
 2017-10-24 21:21:42 -07:00
Goutham Veeramachaneni 3f0267c548 Merge branch 'dev-2.0' into go-kit/log 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-09-15 23:15:27 +05:30
Johannes 'fish' Ziemke 70f3d1e9f9 k8s: Support discovery of ingresses (#3111) 
* k8s: Support discovery of ingresses

* Move additional labels below allocation

This makes it more obvious why the additional elements are allocated.
Also fix allocation for node where we only set a single label.

* k8s: Remove port from ingress discovery

* k8s: Add comment to ingress discovery example
 2017-09-04 13:10:44 +02:00