05e84a6452
Merge branch 'master' into dev-v2
2019-06-12 01:46:41 +02:00
e7f6132a76
Remove work duplication in doc comment
...
Signed-off-by: beorn7 <beorn@grafana.com>
2019-06-12 01:46:17 +02:00
f2e6ed57d6
Merge branch 'master' into dev-v2
2019-06-12 01:44:45 +02:00
dae2ffdedc
Merge pull request #600 from prometheus/beorn7/deprecation
...
Remove all deprecated features
2019-06-11 17:08:54 +02:00
761a2ff07c
Remove all deprecated features
...
This is in preparation of the upcoming v1 release.
Signed-off-by: beorn7 <beorn@grafana.com>
2019-06-11 16:28:47 +02:00
cfcfe12731
Merge branch 'master' into dev-v2
2019-06-11 14:41:05 +02:00
2e1bc8f8ec
Merge pull request #597 from prometheus/makefile_common
...
Synchronize Makefile.common from prometheus/prometheus
2019-06-09 00:58:26 +02:00
2641b98748
Merge pull request #598 from prometheus/beorn7/release
...
Cut v0.9.4
2019-06-07 16:56:44 +02:00
b76fdd6b6a
Cut v0.9.4
...
Signed-off-by: beorn7 <beorn@grafana.com>
2019-06-07 12:45:06 +02:00
b8b56b52bd
Merge pull request #595 from prometheus/beorn7/go-collector
...
Add a simple buildInfoCollector
2019-06-07 10:33:13 +02:00
8d595571fe
makefile: update Makefile.common with newer version
...
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2019-06-07 00:01:38 +00:00
8576729b6f
Add a simple buildInfoCollector
...
Signed-off-by: beorn7 <beorn@grafana.com>
2019-06-06 22:24:23 +02:00
7ed96b33bd
Merge pull request #594 from prometheus/beorn7/promhttp
...
Add an error counter for internal errors in the HTTP handler
2019-06-06 17:41:52 +02:00
4d8144c11a
Add test for the new promhttp_metric_handler_errors_total metric
...
Signed-off-by: beorn7 <beorn@grafana.com>
2019-06-06 16:56:58 +02:00
3fa9fca2cb
Add an error counter for internal errors in the HTTP handler
...
The doc comments explain the rationale in a quite detailed way.
Fixes #543 and #542
Signed-off-by: beorn7 <beorn@grafana.com>
2019-06-05 20:07:49 +02:00
ea8c935f20
Merge pull request #593 from prometheus/beorn7/modules
...
Remove use of deprecated procfs functions
2019-06-05 17:42:15 +02:00
3d1d93eb51
Remove use of deprecated procfs functions
...
Signed-off-by: beorn7 <beorn@grafana.com>
2019-06-04 19:26:20 +02:00
674d720113
Use tagged version of prometheus/procfs
...
Signed-off-by: beorn7 <beorn@grafana.com>
2019-06-04 18:54:12 +02:00
f0a455664e
Merge pull request #591 from krasi-georgiev/remove-tsdb
...
remove the tsdb dependancy
2019-05-28 15:29:58 +02:00
f6e51267db
remove the tsdb dependancy
...
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
2019-05-28 15:42:25 +03:00
329278ec53
encapsulate target metadata api ( #590 )
...
Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
2019-05-28 14:27:09 +02:00
301aa8906b
/api/v1/rules: alert value as string ( #585 )
...
Signed-off-by: Alexander Saltykov <alexander-s@yandex-team.ru>
2019-05-28 13:57:09 +02:00
7e60220fd3
Switch from encoding/json -> jsoniter ( #570 )
...
* Switch from encoding/json -> jsoniter
Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>
2019-05-28 13:45:06 +02:00
388f9869ac
Merge pull request #588 from prometheus/beorn7/test
...
Attempt to fix flakiness of TestGoCollectorMemStats
2019-05-26 23:20:33 +02:00
33a2efdc9c
Merge pull request #589 from prometheus/beorn/test2
...
Unflake TestGoCollectorGC
2019-05-26 23:19:56 +02:00
c818d96e15
Unflake TestGoCollectorGC
...
It is perfectly possible that a normal GC happens just before the
forced one. Thus seeing 2 GCs is fine.
Whenever this test failed, it was because two GCs were seen.
Signed-off-by: beorn7 <bjoern@rabenste.in>
2019-05-26 14:11:51 +02:00
fe90eea9bb
Attempt to fix flakiness of TestGoCollectorMemStats
...
This is really lame as it essentially just uses longer times to
wait. The test is still timing-dependent and thus could still
theoretically fail with unlucky scheduling. However, we are testing
something that _is_ about timing. Turning this all into something not
timing-dependent would be first quite involved and second might defeat
the purpose of testing code that is inherently about timing.
Let's see how this works out in practice.
Signed-off-by: beorn7 <bjoern@rabenste.in>
2019-05-26 13:25:59 +02:00
b46e6ec51b
Merge pull request #562 from jacksontj/issue_560
...
Add storage.Warnings to client
2019-05-22 00:31:30 +02:00
d5f3c8d55d
Add storage.Warnings to client
...
Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>
Fixes #560
2019-05-21 07:36:05 -07:00
b5f69192ee
Purge remaining references to v0.10 from doc comments
...
Signed-off-by: beorn7 <bjoern@rabenste.in>
2019-05-16 23:35:36 +02:00
7fdeda3bf5
Merge branch 'master' into dev-v2
2019-05-16 23:31:19 +02:00
50c4339db7
Merge pull request #579 from prometheus/beorn7/release
...
Cut v0.9.3 and announce new versioning plan
2019-05-16 23:22:10 +02:00
d980b1cf3b
Cut v0.9.3
...
Signed-off-by: beorn7 <bjoern@rabenste.in>
2019-05-16 18:07:07 +02:00
d586b4b2d5
Update dependencies
...
Signed-off-by: beorn7 <bjoern@rabenste.in>
2019-05-16 18:05:52 +02:00
9a6fc61a7b
Update versioning plan with Go Modules in mind
...
Signed-off-by: beorn7 <bjoern@rabenste.in>
2019-05-16 18:05:52 +02:00
ed5d97df1f
Merge pull request #582 from prometheus/beorn7/promhttp
...
Make use of pre-existing context in InstrumentRoundTripperTrace
2019-05-16 18:03:24 +02:00
bc54582c5e
Make use of pre-existing context in InstrumentRoundTripperTrace
...
Fixes #580
Signed-off-by: beorn7 <bjoern@rabenste.in>
2019-05-16 17:52:19 +02:00
6c520f6aca
Add test to expose #580
...
Tests are heavily inspired by @shturec, see #584 .
Signed-off-by: beorn7 <bjoern@rabenste.in>
2019-05-16 17:52:19 +02:00
775f94f6fc
Merge pull request #581 from prometheus/beorn7/test
...
Fix race in TestGoCollectorMemStats
2019-05-16 15:31:37 +02:00
0e198671c5
Merge pull request #583 from prometheus/beorn7/doc
...
Remove outdated use-case description from doc comment
2019-05-16 11:31:50 +02:00
e91cd81632
Remove outdated use-case description from doc comment
...
We stopped advertising binary-wide setting of a label quite a while
ago. This doc comment was missed in the cleanup.
Signed-off-by: beorn7 <bjoern@rabenste.in>
2019-05-16 11:23:48 +02:00
709dc4b1de
Fix race in TestGoCollectorMemStats
...
Related to #573 (but only partially fixes it).
Signed-off-by: beorn7 <bjoern@rabenste.in>
2019-05-16 10:37:37 +02:00
2827f2a8d9
Merge pull request #577 from prometheus/makefile_common
...
Synchronize Makefile.common from prometheus/prometheus
2019-05-15 11:10:46 +02:00
af332dff97
makefile: update Makefile.common with newer version
...
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2019-05-15 00:00:42 +00:00
7f34606871
Merge pull request #576 from cviecco/fix-pusher-regression
...
Fix regression issue 574
2019-05-14 21:31:02 +02:00
facfcc21f8
fix regression issue 574
...
Signed-off-by: Camilo Viecco <camilo_viecco1@symantec.com>
2019-05-14 11:44:55 -07:00
b0f4d8e1d5
Merge pull request #572 from prometheus/beorn7/deprecation
...
Clarify deprecation of `DefObjectives`
2019-05-08 13:54:16 +02:00
886e2ee0c0
Clarify deprecation of `DefObjectives`
...
Previously, the whole `Objectives` field was marked as deprecated by
linters.
Signed-off-by: beorn7 <bjoern@rabenste.in>
2019-05-08 13:38:43 +02:00
2d3b0fe0e0
Merge pull request #568 from prometheus/beorn7/go-collector
...
Return previous memstats if Go collector needs longer than 1s
2019-05-07 00:10:32 +02:00
7cf0955421
Handle long ReadMemStats duration in Go collector
...
tl;dr: Return previous memstats if reading new ones takes longer than
1s.
See the doc comment of NewGoCollector for details.
Signed-off-by: beorn7 <bjoern@rabenste.in>
2019-05-06 23:28:31 +02:00
beorn7