mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-19 23:37:31 -07:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
5696 commits 210 branches 424 tags 634 MiB
Commit graph

293 commits

Author SHA1 Message Date
Björn Rabenstein 0be9388f8d
Merge pull request #5463 from prometheus/beorn7/templating 
Follow-up on #5009
 2019-04-24 16:42:23 +02:00
Romain Baugue 95193fa027 Exhaust every request body before closing it (#5166) (#5479) 
From the documentation:
> The default HTTP client's Transport may not
> reuse HTTP/1.x "keep-alive" TCP connections if the Body is
> not read to completion and closed.

This effectively enable keep-alive for the fixed requests.

Signed-off-by: Romain Baugue <romain.baugue@elwinar.com>
 2019-04-18 09:50:37 +01:00
EarthmanT 35be8c9e25 Add azure public ip label (#5475) 
* Update Azure SD Config with Public IP label

Signed-off-by: earthmant <trammell@cloudify.co>
 2019-04-17 16:05:44 +01:00
Bjoern Rabenstein a92ef68dd8 Fix staticcheck errors 
Not sure why they only show up now.

Signed-off-by: Bjoern Rabenstein <bjoern@rabenste.in>
 2019-04-17 01:40:10 +02:00
Simon Pasquier 559237cc4f discovery/kubernetes: fix missing label sanitization (#5462) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-15 19:04:50 +01:00
Brian Brazil 8ff6938fa4
Update dependencies. (#5449) 
Including going to tsdb 0.7.0.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-04-10 18:47:25 +01:00
Simon Pasquier dafd1632a2 discovery/kubernetes: add present labels for labels/annotations (#5443) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-10 13:21:42 +01:00
Simon Pasquier 4f47806a7d
discovery/dns: fix slice with wrong length (#5432) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-04 17:05:35 +02:00
Kien Nguyen-Tuan 813b58367a [OpenStack SD] Add ProjectID and UserID meta labels (#5431) 
Add extra meta labels which will be useful in the case
Prometheus discovery instances from all projects.

Signed-off-by: Kien Nguyen <kiennt2609@gmail.com>
 2019-04-04 10:02:31 +01:00
Tariq Ibrahim 8fdfa8abea refine error handling in prometheus (#5388) 
i) Uses the more idiomatic Wrap and Wrapf methods for creating nested errors.
ii) Fixes some incorrect usages of fmt.Errorf where the error messages don't have any formatting directives.
iii) Does away with the use of fmt package for errors in favour of pkg/errors

Signed-off-by: tariqibrahim <tariq181290@gmail.com>
 2019-03-26 00:01:12 +01:00
Simon Pasquier 782d00059a
discovery: factorize for SD based on refresh (#5381) 
* discovery: factorize for SD based on refresh

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

* discovery: use common metrics for refresh

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-03-25 11:54:22 +01:00
Tariq Ibrahim 0d7104b7eb discovery/azure:optimize iteration logic for VMScalesets, VMScalesetVMs, and VMs (#5363) 
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
 2019-03-20 09:03:47 +00:00
Tariq Ibrahim 5f933e99d0 discovery/azure: make local virtualMachine struct more generic by removing the go sdk field reference (#5350) 
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
 2019-03-15 16:18:37 +00:00
Mario Trangoni 5354ffff99 Fix some spelling issues (#5361) 
See,
$ codespell -S './vendor/*,./.git*,./web/ui/static/vendor*' --ignore-words-list="uint,dur,ue,iff,te,wan"

Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>
 2019-03-14 14:38:54 +00:00
Simon Pasquier 67385f356f
discovery/openstack: pass context to the OpenStack client (#5231) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-03-12 13:53:03 +01:00
Callum Styan 83c46fd549 update Consul vendor code so that catalog.ServiceMultipleTags can be (#5151) 
Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2019-03-12 10:31:27 +00:00
Tariq Ibrahim 197e5ac597 docs: minor improvements to the service discovery README.md (#5296) 
i) Increased the size of the Service Discovery Readme title
ii) Changed `TargetGroups` to "target groups" as it has been relocated and renamed to another package.

Signed-off-by: tariqibrahim <tariq181290@gmail.com>
 2019-03-03 19:48:03 +01:00
JoeWrightss e4b88704a6 Fix misspell in manager_test.go (#5279) 
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
 2019-02-27 11:22:31 +01:00
Simon Pasquier 1d2fc95b1c
discovery/marathon: pass context to the client (#5232) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-02-26 14:49:16 +01:00
Simon Pasquier e60d314f43
discovery/consul: pass current context to Consul queries (#5230) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-02-26 14:48:19 +01:00
Simon Pasquier 8f578d9c6b
discovery/ec2: pass context to the client (#5234) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-02-26 14:48:03 +01:00
Simon Pasquier 4997dcb4a1
discovery/gce: pass context to the client (#5233) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-02-26 14:47:43 +01:00
Simon Pasquier 9040dddd0c
discovery/azure: pass context to the client (#5255) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-02-26 14:47:26 +01:00
Simon Pasquier fe7a1bcfc6
discovery/triton: pass context to the client (#5235) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-02-26 14:47:04 +01:00
Björn Rabenstein ad29221a7b
Merge pull request #5020 from erikh/upgrade-miekg-dns 
Upgrade miekg dns
 2019-02-25 12:47:32 +01:00
Simon Pasquier e72c875e63
config: fix Kubernetes config with empty API server (#5256) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-02-22 15:51:47 +01:00
Nguyen Hai Truong aed9ea144a Remove duplicated words in comments 
Although it is spelling mistakes, it might make an affects
while reading.

Co-Authored-By: Kim Bao Long longkb@vn.fujitsu.com
Signed-off-by: Nguyen Hai Truong <truongnh@vn.fujitsu.com>
 2019-02-20 17:41:02 -08:00
Simon Pasquier c8a1a5a93c
discovery/kubernetes: fix support for password_file and bearer_token_file (#5211) 
* discovery/kubernetes: fix support for password_file

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

* Create and pass custom RoundTripper to Kubernetes client

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

* Use inline HTTPClientConfig

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-02-20 11:22:34 +01:00
Erik Hollensbe be3c082539 discovery/dns/dns.go: fix handling of truncated dns records 
https://github.com/miekg/dns/pull/815 goes into the detail, but more or
less the existing solution was no longer supported and needed to be
rewritten to support the new versions of the library. miekg additionally
claims this is more correct in the ticket.

Signed-off-by: Erik Hollensbe <github@hollensbe.org>
 2019-02-20 00:36:41 +00:00
Simon Pasquier f9462d5d44 discovery/consul: pass current context to Consul queries 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-02-18 14:23:56 +01:00
JoeWrightss 4cb6c202ff Fix fmt.Errorf error message (#5199) 
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
 2019-02-10 15:16:20 +05:30
tariqibrahim b173de0c26 fix ineffectual assignment in dns.go 
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
 2019-01-28 17:15:43 -08:00
Jannick Fahlbusch ฏ๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎ 63f375e80a [FIX] Azure DS: Return error when request failed (#4719) 
This fixes the issue that the error is swallowed when the request failed.

Signed-off-by: Jannick Fahlbusch <git@jf-projects.de>
 2019-01-28 21:31:45 +00:00
Tariq Ibrahim f4275d2352 Use the latest versions of azure go sdk and go-autorest (#5015) 
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
 2019-01-28 18:30:29 +00:00
Tariq Ibrahim bfcdba211f remove the prepended watch reactor from the fake k8s client (#5140) 
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
 2019-01-28 16:42:25 +01:00
Simon Pasquier 68e4c211f2
discovery/azure: more robust handling of go routines (#5106) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-01-18 09:55:47 +01:00
Matt Layher 302148fd69 *: apply gofmt -s 
Signed-off-by: Matt Layher <mdlayher@gmail.com>
 2019-01-16 17:28:14 -05:00
Simon Pasquier 22a1def98d
Merge pull request #5099 from prometheus/release-2.6 
Merge release-2.6 to master
 2019-01-16 09:26:00 +01:00
tommarute 9922c35a23 marathon-sd - use Tasks.Ports instead of PortDefinitions.Ports if RequirePorts is false (#5022) (#5026) 
Signed-off-by: tommarute <tommarute@gmail.com>
 2019-01-14 17:20:22 +00:00
Sylvain Rabot d9f4a8c95f sd: Fix stuck Azure service discovery (#5088) 
Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>
 2019-01-14 15:09:27 +00:00
Kevin Bulebush 718344434c openstack_sd: Supporting application credential for authentication. (#4968) 
* openstack_sd: Support application credentials for authentication.
Updated gophercloud

Signed-off-by: Kevin Bulebush <kmbulebu@gmail.com>
 2019-01-09 15:18:58 +00:00
Frederic Branczyk e9ae0b5a1b
Merge pull request #4927 from tariq1890/update_k8s 
update client-go to v10.0.0 and other k8s deps to v1.13.1
 2019-01-07 10:54:34 +01:00
Fabian Reinartz ca93c8e19b
Merge pull request #4969 from prometheus/azuresubid 
Add Azure tenant and subscription ID labels
 2019-01-06 12:25:06 +01:00
Simon Pasquier f678e27eb6
*: use latest release of staticcheck (#5057) 
* *: use latest release of staticcheck

It also fixes a couple of things in the code flagged by the additional
checks.

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

* Use official release of staticcheck

Also run 'go list' before staticcheck to avoid failures when downloading packages.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-01-04 14:47:38 +01:00
tariqibrahim aa94efe4b5 Merge branch 'master' of https://github.com/prometheus/prometheus into update_k8s 2019-01-03 10:27:12 -08:00
Fabian Reinartz 7a41038695 Add Azure tenant and subscription ID labels 
Signed-off-by: Fabian Reinartz <freinartz@google.com>
 2019-01-03 13:09:13 +01:00
Lv Jiawei ad22389218 Add ingress in UnmarshalYAML and init (#5035) 
Both UnmarshalYAML and init lacks the role type ingress.

Signed-off-by: MIBc <lvjiawei@cmss.chinamobile.com>
 2018-12-24 09:24:01 +00:00
tariqibrahim 122b47caa0 address review comment in client_metrics 
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
 2018-12-21 00:46:47 -08:00
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