mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 21:54:10 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
5424 commits 243 branches 444 tags 649 MiB
Commit graph

5424 commits

This branch
This branch
All branches
Author SHA1 Message Date
tariqibrahim 1e4e4c46ba Merge branch 'master' of https://github.com/prometheus/prometheus into update_k8s 
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
 2018-12-20 11:36:54 -08:00
Ilya Gladyshev 922c17e119 added name label to all discovery metrics (#5002) 
Signed-off-by: Ilya Gladyshev <ilya.v.gladyshev@gmail.com>
 2018-12-20 14:47:29 +00:00
Erik Hollensbe b94eea482c discovery/gce: oauth2.NoContext is deprecated, replace with context.Background() (#5024) 
* vendor update
* discovery/gce: oauth2.NoContext is deprecated, replace with context.Background()

Signed-off-by: Erik Hollensbe <github@hollensbe.org>
 2018-12-20 14:45:18 +00:00
Simon Pasquier 5e2f5e4eea
circleci: add back 'unused' and 'staticcheck' tests (#5021) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-12-20 14:40:34 +01:00
AixesHunter 29f21b8d0c import aliases yaml that can be omitted (#5018) 
Signed-off-by: aixeshunter <aixeshunter@gmail.com>
 2018-12-20 09:45:30 +00:00
Paul Gier 1ca7037526 the go test -race option is only supported on amd64 (#4382) 
Adds checks for current OS and arch to determine whether the '-race' option
should be used with go test

Signed-off-by: Paul Gier <pgier@redhat.com>
 2018-12-19 11:28:26 +01:00
Marcel D. Juhnke c7d83b2b6a discovery: add support for Managed Identity authentication in Azure SD (#4590) 
Signed-off-by: Marcel Juhnke <marrat@marrat.de>
 2018-12-19 10:03:33 +00:00
AixesHunter fb8479a677 Variable 'labels' collides with imported package name (#5012) 
Signed-off-by: aixeshunter <aixeshunter@gmail.com>
 2018-12-19 09:44:03 +00:00
tariqibrahim 0d4b6e4e66 address review comments 
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
 2018-12-18 08:14:30 -08:00
tariqibrahim b883f6826b updating k8s.io/api to v1.13.1 
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
 2018-12-18 07:58:09 -08:00
Paul Gier d55bd57bdc Makefile.common: fix promu download path for arm32 (#4998) 
Signed-off-by: Paul Gier <pgier@redhat.com>
 2018-12-18 16:20:43 +01:00
Tariq Ibrahim de6f3b6af7 expose kubernetes service cluster ip (#4940) 
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
 2018-12-18 15:17:34 +00:00
Julius Volz 68f0787c37
Fix various misspellings of "shepherd" in the release docs (#5006) 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2018-12-18 12:53:28 +01:00
Bartek Płotka 62c8337e77 Moved configuration into relabel package. (#4955) 
Adapted top dir relabel to use pkg relabel structs.

Removal of this in a separate tracked here: https://github.com/prometheus/prometheus/issues/3647

Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
 2018-12-18 11:26:36 +00:00
Alin Sinpalean 44bec482fb Minor optimization for BufferedSeriesIterator: actually drop the samples falling outside of the new delta from the underlying sampleRing, when ReduceDelta is called. (#4849) 
Signed-off-by: Alin Sinpalean <alin.sinpalean@gmail.com>
 2018-12-18 11:25:45 +00:00
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