Fabian Reinartz
76ffdf4cc5
Merge pull request #1716 from prometheus/fabxc-static-configs
...
config: deprecate `target_groups` for `static_configs`
2016-06-08 16:14:21 +02:00
Fabian Reinartz
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
Fabian Reinartz
ad18ac51b8
Merge pull request #1715 from prometheus/fabxc-vendor-fsnotify
...
vendor: update gopkg.in/fsnotify.v1
2016-06-08 15:33:23 +02:00
Fabian Reinartz
733ed099f5
vendor: update gopkg.in/fsnotify.v1
...
This updates the fsnotify package, which now uses golang.org/x/sys/unix
package. This fixes #1507 .
2016-06-08 11:59:16 +02:00
Brian Brazil
05b918a024
Merge pull request #1713 from mattbostock/document_drop
...
Relabel: Document whole label set is dropped
2016-06-07 17:22:34 +01:00
Matt Bostock
329a00e44f
Relabel: Document whole label set is dropped
...
From the documentation and current tests, it wasn't immediately clear to
me whether the `target` being dropped as the result of a 'drop' action
was a label key-value pair or the entire labelset.
Add a test that documents this behaviour.
Documentation: https://prometheus.io/docs/operating/configuration/
2016-06-07 17:13:30 +01:00
Brian Brazil
33759dddd2
Merge pull request #1712 from fabric8io/kubernetes-sd-node-ip-labels
...
Kubernetes SD: Add labels for all node addresses and discover node port
2016-06-07 12:37:40 +01:00
Jimmi Dyson
206bcfcdaa
Kubernetes SD: Remove kubeletPort config option
2016-06-07 12:34:55 +01:00
Jimmi Dyson
d48297c904
Kubernetes SD: Add labels for all node addresses and discover node port if available
2016-06-07 12:34:49 +01:00
Fabian Reinartz
26b1c89469
Merge pull request #1702 from pdbogen/master
...
Initial local pods before using the pod list to initialize pod targets
2016-06-06 15:14:49 +02:00
Fabian Reinartz
dd57e7ef5c
Merge pull request #1699 from prometheus/fabxc-multiam
...
notifier: dispatch to multiple Alertmanagers
2016-06-06 12:01:41 +02:00
Fabian Reinartz
35ccca09ea
Merge pull request #1704 from prometheus/fabxc-ghtemplate
...
Make issue reports great again!
2016-06-06 11:49:09 +02:00
Fabian Reinartz
fa1dc018cb
.github: Add issue template
2016-06-06 11:48:14 +02:00
Fabian Reinartz
9baf120cd5
notifier: dispatch to multiple Alertmanagers
...
This commit extends the notifier to dispatch alert batches
to multiple Alertmanagers concurrently.
It changes the `-alertmanager.url` flag to accept a comma
separated list of URLs and/or to be set multiple times.
2016-06-06 11:41:10 +02:00
Björn Rabenstein
2bcf712e29
Merge pull request #1657 from joshuarubin/master
...
fix build with multi-part $GOPATH
2016-06-06 11:35:49 +02:00
Björn Rabenstein
e084d8e8c1
Merge pull request #1701 from prometheus/beorn7/lock
...
Make the number of fingerprint mutexes configurable
2016-06-03 13:31:57 +02:00
beorn7
b274c7aaa7
Update doc comments
2016-06-03 12:34:01 +02:00
Patrick Bogen
1e6770cdc5
Initial local pods before using the pod list to initialize pod targets; include more logging in pod target creation
2016-06-02 17:49:21 -07:00
beorn7
99881ded63
Make the number of fingerprint mutexes configurable
...
With a lot of series accessed in a short timeframe (by a query, a
large scrape, checkpointing, ...), there is actually quite a
significant amount of lock contention if something similar is running
at the same time.
In those cases, the number of locks needs to be increased.
On the same front, as our fingerprints don't have a lot of entropy, I
introduced some additional shuffling. With the current state, anly
changes in the least singificant bits of a FP would matter.
2016-06-02 19:18:00 +02:00
Julius Volz
894cf8df2f
Merge pull request #1690 from andmarios/master
...
Fix consoles and console_libraries path in Dockerfile.
2016-06-01 21:15:49 -05:00
Julius Volz
2eaccdd111
Merge pull request #1697 from sigma-star/master
...
Fix JS XHR requests in prom_console.js on IE11
2016-06-01 20:15:02 -05:00
David Gstir
2dd80225a4
Fix JS XHR requests in prom_console.js on IE11
...
IE11 does not support automatic JSON parsing for responses with
xhr.responseType = 'json', so we have to to do it manually.
2016-06-01 19:44:04 +02:00
Fabian Reinartz
9e952a55c6
Merge pull request #1686 from alileza/master
...
change file_sd names to files, for consistency
2016-06-01 07:49:34 -07:00
Ali Reza
c81b4e8a87
change config names to files for consistency
2016-05-30 07:47:58 +07:00
Marios Andreopoulos
3f07a6b9d0
Fix consoles and console_libraries path in Dockerfile.
2016-05-30 01:02:38 +03:00
beorn7
e3ec8fa83b
Merge branch 'release-0.19'
2016-05-29 21:06:44 +02:00
Fabian Reinartz
23ca13c2fb
Merge pull request #1688 from prometheus/beorn7/0.19
...
Cut 0.19.2
2016-05-29 10:41:00 -07:00
beorn7
592f02925e
Cut 0.19.2
...
Note that this will be merged into the release-0.19 branch and only
includes bug fixes, not other recent commits.
This is low-risk and contains critical bug fixes and should therefore
be released ASAP.
2016-05-29 18:44:40 +02:00
Björn Rabenstein
3113c0d719
Merge pull request #1685 from prometheus/beorn7/fix-group
...
Correctly stringify GROUP_x modifiers without labels
2016-05-29 18:34:58 +02:00
beorn7
5408666387
Correctly stringify GROUP_x modifiers without labels
...
Since rule evaluations work via String(), this fixes evaluation of
rules containing GROUP_x modifiers without labels. This change is the
minimal bugfix (so that we can release a fixed version without
risk). It does not intend to implement any additional features (like
allowing `GROUP_LEFT()` or `ON()` or even `ON` - see discussion in
https://github.com/prometheus/prometheus/issues/1597 ).
2016-05-28 20:15:02 +02:00
Brian Brazil
f55a1d463d
Merge pull request #1670 from gregorygtseng/tls-servername-const
...
Unexport testing constant
2016-05-26 22:49:39 +01:00
Gregory G. Tseng
4ceedffe86
Unexport testing constant
2016-05-26 14:42:17 -07:00
Brian Brazil
bd6568ccc9
Merge pull request #1658 from gregorygtseng/tls-servername-override
...
Add ServerName into TLS Config
2016-05-26 22:33:07 +01:00
Gregory G. Tseng
7997c14b0d
Add ServerName into TLS Config
2016-05-26 14:24:49 -07:00
Julius Volz
26f3b7bbc6
Merge pull request #1669 from alileza/master
...
remove keeping_extra because it's replaced with keep_common
2016-05-26 15:04:19 -05:00
Julius Volz
194a486c60
Merge pull request #1660 from alileza/add_http_errorlog
...
Log HTTP server errors using common/log
2016-05-26 15:03:15 -05:00
Ali Reza
5e2b197a00
Update vendoring for github.com/prometheus/common/log
2016-05-27 00:20:54 +07:00
Ali Reza
624717e801
Log HTTP server errors using common/log
...
change naming to be more descriptive.
Fixes #1651
remove pointer receiver
use common/log error logger
2016-05-27 00:20:40 +07:00
Ali Reza
e7eba75690
remove keeping_extra because it's replaced with keep_common
...
change all keepExtra label into keepCommon, and move action into removed list
change incorrect token list
2016-05-27 00:02:04 +07:00
Björn Rabenstein
f24b8b6c1b
Merge pull request #1668 from roman-vynar/missed-path-prefix
...
Added missed pathPrefix to Status sub-menus
2016-05-26 17:29:57 +02:00
Roman Vynar
9d616952b3
Added missed pathPrefix to Status sub-menus
2016-05-26 17:42:28 +03:00
Fabian Reinartz
0b6e5eb7dd
Merge branch 'release-0.19'
2016-05-25 17:40:42 -07:00
Fabian Reinartz
500a494c9c
*: add 0.19.1 changelog
2016-05-25 17:33:01 -07:00
Fabian Reinartz
8074281180
*: bump version to 0.19.1
2016-05-25 17:33:01 -07:00
Fabian Reinartz
4e087165aa
retrieval: handle nil target groups from updates
2016-05-25 17:33:01 -07:00
Fabian Reinartz
8fe8ccce63
retrieval: document panic behavior
2016-05-25 17:33:01 -07:00
Fabian Reinartz
021ef27fe3
retrieval: don't panic on non-HTTP scheme
2016-05-25 17:33:01 -07:00
beorn7
9a506fae47
Remove a spurious "w" from _base.html
2016-05-25 17:33:00 -07:00
Fabian Reinartz
810e0e254b
Fix typo
2016-05-25 17:33:00 -07:00
Fabian Reinartz
ec3aa12163
Fix indentation
2016-05-25 17:31:22 -07:00
