mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-16 02:24:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
11543 commits 248 branches 440 tags 658 MiB
Commit graph

149 commits

Author SHA1 Message Date
Julien Pivotto 0dc31ade41 Add support for consul path_prefix 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-05-17 00:14:58 +02:00
Julien Pivotto 599b70a05d Add include scrape configs 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-03-06 23:35:39 +01:00
Julien Levesy 8c5da5e078
feat(config): allow no remote write configs 
Signed-off-by: Julien Levesy <jlevesy@gmail.com>
 2022-12-13 18:41:06 +01:00
Julien Pivotto 005ede70de relabel: add keepequal/dropequal relabel action 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-11-10 14:41:02 +01:00
Marine Bal 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
Ganesh Vernekar 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
Bram Vogelaar 4456dcc26e feat(nomad): add nomad service discovery 
Signed-off-by: Bram Vogelaar <bram@attachmentgenie.com>
 2022-06-30 14:17:08 +02:00
David Dymko 3ef153b00c vultr integration 
Signed-off-by: David Dymko <dymkod@gmail.com>
 2022-05-24 18:38:06 +02:00
Felix Ehrenpfort 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
Julien Pivotto 71dbb4d091
Add lowercase and uppercase relabel action (#10641) 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-05-03 10:09:53 +02:00
Julien Pivotto 09da88114d Support overriding minimum TLS version 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-04-20 23:41:30 +02:00
Julien Pivotto 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
David N Perkins 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
Julien Pivotto fb2da1f26a
Followup on tracing (#10338) 
* Simplify code by letting common deal with empty TLS config
* Improve error message if we notice a user is putting an authorization
header into its configuration.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2022-02-22 21:44:36 +01:00
Matej Gera 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
beorn7 35010daa90 Merge branch 'release-2.33' into beorn7/cleaning-up-cherrypicking-fallout 2022-02-02 16:49:40 +01:00
Julien Pivotto 9d63502204 k8s: improve 'own_namespace' 
Fail configuration unmarshalling if kubeconfig or api url are set with
"own namespace"

Only read namespace file if needed.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2022-02-01 14:59:09 +01:00
Matej Gera 2c61d29b2a
Tracing: Migrate to OpenTelemetry library (#9724) 
Signed-off-by: Matej Gera <matejgera@gmail.com>
 2022-01-25 11:08:04 +01:00
Filip Petkovski 4855a0c067
Allow escaping a dollar sign when expanding external labels (#10129) 
* Allow escaping a dollar sign when expanding external labels

There is currently no mechanism to natively escape a dollar sign
in the os.Expand function. As a workaround, this commit modifies
the external label expansion logic to treat a double dollar ($$)
as a mechanism for escaping the dollar character.

Signed-off-by: fpetkovski <filip.petkovsky@gmail.com>
 2022-01-17 16:43:55 +01:00
Witek Bedyk 14986e52cf
Fix Uyuni SD initialization (#9924) 
* Fix Uyuni SD initialization

The change prevents null pointer exception during SD initialization.

Signed-off-by: Witek Bedyk <witold.bedyk@suse.com>
 2021-12-04 21:14:47 +01:00
Julien Pivotto 77f411b2ec
Enable tls_config in oauth2 (#9550) 
* Enable tls_config in oauth2

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-10-20 23:10:18 +02:00
Witek Bedyk cda2dbbef6
Add Uyuni service discovery (#8190) 
* Add Uyuni service discovery

Signed-off-by: Witek Bedyk <witold.bedyk@suse.com>

Co-authored-by: Joao Cavalheiro <jcavalheiro@suse.de>
Co-authored-by: Marcelo Chiaradia <mchiaradia@suse.com>
Co-authored-by: Stefano Torresi <stefano@torresi.io>
Co-authored-by: Julien Pivotto <roidelapluie@gmail.com>
 2021-10-19 01:00:44 +02:00
Julien Pivotto 8920024323 Add PuppetDB service discovery 
We have been Puppet user for 10 years and we are users of
https://github.com/camptocamp/prometheus-puppetdb-sd

However, that file_sd implementation contains business logic and
assumptions around e.g. the modules which you are using.

This pull request adds a simple PuppetDB service discovery, which will
enable more use cases than the upstream sd.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-09-16 16:54:26 +02:00
DrAuYueng e8be1d0a5c
Check relabel action at yaml unmarshal stage (#9224) 
Signed-off-by: DrAuYueng <ouyang1204@gmail.com>
 2021-08-31 17:52:57 +02:00
austin ce bbc951f50b
Add config tests for kuma SD 
Signed-off-by: austin ce <austin.cawley@gmail.com>
 2021-07-21 12:55:02 -04:00
Julien Pivotto 17700e5600 Fix yaml indent to make CI happy 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-06-25 00:53:22 +02:00
Ben Kochie 7cb55d5732
Merge pull request #8802 from mwasilew2/yaml-linting 
Adds yamllinting to Makefile.common
 2021-06-24 15:59:35 +02:00
3Xpl0it3r a0bac4b488
add kubeconfig support in discovery module (#8811) 
Signed-off-by: 3Xpl0it3r <shouc.wang@hotmail.com>
 2021-06-17 12:41:50 +02:00
Michal Wasilewski 3f686cad8b
fixes yamllint errors 
Signed-off-by: Michal Wasilewski <mwasilewski@gmx.com>
 2021-06-12 12:47:47 +02:00
Julien Pivotto 9444698ae2
http_sd (#8839) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-06-11 18:04:45 +02:00
Julien Pivotto 20c6739adc
Merge pull request #8833 from hanjm/feature/add-scape-read-body-limit 
Add body_size_limit to prevent bad targets response large body cause Prometheus server OOM (#8827)
 2021-06-02 09:24:59 +02:00
TJ Hoplock dc22c65349
Add Linode Service Discovery (#8846) 
* Add Linode Service Discovery

Signed-off-by: TJ Hoplock <t.hoplock@gmail.com>
 2021-06-01 20:32:36 +02:00
hanjm 1df05bfd49 Add body_size_limit to prevent bad targets response large body cause Prometheus server OOM (#8827) 
Signed-off-by: hanjm <hanjinming@outlook.com>
 2021-05-29 07:05:42 +08:00
Levi Harrison fa184a5fc3
Add OAuth 2.0 Config (#8761) 
* Introduced oauth2 config into the codebase

Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-04-28 14:47: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
Julien Pivotto e635ca834b Add environment variable expansion in external label values 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-03-30 01:36:28 +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
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
Harkishen-Singh 79ba53a6c4 Custom headers on remote-read and refactor implementation to roundtripper. 
Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>
 2021-02-26 17:20:29 +05:30
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
Harkishen-Singh 77c20fd2f8 Adds support to configure retry on Rate-Limiting from remote-write config. 
Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>
 2021-02-16 14:52:49 +05:30
Nándor István Krácser 509000269a
remote_write: allow passing along custom HTTP headers (#8416) 
* remote_write: allow passing along custom HTTP headers

Signed-off-by: Nandor Kracser <bonifaido@gmail.com>

* add warning

Signed-off-by: Nandor Kracser <bonifaido@gmail.com>

* remote_write: add header valadtion

Signed-off-by: Nandor Kracser <bonifaido@gmail.com>

* extend tests for bad remote write headers

Signed-off-by: Nandor Kracser <bonifaido@gmail.com>

* remote_write: add note about the authorization header

Signed-off-by: Nandor Kracser <bonifaido@gmail.com>
 2021-02-04 14:18:13 -07: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
kangwoo 7c0d5ae4e7
Add Eureka Service Discovery (#3369) 
Signed-off-by: kangwoo <kangwoo@gmail.com>
 2020-08-26 17:36:59 +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
Julien Pivotto f8ec72d730 Add digitalocean test 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-22 00:04:36 +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
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