mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 15:09:39 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
2529 commits 243 branches 444 tags 649 MiB
Commit graph

2529 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz 8456b7e12f Use go1.5.1 2015-09-10 12:11:44 +02:00
Julius Volz 6e393807c3 Merge pull request #1066 from prometheus/fix-bool 
Fix bool modifier in recording rules and printing.
 2015-09-10 12:03:11 +02:00
Julius Volz 6d3e054692 Fix bool modifier in recording rules and printing. 
Fixes https://github.com/prometheus/prometheus/issues/1065
 2015-09-10 01:37:05 +02:00
Julius Volz 9a70ee752e Merge pull request #1063 from fabric8io/kubernetes-discovery 
Kubernetes SD config check
 2015-09-09 15:28:27 +02:00
Jimmi Dyson ec04ba38a2 Kubernetes SD config check 2015-09-09 13:24:44 +01:00
Fabian Reinartz 58c32f84ce Merge pull request #1055 from fabric8io/kubernetes-discovery 
Move TLS options to scrape config
 2015-09-09 11:24:29 +02:00
Jimmi Dyson a1574aa2b3 Move TLS options to scrape config 
Fixes #1013, fixes #989
 2015-09-09 09:52:21 +01:00
Julius Volz ffc5142c54 Merge pull request #1058 from prometheus/check-errors 
Fix error checking and logging around checkpointing.
 2015-09-07 19:57:16 +02:00
Julius Volz 6774a73878 Fix error checking and logging around checkpointing. 2015-09-07 19:34:59 +02:00
Julius Volz 011faf9057 Fix typo in comment. 2015-09-07 19:15:28 +02:00
Fabian Reinartz 09c353c272 Change mail address 2015-09-07 15:12:42 +02:00
Fabian Reinartz e298463fd6 Merge pull request #1053 from prometheus/diag 
Update architecture diagram
 2015-09-07 15:08:14 +02:00
Fabian Reinartz 1a3ee28cd2 Point README to new architecture diagram 2015-09-07 15:07:47 +02:00
Fabian Reinartz e761f0d664 Update architecture diagram 2015-09-07 14:11:28 +02:00
Fabian Reinartz 1ef5ed0cf2 Merge pull request #1048 from xperimental/fix/marathon-config 
Fix parsing Marathon SD config
 2015-09-06 20:09:46 +02:00
Robert Jacob eb7416e71f Fix missing unmarshal for Marathon SD config. 2015-09-06 20:02:22 +02:00
Julius Volz b7b7b2e883 Merge pull request #1050 from fabric8io/kubernetes-discovery 
Kubernetes SD improvements
 2015-09-04 14:58:11 +02:00
Jimmi Dyson d7a7fd4589 Kubernetes SD improvements 
* Support multiple masters with retries against each master as required.
* Scrape masters' metrics.
* Add role meta label for node/service/master to make it easier for relabeling.
 2015-09-04 11:31:20 +01:00
Fabian Reinartz d839980fcb Merge pull request #1051 from prometheus/globallabels 
Change global label handling
 2015-09-03 16:52:59 +02:00
Fabian Reinartz 8fa719f778 Attach global labels to remote storage samples 2015-09-03 16:38:04 +02:00
Fabian Reinartz 5fed076a76 Attach global labels to outgoing alerts. 2015-09-03 16:38:04 +02:00
Fabian Reinartz 9bbd9264e2 Add global labels to federation 2015-09-03 16:38:03 +02:00
Brian Brazil 9ec11b1847 Merge pull request #1049 from prometheus/bool-nofilter 
promql: Add 'bool' modifier to comparison functions
 2015-09-03 15:08:38 +01:00
Fabian Reinartz bc89b98a7d Merge branch 'master' of github.com:prometheus/prometheus 2015-09-03 14:22:16 +02:00
Fabian Reinartz e3d809024c Change email address 2015-09-03 14:19:26 +02:00
Fabian Reinartz cc1a2a2061 Remove attachment of global labels upon ingestion 2015-09-03 14:16:23 +02:00
Fabian Reinartz e2b979868b Merge pull request #1047 from swsnider/upstreamed 
Add an exported counter to track configuration reloads
 2015-09-02 19:16:26 +02:00
Silas Snider b2cb637f97 Add instrumentation around configuration reloads. 
This commit enables automation (and alerting) around attempts to update prometheus
server configuration automatically.
 2015-09-02 10:08:51 -07:00
