mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-13 17:14:05 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
5609 commits 247 branches 438 tags 656 MiB
Commit graph

5609 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alin Sinpalean d6adfe2ae2 Use a fake SeriesIterator (that generates samples on the fly instead of using a slice) for BufferedSeriesIterator, to reduce the variance of benchmark results due to memory pressure. (#4847) 
Signed-off-by: Alin Sinpalean <alin.sinpalean@gmail.com>
 2018-12-18 11:22:33 +00:00
Simon Pasquier a2766a94a3 cmd/prometheus: add tests for sendAlerts() (#4910) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-12-18 11:15:46 +00:00
AixesHunter 1b166d7174 Fix variable 'notifier' collides with imported package name 'github.com/prometheus/prometheus/notifier', changed to 'notifierManager'. (#4947) 
Signed-off-by: aixeshunter <aixeshunter@gmail.com>
 2018-12-18 11:13:18 +00:00
Julius Volz c96828fb57 Mention PromQL by name in querying basics doc (#4996) 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2018-12-18 11:57:00 +01:00
Thomas J. Fox 11a93b2b37 fix link in docs/examples/k8s-rabbitmq readme (#4967) 
Signed-off-by: Thomas J. Fox <thomasjfox1@gmail.com>
 2018-12-18 11:53:55 +01:00
JoeWrightss e8be31eed9 Fixs typo: 'possibliy' to 'possibly' (#4974) 
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
 2018-12-18 11:52:40 +01:00
SenXuDC 8fd0c0ab2e fix typo imeplements -> implements (#4979) 
Signed-off-by: SenXuDC <sen.xu@daocloud.io>
 2018-12-18 11:52:16 +01:00
Samuel Alfageme 240321acee Add taggedAddress to the labels in ConsulSD (#5001) 
Useful when multiple (tagged) addresses for a node are exposed on the catalog API
Ref. https://www.consul.io/api/catalog.html#taggedaddresses

Signed-off-by: Samuel Alfageme <samuel@alfage.me>
 2018-12-18 11:51:05 +01:00
Ganesh Vernekar fbadd88ba5 Get unique eval times for alert unit tests (#4964) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2018-12-18 08:40:03 +00:00
Simon Pasquier dbd1d58c89
*: cut v2.6.0 (#5008) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-12-17 16:12:01 +01:00
Simon Pasquier b021025e47
Fix go.sum after Go1.11.4 bump (#5007) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-12-17 14:40:03 +01:00
Simon Pasquier 3fe4f3e700
*: cut v2.6.0-rc.1 (#5000) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-12-14 13:46:54 +01:00
Krasi Georgiev 26a360341a
update tsdb to 0.3.1 (#4997) 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2018-12-14 11:54:26 +03:00
Tariq Ibrahim e3bdc463fa Revert "add logic to check if an azure VM is deallocated or not (#4908)" (#4980) 
This reverts commit 61cf4365

Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
 2018-12-12 09:27:12 +01:00
Ben Kochie 458455245f Fix Dockerfile entrypoint (#4976) 
* Fix Dockerfile entrypoint

Fix WORKDIR and use symlink to setup working defaults for config flags.

Signed-off-by: Ben Kochie <superq@gmail.com>

* Collapse Dockrefile RUNs

Signed-off-by: Ben Kochie <superq@gmail.com>
 2018-12-10 09:19:01 +01:00
tariqibrahim 8264d41ebf Merge branch 'master' of https://github.com/prometheus/prometheus into update_k8s 2018-12-06 09:15:57 -08:00
tariqibrahim ba25025220 Merge branch 'update_k8s' of github.com:tariq1890/prometheus into update_k8s 2018-12-06 09:15:49 -08:00
tariqibrahim 1fd438ed2b rebase and resolve merge conflicts 
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
 2018-12-06 09:15:34 -08:00
Simon Pasquier 56cda567d9 Makefile.common: fix format rule (#4918) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-12-06 12:49:47 +01:00
Simon Pasquier 40f0b4a9f6
*: cut v2.6.0-rc.0 (#4958) 
* *: cut v2.6.0-rc.0

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Add #4926

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Address Brian's comments

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Address Goutham's comments

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-12-05 17:12:34 +01:00
F4ncyMooN cd491e2d3a wait for interval-now%interval to make sure target will be collected with a fixed interval when restart prometheus (#4926) 
Signed-off-by: hlv <hlv@freewheel.tv>
 2018-12-05 09:58:39 +00:00
Ryota Arai 135d580ab2 Introduce min_shards for remote write to set minimum number of shards. (#4924) 
Signed-off-by: Ryota Arai <ryota.arai@gmail.com>
 2018-12-04 17:32:14 +00:00
Tom Wilkie e1d9bf77f1
Export the error field in ErrStorage, so we can 'throw' it outside the package. (#4954) 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-12-04 16:49:21 +00:00
Krasi Georgiev 7fc501d983
update tsdb to version v0.3.0 (#4953) 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2018-12-04 19:46:31 +03:00
tariqibrahim da69b5a50c rebase and resolve merge conflicts 
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
 2018-12-04 07:30:54 -08:00
Simon Pasquier ac9d5f3d53
cmd/prometheus: replace glog by glog-gokit (#4931) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-12-04 15:01:12 +01:00
tariqibrahim 412ca33226 update kubernetes deps to v1.13.0 
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
 2018-12-03 19:32:16 -08:00
tariqibrahim 08d6c83657 Merge branch 'master' of https://github.com/prometheus/prometheus into update_k8s 2018-12-03 19:16:17 -08:00
Julius Volz 11a52be1d8
Better rounding for incoming query timestamps (#4941) 
Fixes https://github.com/prometheus/prometheus/issues/4939

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2018-12-03 20:25:54 +08:00
Julius Volz d28246e337
Fix config loading panics on nil pointer slice elements (#4942) 
Fixes https://github.com/prometheus/prometheus/issues/4902
Fixes https://github.com/prometheus/prometheus/issues/4889

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2018-12-03 18:09:02 +08:00
Simon Pasquier 8b91d39c43
discovery: send empty group on empty SD config (#4819) 
* discovery: send empty group on blank SD config

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Update comments

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Add another comment

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-11-30 17:59:57 +01:00
Simon Pasquier 7b88360260 promu: fix ldflags for Go modules (#4929) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-11-30 17:10:43 +01:00
Ben Kochie e4a49f1a71
Update Makefile.common (#4932) 
* Fixup PROMU unpack

When setting up promu, use an explicit path, not the `PROMU` variable.
This allows for Makefile override of the PROMU command line flags.

* Use temp dir for unpacking tools.
* Use BSD compatible tar command.
* OpenBSD mkdir doesn't support `-v`.

Signed-off-by: Ben Kochie <superq@gmail.com>
 2018-11-30 16:20:50 +01:00
mknapphrt f0e9196dca Return warnings on a remote read fail (#4832) 
Signed-off-by: Mark Knapp <mknapp@hudson-trading.com>
 2018-11-30 14:27:12 +00:00
Simon Pasquier 77ee41084f
web: group targets by job then instance (#4898) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-11-30 15:24:15 +01:00
Simon Pasquier 632626b553
web: deduplicate handler label for HTTP metrics (#4752) 
* web: deduplicate handler label for HTTP metrics

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* remove instrumentHandlerFunc

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-11-30 13:30:32 +01:00
Tariq Ibrahim 61cf4365d6 add logic to check if an azure VM is deallocated or not (#4908) 
* add logic to check if an azure VM is deallocated or not
* update documentation  with the new azure power state label

Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
 2018-11-30 11:32:40 +00:00
Serghei Anicheev 8e659a5109 Adding private_dns_name to the list of ec2 labels which can be used i… (#4693) 
* Adding private_dns_name to the list of ec2 labels which can be used in node naming for dynamic environments

Signed-off-by: Serghei Anicheev <serghei@rentalcover.com>
 2018-11-30 11:11:06 +00:00
Yaqiang Wang 8b85d876f2 fix file_sd never stop update 'custom_sd.json' file in adapter.go (#4567) 
Signed-off-by: wangyaqiang1 <wangyaqiang1@jd.com>
 2018-11-30 10:32:17 +01:00
Fabian Reinartz 76b266b2f0
Update Fabian's email address 2018-11-30 09:37:40 +01:00
mengnan a5d39361ab discovery/azure: Fail hard when Azure authentication parameters are missing (#4907) 
* discovery/azure: fail hard when client_id/client_secret is empty

Signed-off-by: mengnan <supernan1994@gmail.com>

* discovery/azure: fail hard when authentication parameters are missing

Signed-off-by: mengnan <supernan1994@gmail.com>

* add unit test

Signed-off-by: mengnan <supernan1994@gmail.com>

* add unit test

Signed-off-by: mengnan <supernan1994@gmail.com>

* format code

Signed-off-by: mengnan <supernan1994@gmail.com>
 2018-11-29 16:47:59 +01:00
tariqibrahim e4222b1223 update client-go to v9.0.0 and other k8s deps to v1.12.3 
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
 2018-11-28 21:13:03 -08:00
Krasi Georgiev 0754e5334b
querier for RestoreForState not closed. (#4922) 
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2018-11-28 15:25:17 +02:00
Ben Kochie c6399296dc
Fix spelling/typos (#4921) 
* Fix spelling/typos

Fix spelling/typos reported by codespell/misspell.
* UK -> US spelling changes.

Signed-off-by: Ben Kochie <superq@gmail.com>
 2018-11-27 17:44:29 +01:00
Simon Pasquier 0bb810d126
discovery/marathon: fix leaked connections (#4915) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-11-27 14:58:27 +01:00
Stafford Williams 328d81999a /config: Added Copy to clipboard button for /config (#4410) 
* added `Copy to clipboard` button

Signed-off-by: Stafford Williams <stafford.williams@gmail.com>

* generate vsfdata

Signed-off-by: Stafford Williams <stafford.williams@gmail.com>

* new lines

Signed-off-by: Stafford Williams <stafford.williams@gmail.com>

* single newline

Signed-off-by: Stafford Williams <stafford.williams@gmail.com>
 2018-11-27 16:05:26 +08:00
Wei Guo e329cbf673 Add metric prometheus_rule_group_last_evaluation for recording and alerting (#4852) 
* add metric prometheus_rule_group_last_evaluation for recording and alerting

Signed-off-by: Wei Guo <me@imkira.com>

* fix issues from comments

Signed-off-by: Wei Guo <me@imkira.com>
 2018-11-27 14:38:13 +08:00
Brian Brazil d2f0f54d68
Pass through content-type for non-compressed output. (#4912) 
Fixes #4911

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-11-26 13:05:07 +00:00
Timo Beckers bea302e061 marathon-sd - use 'hostPort' member of portMapping to construct target endpoints (#4887) 
Fixes #4855 - ServicePort was wrongly used to construct an address to endpoints
defined in portMappings. This was changed to HostPort. Support for obtaining
auto-generated host ports was also added.

Signed-off-by: Timo Beckers <timo@incline.eu>
 2018-11-26 13:39:35 +01:00
Frederic Branczyk f9c93b3686
Merge pull request #4905 from simonpasquier/cherrypick-4840 
Cherrypick 4840
 2018-11-26 10:35:02 +01:00