Fabian Reinartz
ea62fce5f1
Merge pull request #705 from prometheus/fabxc/file_label
...
Attach __meta_filepath label to file SD targets.
2015-05-20 11:28:30 +02:00
Fabian Reinartz
a703241bf8
Adjust example config to naming changes
2015-05-19 18:12:58 +02:00
Fabian Reinartz
a216b1cb27
Merge pull request #704 from prometheus/fabxc/cfg_check
...
Clean storage shutdown on startup errors, require initial config
2015-05-19 16:50:05 +02:00
Fabian Reinartz
ff832d2e03
Attach __meta_filepath label to file SD targets.
2015-05-19 15:49:38 +02:00
Fabian Reinartz
ec9c51ab98
Fix old template naming
2015-05-19 15:40:41 +02:00
Fabian Reinartz
5d3024fd3e
Restructure component initialization
2015-05-19 14:41:47 +02:00
Fabian Reinartz
d8440d75f1
Do not start storage processing before Start() is called.
2015-05-19 13:51:45 +02:00
Fabian Reinartz
198c68045d
Merge pull request #703 from prometheus/fabxc/testtime
...
Increase target test wait times
2015-05-19 12:15:36 +02:00
Fabian Reinartz
8de50619f1
Increase target test wait times
...
On slow systems such as Travis CI occasionally the tests fail
because the wait times are too short.
2015-05-19 12:06:52 +02:00
Fabian Reinartz
2843ff6a0d
Merge pull request #701 from prometheus/fabxc/decouple
...
Avoid inter-component blocking if ingestion/scraping blocks
2015-05-19 10:19:05 +02:00
Fabian Reinartz
385919a65a
Avoid inter-component blocking if ingestion/scraping blocks.
...
Appending to the storage can block for a long time. Timing out
scrapes can also cause longer blocks. This commit avoids that those
blocks affect other compnents than the target itself.
Also the Target interface was removed.
2015-05-18 17:58:51 +02:00
Fabian Reinartz
1a2d57b45c
Move template functionality out of target.
...
The target implementation and interface contain methods only serving a
specific purpose of the templates. They were moved to the template
as they operate on more fundamental target data.
2015-05-18 13:35:43 +02:00
Fabian Reinartz
dbc08d390e
Move target status data into its own object
2015-05-18 11:15:42 +02:00
Fabian Reinartz
9ca47869ed
Provide full SD configs to discovery constructors.
...
Some SD configs may have many options. To be readable and consistent, make
all discovery constructors receive the full config rather than the separate
arguments.
2015-05-15 14:54:29 +02:00
Fabian Reinartz
93548a8882
Add initial file based service discovery.
...
This commits adds file based service discovery which reads target
groups from specified files. It detects changes based on file watches
and regular refreshes.
2015-05-15 14:44:54 +02:00
Fabian Reinartz
36016cb308
Add fsnotify to godeps.
2015-05-15 14:44:54 +02:00
Fabian Reinartz
3b21c7037a
Add file SD to configuration.
2015-05-15 14:44:54 +02:00
Fabian Reinartz
d5aa012fd0
Make HTTP basic auth configurable for scrape targets.
2015-05-15 12:47:50 +02:00
Fabian Reinartz
92493603c4
Merge pull request #694 from prometheus/fabxc/cfg_reload
...
Implement config reloading on SIGHUP
2015-05-13 23:04:35 +02:00
Fabian Reinartz
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
Fabian Reinartz
3b0777ff84
Merge branch 'master' into fabxc/servdisc
2015-05-12 15:46:16 +02:00
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
