Simon Pasquier
81c0ab69e0
Don't reset FiredAt for inactive alerts
...
Otherwise AlertManager receives resolved alerts where StartsAt is zero which
fails the validation.
2018-01-22 17:17:33 +01:00
Julius Volz
09e460a647
discovery: Rename file SD mtime metric ( #3723 )
...
- "timestamp" -> "mtime" to be in line with node exporter and clearer.
- add unit suffix
2018-01-22 14:02:24 +01:00
Goutham Veeramachaneni
84e462ae24
Merge pull request #3722 from prometheus/reusable-rulefmt
...
rulefmt: Allow parsing from bytes instead of file
2018-01-22 18:19:06 +05:30
Julius Volz
192e665317
rulefmt: Allow parsing from bytes instead of file
...
This makes the rulefmt package more reusable for users whose rulesets are not
stored in files on disk. Concrete example: Cortex.
2018-01-22 11:46:55 +01:00
Julius Volz
953af2c089
promql: Make printer formatting less vintage ( #3721 )
...
- lower-case modifiers
- reverse order of aggregation modifiers and aggregated expression
- remove spacing before modifier parentheses
2018-01-22 11:14:59 +01:00
Julius Volz
1e943fc10a
promql: Fix printing of empty without() ( #3719 )
...
* promql: Fix printing of empty without()
Fixes https://github.com/prometheus/prometheus/issues/3704
* Test cleanup fixup
2018-01-21 22:22:55 +01:00
Krasi Georgiev
66bcb10f40
t.Fatal should be t.Fatalf in the one scrape test
2018-01-19 12:07:19 +00:00
Goutham Veeramachaneni
85f23d82a0
Merge pull request #3700 from Gouthamve/release-2.1
...
*: release 2.1.0
2018-01-19 17:24:28 +05:30
Krasi Georgiev
d202718116
read bearer token on every request , + some http and scrape tests
...
read bearer token on every request
removed unuseful scrape manager startup log
new tests -TestScrapeManagerReloadNoChange( scrape pool is not reloaded
when the config hasn't changed), TestMissingBearerAuthFile ,
TestBearerAuthFileRoundTripper
2018-01-19 11:36:21 +00:00
Goutham Veeramachaneni
14eb15fe45
*: release 2.1.0
...
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2018-01-19 16:57:18 +05:30
Goutham Veeramachaneni
4b984d2378
Merge pull request #3705 from Gouthamve/update_tsdb
...
vendor: update tsdb
2018-01-19 14:13:01 +05:30
Goutham Veeramachaneni
d982427aa8
vendor: update tsdb
...
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2018-01-19 13:31:33 +05:30
Goutham Veeramachaneni
ab7c54e2c8
Merge pull request #3698 from krasi-georgiev/scrape-config-reload-fix
...
Scraper config reload bugfix
2018-01-18 19:00:28 +05:30
Krasi Georgiev
910c22418c
move cleanup and reload in ApplyConfig
2018-01-18 11:49:42 +00:00
Krasi Georgiev
719c579f7b
refactor main execution reloadReady handling, update some comments
2018-01-17 18:14:24 +00:00
Krasi Georgiev
ec26751fd2
use mutexes for the discovery manager instead of a loop as this was a stupid idea
2018-01-17 18:12:58 +00:00
Krasi Georgiev
0eafaf32d3
set the correct config reloading execution for scraper and notifier
2018-01-17 13:06:56 +00:00
Alexey Palazhchenko
85bef0d583
Add comment about samples order. ( #3642 )
2018-01-17 12:31:30 +00:00
Tom Wilkie
f2c5399e39
Merge pull request #3561 from twiedenbein/master
...
fixed bug with initialization of queueconfig
2018-01-17 12:24:58 +00:00
Krasi Georgiev
97f0461e29
refactor the config reloading execution
2018-01-17 12:02:13 +00:00
Krasi Georgiev
af58c1b452
replace state machine with mutex
2018-01-17 11:46:17 +00:00
Goutham Veeramachaneni
a3de70ed19
Merge pull request #3638 from krasi-georgiev/notifier-reimplement-discovery
...
reimplement the Notifier discovery
2018-01-17 16:08:11 +05:30
Frederic Branczyk
5cea27f06a
Merge pull request #3655 from Conorbro/dropped-target-fix
...
Fix dropped target list growing forever
2018-01-17 11:03:39 +01:00
Krasi Georgiev
87a8fc24d5
fix the test
2018-01-16 13:39:48 +00:00
Krasi Georgiev
5260c650ec
use the config hash for the map lookup
2018-01-16 11:10:54 +00:00
Krasi Georgiev
8369826808
comment to rethink the map reference for the notifier discovery
2018-01-16 09:47:53 +00:00
Krasi Georgiev
2e058b1c6f
reload test
...
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
2018-01-15 13:39:47 +00:00
Krasi Georgiev
767faa44b6
fixed the tests
...
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
2018-01-15 13:39:47 +00:00
Krasi Georgiev
d12e6f29fc
discovery manager ApplyConfig now takes a direct ServiceDiscoveryConfig so that it can be used for the notify manager
...
reimplement the service discovery for the notify manager
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
2018-01-15 13:39:44 +00:00
Goutham Veeramachaneni
b20a1b1b1b
Merge pull request #3654 from krasi-georgiev/discovery-handle-discoverer-updates
...
discovery - handle Discoverers that send only target Group updates.
2018-01-15 18:53:22 +05:30
Krasi Georgiev
790cf30fcb
remove uneeded check
2018-01-15 11:52:20 +00:00
Krasi Georgiev
38938ba493
comment nits
2018-01-15 11:47:36 +00:00
Krasi Georgiev
a535c8d1b4
simplify the pool cleanup
2018-01-14 19:53:38 +00:00
Krasi Georgiev
a981b51900
The config map was never reset on applying a new config
2018-01-14 19:53:25 +00:00
Krasi Georgiev
e4ddffcc6e
run staticcheck in travis ( #3682 )
2018-01-13 11:52:48 +00:00
Krasi Georgiev
4be9a40b89
fatalf is not thread safe so using panic instead ( #3680 )
2018-01-13 10:37:38 +00:00
Krasi Georgiev
febebcd49a
more comments for the future ME, and reverted the Discovery manager execution changes as these were correct in the first place
2018-01-12 22:07:21 +00:00
Krasi Georgiev
78ba5e62a6
few mote usefull comments
2018-01-12 13:58:23 +00:00
Krasi Georgiev
cabce21b70
delete empty targets sets to avoid memory leaks
2018-01-12 13:10:59 +00:00
Krasi Georgiev
abfd9f1920
nits
2018-01-12 12:19:52 +00:00
Shubheksha Jalan
0471e64ad1
Use shared types from the common repo ( #3674 )
...
* refactor: use shared types from common repo, remove util/config
* vendor: add common/config
* fix nit
2018-01-11 16:10:25 +01:00
Goutham Veeramachaneni
35a6ffbaf3
Merge pull request #3587 from krasi-georgiev/web-test-error-check
...
handle web_test webhandler errors.
2018-01-10 22:03:25 +05:30
Krasi Georgiev
546c29af5b
return early for nil target groups
2018-01-09 16:34:23 +00:00
Adam
f64014f70b
Fix the incrementing of prometheus_target_scrapes_exceeded_sample_limit_total ( #3669 )
...
Once a scrape target has reached the samle_limit, any further samples
from that target will continue to result in errSampleLimit.
This means that after the completion of the append loop `err` must still
be errSampleLimit, and so the metric would not have been incremented.
2018-01-09 15:43:28 +00:00
Callum Styan
97464236c7
comments with TargetProvider should read Discoverer instead ( #3667 )
2018-01-08 23:59:18 +00:00
James Turnbull
00f4821178
Added missing ingress from role list ( #3666 )
2018-01-08 21:23:01 +00:00
conorbroderick
658914ba27
Fix dropped target list growing forever
2018-01-05 11:08:37 +00:00
Krasi Georgiev
77bf6bece0
discovery-manager comment update
2018-01-04 21:57:28 +00:00
Krasi Georgiev
135ea0f793
discovery manager - doesn't need sorting of the target groups so move it in the discovery manager tests as we only need it there.
...
discovery manager - refactor the discovery tests.
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
2018-01-04 21:41:54 +00:00
Krasi Georgiev
638818a974
some Discoverers send nil targetgroup so need to check for it when updating a group
2018-01-04 13:57:34 +00:00