Brian Brazil 29e8dc2c49 promql: Add 'bool' modifier to comparison functions 
When doing comparison operations on vectors, filtering
sometimes gets in the way and you have to go to a fair bit of
effort to workaround it in order to always return a result.
The 'bool' modifier instead of filtering returns 0/1 depending
on the result of the compairson.

This is also a prerequisite to removing plain scalar/scalar comparisons,
as it maintains the current behaviour under a new syntax.
 2015-09-02 14:51:44 +01:00
Fabian Reinartz 4459265739 Merge branch 'master' of github.com:prometheus/prometheus 2015-09-01 18:06:40 +02:00
Fabian Reinartz ebf417a282 Fix map initialization 2015-09-01 18:06:22 +02:00
Julius Volz 58780a8c79 Merge pull request #1045 from prometheus/anchored-label-replace 
Change relabel_replace() to do full-string matches.
 2015-09-01 17:50:36 +02:00
Julius Volz 4c90168130 Merge pull request #1044 from prometheus/config-anchored-regexes 
Change config regexes to full-string matches.
 2015-09-01 17:14:23 +02:00
Julius Volz 61c42c8da0 Change relabel_replace() to do full-string matches. 
THIS IS A BREAKING CHANGE.

Fixes part of https://github.com/prometheus/prometheus/issues/996
 2015-09-01 15:49:28 +02:00
Julius Volz f63a899744 Change config regexes to full-string matches. 
This anchors all regular expressions entered via the config to match a
full string vs. a substring.

THIS IS A BREAKING CHANGE!

Fixes part of https://github.com/prometheus/prometheus/issues/996
 2015-09-01 15:46:41 +02:00
Julius Volz dfbda8fd3f Merge pull request #1041 from Dieterbe/fix-fanout-comment 
fix comment.
 2015-08-31 12:28:51 +02:00
Dieter Plaetinck e1dacc56e6 fix comment. 
the sample doesn't get appended to the list of sampleappenders.
 2015-08-30 16:26:46 +02:00
Fabian Reinartz bfdd474202 Merge pull request #1040 from prometheus/fixfilesd 
Fix draining of file watcher events
 2015-08-28 15:53:24 +02:00
Fabian Reinartz 542da6774e Fix draining of file watcher events 2015-08-28 12:17:22 +02:00
Fabian Reinartz facf60e033 Merge pull request #1033 from dln/serverset-shard 
serverset discovery: extract shard number from serverset data
 2015-08-27 16:42:10 +02:00
Daniel Lundin 4abf54b747 serverset: extract shard number from serverset data 2015-08-27 16:26:00 +02:00
Brian Brazil 4d196fea6b Merge pull request #1032 from prometheus/scalar-metric 
rules: Allow for setting labels on LHS on scalars
 2015-08-26 16:56:16 +01:00
Brian Brazil 3bcdb2bbba rules: Allow for setting labels on LHS on scalars 2015-08-26 16:54:28 +01:00
Julius Volz 9bca70710b Merge pull request #1034 from prometheus/fix-pprof 
Add POST handler for /debug to fix CPU profiling.
 2015-08-26 17:47:01 +02:00
Julius Volz da2499d5a5 Add POST handler for /debug to fix CPU profiling. 
`go tool pprof` sends a POST request to enable CPU profiling, so we also
need to handle that method.
 2015-08-26 17:42:25 +02:00
Julius Volz 29eaa8c7cf Merge pull request #1030 from prometheus/fix-flakey-filesd 
Fix flakey FileSD test.
 2015-08-26 13:25:00 +02:00
Julius Volz 3fd5826589 Fix flakey FileSD test. 
When the test ends, all files matching the watcher's glob are removed
via defer. In that moment, the draining goroutine may still be running
and then detect no files matching the configured glob just before the
test exits.

This is now solved by waiting for the draining goroutine to finish
before leaving the test function and thus causing the deferred file
removal.
 2015-08-26 13:06:34 +02:00
Julius Volz 744d5d5a7a Merge pull request #1029 from prometheus/vet-fixes 
Fix "go vet" errors.
 2015-08-26 12:50:18 +02:00
Julius Volz 78f5a93ea6 Merge pull request #1028 from prometheus/lint-fixes 
Fix most golint warnings.
 2015-08-26 12:50:03 +02:00
Julius Volz 995d3b831d Fix most golint warnings. 
This is with `golint -min_confidence=0.5`.

I left several lint warnings untouched because they were either
incorrect or I felt it was better not to change them at the moment.
 2015-08-26 12:44:46 +02:00