3b21c7037a
Add file SD to configuration.
2015-05-15 14:44:54 +02:00
d5aa012fd0
Make HTTP basic auth configurable for scrape targets.
2015-05-15 12:47:50 +02:00
92493603c4
Merge pull request #694 from prometheus/fabxc/cfg_reload
...
Implement config reloading on SIGHUP
2015-05-13 23:04:35 +02:00
bb540fd9fd
Implement config reloading on SIGHUP.
...
With this commit, sending SIGHUP to the Prometheus process will reload
and apply the configuration file. The different components attempt
to handle failing changes gracefully.
2015-05-13 16:49:46 +02:00
3b0777ff84
Merge branch 'master' into fabxc/servdisc
2015-05-12 15:46:16 +02:00
4234a45d2e
Merge pull request #693 from prometheus/fabxc/preload_timeout
...
Check context before each preloading.
2015-05-12 12:25:22 +02:00
8ea94ebb58
Check context before each preloading.
2015-05-12 12:03:30 +02:00
1f2209b159
Merge pull request #680 from prometheus/fabxc/sd_yamlcfg
...
Switch config to YAML format.
2015-05-11 18:20:29 +02:00
86087120dd
Replace example config with new YAML format.
2015-05-11 18:14:07 +02:00
921f4f22ca
Merge pull request #690 from prometheus/beorn7/release
...
Cut 0.13.3.
2015-05-11 18:09:58 +02:00
43b41c56ce
Cut 0.13.3.
2015-05-11 18:05:31 +02:00
2e8a50649b
Merge pull request #682 from prometheus/beorn7/fingerprint
...
The desperately awaited collision detection.
2015-05-11 17:15:43 +02:00
d1a93655a1
Fix typo.
2015-05-11 17:15:30 +02:00
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
969c231191
Make parser more strict about identifiers, extract number parsing
2015-05-11 11:45:23 +02:00
870ad3e32e
Merge pull request #687 from prometheus/fabxc/tmpl_query
...
Do implicit conversion in template queries.
2015-05-11 09:39:19 +02:00
e04d05d8b3
Do implicit conversion in template queries.
2015-05-11 09:12:28 +02:00
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
1b3d3b4d5c
Merge pull request #685 from prometheus/fabxc/quptes
...
Fix single quote parsing, add tests
2015-05-08 16:49:53 +02:00
8707c54508
Fix single quote parsing, add tests
2015-05-08 16:43:02 +02:00
ac75dc2812
Avoid archive lookup for known mapped FPs.
2015-05-08 16:39:26 +02:00
ed810b45bf
Improvements after review.
2015-05-08 13:35:39 +02:00
c36e0e05f1
Add crash recovery of fingerprint mappings.
2015-05-07 18:58:14 +02:00
2235cec175
Handle fingerprint collisions.
2015-05-07 18:17:59 +02:00
5fbde88919
Switch config to YAML format.
2015-05-07 16:52:14 +02:00
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
0dc8f3cb04
Remove obsolete "rules" target from main Makefile.
2015-05-07 11:59:06 +02:00
2579606e77
Merge pull request #676 from prometheus/fabxc/promql
...
Query/rules refactoring
2015-05-07 11:39:26 +02:00
66ecc420ef
Add gopkg.in/yaml.v2 godep.
2015-05-07 11:07:04 +02:00
1dd0b772cb
Fix missing Godep entry.
2015-05-06 13:21:44 +02:00
eeca323d24
Merge branch 'master' into promql
2015-05-06 13:04:54 +02:00
498b85f05f
Merge pull request #673 from prometheus/beorn7/fingerprint
...
Use FastFingerprint where appropriate.
2015-05-06 12:24:06 +02:00
bb141fd3db
Updated vendoring.
...
This pulls in the required changes in client_golang.
2015-05-06 12:14:05 +02:00
9820e5fe99
Use FastFingerprint where appropriate.
2015-05-06 12:00:58 +02:00
b365947bc4
Merge pull request #666 from prometheus/fabxc/pql/gate
...
Limit maximum number of concurrent queries.
2015-05-06 11:36:33 +02:00
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
f4d90a105e
Merge pull request #672 from prometheus/release-0.13.2
...
Release 0.13.2
2015-05-06 11:11:07 +02:00
36023ed213
Cut 0.13.2
2015-05-06 11:08:58 +02:00
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
e020b91603
Merge pull request #669 from prometheus/fabxc/sd_warn
...
Add warning about config changes.
2015-05-05 19:10:36 +02:00
ab3e08e070
Add rule_checker and console templates to archive
2015-05-05 18:40:51 +02:00
8f75ff0513
Add warning about config changes.
2015-05-05 15:17:55 +02:00
d59d1cb2c1
Fix Error() methods.
2015-05-01 17:58:58 +02:00
d108366cd6
Merge pull request #662 from prometheus/fabxc/sd_cfg
...
Cleanup, test, and document config.
2015-04-30 23:58:10 +02:00
b8fa0a9f8d
Merge pull request #665 from chkno/master
...
Fix storage/local tests for 32-bit systems
2015-04-30 23:54:09 +02:00
e5f92d35fe
Fix storage/local tests for 32-bit systems
2015-04-30 14:19:48 -07:00
44d2f7c9ba
Merge pull request #664 from fabxc/gitignore
...
Add *.rules to ignored files.
2015-04-30 21:50:17 +02:00
049b8eaafb
Add *.rules to ignored files.
2015-04-30 21:40:27 +02:00
b5a8f7b8fa
Cleanup, test, and document config.
2015-04-30 21:17:19 +02:00
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
Björn Rabenstein
beorn7
Julius Volz
Johannes 'fish' Ziemke
Scott Worley