Commit Graph

467 Commits

Author SHA1 Message Date
chardch
2f59d38054 Add global config option for convert_classic_histograms_to_nhcb
Addresses the global part of https://github.com/prometheus/prometheus/issues/13532

Signed-off-by: chardch <otwordsne@gmail.com>
2025-03-27 10:55:27 -07:00
Owen Williams
6566c5a2b3
scrape: Add config option for escaping scheme request. (#16066)
The new metric_name_escaping_scheme config option works in parallel with metric_name_validation_scheme and controls which escaping scheme is requested when scraping. When not specified, the scheme will request underscores if the validation scheme is set to legacy, and will request allow-utf-8 when the validation scheme is set to utf8. This setting allows users to allow utf8 names if they like, but explicitly request an escaping scheme rather than UTF-8.

Fixes https://github.com/prometheus/prometheus/issues/16034

Built on https://github.com/prometheus/prometheus/pull/16080

Signed-off-by: Owen Williams <owen.williams@grafana.com>
2025-03-26 18:27:28 -04:00
Carrie Edwards
c90b387d89
Optionally translate OTel histograms to NHCB (#15850)
* Optionally translate OTEL histograms to NHCB

Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>

* Add tests for explicit histogram to NHCB translation

Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>

* Linting

Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>

* Add test for translation with flag

Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>

* Refactor to re-use bucket conversion function

Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>

* Update prompb

Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>

* Add comment explaining explicit bounds and use defined CustomBucketSchema

Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>

* Add TODO for limiting max bucket count

Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>

* Fix imports and remove extra blank line

Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>

* Update configuration docs and CHANGELOG

Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>

* Update CHANGELOG

Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>

* Use otlptranslator package

Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>

---------

Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>
2025-03-20 09:18:51 -07:00
co63oc
0e4e5a71bd
Fix typos (#16076)
Signed-off-by: co63oc <co63oc@users.noreply.github.com>
2025-02-28 11:24:25 +11:00
Sebastian Schubert
efa4f4a60b
doc: clarified behaviour of source_labels in relabel_config
Signed-off-by: Sebastian Schubert <basti@schubert.digital>
2025-02-26 17:57:44 +01:00
Ian Kerins
8c8b83ed4e
doc: fix broken kuma.io link (#16028)
doc: fix broken kuma.io link

I'm not actually familiar with kuma, but I noticed this link was broken, and I believe the one I've found here is equivalent.

Signed-off-by: Ian Kerins <git@isk.haus>
Signed-off-by: Björn Rabenstein <github@rabenste.in>
Co-authored-by: Björn Rabenstein <github@rabenste.in>
2025-02-20 23:14:33 +01:00
Ayoub Mrini
de6add2c7d
Merge pull request #14228 from Codelax/sd-scaleway-routed-ips
feat(scaleway-sd): add labels for multiple public IPs
2025-02-11 17:21:29 +01:00
Paulo Dias
cddf729ca3
Merge branch 'main' of github.com:prometheus/prometheus into openstack-loadbalancer-discovery
Signed-off-by: Paulo Dias <paulodias.gm@gmail.com>
2025-01-21 11:16:52 +00:00
Paulo Dias
c803f7e82f
Merge branch 'openstack-loadbalancer-discovery' of github.com:paulojmdias/prometheus into openstack-loadbalancer-discovery
Signed-off-by: Paulo Dias <paulodias.gm@gmail.com>
2025-01-06 15:15:32 +00:00
Paulo Dias
816a5c94b9
fix: fix docs typo
Signed-off-by: Paulo Dias <paulodias.gm@gmail.com>
2025-01-06 15:15:17 +00:00
Hélia Barroso
56094197b5
[Docs] Note that scrape_timeout cannot be greater than scrape_interval (#15786)
Signed-off-by: Hélia Barroso <helia_barroso@hotmail.com>
2025-01-06 14:13:17 +00:00
Arve Knudsen
4f67a38a39
template: Use cases.Title instead of deprecated strings.Title (#15721)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2025-01-03 17:58:02 +01:00
Paulo Dias
36ccf62692
Merge branch 'prometheus:main' into openstack-loadbalancer-discovery 2025-01-02 14:44:19 +00:00
Paulo Dias
d40e99c2ec
Merge branch 'openstack-loadbalancer-discovery' of github.com:paulojmdias/prometheus into openstack-loadbalancer-discovery
Signed-off-by: Paulo Dias <paulodias.gm@gmail.com>
2025-01-02 14:43:46 +00:00
Paulo Dias
cb7254158b
feat: rename status to provisioning_status and add operating_status
Signed-off-by: Paulo Dias <paulodias.gm@gmail.com>
2025-01-02 14:43:31 +00:00
Arve Knudsen
beca06c629
Clarify the NoUTF8EscapingWithSuffixes and UnderscoreEscapingWithSuffixes modes (#15567)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-12-17 08:40:53 +01:00
Jeremiah Harbach
7d0f6b7e6d
Add specific Azure permissions required for Azure SD (#15549)
Add specific Azure permissions required for Azure SD

Co-authored-by: Ayoub Mrini <ayoubmrini424@gmail.com>
Signed-off-by: Jeremiah Harbach <jeremiah.harbach@gmail.com>

---------

Signed-off-by: Jeremiah Harbach <jeremiah.harbach@gmail.com>
Co-authored-by: Ayoub Mrini <ayoubmrini424@gmail.com>
2024-12-12 13:57:08 +01:00
Paulo Dias
a5c20713dc
Merge branch 'prometheus:main' into openstack-loadbalancer-discovery 2024-12-08 22:54:18 +00:00
Paulo Dias
713903fe48
fix: fix configuration and remove uneeded libs
Signed-off-by: Paulo Dias <paulodias.gm@gmail.com>
2024-12-06 17:58:21 +00:00
Paulo Dias
a90aa34e71
fix: fix docs typo
Signed-off-by: Paulo Dias <paulodias.gm@gmail.com>
2024-12-04 23:52:14 +00:00
Paulo Dias
fc0141aec2
discovery: add openstack load balancer discovery
Signed-off-by: Paulo Dias <paulodias.gm@gmail.com>
2024-12-04 23:34:29 +00:00
machine424
c9f3d9b47f
doc(nomad): adjust sections about nomad_sd_config's server
test(nomad): extend TestConfiguredService with more valid/invalid servers configs

fixes https://github.com/prometheus/prometheus/issues/12306

Signed-off-by: machine424 <ayoubmrini424@gmail.com>
2024-12-03 19:41:45 +01:00
György Krajcsovits
f5c7ef3d9d Fix typo
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-11-29 15:24:18 +01:00
György Krajcsovits
8ce9e20001 Add documentation
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-11-29 15:23:35 +01:00
Simon Pasquier
63d87a60a8
docs: fix typo (#15436)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2024-11-24 17:13:19 +01:00
Bryan Boreham
26886d6d95 Merge branch 'release-3.0' into merge-release-into-main 2024-11-18 14:43:56 +00:00
Đurica Yuri Nikolić
101b1c307f
[ENHANCEMEN] Remote-Write: optionally use a DNS resolver that picks a random IP (#15329)
When a remote-write is executed towards a host name that is resolved to multiple IP addresses, this PR introduces a possibility to force creation of new connections used for the remote-write request to a randomly chosen IP address from the ones corresponding to the host name. The default behavior remains unchanged, i.s., the IP address used for the connection creation remains the one chosen by Go.

This is an experimental feature, it is disabled by default.

Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>
2024-11-15 15:41:49 +00:00
bwplotka
e08794c53f Added config entry.
Signed-off-by: bwplotka <bwplotka@gmail.com>
2024-11-11 21:44:08 +00:00
Bryan Boreham
20fdc8f541 [CHANGE] Remote-write: default enable_http2 to false
Remote-write creates several shards to parallelise sending, each with
its own http connection. We do not want them all combined onto one
socket by http2.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-10-24 22:27:06 +02:00
Jesus Vazquez
3cb09acb21
Docs: Remove experimental note on out of order feature (#15215)
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
2024-10-24 18:18:21 +02:00
alexgreenbank
3afcda82be docs: add keep_firing_for in alerting rules
Signed-off-by: alexgreenbank <alex.greenbank@grafana.com>
2024-10-22 14:19:01 +01:00
Bryan Boreham
70e2d23027
Merge pull request #11474 from clwluvw/group-label
[FEATURE] rules: add labels at group level
2024-10-21 14:47:12 +01:00
Alex Greenbank
421a3c22ea
scrape: provide a fallback format (#15136)
scrape: Remove implicit fallback to the Prometheus text format

Remove implicit fallback to the Prometheus text format in case of invalid/missing Content-Type and fail the scrape instead. Add ability to specify a `fallback_scrape_protocol` in the scrape config.

---------

Signed-off-by: alexgreenbank <alex.greenbank@grafana.com>
Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com>
Co-authored-by: Björn Rabenstein <beorn@grafana.com>
2024-10-18 17:12:31 +02:00
Bartlomiej Plotka
efc43d0714
s/scrape_classic_histograms/always_scrape_classic_histograms (3.0 breaking change) (#15178)
This is for readability, especially when we can converting to nhcb option.

See discussion https://cloud-native.slack.com/archives/C077Z4V13AM/p1729155873397889

Signed-off-by: bwplotka <bwplotka@gmail.com>
2024-10-18 08:32:15 +01:00
Yi
2cabd1b707
config: remove expand-external-labels flag in release 3.0 (#14657)
remove expand-external-labels feature flag

and enabled env arg expansion for external labels by default.

Signed-off-by: jyz0309 <45495947@qq.com>
2024-10-17 10:25:05 +02:00
Julien
e6f9e2dde3
Merge pull request #15119 from roidelapluie/dochttp
docs: extract HTTP client option documentation in their own sections
2024-10-11 13:10:34 +02:00
Bryan Boreham
b87b88ddc2
Merge branch 'main' into consul-catalog-filter-support
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-10-08 12:20:31 +01:00
Julien
7eb73b10d8 Remove http client config from consul and digitalocean
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-07 15:13:00 +02:00
Julien
57e3fd0c51 Remove http options from docker and dockerswarm sd
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-07 15:11:15 +02:00
Julien
5f13098403 Remove http client config from EC2 and PuppetDB
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-07 15:09:41 +02:00
Julien
409d924381 Remove client HTTP settings from HTTP SD and Hetzner SD
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-07 15:07:40 +02:00
Julien
62b26ac13c Remove HTTP config docs from Kuma, Kubernetes and IONOS
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-07 15:05:24 +02:00
Julien
04b12014a6 Remove http client docs from linode and lightsail
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-07 15:03:17 +02:00
Julien
530c3fc345 Remove HTTP client doc from nomad and marathon
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-07 15:01:01 +02:00
Julien
1dd45fd286 Remove http options from Eureka and Scaleway
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-07 14:57:54 +02:00
Julien
aef84c068b Remove http options from uyuni
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-07 14:55:58 +02:00
Julien
675349c849 Remove HTTP options from vultr
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-07 14:54:22 +02:00
Julien
6acf2dc054 Remove HTTP options from alerting
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-07 14:52:41 +02:00
Julien
e7206c2630 Remove http options from remote read/write
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-07 14:51:03 +02:00
Julien
261d7d75eb docs: extract HTTP client option documentation from scrape config
Extracted HTTP client options (e.g., authentication, proxy settings,
TLS configuration, and custom headers) into a dedicated section for
improved clarity and organization. This will centralize all HTTP-related
options from prometheus/common in one place within the documentation.

The remaining HTTP-related settings in sections (e.g. Service Discovery)
will be moved in a follow-up PR to further unify the documentation
structure.

Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-07 14:45:44 +02:00