RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-27 17:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,294 Commits 243 Branches 444 Tags 653 MiB
dcb4856d72
Commit Graph

102 Commits

Author SHA1 Message Date
Matt Jibson
dcb4856d72 Add SD for Amazon EC2 instances 2015-10-06 18:36:17 -04:00
Julius Volz
dac26cef71 Rename global "labels" config option to "external_labels". 2015-09-29 20:54:20 +02:00
Matt Jibson
0e99fa6c46 Allow labelmap action 2015-09-21 15:41:19 -04:00
Jimmi Dyson
ec04ba38a2 Kubernetes SD config check 2015-09-09 13:24:44 +01:00
Jimmi Dyson
a1574aa2b3 Move TLS options to scrape config 
Fixes #1013, fixes #989
 2015-09-09 09:52:21 +01:00
Fabian Reinartz
1ef5ed0cf2 Merge pull request #1048 from xperimental/fix/marathon-config 
Fix parsing Marathon SD config
 2015-09-06 20:09:46 +02:00
Robert Jacob
eb7416e71f Fix missing unmarshal for Marathon SD config. 2015-09-06 20:02:22 +02:00
Jimmi Dyson
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
Julius Volz
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
Julius Volz
995d3b831d Fix most golint warnings. 
This is with `golint -min_confidence=0.5`.

I left several lint warnings untouched because they were either
incorrect or I felt it was better not to change them at the moment.
 2015-08-26 12:44:46 +02:00
Fabian Reinartz
438e232c9b Fix grouping of import blocks 2015-08-22 09:42:45 +02:00
Fabian Reinartz
306e8468a0 Switch from client_golang/model to common/model 2015-08-21 13:33:38 +02:00
Fabian Reinartz
ac0be60bb9 Add license headers 2015-08-20 13:03:56 +02:00
Fabian Reinartz
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
Fabian Reinartz
3c6dd161d7 Scrape all services on empty services list. 2015-08-14 17:39:41 +02:00
Fabian Reinartz
b964da4b75 Merge pull request #905 from fabric8io/kubernetes-discovery 
Kubernetes discovery
 2015-08-13 15:08:32 +02:00
Fabian Reinartz
24e91720ad Merge pull request #980 from prometheus/map-labels 
Retrieval: Add relabel action to map labels names with a regex.
 2015-08-13 14:36:59 +02:00
Brian Brazil
4e70a0a14e Retrieval: Add relabel action to map label names with a regex. 
The intended use case is where a user has tags/labels coming
from metadata in Kubernetes or EC2, and wants to make
some subset of them into target labels.
 2015-08-13 13:19:11 +01:00
Brian Brazil
43449b0581 config: Update tests/examples to use __tmp_ 2015-08-13 10:39:21 +01:00
Jimmi Dyson
923f8111d4 Initial Kubernetes discovery 
Fixes #904
 2015-08-13 10:38:52 +01:00
Fabian Reinartz
cdcfada2ac Merge pull request #965 from prometheus/fabxc/relpath 
Resolve relative paths on configuration loading
 2015-08-10 19:43:42 +02:00
Fabian Reinartz
73f1cc807d Check token and cert file existence in promtool 2015-08-10 11:42:29 +02:00
Fabian Reinartz
54202bc5a8 Merge pull request #902 from xperimental/feature/marathon-discovery 
retrieval/discovery: Service discovery using marathon API
 2015-08-10 01:43:37 +02:00
Robert Jacob
4d0f974c42 Add service discovery using Marathon API. 2015-08-10 01:36:24 +02:00
Will Rouesnel
7810448dbe Add proxy_url parameter to allow specifying per-job HTTP proxy servers 
Allow scrape_configs to have an optional proxy_url option which specifies
a proxy to be used for all connections to hosts in that config.

Internally this modifies the various client functions to take a *url.URL pointer
which currently must point to an HTTP proxy (but has been left open-ended to
allow the url format to be extended to support others, such as maybe SOCKS if
needed).
 2015-08-08 04:29:27 +10:00
