01382cadc3
Update Prometheus/common
...
- Check if TLS certificate and key file have been modified
https://github.com/prometheus/common/issues/345
- Add the ability to specify the maximum acceptable TLS version
https://github.com/prometheus/common/issues/414
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2022-12-08 14:51:17 +01:00
f81fae2414
Add common HTTP client to AWS SDs ( #11611 )
...
* Common client in EC2 and Lightsail
Signed-off-by: Levi Harrison <git@leviharrison.dev>
* Azure -> AWS
Signed-off-by: Levi Harrison <git@leviharrison.dev>
Signed-off-by: Levi Harrison <git@leviharrison.dev>
2022-11-22 10:09:14 -05:00
a2fa375278
remove duplicate line
...
Signed-off-by: Alex Boltris <ua2fgb@gmail.com>
2022-11-16 18:04:35 +02:00
005ede70de
relabel: add keepequal/dropequal relabel action
...
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2022-11-10 14:41:02 +01:00
7a67a728a8
Followup on OVHCloud merge ( #11529 )
...
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2022-11-03 15:04:19 +01:00
16c3aa75c0
Add service discovery for OvhCloud ( #10802 )
...
* feat(ovhcloud): add ovhcloud management
Signed-off-by: Marine Bal <marine.bal@corp.ovh.com>
Co-authored-by: Arnaud Sinays <sinaysarnaud@gmail.com>
2022-11-03 10:20:09 +01:00
e3719d670b
Merge remote-tracking branch 'upstream/main' into sparsehistogram
...
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
2022-10-25 14:38:56 -04:00
51a44e6657
Adding Consul Enterprise Admin Partitions ( #11482 )
...
* Adding Consul Enterprise Admin Partitions
Signed-off-by: dcanadillas <dcanadillas@hashicorp.com>
2022-10-21 14:13:01 +02:00
76b0d26be8
Update url for configuration.md doc ( #11461 )
...
This PR updates the Serverset url at the configuration.md documentation.
Signed-off-by: Gabriela Cervantes <gabriela.cervantes.tellez@intel.com>
Signed-off-by: Gabriela Cervantes <gabriela.cervantes.tellez@intel.com>
2022-10-14 23:23:20 +02:00
e934d0f011
Merge 'main' into sparsehistogram
...
Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
2022-10-05 22:14:49 +02:00
fbec3bfc90
Small improvements to out-of-order ingestion docs ( #11366 )
...
Signed-off-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2022-09-30 09:13:32 +02:00
f371d7f0fb
Add docs for out of order ingestion ( #11340 )
...
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
Signed-off-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
Co-authored-by: Levi Harrison <levisamuelharrison@gmail.com>
2022-09-28 20:01:21 +05:30
4a493db432
Add __meta_ec2_region label ( #11326 )
...
Fixes #11320
Signed-off-by: Brian Candler <b.candler@pobox.com>
Signed-off-by: Brian Candler <b.candler@pobox.com>
2022-09-19 22:14:55 +02:00
15fa34936b
PuppetDB SD: Add __meta_puppetdb_query label ( #11238 )
...
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2022-09-01 17:05:54 +02:00
0683348121
Merge pull request #11140 from mercedes-benz/export-external-ip
...
Add LoadBalancerIP to discovered services
2022-08-12 10:48:59 +02:00
bf264f2021
Add pod_container_image label to docs ( #11146 )
...
Signed-off-by: Levi Harrison <git@leviharrison.dev>
Signed-off-by: Levi Harrison <git@leviharrison.dev>
2022-08-11 20:16:28 +02:00
c9fd3c235d
Merge branch 'main' into sparsehistogram
2022-08-10 17:54:37 +02:00
cc469e0085
documentation for the loadbalancerip
...
Signed-off-by: Karl Piplies <karl.piplies@mercedes-benz.com>
2022-08-10 12:40:11 +02:00
fba20567c0
Document permissions needed for `ec2_sd_configs` ( #11119 )
...
Currently, it's not explicitly called out which permissions are needed
for service discovery of EC2 instances. It's not super hard to figure
out, but it did involve a bit of guesswork when I did it yesterday, and
I figure it's worth saving people that effort.
I've also seen examples around the internet where people are granting
much broader permissions than they need to, so maybe we can save on that
by explicitly saying what's needed.
Signed-off-by: Chris Sinjakli <chris@sinjakli.co.uk>
2022-08-05 15:49:38 +02:00
d677ec489e
Support using MX records for DNS discovery ( #10099 )
...
It's currently possible to use blackbox_exporter to probe MX records
themselves. However it's not possible to do an end-to-end test, like is
possible with SRV records. This makes it possible to use MX records as a
source of hostnames in the same way as SRV records.
Signed-off-by: David Leadbeater <dgl@dgl.cx>
2022-08-03 11:19:26 +02:00
a6c6155092
Fix YAML and JSON doc section ( #11023 )
...
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2022-08-03 11:09:57 +02:00
be330ac035
add __meta_kubernetes_service_port_number ( #11053 )
...
Signed-off-by: yngwiewang <yngwiewang@163.com>
Co-authored-by: yngwiewang <yngwiewang@163.com>
2022-07-29 03:39:03 +02:00
08f3ddb864
Sparse histogram remote-write support ( #11001 )
2022-07-14 09:13:12 -04:00
cf0fdd557e
docs: Change relabelling -> relabeling ( #11006 )
...
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2022-07-14 13:49:30 +02:00
875c4aa12e
Merge pull request #10915 from attachmentgenie/nomad_sd
...
feat(nomad): add nomad service discovery
2022-06-30 15:26:20 +02:00
db2614102f
add description for __meta_kubernetes_endpoints_label_* and __meta_kubernetes_endpoints_labelpresent_* ( #10911 )
...
* add description for __meta_kubernetes_endpoints_label_* and __meta_kubernetes_endpoints_labelpresent_*
Signed-off-by: renzheng.wang <wangrzneu@gmail.com>
2022-06-30 18:22:53 +05:30
d9347bf128
nomad: Fix documentation and comments.
...
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2022-06-30 14:19:55 +02:00
4456dcc26e
feat(nomad): add nomad service discovery
...
Signed-off-by: Bram Vogelaar <bram@attachmentgenie.com>
2022-06-30 14:17:08 +02:00
05da373dcb
kubernetes_sd: Allow attaching node labels for endpoint role
...
The Kubernetes service discovery can only add node labels to
targets from the pod role.
This commit extends this functionality to the endpoints and
endpointslices roles.
Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
2022-06-16 12:22:55 +02:00
31cffd9e92
Fix a small typo ( #10771 )
...
Signed-off-by: Hu Shuai <hus.fnst@fujitsu.com>
2022-06-01 12:31:18 +10:00
1afe72f0af
vultr: ram is in mb, not bytes
...
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2022-05-24 18:38:06 +02:00
c9d4e5fc94
vultr: minor fixups
...
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2022-05-24 18:38:06 +02:00
3ef153b00c
vultr integration
...
Signed-off-by: David Dymko <dymkod@gmail.com>
2022-05-24 18:38:06 +02:00
ce3bc818a8
Add service discovery for IONOS Cloud ( #10514 )
...
* Add service discovery for IONOS Cloud
Signed-off-by: Felix Ehrenpfort <felix@ehrenpfort.de>
2022-05-20 14:57:23 +02:00
71dbb4d091
Add lowercase and uppercase relabel action ( #10641 )
...
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2022-05-03 10:09:53 +02:00
9fcf0b3d46
Merge pull request #10616 from prometheus/release-2.35
...
Release 2.35
2022-04-21 14:17:08 +02:00
b2c21433eb
Fix exemplar docs. ( #10609 )
...
Signed-off-by: Joker <joker9764@126.com>
2022-04-21 10:15:14 +02:00
09da88114d
Support overriding minimum TLS version
...
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2022-04-20 23:41:30 +02:00
98039cddfa
Update Prometheus common ( #10492 )
...
* Update Prometheus common
- Oauth2 supports proxy URL
- HTTP2 can be disabled
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2022-03-30 12:49:03 +02:00
b13aec9167
Merge pull request #10365 from David-N-Perkins/azure-resource-group-filter
...
Azure Service Discovery resource group filter
2022-03-29 01:21:23 +02:00
c7be45d957
Merge pull request #10297 from prometheus/superq/improve_labelmap_doc
...
Improve wording of labelmap action
2022-03-25 11:53:40 +01:00
eb5512555d
Update docs
...
Signed-off-by: fpetkovski <filip.petkovsky@gmail.com>
2022-03-10 08:47:04 +01:00
fa798d3042
Allow attaching node metadata
...
Signed-off-by: fpetkovski <filip.petkovsky@gmail.com>
2022-03-10 08:40:52 +01:00
9e7ae4d963
Use containers labels instead of task labels from Docker Swarm SD ( #9187 ) ( #10311 )
...
* Remove task labels from Docker Swarm SD (#9187 )
Signed-off-by: Ujjwal Goyal <importujjwal@gmail.com>
Add container labels to Docker Swarm SD (#9187 )
Signed-off-by: Ujjwal Goyal <importujjwal@gmail.com>
* Reorder labels in configuration doc
Signed-off-by: Ujjwal Goyal <importujjwal@gmail.com>
2022-03-08 14:49:20 +01:00
097b359b41
Added a failure counter to the HTTP service discovery ( #10372 )
...
* Added a failure counter to the http service discovery
Signed-off-by: David N Perkins <David.N.Perkins@ibm.com>
2022-03-08 14:10:45 +01:00
b9a1b00475
Update docs/configuration/configuration.md
...
Co-authored-by: Levi Harrison <git@leviharrison.dev>
2022-03-04 20:50:51 +01:00
0acbe5e3f5
Tracing: Add additional options to align with the upstream exporter ( #10276 )
...
* Enhance configuration
Signed-off-by: Matej Gera <matejgera@gmail.com>
2022-02-22 17:07:30 +01:00
5a6e26556b
Add an option to use the external labels as selectors for the remote read endpoint ( #10254 )
...
* An option to ignore external_labels
Signed-off-by: DrAuYueng <ouyang1204@gmail.com>
2022-02-16 22:12:47 +01:00
3b082e48a1
Improve wording of labelmap action
...
Update the wording of the `labelmap` relabel action to make it more
clear that it acts on all the label names, rather than the list provided
by source_labels.
Signed-off-by: SuperQ <superq@gmail.com>
2022-02-14 15:31:51 +01:00
277bf93952
Fix documentation for Docker API filters ( #10252 )
...
* Fix documentation for Docker API filters
Signed-off-by: Robert Jacob <xperimental@solidproject.de>
* Undo indentation change
Signed-off-by: Robert Jacob <xperimental@solidproject.de>
2022-02-03 23:57:02 +01:00
Julien Pivotto
Levi Harrison
Alex Boltris
Marine Bal
Ganesh Vernekar
David Cañadillas
GabyCT
Jesus Vazquez
Julius Volz
Ganesh Vernekar
Brian Candler
Frederic Branczyk
beorn7
Karl Piplies
Chris Sinjakli
David Leadbeater
yngwiewang
renzheng.wang
Bram Vogelaar
Filip Petkovski
Hu Shuai
David Dymko
Felix Ehrenpfort
Julien Pivotto
Joker
David N Perkins
Ben Kochie
Ujjwal Goyal
Richard Hartmann
Matej Gera
DrAuYueng
Robert Jacob