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>
4 years ago
b253056163
Implement Docker discovery ( #8629 )
...
* Implement Docker discovery
Signed-off-by: Robert Jacob <xperimental@solidproject.de>
4 years ago
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>
4 years ago
0858657516
digitalocean_sd: Expose vpc for use in relabelling.
...
Signed-off-by: Andrew Starr-Bochicchio <a.starr.b@gmail.com>
4 years ago
bab0fb81ef
Rename to or ID
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
4 years ago
d1c8550894
Scaleway SD: Add more labels to the instance role
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
4 years ago
990d01631f
Scaleway SD: Add instance test
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
120a84da5d
zookeeper: change upstream to github.com/go-zookeeper/zk
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
4 years ago
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>
4 years ago
829b939891
[fix] service discovery : change var "eps" to "pod
...
Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>
4 years ago
fc8004eeec
EC2 SD: fix error handling of NewSessionWithOptions ( #8356 )
...
Last change in 4efca5a
4 years ago
997bb7134f
Merge pull request #8338 from prometheus/release-2.24
...
Merge release back (or forward?) into master.
4 years ago
19b0ec3baf
Merge pull request #8273 from fcddk/fcddk-k8s-enpoints-label
...
K8s SD: add endpoints labels metadata
4 years ago
31e86ed4bc
prevent adding empty target when CNAME is encountered
...
Signed-off-by: Matt Berther <mattberther@users.noreply.github.com>
4 years ago
611fa967cd
Merge pull request #8285 from ashumkin/label-selector
...
discovery/kubernetes: Fix valid label selector causing config error
4 years ago
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>
4 years ago
b270a1d6bf
import strutil package
...
import strutil package
Signed-off-by: root <likerj@inspur.com>
4 years ago
617c56f55a
add endponits labels metadata
...
add endponits labels metadata
Signed-off-by: root <likerj@inspur.com>
4 years ago
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>
4 years ago
acee998df6
CNAME responses can occur with "Type: A" dns_sd_config requests ( #8216 )
...
Signed-off-by: Matt Berther <mattberther@users.noreply.github.com>
4 years ago
587fd740be
discovery: ec2: expose IPv6 as label ( #7086 )
...
* discovery: ec2: expose IPv6 as label
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
4 years ago
f8ba0ed906
Rebase docker swarm test ( #8163 )
...
Fix master tests
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
4e5b1722b3
Move away from testutil, refactor imports ( #8087 )
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
4 years ago
8dbfa14607
Add UserAgent to Hetzner Robot SD ( #8008 )
...
Fix #8003
Signed-off-by: Viren Negi <meetme2meat@gmail.com>
4 years ago
d253251266
Add UserAgent header to Eureka client ( #8006 )
...
Signed-off-by: Viren Negi <meetme2meat@gmail.com>
4 years ago
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>
4 years ago
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>
4 years ago
7c0d5ae4e7
Add Eureka Service Discovery ( #3369 )
...
Signed-off-by: kangwoo <kangwoo@gmail.com>
4 years ago
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>
4 years ago
b6955bf1ca
Add hetzner service discovery ( #7822 )
...
Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
4 years ago
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>
4 years ago
06e2c2f804
Merge pull request #6838 from brancz/endpointslice
...
discovery/kubernetes: EndpointSlice discovery
4 years ago
9da53391d1
Merge pull request #7739 from prometheus/release-2.20
...
Merge release-2.20 into the main branch after Consul fix
4 years ago
01d096567b
discovery: simplify code. ( #7725 )
...
Signed-off-by: johncming <johncming@yahoo.com>
4 years ago
3a7120bc07
Consul: Reduce WatchTimeout to 2m and set it as timeout for requests
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
4 years ago
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>
4 years ago
3e0ec3f8e1
Minor change
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
89d2f5ec1d
Merge pull request #7635 from roidelapluie/sdtests2
...
Tests for digitalocean and Docker Swarm configs
4 years ago
52cdcc2a3b
Add a check-list for new SD's ( #7634 )
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
4 years ago
a197508d09
Add docker swarm test
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
4 years ago
79620c78db
Merge pull request #7604 from roidelapluie/swarmsocket
...
Docker swarm: enable unix socket
4 years ago
6da680c7e4
discovery/config: add swarmsd config validation.
...
Signed-off-by: johncming <johncming@yahoo.com>
4 years ago
49f48d8f65
Fix comment
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
4 years ago
968c86d642
Fix comment
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
4 years ago
45644c82f6
Docker swarm: enable unix socket
...
Fixes #7603
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
4 years ago
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>
4 years ago
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>
4 years ago
98a69b77d1
Fix spelling ( #7512 )
...
Signed-off-by: John Bampton <jbampton@users.noreply.github.com>
4 years ago
e1f9816a33
Openstack: Reduce timeouts ( #7507 )
...
Set saner values for openstack timeouts
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
59de58d380
Docker Swarm service discovery ( #7420 )
...
* Docker Swarm service discovery
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
4 years ago
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>
4 years ago
fb9a1a872e
DigitalOcean: limit refresh timeout ( #7425 )
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
5 years ago
c61141ce51
Add DigitalOcean service discovery ( #7407 )
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
5 years ago
f6c5a75661
discovery/kubernetes: Add Kubernetes EndpointSlice discovery
...
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
5 years ago
b5d61fb66c
Add AMI to labels scraped during service discovery. ( #7386 )
...
Signed-off-by: Martin Lee <martin@martinlee.org>
5 years ago
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>
5 years ago
06a6621b6c
update kubernetes to v1.18.x and update ingress apiVersion
...
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
5 years ago
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
5 years ago
5b4006ac86
cleanup: remove unnacessary nil check before range ( #7194 )
...
Signed-off-by: Guangming Wang <guangming.wang@daocloud.io>
5 years ago
2b7437d60e
Fix some warnings: 'redundant type from array, slice, or map composite literal' ( #7109 )
...
Signed-off-by: ZouYu <zouy.fnst@cn.fujitsu.com>
5 years ago
8224ddec23
Capitalizing first letter of all log lines ( #7043 )
...
Signed-off-by: Marek Slabicki <thaniri@gmail.com>
5 years ago
f494426f73
fix warning redundant type from array, slice, or map composite literal ( #7106 )
...
Signed-off-by: ZouYu <zouy.fnst@cn.fujitsu.com>
5 years ago
0730d6eb74
remove deprecated methods from the MetricProvider interface
...
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
5 years ago
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>
5 years ago
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>
5 years ago
df92a00838
Expose EC2 instance lifecycle as label ( #6914 )
...
Signed-off-by: Alex Gaganov <alex.gaganov@fiverr.com>
5 years ago
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>
5 years ago
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>
5 years ago
d06f1034db
discovery/kubernetes: Fix race in test setup
...
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
5 years ago
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>
5 years ago
06c1a07d5a
discovery/kubernetes: remove extraneous parameters from send()
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
5 years ago
8e53c19f9c
discovery/kubernetes: expose label_selector and field_selector
...
Close #6807
Co-authored-by @shuttie
Signed-off-by: Aleksandra Gacek <algacek@google.com>
5 years ago
b4445ff03f
discovery/kubernetes: expose label_selector and field_selector
...
Closes #6096
Signed-off-by: Grebennikov Roman <grv@dfdx.me>
5 years ago
fe76ccbfe3
discovery/consul: fix logging of tags ( #6783 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
5 years ago
1a18594176
keep kubernetes metrics in global vars ( #6765 )
...
Signed-off-by: yeya24 <yb532204897@gmail.com>
5 years ago
60527de355
keep consul service metrics in global variables ( #6764 )
...
Signed-off-by: yeya24 <yb532204897@gmail.com>
5 years ago
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>
5 years ago
17683d074c
discovery: fix bug that use rlock for read. ( #5928 )
...
Signed-off-by: johncming <johncming@yahoo.com>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
7bf17b654c
As per dev summit, SD moratorium has been lifted. ( #6324 )
...
Signed-off-by: Callum Styan <callumstyan@gmail.com>
5 years ago
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>
5 years ago
1afa476b8a
minor fix for making map ( #6076 )
...
Signed-off-by: YaoZengzeng <yaozengzeng@huawei.com>
5 years ago
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>
5 years ago
19ce6b7f5f
discovery: fix more error logs on context cancelation ( #6133 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
5 years ago
0939d566f3
Improve test by asserting on whole Target Group object
...
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
5 years ago
3309ffa482
Fix imports
...
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
5 years ago
9372a224b5
Improve unit tests for target group
...
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
5 years ago
1f9eb09e8e
Improve unit tests for target group
...
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
5 years ago
5146bb14ef
adding unit test for target group ( #6138 )
...
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
5 years ago
15de05d55e
adding unit test for target group
...
Signed-off-by: Jean-Baptiste Le Duigou <jb.leduigou@gmail.com>
5 years ago
8ec6f02854
discovery: don't log errors on context cancelation
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
5 years ago
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>
5 years ago
c6928b5c6e
fix-up typo unkown->unknown ( #6055 )
...
Signed-off-by: chentanjun <2799194073@qq.com>
5 years ago
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>
5 years ago
52e0504f83
Merge pull request #5254 from nevill/fix-4890
...
Change prometheus_sd_configs_failed_total to Gauge
5 years ago
55661ab004
Set failedConfigs only once right after registerProviders finished
...
Signed-off-by: Nevill <nevill.dutt@gmail.com>
5 years ago
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>
5 years ago
048f81218d
Change prometheus_sd_configs_failed_total to Gauge
...
Signed-off-by: Nevill <nevill.dutt@gmail.com>
5 years ago
d98d4a9bf0
remove resetting of manager properties and init manager props under locking ( #5979 )
...
Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>
5 years ago
f0a5f88b95
[prometheus_sd/kubernetes]add new node address types for discover ( #5902 )
...
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
5 years ago
5cb32d67f9
Merge pull request #5893 from prometheus/unify-tsdbutil
...
Removed extra tsdb/testutil after merge.
5 years ago
f0863a604e
Removed extra tsdb/testutil after merge.
...
Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
5 years ago
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>
5 years ago
70ce3df23c
Merge pull request #5860 from tariq1890/variadic
...
pass multiple args to Registerer.MustRegister method
5 years ago
5ecef3542d
Cleanup after merging tsdb into prometheus
...
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
5 years ago
df99d943ba
pass multiple args to Registers.MustRegister method
...
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
5 years ago
529ccff07b
Remove all usages of stretchr/testify
...
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
5 years ago
41151ca8dc
fix mis-spelling in consul_test.go ( #5836 )
...
Signed-off-by: czm <zhongming.chang@daocloud.io>
5 years ago
938ca06057
fix wrong spells in ingress.go
...
Signed-off-by: dzzg <zhengguang.zhu@daocloud.io>
5 years ago
9229811c94
give each tree cache its unique channel to avoid multiple close on the same channel
...
Signed-off-by: Ye Ji <ye@hioscar.com>
5 years ago
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>
6 years ago
8ba23fb336
fix(style): container_is_init to container_init
...
Removes 'is' keyword to comply style guide
Signed-off-by: sh0rez <me@shorez.de>
6 years ago
88b79bae64
chore(style): Comply with style guide, order list
...
Signed-off-by: sh0rez <me@shorez.de>
6 years ago
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>
6 years ago
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>
6 years ago
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>
6 years ago
bea07fe866
feat(discovery/kubernetes): include InitContainers
...
Includes InitContainers in the ServiceDiscovery
Signed-off-by: sh0rez <me@shorez.de>
6 years ago
b7cdd3e840
Exhaust request body before closing it ( #5596 )
...
Signed-off-by: bevisy <binbin36520@gmail.com>
6 years ago
d81df5609d
fix nil pointer dereference in azure discovery ( #5587 )
...
Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>
6 years ago
3441ecdea1
discovery/kubernetes: add node name and hostname to endpoints
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
6 years ago
45506841e6
*: enable all default linters ( #5504 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
6 years ago
3cffd81035
Merge pull request #5520 from YaoZengzeng/service
...
The workqueue of service should be `service` other than `ingress`
6 years ago
658b33808c
The workqueue of service should be `service` other than `ingress`
...
Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
6 years ago
f874555a0d
Merge pull request #5486 from tariq1890/update_kubernetes
...
update client-go,api,api-machinery and klog dependencies
6 years ago
0be9388f8d
Merge pull request #5463 from prometheus/beorn7/templating
...
Follow-up on #5009
6 years ago
00036cd1e5
update client-go,api,api-machinery and klog dependencies
...
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
6 years ago
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>
6 years ago
35be8c9e25
Add azure public ip label ( #5475 )
...
* Update Azure SD Config with Public IP label
Signed-off-by: earthmant <trammell@cloudify.co>
6 years ago
a92ef68dd8
Fix staticcheck errors
...
Not sure why they only show up now.
Signed-off-by: Bjoern Rabenstein <bjoern@rabenste.in>
6 years ago
559237cc4f
discovery/kubernetes: fix missing label sanitization ( #5462 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
6 years ago
8ff6938fa4
Update dependencies. ( #5449 )
...
Including going to tsdb 0.7.0.
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
6 years ago
dafd1632a2
discovery/kubernetes: add present labels for labels/annotations ( #5443 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
6 years ago
4f47806a7d
discovery/dns: fix slice with wrong length ( #5432 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
6 years ago
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>
6 years ago
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>
6 years ago
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>
6 years ago
0d7104b7eb
discovery/azure:optimize iteration logic for VMScalesets, VMScalesetVMs, and VMs ( #5363 )
...
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
6 years ago
5f933e99d0
discovery/azure: make local virtualMachine struct more generic by removing the go sdk field reference ( #5350 )
...
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
6 years ago
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>
6 years ago
67385f356f
discovery/openstack: pass context to the OpenStack client ( #5231 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
6 years ago
83c46fd549
update Consul vendor code so that catalog.ServiceMultipleTags can be ( #5151 )
...
Signed-off-by: Callum Styan <callumstyan@gmail.com>
6 years ago
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>
6 years ago
e4b88704a6
Fix misspell in manager_test.go ( #5279 )
...
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
6 years ago
1d2fc95b1c
discovery/marathon: pass context to the client ( #5232 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
6 years ago
e60d314f43
discovery/consul: pass current context to Consul queries ( #5230 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
6 years ago
8f578d9c6b
discovery/ec2: pass context to the client ( #5234 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
6 years ago
4997dcb4a1
discovery/gce: pass context to the client ( #5233 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
6 years ago
9040dddd0c
discovery/azure: pass context to the client ( #5255 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
6 years ago
fe7a1bcfc6
discovery/triton: pass context to the client ( #5235 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
6 years ago
ad29221a7b
Merge pull request #5020 from erikh/upgrade-miekg-dns
...
Upgrade miekg dns
6 years ago
e72c875e63
config: fix Kubernetes config with empty API server ( #5256 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
6 years ago
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>
6 years ago
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>
6 years ago
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>
6 years ago
f9462d5d44
discovery/consul: pass current context to Consul queries
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
6 years ago
4cb6c202ff
Fix fmt.Errorf error message ( #5199 )
...
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
6 years ago
b173de0c26
fix ineffectual assignment in dns.go
...
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
6 years ago
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>
6 years ago
f4275d2352
Use the latest versions of azure go sdk and go-autorest ( #5015 )
...
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
6 years ago
bfcdba211f
remove the prepended watch reactor from the fake k8s client ( #5140 )
...
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
6 years ago
68e4c211f2
discovery/azure: more robust handling of go routines ( #5106 )
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
6 years ago
302148fd69
*: apply gofmt -s
...
Signed-off-by: Matt Layher <mdlayher@gmail.com>
6 years ago
22a1def98d
Merge pull request #5099 from prometheus/release-2.6
...
Merge release-2.6 to master
6 years ago
9922c35a23
marathon-sd - use Tasks.Ports instead of PortDefinitions.Ports if RequirePorts is false ( #5022 ) ( #5026 )
...
Signed-off-by: tommarute <tommarute@gmail.com>
6 years ago
d9f4a8c95f
sd: Fix stuck Azure service discovery ( #5088 )
...
Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>
6 years ago
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>
6 years ago
e9ae0b5a1b
Merge pull request #4927 from tariq1890/update_k8s
...
update client-go to v10.0.0 and other k8s deps to v1.13.1
6 years ago
ca93c8e19b
Merge pull request #4969 from prometheus/azuresubid
...
Add Azure tenant and subscription ID labels
6 years ago
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>
6 years ago
aa94efe4b5
Merge branch 'master' of https://github.com/prometheus/prometheus into update_k8s
6 years ago
7a41038695
Add Azure tenant and subscription ID labels
...
Signed-off-by: Fabian Reinartz <freinartz@google.com>
6 years ago
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>
6 years ago
122b47caa0
address review comment in client_metrics
...
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
6 years ago
1e4e4c46ba
Merge branch 'master' of https://github.com/prometheus/prometheus into update_k8s
...
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
6 years ago
922c17e119
added name label to all discovery metrics ( #5002 )
...
Signed-off-by: Ilya Gladyshev <ilya.v.gladyshev@gmail.com>
6 years ago
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>
6 years ago
c7d83b2b6a
discovery: add support for Managed Identity authentication in Azure SD ( #4590 )
...
Signed-off-by: Marcel Juhnke <marrat@marrat.de>
6 years ago
0d4b6e4e66
address review comments
...
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
6 years ago
de6f3b6af7
expose kubernetes service cluster ip ( #4940 )
...
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
6 years ago
e8be31eed9
Fixs typo: 'possibliy' to 'possibly' ( #4974 )
...
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
6 years ago
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>
6 years ago
e3bdc463fa
Revert "add logic to check if an azure VM is deallocated or not ( #4908 )" ( #4980 )
...
This reverts commit 61cf4365
6 years ago
1fd438ed2b
rebase and resolve merge conflicts
...
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
6 years ago
Julien Pivotto