Fabian Reinartz
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
Jimmi Dyson
52cf6b3e6e Configuration options for bearer tokens, client certs & CA certs 
Fixes #918, fixes #917
 2015-08-04 17:18:46 +01:00
Johannes 'fish' Ziemke
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
187fe4e3d3 Fix missing defaults for empty global config blocks 2015-07-17 21:25:56 +02:00
Fabian Reinartz
2a53b107c1 Fix missing defaults in empty configurations 2015-07-17 19:15:01 +02:00
Fabian Reinartz
435fc7234f config: add overflow detection for serverset config 2015-07-14 02:46:00 +02:00
Fabian Reinartz
02e06839f2 config: hide authentication credentials in String() output 2015-07-06 14:28:07 +02:00
Brian Brazil
52859b8033 Merge pull request #836 from prometheus/shard 
Add 'hashmod' relabel action.
 2015-06-24 21:40:10 +01:00
Brian Brazil
682f949ab1 Add 'hashmod' relabel action. 
This takes the modulus of a hash of some labels.
Combined with a keep relabel action, this allows
for sharding of targets across multiple prometheus
servers.
 2015-06-24 21:14:53 +01:00
Fabian Reinartz
4319b06dd2 config: add omitempty for consul SD config. 2015-06-24 16:22:52 +02:00
Fabian Reinartz
7ec15956e4 config: show original input on String() 2015-06-23 19:40:44 +02:00
Fabian Reinartz
dc7d27ab9a retrieval: add honor label handling and parametrized querying. 
This commit adds the honor_labels and params arguments to the scrape
config. This allows to specify query parameters used by the scrapers
and handling scraped labels with precedence.
 2015-06-23 13:45:14 +02:00
Brian Brazil
4d895242f9 Add support for Zookeeper Serversets for SD. 
It can discover an entire tree of serversets, or just one.
 2015-06-16 11:02:08 +01:00
Brian Brazil
0dbae36d36 Allow ingested metrics to be relabeled. 
The main purpose of this is to allow for blacklisting
of expensive metrics as a tactical option.
It could also find uses for renaming and removing labels
from federation.
 2015-06-13 15:18:27 +01:00
Brian Brazil
58ceae82bc Revert "Allow ingested metrics to be relabeled." 
This reverts commit f2f26ca08f.

Was accidentally pushed to master instead of a branch for PR.
 2015-06-12 22:12:26 +01:00
Brian Brazil
f2f26ca08f Allow ingested metrics to be relabeled. 
The main purpose of this is to allow for blacklisting
of expensive metrics as a tactical option.
It could also find uses for renaming and removing labels
from federation.
 2015-06-12 22:06:30 +01:00
Fabian Reinartz
116e6df096 config: raise error on unknown config parameters. 
The YAML parser ignores additional parameters on unmarshaling. This causes
frequent confusion with bad configs that pass parsing.
These changes raise errors on additional parameters.
 2015-06-12 13:42:56 +02:00
Fabian Reinartz
3a24a7779d config: extend and format config example/test. 2015-06-12 13:39:12 +02:00
Fabian Reinartz
458550560c config: error on missing regex in relabel config. 
Fixes issue #787.
 2015-06-10 23:42:51 +02:00
Fabian Reinartz
b5fe2e9afe Merge pull request #773 from prometheus/fabxc/simple-cfg 
config: simplify default config handling.
 2015-06-08 16:22:06 +02:00
Fabian Reinartz
f6c33a2347 config: prevent overwrite of DefaultGlobalConfig 2015-06-08 16:02:10 +02:00
Fabian Reinartz
db3367e83f config: ensure correct labelname in JSON target group. 2015-06-06 10:08:42 +02:00
Fabian Reinartz
0af1cff8af config: simplify default config handling. 2015-06-06 09:04:04 +02:00
Fabian Reinartz
17c4c8ed95 config: fix json/yaml tag inconsistencies. 2015-06-02 18:21:19 +02:00
Fabian Reinartz
867f2ac979 Merge pull request #762 from prometheus/0.14.1 
0.14.1
 2015-06-02 13:24:12 +02:00