mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2026-02-15 21:01:14 +01:00
Code Issues Projects Releases Wiki Activity
3,349 Commits 330 Branches 510 Tags
Commit Graph

3349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frederic Branczyk
08fa4eaa92 retrieval: add kubernetes pod discovery tests 2016-10-17 10:32:10 +02:00
Frederic Branczyk
3762e39ce5 retrieval: add kubernetes service discovery tests 2016-10-17 10:32:10 +02:00
Frederic Branczyk
397072a482 retrieval: add kubernetes node discovery tests 2016-10-17 10:32:10 +02:00
Frederic Branczyk
cc46058802 retrieval: kubernetes nodes are not namespaced 2016-10-17 10:32:10 +02:00
Frederic Branczyk
a318d9ad27 retrieval: fix pod label and annotation prefixes 2016-10-17 10:32:10 +02:00
Frederic Branczyk
2e18c81a00 config: adapt unit tests 2016-10-17 10:32:10 +02:00
Fabian Reinartz
b24602f713 kubernetes: merge back into single configuration 2016-10-17 10:32:10 +02:00
Fabian Reinartz
a9cfb66b28 kubernetes: add node discovery 2016-10-17 10:32:10 +02:00
Fabian Reinartz
d896a654f9 kubernetes: Add discovery of services 2016-10-17 10:32:10 +02:00
Fabian Reinartz
6d269ed870 kubernetes: infer pod information in endpoints discovery 2016-10-17 10:32:10 +02:00
Fabian Reinartz
7c439a9060 kubernetes: use and vendor 1.5 client 2016-10-17 10:32:10 +02:00
Fabian Reinartz
de22524e57 kubernetes: add KubernetesV2 endpoints 2016-10-17 10:32:10 +02:00
Fabian Reinartz
2331701b50 kubernetes: Add K8S v2 pod discovery 
This adds plumbing for a parallel version of the new K8S SD
and adds pod discovery as the first role.
 2016-10-17 10:32:10 +02:00
