183c5749b9
config: add Alertmanager configuration
2016-11-23 18:23:37 +01:00
200bbe1bad
config: extract SD and HTTPClient configurations
2016-11-23 18:23:37 +01:00
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
aabf4a419b
use LabelNam.IsValid() instead of LabelNameRE and MatchString instead of Match
2016-10-19 16:30:52 +03:00
f867c1fd58
formating and text fixes, adjust regexp
2016-10-19 13:31:55 +03:00
56907ba6e3
Add interpolation to good test config. Fix regex
2016-10-19 01:19:19 +03:00
7a36af1c85
add comment about interpolation
2016-10-19 00:42:49 +03:00
3b8e7c1277
Merge branch 'master' of https://github.com/prometheus/prometheus into bug/target_label_unmarshal
2016-10-19 00:33:52 +03:00
5a1e909b5d
Make TargetLabel in RelabelConfig a string
2016-10-19 00:33:22 +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
1b6dfa32a9
config: rename role 'endpoint' to 'endpoints'
2016-10-17 11:53:49 +02:00
b24602f713
kubernetes: merge back into single configuration
2016-10-17 10:32:10 +02:00
2331701b50
kubernetes: Add K8S v2 pod discovery
...
This adds plumbing for a parallel version of the new K8S SD
and adds pod discovery as the first role.
2016-10-17 10:32:10 +02:00
72cbf8af6f
Fix small copy and paste error
2016-10-08 08:49:00 +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
4520e12440
Add HTTP Basic Auth & TLS support to the generic write path. ( #1957 )
...
* Add config, HTTP Basic Auth and TLS support to the generic write path.
- Move generic write path configuration to the config file
- Factor out config.TLSConfig -> tlf.Config translation
- Support TLSConfig for generic remote storage
- Rename Run to Start, and make it non-blocking.
- Dedupe code in httputil for TLS config.
- Make remote queue metrics global.
2016-09-19 22:47:51 +02:00
874cb44bb6
Merge pull request #1996 from ton31337/Fix/allow_numbers_as_first_letter
...
Allow number to be the first letter as well for `job_name`
2016-09-16 11:08:52 -04:00
1aa8898b66
Allow number to be the first letter as well for `job_name`
2016-09-16 14:06:47 +03:00
3b546d061f
Add support for GCE discovery
2016-09-16 08:55:33 +02: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
be596f82b4
Merge pull request #1783 from knyar/json
...
Allow URLs in targets defined via a JSON file
2016-08-10 09:42:17 +02:00
b655aa002f
introduce top level alerting config node
2016-08-09 14:19:25 +02:00
679d225c8d
allow relabeling of alerts
...
in case of dropping don't even enqueue them
2016-08-09 14:18:31 +02:00
7a0b3af0b7
config: validate Kubernetes role correctly.
2016-07-18 22:24:41 +09:00
919558f601
config: remove deprecated `target_groups` configuration
2016-07-14 09:55:00 +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
772a3af38f
Allow URLs in targets defined via a JSON file
...
This enables defining `blackbox_exporter` targets (which can be URLs,
because of relabeling) in a JSON file.
Not sure if this is the best approach, but current behaviour is
inconsistent (`UnmarshalYAML` does not have this check) and breaks
officially documented way to use `blackbox_exporter`.
2016-07-04 00:05:57 +03:00
98c156c361
reorder config validation, move checkOverflow before any other validation
2016-06-13 10:02:20 +07: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
7997c14b0d
Add ServerName into TLS Config
2016-05-26 14:24:49 -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
37c709f917
Fix global config YAML issues
2016-02-15 14:08:25 +01:00
44a5e860ed
Fix scrape timeout config checks
2016-02-15 12:07:46 +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
f2a8261cdb
Merge pull request #1177 from fabric8io/kubernetes-discovery
...
Kubernetes SD authentication options cleanup
2015-10-24 20:32:25 +02:00
180da1ba65
Add overflow check in TLS config
2015-10-24 17:12:34 +02:00
Fabian Reinartz
Kraig Amador
beorn7
Brian Brazil
bekbulatov
Matti Savolainen
Matti Savolainen
Björn Rabenstein
Dominik Schulz
Brian Brazil
Tom Wilkie
Tobias Schmidt
Donatas Abraitis
Ingo Gottwald
Alexey Miroshkin
Frederic Branczyk
Anton Tolchanov
Ali Reza
Jimmi Dyson
Gregory G. Tseng
Seth Miller
Julien Dehee