Julien Pivotto
e1774b6f83
Fix the computation of prometheus_sd_discovered_targets
...
prometheus_sd_discovered_targets is wrongly calculated when there are
multiple SD configurations in place. One discovery manager can have
multiple groups coming from multiple service discoveries.
When multiple service discovery configs are used, we do not compute the
metric correctly, and instead just set the metric to one of the service
discoveries.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-05-14 22:38:37 +02:00
Julien Pivotto
2a4b8e12bb
Merge pull request #8766 from Nick-Triller/consul-sd-always-send-targetgroups
...
Send empty targetgroup if nothing discovered [consul_sd]
2021-04-30 10:27:41 +02:00
Hu Shuai
9d7d818629
Fix golint issues caused by typos ( #8769 )
...
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
2021-04-29 10:05:33 +02:00
Nick Triller
15d328750a
Fix typo in SD docs
...
Signed-off-by: Nick Triller <nicktriller@gmail.com>
2021-04-29 09:06:52 +02:00
Nick Triller
fddf4918c0
Send empty targetgroup if nothing discovered
...
Signed-off-by: Nick Triller <nicktriller@gmail.com>
2021-04-29 09:06:52 +02:00
n888
7c028d59c2
Add lightsail service discovery ( #8693 )
...
Signed-off-by: N888 <drifto@gmail.com>
2021-04-28 11:29:12 +02:00
Marco Pracucci
4da5c25ea4
Upgrade prometheus/common to v0.21.0
...
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2021-04-21 12:19:16 +02:00
Julien Pivotto
73237c04bf
scaleway_sd_config: be more cautious with pointers
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-04-19 20:40:14 +02:00
code1305
9c705ffdfb
err fix if target creation fails
...
return right error if any target creation fails. Need to wrap the right error.
Signed-off-by: Anshul <anshulkhandelwal.nitj@gmail.com>
2021-04-16 20:37:52 +05:30
Bogdan Drutu
d1ced85d7a
Bump k8s.io/* from 0.20.5 to 0.21.0 ( #8714 )
...
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
2021-04-13 10:00:00 +02:00
Julien Pivotto
5bce801a09
Rename discovery/dockerswarm to discovery/moby ( #8691 )
...
This makes it clear that the dockerswarm package does more than docker
swarm, but does also docker.
I have picked moby as it is the upstream name: https://mobyproject.org/
There is no user-facing change, except in the case of a bad
configuration. Previously, a user who would have a bad docker sd config
would see an error like:
> field xx not found in type dockerswarm.plain
Now that error would be turned into:
> field xx not found in type moby.plain
While not perfect, it should at not be confusing between docker and
dockerswarm.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-04-13 09:33:54 +02:00
Julien Pivotto
d680880b31
Fix main branch tests ( #8669 )
...
I merged #8629 without noticing that circle ci did not run here.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-30 00:00:38 +02:00
Robert Jacob
b253056163
Implement Docker discovery ( #8629 )
...
* Implement Docker discovery
Signed-off-by: Robert Jacob <xperimental@solidproject.de>
2021-03-29 22:30:23 +02:00
Julien Pivotto
5a6d244b00
Scaleway SD: Add the ability to read token from file
...
Prometheus adds the ability to read secrets from files. This add
this feature for the scaleway service discovery.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-25 00:52:33 +01:00
Andrew Starr-Bochicchio
0858657516
digitalocean_sd: Expose vpc for use in relabelling.
...
Signed-off-by: Andrew Starr-Bochicchio <a.starr.b@gmail.com>
2021-03-24 17:00:30 -04:00
Julien Pivotto
bab0fb81ef
Rename to or ID
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-12 23:53:08 +01:00
Julien Pivotto
d1c8550894
Scaleway SD: Add more labels to the instance role
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-12 01:04:15 +01:00
Julien Pivotto
990d01631f
Scaleway SD: Add instance test
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-11 22:18:07 +01:00
Rémy Léone
f690b811c5
add support for scaleway service discovery ( #8555 )
...
Co-authored-by: Patrik <patrik@ptrk.io>
Co-authored-by: Julien Pivotto <roidelapluie@inuits.eu>
Signed-off-by: Rémy Léone <rleone@scaleway.com>
2021-03-10 15:10:17 +01:00
Rémy Léone
6962e44618
Discovery docs: add a pull requests examples section ( #8556 )
...
* add a pull requests examples section
Signed-off-by: Rémy Léone <rleone@scaleway.com>
2021-03-04 10:11:08 +01:00
Julien Pivotto
93c6139bc1
Support follow_redirect
...
This PR introduces support for follow_redirect, to enable users to
disable following HTTP redirects.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-02-26 22:50:56 +01:00
Julien Pivotto
8787f0aed7
Update common to support credentials type
...
Most of the backwards compat tests is done in common.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-02-18 23:28:22 +01:00
Julien Pivotto
120a84da5d
zookeeper: change upstream to github.com/go-zookeeper/zk
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-02-16 22:58:11 +01:00
Matteo Valentini
44b78ef318
Add image name meta label to DO service discovery
...
The label `__meta_digitalocean_image` expose the `slug` of the image and
the `slug` is only present in the public images.
To refer a user-generated image (`snapshot` or `custom`) we can use
the image's display name.
See: https://developers.digitalocean.com/documentation/v2/#images
Signed-off-by: Matteo Valentini <matteo.valentini@nethesis.it>
2021-02-16 11:05:14 +01:00
fuling
829b939891
[fix] service discovery : change var "eps" to "pod
...
Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>
2021-02-10 20:17:04 +08:00
Alfred Krohmer
fc8004eeec
EC2 SD: fix error handling of NewSessionWithOptions ( #8356 )
...
Last change in 4efca5a
introduced a problem where NewDiscovery would
just return a nil value, which is not handled well and didn't allow for
fixing configuration issues at runtime without a reload.
Signed-off-by: Alfred Krohmer <alfred.krohmer@logmein.com>
2021-01-26 11:27:30 +00:00
Björn Rabenstein
997bb7134f
Merge pull request #8338 from prometheus/release-2.24
...
Merge release back (or forward?) into master.
2021-01-04 18:13:09 +01:00
Frederic Branczyk
19b0ec3baf
Merge pull request #8273 from fcddk/fcddk-k8s-enpoints-label
...
K8s SD: add endpoints labels metadata
2021-01-04 17:25:27 +01:00
Matt Berther
31e86ed4bc
prevent adding empty target when CNAME is encountered
...
Signed-off-by: Matt Berther <mattberther@users.noreply.github.com>
2021-01-04 15:51:41 +01:00
Frederic Branczyk
611fa967cd
Merge pull request #8285 from ashumkin/label-selector
...
discovery/kubernetes: Fix valid label selector causing config error
2020-12-28 16:00:06 +01:00
Alfred Krohmer
4efca5ab70
EC2 service discovery: reuse EC2 client instead of recreating it every time ( #8311 )
...
This also caches credentials that are obtained e.g. via IRSA on AWS EKS.
Previously, every refresh cycle would request the credentials again.
Signed-off-by: Alfred Krohmer <alfred.krohmer@logmein.com>
2020-12-22 15:47:44 +00:00
fcddk
b270a1d6bf
import strutil package
...
import strutil package
Signed-off-by: root <likerj@inspur.com>
2020-12-16 16:27:03 +08:00
fcddk
617c56f55a
add endponits labels metadata
...
add endponits labels metadata
Signed-off-by: root <likerj@inspur.com>
2020-12-16 16:07:49 +08:00
Alexey Shumkin
73ddf603af
discovery/kubernetes: Fix valid label selector causing config error
...
Label selector can be
"set-based"(https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#set-based-requirement )
but such a selector causes Prometheus start failure with the "unexpected
error: parsing YAML file ...: invalid selector: 'foo in (bar,baz)';
can't understand 'baz)'"-like error.
This is caused by the `fields.ParseSelector(string)` function that
simply splits an expression as a CSV-list, so a comma confuses such a
parsing method and lead to the error.
Use `labels.Parse(string)` to use a valid lexer to parse a selector
expression.
Closes #8284 .
Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>
2020-12-16 10:56:01 +03:00
Matt Berther
acee998df6
CNAME responses can occur with "Type: A" dns_sd_config requests ( #8216 )
...
Signed-off-by: Matt Berther <mattberther@users.noreply.github.com>
2020-12-01 09:32:15 +00:00
Muhammad Falak R Wani
587fd740be
discovery: ec2: expose IPv6 as label ( #7086 )
...
* discovery: ec2: expose IPv6 as label
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
2020-11-20 17:13:52 +00:00
Julien Pivotto
f8ba0ed906
Rebase docker swarm test ( #8163 )
...
Fix master tests
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-11-09 18:08:08 +05:30
Julien Pivotto
3509647462
Docker swarm: add filtering of services ( #8074 )
...
* Docker swarm: add filtering of services
Add filters on all docker swarm roles (nodes, tasks and services).
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-11-09 12:41:02 +01:00
Julien Pivotto
6c56a1faaa
Testify: move to require ( #8122 )
...
* Testify: move to require
Moving testify to require to fail tests early in case of errors.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
* More moves
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-10-29 09:43:23 +00:00
Julien Pivotto
1282d1b39c
Refactor test assertions ( #8110 )
...
* Refactor test assertions
This pull request gets rid of assert.True where possible to use
fine-grained assertions.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-10-27 11:06:53 +01:00
Julien Pivotto
4e5b1722b3
Move away from testutil, refactor imports ( #8087 )
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-10-22 11:00:08 +02:00
Viren Negi
8dbfa14607
Add UserAgent to Hetzner Robot SD ( #8008 )
...
Fix #8003
Signed-off-by: Viren Negi <meetme2meat@gmail.com>
2020-10-05 13:34:41 +02:00
Viren Negi
d253251266
Add UserAgent header to Eureka client ( #8006 )
...
Signed-off-by: Viren Negi <meetme2meat@gmail.com>
2020-10-02 21:09:56 +02:00
Julien Pivotto
184a871638
Eureka: Fix service discovery when compiled in 32-bit ( #7961 )
...
Java timestamps are causing issues when unmarshalling with a 32 bit
prometheus. It appears that we do not use those fields, so let's remove
them.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-09-22 17:53:26 +02:00
Lukas Kämmerling
c49d8680ce
Fix Hetzner Robot SD decoding with non HTTP 2xx ( #7872 )
...
* Fix Hetzner Robot SD trying to decode response when a non 2xx HTTP code was returned
Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
2020-08-31 13:24:39 +02:00
kangwoo
7c0d5ae4e7
Add Eureka Service Discovery ( #3369 )
...
Signed-off-by: kangwoo <kangwoo@gmail.com>
2020-08-26 17:36:59 +02:00
johncming
a5beb627ff
some fixies for consul sd. ( #7799 )
...
* discovery/consul: make duration more accurate.
Signed-off-by: johncming <johncming@yahoo.com>
* discovery/consul: fix bug when context done.
Signed-off-by: johncming <johncming@yahoo.com>
2020-08-25 15:46:14 +02:00
Lukas Kämmerling
b6955bf1ca
Add hetzner service discovery ( #7822 )
...
Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
2020-08-21 15:49:19 +02:00
Andy Bursavich
4e6a94a27d
Invert service discovery dependencies ( #7701 )
...
This also fixes a bug in query_log_file, which now is relative to the config file like all other paths.
Signed-off-by: Andy Bursavich <abursavich@gmail.com>
2020-08-20 13:48:26 +01:00
Frederic Branczyk
06e2c2f804
Merge pull request #6838 from brancz/endpointslice
...
discovery/kubernetes: EndpointSlice discovery
2020-08-12 16:42:49 +02:00
Julien Pivotto
9da53391d1
Merge pull request #7739 from prometheus/release-2.20
...
Merge release-2.20 into the main branch after Consul fix
2020-08-04 20:15:43 +02:00
johncming
01d096567b
discovery: simplify code. ( #7725 )
...
Signed-off-by: johncming <johncming@yahoo.com>
2020-08-03 10:29:59 +01:00
Julien Pivotto
3a7120bc07
Consul: Reduce WatchTimeout to 2m and set it as timeout for requests
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-08-03 00:42:55 +02:00
johncming
3c5ff27959
Update http header User-Agent
in k8s and swarm discovery. ( #7614 )
...
* discovery: update k8s and swarm user agent.
Signed-off-by: johncming <johncming@yahoo.com>
2020-07-31 00:18:38 +02:00
Julien Pivotto
3e0ec3f8e1
Minor change
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-29 22:14:23 +02:00
Julien Pivotto
924e7239b7
Docker Swarm SD: Support tasks and service without published ports ( #7686 )
...
* Support tasks and service without published ports
Mimics k8s discovery behaviour.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-29 20:56:30 +02:00
Julien Pivotto
88bdb13c55
DNS SD: add srv record target and port meta labels ( #7678 )
...
* DNS SD: add srv record target and port meta labels
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-28 22:09:01 +02:00
Julien Pivotto
e76c436e9c
Goleak in discoveries, scrape, rules ( #7662 )
...
* Add go leak tests for discoveries with goroutines
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
* Add go leak tests in rules
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
* Add go leak tests in scrape tests
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-27 09:38:08 +01:00
Julien Pivotto
e07415227a
discovery: check for nil triton_sd_config ( #7671 )
...
* discovery: check for nil triton_sd_config
Note: this was discovered thanks to the added test.
The test is pretty low-level but also effective.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-26 01:20:40 +02:00
Julien Pivotto
93e9c010f3
Add more Go leak tests ( #7652 )
...
* Implement go leak test for promql
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
* Implement go leak test for Consul SD
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
* Implement go leak test in discovery manager
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-24 10:10:20 +01:00
Julien Pivotto
89d2f5ec1d
Merge pull request #7635 from roidelapluie/sdtests2
...
Tests for digitalocean and Docker Swarm configs
2020-07-22 10:56:37 +02:00
Julien Pivotto
52cdcc2a3b
Add a check-list for new SD's ( #7634 )
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-22 00:07:33 +02:00
Julien Pivotto
a197508d09
Add docker swarm test
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-22 00:04:36 +02:00
Björn Rabenstein
79620c78db
Merge pull request #7604 from roidelapluie/swarmsocket
...
Docker swarm: enable unix socket
2020-07-20 13:11:06 +02:00
johncming
6da680c7e4
discovery/config: add swarmsd config validation.
...
Signed-off-by: johncming <johncming@yahoo.com>
2020-07-19 22:50:22 +02:00
Julien Pivotto
49f48d8f65
Fix comment
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-17 17:48:05 +02:00
Julien Pivotto
968c86d642
Fix comment
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-17 17:41:02 +02:00
Julien Pivotto
45644c82f6
Docker swarm: enable unix socket
...
Fixes #7603
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-17 17:38:49 +02:00
Julien Pivotto
93ecf0e14c
Refactor dockerswarm refresh for testing ( #7541 )
...
We were missing testing on the behaviour of the configuration
unmarshalling.
This PR adds a refresh command that can be used to test that we
use the correct refresh function.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-09 13:01:08 +02:00
Julien Pivotto
27867412a7
openstack tests: use new test.Cleanup function ( #7514 )
...
Since we dependend on go1.14 now, we can use T.Cleanup
https://golang.org/pkg/testing/#T.Cleanup
This provides a nicer approach to shut down the test server.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-06 20:24:16 +02:00
John Bampton
98a69b77d1
Fix spelling ( #7512 )
...
Signed-off-by: John Bampton <jbampton@users.noreply.github.com>
2020-07-04 14:54:26 +02:00
Julien Pivotto
e1f9816a33
Openstack: Reduce timeouts ( #7507 )
...
Set saner values for openstack timeouts
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-02 22:50:32 +02:00
Steffen Neubauer
9c9b872087
OpenStack SD: Add availability config option, to choose endpoint type ( #7494 )
...
* OpenStack SD: Add availability config option, to choose endpoint type
In some environments Prometheus must query OpenStack via an alternative
endpoint type (gophercloud calls this `availability`.
This commit implements this option.
Co-Authored-By: Dennis Kuhn <d.kuhn@syseleven.de>
Signed-off-by: Steffen Neubauer <s.neubauer@syseleven.de>
2020-07-02 15:17:56 +01:00
Julien Pivotto
aa452d8ab4
digitalocean: use a safer pagination method ( #7498 )
...
this method is documented here: https://github.com/digitalocean/godo
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-02 00:13:39 +02:00
Hu Shuai
a94b570dc6
Add a unit test for newAzureResourceFromID in discovery/azure/azure.go. ( #7484 )
...
This PR is about adding a unit test for newAzureResourceFromID in discovery/azure/azure.go.
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
2020-06-30 11:11:57 +01:00
Julien Pivotto
59de58d380
Docker Swarm service discovery ( #7420 )
...
* Docker Swarm service discovery
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-06-26 12:25:58 +02:00
Pierre Souchay
1508678001
Use 10m timeouts for watches ( #7423 )
...
use ?wait=10m will give results as fast as usual when data is changing
but will perform far less requests when services do not change.
On large infrastructure, this will reduce quite a lot the number of
qps on Consul servers while having the same performance for freshness
of results.
Signed-off-by: Pierre Souchay <p.souchay@criteo.com>
2020-06-20 20:22:45 +01:00
Julien Pivotto
fb9a1a872e
DigitalOcean: limit refresh timeout ( #7425 )
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-06-20 09:45:28 +02:00
Julien Pivotto
c61141ce51
Add DigitalOcean service discovery ( #7407 )
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-06-18 17:04:41 +02:00
Frederic Branczyk
f6c5a75661
discovery/kubernetes: Add Kubernetes EndpointSlice discovery
...
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-06-14 21:55:27 +02:00
Martin Lee
b5d61fb66c
Add AMI to labels scraped during service discovery. ( #7386 )
...
Signed-off-by: Martin Lee <martin@martinlee.org>
2020-06-11 18:25:58 +01:00
Frederic Branczyk
7b1c0d6b66
discovery/kubernetes: Fix incorrect premature break of reading results
...
Previously `max` results stopped reading from results in tests
prematurely, as it stopped when `max` number of items were received from
the channel instead of `max` number of unique target groups received.
This caused flaky tests where the same target group was received
multiple times, as Kubernetes informers may emit the same event multiple
times.
Before this patch, running this test repeatedly failed eventually. After
this patch I have run the test many thousand times without failure.
```bash
go test -run TestEndpointsDiscoveryNamespaces -count 1000 -test.v
```
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
2020-06-11 16:08:28 +02:00
Tariq Ibrahim
06a6621b6c
update kubernetes to v1.18.x and update ingress apiVersion
...
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
2020-06-01 08:26:50 -07:00
Jop Zinkweg
1f69c38ba4
Add discovery support for triton compute nodes ( #7250 )
...
Added optional configuration item role, defaults to 'container' (backwards-compatible).
Setting role to 'cn' will discover compute nodes instead.
Human-friendly compute node hostname discovery depends on cmon 1.7.0:
c1a2aeca36
Adjust testcases to use discovery config per case as two different types are now supported.
Updated documentation:
* new role setting
* clarify what the name 'container' covers as triton uses different names in different locations
Signed-off-by: jzinkweg <jzinkweg@gmail.com>
2020-05-22 16:19:21 +01:00
Guangming Wang
5b4006ac86
cleanup: remove unnacessary nil check before range ( #7194 )
...
Signed-off-by: Guangming Wang <guangming.wang@daocloud.io>
2020-05-02 07:25:44 +01:00
ZouYu
2b7437d60e
Fix some warnings: 'redundant type from array, slice, or map composite literal' ( #7109 )
...
Signed-off-by: ZouYu <zouy.fnst@cn.fujitsu.com>
2020-04-15 11:17:41 +01:00
Marek Slabicki
8224ddec23
Capitalizing first letter of all log lines ( #7043 )
...
Signed-off-by: Marek Slabicki <thaniri@gmail.com>
2020-04-11 09:22:18 +01:00
ZouYu
f494426f73
fix warning redundant type from array, slice, or map composite literal ( #7106 )
...
Signed-off-by: ZouYu <zouy.fnst@cn.fujitsu.com>
2020-04-09 11:29:19 +01:00
Tariq Ibrahim
0730d6eb74
remove deprecated methods from the MetricProvider interface
...
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
2020-04-06 09:23:58 -07:00
Deepjyoti Mondal
c38ca2ca95
Fix #6999 : Add architecture meta label for EC2 ( #7000 )
...
This PR adds architecture meta labels for EC2 instances
Signed-off-by: Deepjyoti Mondal <djmdeveloper060796@gmail.com>
2020-03-28 20:41:37 +00:00
coding3min
4dfbf328f2
[OpenStack SD] Add HypervisorID meta labels about id ( #6962 )
...
Add extra meta labels which will be useful in the case
Prometheus discovery hypervisor .
Signed-off-by: pzqu <pzqu@qq.com>
Co-authored-by: pzqu <pzqu@example.com>
2020-03-11 08:38:14 +00:00
Alex Gaganov
df92a00838
Expose EC2 instance lifecycle as label ( #6914 )
...
Signed-off-by: Alex Gaganov <alex.gaganov@fiverr.com>
2020-03-03 08:03:16 +00:00
Julien Pivotto
c67f81937c
discovery: updateGroup should not create targets[poolKey] in the loop ( #6903 )
...
We can assume that not all target groups are nil in normal scernarios,
so we can create targets[poolKey] outside the loop.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-03-02 07:35:02 +00:00
Mathilde Gilles
9b9c58aea8
[Consul] Add health label to metrics ( #5313 )
...
Label metrics with the target health using consul's /health endpoint.
Signed-off-by: Mathilde Gilles <m.gilles@criteo.com>
2020-02-25 13:32:30 +00:00
Frederic Branczyk
d06f1034db
discovery/kubernetes: Fix race in test setup
...
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
2020-02-25 10:33:41 +01:00
李国忠
029b45aa30
add service type metadata to kubernetes_sd_config service role #6496 ( #6684 )
...
* [service discovery] add service type metadata to kubernetes_sd_config service role
Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>
* [fix] ServiceType -> string
Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>
* [fix] fix testcase
Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>
* [style]
Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>
* [doc] add service type
Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>
* [doc] sort
Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>
2020-02-25 09:22:14 +01:00
Simon Pasquier
06c1a07d5a
discovery/kubernetes: remove extraneous parameters from send()
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2020-02-18 17:36:57 +01:00
Aleksandra Gacek
8e53c19f9c
discovery/kubernetes: expose label_selector and field_selector
...
Close #6807
Co-authored-by @shuttie
Signed-off-by: Aleksandra Gacek <algacek@google.com>
2020-02-15 14:57:56 +01:00
Grebennikov Roman
b4445ff03f
discovery/kubernetes: expose label_selector and field_selector
...
Closes #6096
Signed-off-by: Grebennikov Roman <grv@dfdx.me>
2020-02-15 14:57:38 +01:00
Simon Pasquier
fe76ccbfe3
discovery/consul: fix logging of tags ( #6783 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2020-02-13 13:11:44 +01:00
Ben Ye
1a18594176
keep kubernetes metrics in global vars ( #6765 )
...
Signed-off-by: yeya24 <yb532204897@gmail.com>
2020-02-06 15:52:57 +00:00
Ben Ye
60527de355
keep consul service metrics in global variables ( #6764 )
...
Signed-off-by: yeya24 <yb532204897@gmail.com>
2020-02-06 05:48:58 +00:00
Julien Pivotto
cf42888e4d
Fix order of testutil.Equals ( #6695 )
...
Equals takes the expected value as first parameter, and the actual value
as second parameter.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-01-27 12:21:59 +00:00
johncming
17683d074c
discovery: fix bug that use rlock for read. ( #5928 )
...
Signed-off-by: johncming <johncming@yahoo.com>
2020-01-22 09:57:37 +00:00
Julien Pivotto
2b2eb79e8b
Add windows tests for query logger ( #6653 )
...
* Add windows tests
* Do not rely on time.Time in timer
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-01-20 13:17:11 +00:00
Josh Soref
91d76c8023
Spelling ( #6517 )
...
* spelling: alertmanager
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: attributes
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: autocomplete
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: bootstrap
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: caught
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: chunkenc
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: compaction
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: corrupted
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: deletable
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: expected
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: fine-grained
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: initialized
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: iteration
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: javascript
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: multiple
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: number
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: overlapping
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: possible
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: postings
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: procedure
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: programmatic
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: queuing
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: querier
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: repairing
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: received
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: reproducible
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: retention
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: sample
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: segements
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: semantic
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: software [LICENSE]
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: staging
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: timestamp
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: unfortunately
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: uvarint
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: subsequently
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: ressamples
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2020-01-02 15:54:09 +01:00
Simon Pasquier
75470f86b4
discovery/kubernetes: fix client metrics
...
The Kubernetes client records workqueue duration and latency metrics as
seconds so there's no need to convert the values from microseconds to
seconds anymore.
The cache metrics (prometheus_sd_kubernetes_cache_*) are removed because
they aren't used anymore by the client though still exposed by its API.
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-11-29 12:34:36 +01:00
Callum Styan
7bf17b654c
As per dev summit, SD moratorium has been lifted. ( #6324 )
...
Signed-off-by: Callum Styan <callumstyan@gmail.com>
2019-11-21 00:22:15 +00:00
Jean-Baptiste Le Duigou
5973227434
adding additional unit tests for getDataCenter() in consul ( #6192 )
...
* adding additional unit tests for getDataCenter() in consul
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
* Consult Tests : update comments to start with uppercase and end with point
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
* Consult Test : using table-driven tests
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
* Consul Test : cleaner syntax
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
* Consul Test : even cleaner syntax
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
* Consul Test : update comments
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
* Fixing naming convention by removing underscore in function name
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
* Removing duplicated test case for getDatacenter()
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
2019-11-15 14:52:39 +01:00
Yao Zengzeng
1afa476b8a
minor fix for making map ( #6076 )
...
Signed-off-by: YaoZengzeng <yaozengzeng@huawei.com>
2019-10-25 20:06:00 -06:00
Simon Pasquier
3acc3e856c
Adding unit test for target group ( #6141 )
...
* adding unit test for target group
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
* Improve unit tests for target group
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
* Fix imports
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
* Improve test by asserting on whole Target Group object
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
2019-10-18 16:24:26 +02:00
Simon Pasquier
19ce6b7f5f
discovery: fix more error logs on context cancelation ( #6133 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-10-18 11:48:51 +02:00
Jean-Baptiste Le Duigou
0939d566f3
Improve test by asserting on whole Target Group object
...
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
2019-10-17 21:25:38 +02:00
Jean-Baptiste Le Duigou
3309ffa482
Fix imports
...
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
2019-10-17 21:12:50 +02:00
Jean-Baptiste Le Duigou
9372a224b5
Improve unit tests for target group
...
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
2019-10-16 18:03:05 +02:00
Jean-Baptiste Le Duigou
1f9eb09e8e
Improve unit tests for target group
...
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
2019-10-15 21:43:31 +02:00
Jean-Baptiste Le Duigou
5146bb14ef
adding unit test for target group ( #6138 )
...
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
2019-10-14 23:48:08 +01:00
Jean-Baptiste Le Duigou
15de05d55e
adding unit test for target group
...
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
2019-10-14 21:05:11 +02:00
Simon Pasquier
8ec6f02854
discovery: don't log errors on context cancelation
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-10-09 11:51:38 +02:00
Nevill
7465f27ea5
Refactor on discovery/manager_test.go
...
- Use testutil.ToFloat64 to collect testing metrics
- Declare ServiceDiscoveryConfig directly instead of calling Unmarshal on a piece of YAML
Signed-off-by: Nevill <nevill.dutt@gmail.com>
2019-10-08 10:18:48 +08:00
陈谭军
c6928b5c6e
fix-up typo unkown->unknown ( #6055 )
...
Signed-off-by: chentanjun <2799194073@qq.com>
2019-09-25 09:51:43 +02:00
Simon Pasquier
80bc8553be
discovery/file: fix flaky tests ( #5948 )
...
* discovery/file: fix flaky tests
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
* Fix typos
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
* Add copyFileTo() method
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-09-24 14:54:50 +02:00
Björn Rabenstein
52e0504f83
Merge pull request #5254 from nevill/fix-4890
...
Change prometheus_sd_configs_failed_total to Gauge
2019-09-24 12:10:40 +02:00
Nevill
55661ab004
Set failedConfigs only once right after registerProviders finished
...
Signed-off-by: Nevill <nevill.dutt@gmail.com>
2019-09-24 09:15:40 +08:00
johncming
31a8ac3219
discovery/dns: add test case for SDConfig.UnmarshalYAML. ( #6035 )
...
* discovery/dns: Add code coverage.
Signed-off-by: johncming <johncming@yahoo.com>
* discovery/dns: add test case for SDConfig.UnmarshalYAML.
Signed-off-by: johncming <johncming@yahoo.com>
2019-09-23 13:26:11 +02:00
Nevill
048f81218d
Change prometheus_sd_configs_failed_total to Gauge
...
Signed-off-by: Nevill <nevill.dutt@gmail.com>
2019-09-16 10:38:43 +08:00
Harkishen Singh
d98d4a9bf0
remove resetting of manager properties and init manager props under locking ( #5979 )
...
Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>
2019-09-06 12:46:24 +02:00
Tariq Ibrahim
f0a5f88b95
[prometheus_sd/kubernetes]add new node address types for discover ( #5902 )
...
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
2019-08-20 15:52:11 +01:00
Bartek Płotka
5cb32d67f9
Merge pull request #5893 from prometheus/unify-tsdbutil
...
Removed extra tsdb/testutil after merge.
2019-08-15 12:07:59 +01:00
Bartek Plotka
f0863a604e
Removed extra tsdb/testutil after merge.
...
Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
2019-08-14 10:12:32 +01:00
Julius Volz
b5c833ca21
Update go.mod dependencies before release ( #5883 )
...
* Update go.mod dependencies before release
Signed-off-by: Julius Volz <julius.volz@gmail.com>
* Add issue for showing query warnings in promtool
Signed-off-by: Julius Volz <julius.volz@gmail.com>
* Revert json-iterator back to 1.1.6
It produced errors when marshaling Point values with special float
values.
Signed-off-by: Julius Volz <julius.volz@gmail.com>
* Fix expected step values in promtool tests after client_golang update
Signed-off-by: Julius Volz <julius.volz@gmail.com>
* Update generated protobuf code after proto dep updates
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2019-08-14 11:00:39 +02:00
Björn Rabenstein
70ce3df23c
Merge pull request #5860 from tariq1890/variadic
...
pass multiple args to Registerer.MustRegister method
2019-08-13 13:22:30 +02:00
Ganesh Vernekar
5ecef3542d
Cleanup after merging tsdb into prometheus
...
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
2019-08-13 14:04:14 +05:30
tariqibrahim
df99d943ba
pass multiple args to Registers.MustRegister method
...
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
2019-08-12 22:56:10 -07:00
Chris Marchbanks
529ccff07b
Remove all usages of stretchr/testify
...
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
2019-08-08 19:49:27 -06:00
AllenZMC
41151ca8dc
fix mis-spelling in consul_test.go ( #5836 )
...
Signed-off-by: czm <zhongming.chang@daocloud.io>
2019-08-06 06:11:41 +01:00
dzzg
938ca06057
fix wrong spells in ingress.go
...
Signed-off-by: dzzg <zhengguang.zhu@daocloud.io>
2019-07-28 02:07:23 +08:00
Ye Ji
9229811c94
give each tree cache its unique channel to avoid multiple close on the same channel
...
Signed-off-by: Ye Ji <ye@hioscar.com>
2019-07-09 16:38:56 -04:00
beorn7
dd81912554
Add objectives to Summaries
...
With the next release of client_golang, Summaries will not have
objectives by default. To not lose the objectives we have right now,
explicitly state the current default objectives.
Signed-off-by: beorn7 <beorn@grafana.com>
2019-06-12 02:03:13 +02:00
sh0rez
8ba23fb336
fix(style): container_is_init to container_init
...
Removes 'is' keyword to comply style guide
Signed-off-by: sh0rez <me@shorez.de>
2019-05-29 16:16:19 +02:00
sh0rez
88b79bae64
chore(style): Comply with style guide, order list
...
Signed-off-by: sh0rez <me@shorez.de>
2019-05-29 11:22:10 +02:00
sh0rez
6618f28fd7
test(discovery/kubernetes): TestPodDiscoveryInitContainer
...
Adds a test to check whether an InitContainer is included in the discovery
Signed-off-by: sh0rez <me@shorez.de>
2019-05-28 16:51:58 +02:00
sh0rez
fbd5c6f310
test(discovery/kubernetes): add container_is_init label to tests
...
Adds the new container_is_init label to the current tests to make them pass again
Signed-off-by: sh0rez <me@shorez.de>
2019-05-27 19:16:03 +02:00
sh0rez
cfa253ae06
feat(discovery/kubernetes): container_is_init label
...
Adds a label that shows whether the container is an init container or not
Signed-off-by: sh0rez <me@shorez.de>
2019-05-27 17:48:15 +02:00
sh0rez
bea07fe866
feat(discovery/kubernetes): include InitContainers
...
Includes InitContainers in the ServiceDiscovery
Signed-off-by: sh0rez <me@shorez.de>
2019-05-26 22:53:14 +02:00
Bevisy
b7cdd3e840
Exhaust request body before closing it ( #5596 )
...
Signed-off-by: bevisy <binbin36520@gmail.com>
2019-05-25 11:27:12 +01:00
Dmitry Shmulevich
d81df5609d
fix nil pointer dereference in azure discovery ( #5587 )
...
Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>
2019-05-21 20:03:24 +01:00
Simon Pasquier
3441ecdea1
discovery/kubernetes: add node name and hostname to endpoints
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-05-16 10:49:13 +02:00
Simon Pasquier
45506841e6
*: enable all default linters ( #5504 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-05-03 15:11:28 +02:00
Frederic Branczyk
3cffd81035
Merge pull request #5520 from YaoZengzeng/service
...
The workqueue of service should be `service` other than `ingress`
2019-04-29 14:03:21 +02:00
YaoZengzeng
658b33808c
The workqueue of service should be service
other than ingress
...
Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
2019-04-29 17:21:35 +08:00
Frederic Branczyk
f874555a0d
Merge pull request #5486 from tariq1890/update_kubernetes
...
update client-go,api,api-machinery and klog dependencies
2019-04-29 09:34:27 +02:00
Björn Rabenstein
0be9388f8d
Merge pull request #5463 from prometheus/beorn7/templating
...
Follow-up on #5009
2019-04-24 16:42:23 +02:00
Tariq Ibrahim
00036cd1e5
update client-go,api,api-machinery and klog dependencies
...
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
2019-04-23 10:54:18 -07: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