mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-10 23:54:05 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
2062 commits 246 branches 436 tags 652 MiB
Commit graph

2062 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz 4234a45d2e Merge pull request #693 from prometheus/fabxc/preload_timeout 
Check context before each preloading.
 2015-05-12 12:25:22 +02:00
Fabian Reinartz 8ea94ebb58 Check context before each preloading. 2015-05-12 12:03:30 +02:00
Fabian Reinartz 1f2209b159 Merge pull request #680 from prometheus/fabxc/sd_yamlcfg 
Switch config to YAML format.
 2015-05-11 18:20:29 +02:00
Fabian Reinartz 86087120dd Replace example config with new YAML format. 2015-05-11 18:14:07 +02:00
Björn Rabenstein 921f4f22ca Merge pull request #690 from prometheus/beorn7/release 
Cut 0.13.3.
 2015-05-11 18:09:58 +02:00
beorn7 43b41c56ce Cut 0.13.3. 2015-05-11 18:05:31 +02:00
Björn Rabenstein 2e8a50649b Merge pull request #682 from prometheus/beorn7/fingerprint 
The desperately awaited collision detection.
 2015-05-11 17:15:43 +02:00
beorn7 d1a93655a1 Fix typo. 2015-05-11 17:15:30 +02:00
Julius Volz 9fe533e433 Merge pull request #688 from prometheus/fabxc/qltest 
Make parser more strict about identifiers, extract number parsing
 2015-05-11 12:25:33 +02:00
Fabian Reinartz 969c231191 Make parser more strict about identifiers, extract number parsing 2015-05-11 11:45:23 +02:00
Fabian Reinartz 870ad3e32e Merge pull request #687 from prometheus/fabxc/tmpl_query 
Do implicit conversion in template queries.
 2015-05-11 09:39:19 +02:00
Fabian Reinartz e04d05d8b3 Do implicit conversion in template queries. 2015-05-11 09:12:28 +02:00
beorn7 7c6466d476 Reserve only ~1M FPs for the mapping. 
That reduces the chance of having a fingerprint in the reserved area.
 2015-05-08 18:10:56 +02:00
Julius Volz 1b3d3b4d5c Merge pull request #685 from prometheus/fabxc/quptes 
Fix single quote parsing, add tests
 2015-05-08 16:49:53 +02:00
Fabian Reinartz 8707c54508 Fix single quote parsing, add tests 2015-05-08 16:43:02 +02:00
beorn7 ac75dc2812 Avoid archive lookup for known mapped FPs. 2015-05-08 16:39:26 +02:00
beorn7 ed810b45bf Improvements after review. 2015-05-08 13:35:39 +02:00
beorn7 c36e0e05f1 Add crash recovery of fingerprint mappings. 2015-05-07 18:58:14 +02:00
beorn7 2235cec175 Handle fingerprint collisions. 2015-05-07 18:17:59 +02:00
Fabian Reinartz 5fbde88919 Switch config to YAML format. 2015-05-07 16:52:14 +02:00
Julius Volz b404ad5c91 Merge pull request #678 from prometheus/remove-rules-target 
Remove obsolete "rules" target from main Makefile.
 2015-05-07 12:28:25 +02:00
Julius Volz 0dc8f3cb04 Remove obsolete "rules" target from main Makefile. 2015-05-07 11:59:06 +02:00
Julius Volz 2579606e77 Merge pull request #676 from prometheus/fabxc/promql 
Query/rules refactoring
 2015-05-07 11:39:26 +02:00
Fabian Reinartz 66ecc420ef Add gopkg.in/yaml.v2 godep. 2015-05-07 11:07:04 +02:00
Fabian Reinartz 1dd0b772cb Fix missing Godep entry. 2015-05-06 13:21:44 +02:00
Fabian Reinartz eeca323d24 Merge branch 'master' into promql 2015-05-06 13:04:54 +02:00
Björn Rabenstein 498b85f05f Merge pull request #673 from prometheus/beorn7/fingerprint 
Use FastFingerprint where appropriate.
 2015-05-06 12:24:06 +02:00
