ec66082749
Merge branch 'ec2_sd_profile_support' of https://github.com/Ticketmaster/prometheus into Ticketmaster-ec2_sd_profile_support
2016-11-21 11:49:23 +01:00
bec6870ed4
ec2_sd_configs: Support profiles for configuring the ec2 service
2016-11-03 08:38:02 -07:00
b2f28a9e82
Merge branch 'release-1.2'
2016-11-03 14:42:15 +01:00
d1ece12c70
Handle null Regex in the config as the empty regex. ( #2150 )
2016-11-03 13:34:15 +00:00
2bc12fa2fb
Set timeout for marathon_sd
2016-10-24 11:27:08 +01:00
c689b35858
Merge branch 'master' into marathon_tls
2016-10-24 10:37:32 +01:00
ec6524ce74
test the labelTarget regex to make sure it properly validates pre-interpolated label names.
2016-10-19 13:32:42 +03:00
56907ba6e3
Add interpolation to good test config. Fix regex
2016-10-19 01:19:19 +03:00
d93f73874f
Merge pull request #2093 from dominikschulz/spelling
...
Trivial spelling corrections
2016-10-18 22:46:03 +02:00
182e17958a
Trivial spelling corrections and a small comment.
2016-10-18 20:14:38 +02:00
ac702f66eb
Resolve merge conflicts
2016-10-18 14:14:24 +01:00
2e18c81a00
config: adapt unit tests
2016-10-17 10:32:10 +02:00
01b53c1180
Add tls support
2016-10-07 13:40:22 +01:00
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
1aa8898b66
Allow number to be the first letter as well for `job_name`
2016-09-16 14:06:47 +03:00
e29d9394e5
Forbid invalid relabel configurations
...
This fix adds check if target_label value is set in case if action is replace or
hashmod
Issue [#1900 ]
2016-08-29 16:56:06 +02:00
7a0b3af0b7
config: validate Kubernetes role correctly.
2016-07-18 22:24:41 +09:00
7221228843
discovery/kubernetes: select between discovery role
...
This adds `role` field to the Kubernetes SD config, which indicates
which type of Kubernetes SD should be run.
This no longer allows discovering pods and nodes with the same SD
configuration for example.
2016-07-05 14:22:12 +02:00
0f21bd31ca
config: deprecate `target_groups` for `static_configs`
...
This change deprecates the `target_groups` option in favor
of `static_configs`. The old configuration is still accepted
but prints a warning.
Configuration loading errors if both options are set.
2016-06-08 15:55:25 +02:00
206bcfcdaa
Kubernetes SD: Remove kubeletPort config option
2016-06-07 12:34:55 +01:00
c81b4e8a87
change config names to files for consistency
2016-05-30 07:47:58 +07:00
0988e3b937
Add support for Azure discovery
...
This change adds the ability to do target discovery with Microsoft's Azure platform.
2016-04-06 22:47:02 -05:00
829a029dda
Update two more __meta_dns_srv_name references.
...
Although they are only in examples/tests and don't affect anything, they
could be confusing (the label has been renamed in the rest of the code a
while ago).
2016-02-14 22:20:39 +01:00
e26e4b6e89
Restrict scrape timeout to interval length
2016-02-12 12:52:22 +01:00
a7408bfb47
Unify duration parsing
...
It's actually happening in several places (and for flags, we use the
standard Go time.Duration...). This at least reduces all our
home-grown parsing to one place (in model).
2016-01-29 15:41:50 +01:00
061fe2f364
Support AirBnB's Smartstack Nerve client for SD
...
nerve's registration format differs from serverset. With this commit
there is now a dedicated treecache file in util,
and two separate files for serverset and nerve.
Reference:
https://github.com/airbnb/nerve
2016-01-18 14:07:28 +01:00
4d1c9296d5
Add new defaults for relabel configurations
2015-11-16 13:16:13 +01:00
fd2bd81cd8
Allow all instance labels in target groups
...
With the blackbox exporter, the instance label will commonly
be used for things other than hostnames so remove this restriction.
https://example.com or https://example.com/probe/me are some examples.
To prevent user error, check that urls aren't provided as targets
when there's no relabelling that could potentically fix them.
2015-11-07 14:35:20 +00:00
87940ec213
Kubernetes SD: Rename `masters` to `api_servers` in config
2015-10-24 14:41:14 +01:00
7ff5cc66ea
Kubernetes SD authentication options cleanup
2015-10-23 16:47:52 +01:00
1ddf75240d
config: Don't hide username, it's not secret.
...
Usernames are not generally considered to be secrets,
and treating them as secrets may lead to confusion
as to how secure they are. Obscuring them also makes
debugging harder.
2015-10-08 15:13:21 +01:00
dcb4856d72
Add SD for Amazon EC2 instances
2015-10-06 18:36:17 -04:00
dac26cef71
Rename global "labels" config option to "external_labels".
2015-09-29 20:54:20 +02:00
0e99fa6c46
Allow labelmap action
2015-09-21 15:41:19 -04:00
a1574aa2b3
Move TLS options to scrape config
...
Fixes #1013 , fixes #989
2015-09-09 09:52:21 +01:00
1ef5ed0cf2
Merge pull request #1048 from xperimental/fix/marathon-config
...
Fix parsing Marathon SD config
2015-09-06 20:09:46 +02:00
eb7416e71f
Fix missing unmarshal for Marathon SD config.
2015-09-06 20:02:22 +02:00
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
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
438e232c9b
Fix grouping of import blocks
2015-08-22 09:42:45 +02:00
306e8468a0
Switch from client_golang/model to common/model
2015-08-21 13:33:38 +02:00
ac0be60bb9
Add license headers
2015-08-20 13:03:56 +02:00
139f27bf8a
Increase default retry interval for file SD
...
The automatic refresh is a safety mechanism in case
file watches fail. As they seem to be working well the
interval can be increased.
2015-08-16 15:06:26 +02:00
b964da4b75
Merge pull request #905 from fabric8io/kubernetes-discovery
...
Kubernetes discovery
2015-08-13 15:08:32 +02:00
43449b0581
config: Update tests/examples to use __tmp_
2015-08-13 10:39:21 +01:00
923f8111d4
Initial Kubernetes discovery
...
Fixes #904
2015-08-13 10:38:52 +01:00
73f1cc807d
Check token and cert file existence in promtool
2015-08-10 11:42:29 +02:00
7a67472fc1
Resolve relative paths on configuration loading
...
This moves the concern of resolving the files relative to the config
file into the configuration loading itself.
It also fixes #921 which did not load the cert and token files relatively.
2015-08-05 18:08:04 +02:00
52cf6b3e6e
Configuration options for bearer tokens, client certs & CA certs
...
Fixes #918 , fixes #917
2015-08-04 17:18:46 +01:00
9ab340e95e
Add support for A record based DNS SD
...
If using A records, the user needs to specify "port" and set "type" to
"A".
2015-07-30 15:55:38 +02:00
Fabian Reinartz
Kraig Amador
beorn7
Brian Brazil
bekbulatov
Matti Savolainen
Matti Savolainen
Björn Rabenstein
Dominik Schulz
Frederic Branczyk
Brian Brazil
Donatas Abraitis
Alexey Miroshkin
Jimmi Dyson
Ali Reza
Seth Miller
Julius Volz
Julien Dehee
Matt Jibson
Robert Jacob
Johannes 'fish' Ziemke