Matthias Rampke
4f96d28e60 Always show instance label on target page. (#2062) 2016-10-12 12:45:47 +02:00
Björn Rabenstein
274d008fbf Merge pull request #2074 from prometheus/beorn7/build 
promu: Use default Go version again
 2016-10-11 16:29:55 +02:00
beorn7
f3837864f6 promu: Use default Go version again 
The default is Go1.7.1 now.
 2016-10-11 11:42:05 +02:00
beorn7
492eac96d5 Merge branch 'release-1.2' 2016-10-10 17:59:58 +02:00
beorn7
dd66f2e94b Fix go version spec in .promu.yml v1.2.1 2016-10-10 17:53:50 +02:00
beorn7
b66ce9c5cd Merge branch 'release-1.2' 2016-10-10 17:10:14 +02:00
Björn Rabenstein
dc52a852dd Merge pull request #2072 from prometheus/beorn7/release 
Cut v1.2.1
 2016-10-10 17:04:28 +02:00
beorn7
ddcd92b76c Cut v1.2.1 2016-10-10 17:03:51 +02:00
beorn7
dc0ad8ee34 Use Go1.7.1 with Promu 2016-10-10 17:03:51 +02:00
beorn7
3f02e33e34 Re-add counting of evict chunk ops and decrementing NumMemChunks 
Also, modify test to expose the regression.
 2016-10-10 17:03:51 +02:00
Julius Volz
ab870ac653 Clean up some doc comments 2016-10-10 17:03:51 +02:00
Björn Rabenstein
5ec9869463 Merge pull request #2071 from prometheus/beorn7/storage 
Re-add counting of evict chunk ops and decrementing NumMemChunks
 2016-10-10 16:48:13 +02:00
beorn7
719508752b Re-add counting of evict chunk ops and decrementing NumMemChunks 
Also, modify test to expose the regression.
 2016-10-10 16:30:10 +02:00
Brian Brazil
a728f193de Merge pull request #2063 from dominikschulz/gce_instance_status 
Add GCE Instance Status
 2016-10-08 08:32:47 +01:00
Brian Brazil
008dd20d7a Merge pull request #2064 from dominikschulz/gce_copy 
Fix small copy and paste error
 2016-10-08 08:30:41 +01:00
Dominik Schulz
72cbf8af6f Fix small copy and paste error 2016-10-08 08:49:00 +02:00
Dominik Schulz
c73aa82589 Add GCE Instance Status 2016-10-08 08:40:12 +02:00
Björn Rabenstein
0cf8586136 Merge pull request #2059 from prometheus/release-1.2 
Cut v1.2.0
 2016-10-07 14:42:31 +02:00
beorn7
522c933614 Merge branch 'master' into release-1.2 v1.2.0 2016-10-07 14:41:50 +02:00
beorn7
d8cbac1225 Abbreviate CHANGELOG.md entry for 1.2.0 
It now follows the policy of only documenting user-relevant changes.
 2016-10-07 13:39:46 +02:00
Björn Rabenstein
05d3d6d9f7 Merge pull request #2060 from prometheus/cleanup-comments 
Clean up some doc comments
 2016-10-06 23:16:05 +02:00
Julius Volz
cb02f017ee Clean up some doc comments 2016-10-06 21:53:40 +02:00
beorn7
836c61e1da Cut v1.2.0 2016-10-06 21:28:51 +02:00
Julius Volz
2844a8c7b5 Merge pull request #2055 from prometheus/utilization 
Add Chunk.Utilization() methods
 2016-10-06 16:36:25 +02:00
Julius Volz
c212ef0326 Add Chunk.Utilization() methods 
When using the chunking code in other projects (both Weave Prism and
ChronixDB ingester), you sometimes want to know how well you are
utilizing your chunks when closing/storing them.
 2016-10-06 16:31:59 +02:00
Julius Volz
0dbcf55bd2 Merge pull request #2054 from prometheus/remove-grpc-leftovers 
Remove gRPC leftovers in protobuf definitions
 2016-10-05 17:56:25 +02:00
Julius Volz
ee8e8d1d31 Merge pull request #2053 from prometheus/fix-remote-write-example 
Simplify and fix remote write example
 2016-10-05 17:53:45 +02:00
Julius Volz
b5163351bf Simplify and fix remote write example 
After removing gRPC, this can be simplified again. Also, the
configuration for the remote storage moved from flags to the config
file.
 2016-10-05 17:53:01 +02:00
Julius Volz
c7932aa009 Remove gRPC leftovers in protobuf definitions 2016-10-05 17:31:04 +02:00
Björn Rabenstein
1e2f03f668 Merge pull request #2005 from redbaron/microoptimise-matching 
Microoptimise matching
 2016-10-05 17:26:56 +02:00
Maxim Ivanov
e6db9f8159 New fpsForLabelMatchers and seriesForLabelMatchers methods 
These more specific methods have replaced `metricForLabelMatchers`
in cases where its  `map[fingerprint]metric` result type was
not necessary or was used as an intermediate step

Avoids duplicated calls to `seriesForRange` from
`QueryRange` and `QueryInstant` methods.
 2016-10-05 15:15:54 +01:00
Brian Brazil
6e8f87a37f Merge pull request #2047 from prometheus/write-relabel 
Add support for remote write relabelling.
 2016-10-05 07:47:49 +01:00
Brian Brazil
77605649a9 Add support for remote write relabelling. 
Switch back to a single remote writer, as we were only ever meant to
have one and the relabel semantics are clearer that way.
 2016-10-05 07:43:19 +01:00
Julius Volz
9172728125 Merge pull request #2050 from prometheus/unpublish-series-methods 
Unpublish accidentally published series methods
 2016-10-03 11:36:25 +02:00
Tobias Schmidt
f07e67650e Merge pull request #2049 from prometheus/ctxfn-error 
Update common/route vendoring for contextFn errors
 2016-10-03 12:06:46 +03:00
Julius Volz
c9d4526428 Unpublish accidentally published series methods 
There were some more accidentally published methods of the memorySeries
type which I didn't notice when reviewing https://github.com/prometheus/prometheus/pull/2011
 2016-10-03 00:04:56 +02:00
Julius Volz
4f79072fd1 Update common/route vendoring for contextFn errors 2016-10-02 23:04:03 +02:00