beorn7 bb141fd3db Updated vendoring. 
This pulls in the required changes in client_golang.
 2015-05-06 12:14:05 +02:00
beorn7 9820e5fe99 Use FastFingerprint where appropriate. 2015-05-06 12:00:58 +02:00
Fabian Reinartz b365947bc4 Merge pull request #666 from prometheus/fabxc/pql/gate 
Limit maximum number of concurrent queries.
 2015-05-06 11:36:33 +02:00
Fabian Reinartz 9ab1f6c690 Limit maximum number of concurrent queries. 
A high number of concurrent queries can slow each other down
so that none of them is reasonbly responsive. This commit limits
the number of queries being concurrently executed.
 2015-05-06 11:34:17 +02:00
Julius Volz f4d90a105e Merge pull request #672 from prometheus/release-0.13.2 
Release 0.13.2
 2015-05-06 11:11:07 +02:00
Johannes 'fish' Ziemke 36023ed213 Cut 0.13.2 2015-05-06 11:08:58 +02:00
Julius Volz 874ff194c4 Merge pull request #671 from prometheus/add-rule-checker-to-archive 
Include tools/rule_checker/rule_checker in tarball
 2015-05-06 10:27:17 +02:00
Johannes 'fish' Ziemke e020b91603 Merge pull request #669 from prometheus/fabxc/sd_warn 
Add warning about config changes.
 2015-05-05 19:10:36 +02:00
Johannes 'fish' Ziemke ab3e08e070 Add rule_checker and console templates to archive 2015-05-05 18:40:51 +02:00
Fabian Reinartz 8f75ff0513 Add warning about config changes. 2015-05-05 15:17:55 +02:00
Fabian Reinartz d59d1cb2c1 Fix Error() methods. 2015-05-01 17:58:58 +02:00
Julius Volz d108366cd6 Merge pull request #662 from prometheus/fabxc/sd_cfg 
Cleanup, test, and document config.
 2015-04-30 23:58:10 +02:00
Fabian Reinartz b8fa0a9f8d Merge pull request #665 from chkno/master 
Fix storage/local tests for 32-bit systems
 2015-04-30 23:54:09 +02:00
Scott Worley e5f92d35fe Fix storage/local tests for 32-bit systems 2015-04-30 14:19:48 -07:00
Julius Volz 44d2f7c9ba Merge pull request #664 from fabxc/gitignore 
Add *.rules to ignored files.
 2015-04-30 21:50:17 +02:00
Fabian Reinartz 049b8eaafb Add *.rules to ignored files. 2015-04-30 21:40:27 +02:00
Fabian Reinartz b5a8f7b8fa Cleanup, test, and document config. 2015-04-30 21:17:19 +02:00
Fabian Reinartz cb35b7d0e7 Merge pull request #657 from prometheus/fabxc/sd_relabel 
Add relabelling to target management.
 2015-04-30 19:43:15 +02:00
Fabian Reinartz 945c49a2dd Add relabelling to target management. 
This commit adds a relabelling stage on the set of base
labels from which a target is created. It allows to drop
targets and rewrite any regular or internal label.
 2015-04-30 18:46:33 +02:00
Fabian Reinartz 6649306e63 Merge pull request #660 from prometheus/fabxc/pql/parse-errs 
Fix and improve parsing error output.
 2015-04-30 13:31:13 +02:00
Fabian Reinartz 279831cdf1 Fix and improve parsing error output. 2015-04-30 12:19:39 +02:00
Julius Volz adba3b4daa Merge pull request #661 from prometheus/fabxc/pql/rule-stmts 
Stop routing rule statements through the engine.
 2015-04-29 22:55:53 +02:00
Fabian Reinartz fe935179cd Stop routing rule statements through the engine. 2015-04-29 18:01:43 +02:00