blackbox_exporter.git
21 months agoMerge pull request #1022 from prometheus/dependabot/go_modules/golang.org/x/net-0.5.0
Ben Kochie [Wed, 1 Feb 2023 04:17:16 +0000 (05:17 +0100)]
Merge pull request #1022 from prometheus/dependabot/go_modules/golang.org/x/net-0.5.0

Bump golang.org/x/net from 0.4.0 to 0.5.0

21 months agoBump golang.org/x/net from 0.4.0 to 0.5.0
dependabot[bot] [Wed, 1 Feb 2023 03:03:23 +0000 (03:03 +0000)]
Bump golang.org/x/net from 0.4.0 to 0.5.0

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.4.0 to 0.5.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](https://github.com/golang/net/compare/v0.4.0...v0.5.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
21 months agoSynchronize common files from prometheus/prometheus (#1015)
PrometheusBot [Fri, 20 Jan 2023 18:52:31 +0000 (19:52 +0100)]
Synchronize common files from prometheus/prometheus (#1015)

Signed-off-by: prombot <prometheus-team@googlegroups.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
22 months agoAdd root (`modules`) key to CONFIGURATION.md (#1009)
Daz Wilkin [Fri, 23 Dec 2022 06:04:15 +0000 (22:04 -0800)]
Add root (`modules`) key to CONFIGURATION.md (#1009)

* Add root (`modules`) key to CONFIGURATION.md

The Exporter configuration is complicated by the omission of the root (`modules`) key from the configuration document.

Not only must configuration begin with `modules` but each module is a map of module names to module values.

I think I've correctly reflected this here using the document's schema.

Signed-off-by: Daz Wilkin <DazWilkin@users.noreply.github.com>
* link to example.yml

Signed-off-by: Suraj Nath <9503187+electron0zero@users.noreply.github.com>
Signed-off-by: Daz Wilkin <DazWilkin@users.noreply.github.com>
Signed-off-by: Suraj Nath <9503187+electron0zero@users.noreply.github.com>
Co-authored-by: Suraj Nath <9503187+electron0zero@users.noreply.github.com>
22 months agoSynchronize common files from prometheus/prometheus (#1010)
PrometheusBot [Fri, 23 Dec 2022 05:44:41 +0000 (06:44 +0100)]
Synchronize common files from prometheus/prometheus (#1010)

Signed-off-by: prombot <prometheus-team@googlegroups.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
22 months agoMerge pull request #1008 from roidelapluie/consistentdoc
Julien Pivotto [Tue, 20 Dec 2022 11:43:41 +0000 (12:43 +0100)]
Merge pull request #1008 from roidelapluie/consistentdoc

Make Proxy Connect Headers consistent with Prometheus

22 months agoMake Proxy Connect Headers consistent with Prometheus
Julien Pivotto [Fri, 16 Dec 2022 12:32:14 +0000 (13:32 +0100)]
Make Proxy Connect Headers consistent with Prometheus

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
22 months agoUpdate prometheus/common (#1006)
Marcelo Magallon [Thu, 15 Dec 2022 21:00:14 +0000 (15:00 -0600)]
Update prometheus/common (#1006)

This pulls in support for specifying proxy connect headers. Update
CONFIGURATION.md and example.yml to match.

Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>
22 months agoUpdate common Prometheus files (#1004)
PrometheusBot [Thu, 15 Dec 2022 17:02:39 +0000 (18:02 +0100)]
Update common Prometheus files (#1004)

Signed-off-by: prombot <prometheus-team@googlegroups.com>
23 months agoMerge pull request #1000 from roidelapluie/rel0230
Julien Pivotto [Fri, 2 Dec 2022 12:25:39 +0000 (13:25 +0100)]
Merge pull request #1000 from roidelapluie/rel0230

Release 0.23.0

23 months agoUpdate changelog with #990
Julien Pivotto [Fri, 2 Dec 2022 12:24:53 +0000 (13:24 +0100)]
Update changelog with #990

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
23 months agoRelease 0.23.0
Julien Pivotto [Thu, 1 Dec 2022 12:44:06 +0000 (13:44 +0100)]
Release 0.23.0

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
23 months agoMerge pull request #990 from danteu/dns_target_reachable
Ben Kochie [Thu, 1 Dec 2022 17:06:55 +0000 (18:06 +0100)]
Merge pull request #990 from danteu/dns_target_reachable

Add probe_dns_query_succeeded metric

23 months agoMerge commit 'refs/pull/979/head' of https://github.com/prometheus/blackbox_exporter
Julien Pivotto [Thu, 1 Dec 2022 12:35:17 +0000 (13:35 +0100)]
Merge commit 'refs/pull/979/head' of https://github.com/prometheus/blackbox_exporter

And update go.mod

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
23 months agoMerge pull request #998 from prometheus/dependabot/go_modules/google.golang.org/grpc...
Ben Kochie [Thu, 1 Dec 2022 04:53:41 +0000 (05:53 +0100)]
Merge pull request #998 from prometheus/dependabot/go_modules/google.golang.org/grpc-1.51.0

Bump google.golang.org/grpc from 1.48.0 to 1.51.0

23 months agoBump google.golang.org/grpc from 1.48.0 to 1.51.0
dependabot[bot] [Thu, 1 Dec 2022 03:01:56 +0000 (03:01 +0000)]
Bump google.golang.org/grpc from 1.48.0 to 1.51.0

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.48.0 to 1.51.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.48.0...v1.51.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
23 months agoMerge pull request #997 from prometheus/update_toolkit
Ben Kochie [Wed, 30 Nov 2022 11:08:06 +0000 (03:08 -0800)]
Merge pull request #997 from prometheus/update_toolkit

Update prometheus/exporter-toolkit to v0.7.2

23 months agoUpdate prometheus/exporter-toolkit to v0.7.2
Suraj Nath [Wed, 30 Nov 2022 08:10:29 +0000 (13:40 +0530)]
Update prometheus/exporter-toolkit to v0.7.2

Signed-off-by: Suraj Nath <9503187+electron0zero@users.noreply.github.com>
23 months agoMerge pull request #985 from paketb0te/master
Ben Kochie [Wed, 30 Nov 2022 08:31:15 +0000 (00:31 -0800)]
Merge pull request #985 from paketb0te/master

update to golang.org/x/net v0.2.0

23 months agoupdate to golang.org/x/net v0.2.0
Manuel Stausberg [Tue, 8 Nov 2022 16:19:10 +0000 (17:19 +0100)]
update to golang.org/x/net v0.2.0

Signed-off-by: Manuel Stausberg <stausberg@denic.de>
23 months agoMerge pull request #995 from prometheus/dependabot/go_modules/google.golang.org/grpc...
Ben Kochie [Wed, 30 Nov 2022 07:41:40 +0000 (23:41 -0800)]
Merge pull request #995 from prometheus/dependabot/go_modules/google.golang.org/grpc-1.51.0

Bump google.golang.org/grpc from 1.48.0 to 1.51.0

23 months agoBump google.golang.org/grpc from 1.48.0 to 1.51.0
dependabot[bot] [Wed, 30 Nov 2022 07:30:08 +0000 (07:30 +0000)]
Bump google.golang.org/grpc from 1.48.0 to 1.51.0

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.48.0 to 1.51.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.48.0...v1.51.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
23 months agoMerge pull request #994 from prometheus/superq/bump_go
Ben Kochie [Wed, 30 Nov 2022 07:29:34 +0000 (23:29 -0800)]
Merge pull request #994 from prometheus/superq/bump_go

Update Go

23 months agoUpdate Go
SuperQ [Tue, 29 Nov 2022 13:55:36 +0000 (14:55 +0100)]
Update Go

* Update Go to 1.19.
* Update some Go modules.
* Enable dependabot.

Signed-off-by: SuperQ <superq@gmail.com>
23 months agoMerge pull request #993 from prometheus/superq/update_docker_docs
Ben Kochie [Mon, 28 Nov 2022 11:46:10 +0000 (03:46 -0800)]
Merge pull request #993 from prometheus/superq/update_docker_docs

Update Docker run docs

23 months agoUpdate Docker run docs
SuperQ [Mon, 28 Nov 2022 08:43:22 +0000 (09:43 +0100)]
Update Docker run docs

* Remove `-d` so it's easier to see errors interactively.
* Use `latest` tag to make sure users use the release by default.
* Recommend quay.io repo by default.

Signed-off-by: SuperQ <superq@gmail.com>
23 months agoAdd probe_dns_query_succeeded metric
Daniel Teunis [Fri, 25 Nov 2022 23:05:59 +0000 (00:05 +0100)]
Add probe_dns_query_succeeded metric

Currently, one may not be able to differentiate between a query refusal
by the target and the target not responding to a query. These two cases
can have very different ramifications.

This patch adds the probe_dns_query_succeeded gauge which is 1 if and
only if the DNS query was executed correctly, i.e., that the target
host has sent a response, and 0 otherwise.

Resolves #474

Signed-off-by: Daniel Teunis <daniel@teunis.cc>
23 months agoAdd missing probe_tls_version_info and probe_ssl_last_chain_info metrics to STARTTLS...
Lyas Spiehler [Tue, 15 Nov 2022 19:07:06 +0000 (13:07 -0600)]
Add missing probe_tls_version_info and probe_ssl_last_chain_info metrics to STARTTLS TCP probes (#983)

probe_tls_version_info and probe_ssl_last_chain_info metrics were missing from STARTTLS TCP probes and added them.

Signed-off-by: Lyas Spiehler lspiehler@gmail.com
2 years agobump exporter-toolkit to v0.8.1
Perry Naseck [Sat, 22 Oct 2022 16:14:50 +0000 (12:14 -0400)]
bump exporter-toolkit to v0.8.1

Signed-off-by: Perry Naseck <git@perrynaseck.com>
2 years agofix deps for update to exporter-toolkit v0.8.0
Perry Naseck [Sat, 22 Oct 2022 01:44:36 +0000 (21:44 -0400)]
fix deps for update to exporter-toolkit v0.8.0

Signed-off-by: Perry Naseck <git@perrynaseck.com>
2 years agoupdate to exporter-toolkit v0.8.0
Perry Naseck [Fri, 21 Oct 2022 05:00:12 +0000 (01:00 -0400)]
update to exporter-toolkit v0.8.0

Signed-off-by: Perry Naseck <git@perrynaseck.com>
2 years agoRefactor prober gauges (#972)
Ben Kochie [Fri, 30 Sep 2022 10:12:24 +0000 (12:12 +0200)]
Refactor prober gauges (#972)

Move prober metric GaugeOpts into prober.go to reduce copy-n-paste.

Signed-off-by: SuperQ superq@gmail.com
2 years agoUse textproto.CanonicalMIMEHeaderKey
David Leadbeater [Thu, 23 Jun 2022 01:09:02 +0000 (11:09 +1000)]
Use textproto.CanonicalMIMEHeaderKey

Using the full i18n library isn't needed, this just needs to be ASCII
per MIME style header standards.

Signed-off-by: David Leadbeater <dgl@dgl.cx>
Signed-off-by: SuperQ <superq@gmail.com>
2 years agoConsistent HELP message of gauge metrics across check types (#970)
Narsing Metpally [Thu, 29 Sep 2022 16:18:07 +0000 (10:18 -0600)]
Consistent HELP message of gauge metrics across check types (#970)

Co-authored-by: Suraj Nath <9503187+electron0zero@users.noreply.github.com>
2 years agoMerge pull request #968 from prometheus/repo_sync
Ben Kochie [Tue, 20 Sep 2022 19:25:10 +0000 (21:25 +0200)]
Merge pull request #968 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus

2 years agoRefactor proberHandler as an exported function (#957)
Marc Tudurí [Tue, 20 Sep 2022 15:40:26 +0000 (17:40 +0200)]
Refactor proberHandler as an exported function (#957)

* Refactor proberHandler as an exported function

Signed-off-by: Marc Tuduri <marctc@protonmail.com>
2 years agoUpdate common Prometheus files
prombot [Fri, 16 Sep 2022 17:55:29 +0000 (17:55 +0000)]
Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>
2 years agoAdd leaf certificate details in probe_tls_certificate_info metric (#943)
Daniel Jolly [Tue, 9 Aug 2022 10:17:33 +0000 (06:17 -0400)]
Add leaf certificate details in probe_tls_certificate_info metric (#943)

Add left certificate's "subject", "issuer", "subjectalternative" labels in `probe_tls_certificate_info` metric.

See relevent discussion in #892

Co-authored-by: Daniel Jolly <code@danieljolly.com>
2 years agoRelease 0.22.0 (#954)
Julien Pivotto [Tue, 2 Aug 2022 13:54:58 +0000 (15:54 +0200)]
Release 0.22.0 (#954)

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2 years agoUse BBE user agent for oauth2
Julien Pivotto [Thu, 14 Jul 2022 16:25:29 +0000 (18:25 +0200)]
Use BBE user agent for oauth2

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2 years agoMerge pull request #952 from inosato/remove-ioutil
Ben Kochie [Thu, 28 Jul 2022 14:19:46 +0000 (16:19 +0200)]
Merge pull request #952 from inosato/remove-ioutil

Remove ioutil

2 years agoRemove ioutil
inosato [Wed, 27 Jul 2022 17:21:52 +0000 (02:21 +0900)]
Remove ioutil

Signed-off-by: inosato <si17_21@yahoo.co.jp>
2 years agoadd example to skip dns resolve and using proxy
Alireza (Ali) Mansoori [Wed, 27 Jul 2022 02:52:27 +0000 (19:52 -0700)]
add example to skip dns resolve and using proxy

Signed-off-by: Alireza (Ali) Mansoori <amansoori@gmail.com>
2 years agoHTTP: Add Skip Resolve Phase With Proxy option (#944)
Julien Pivotto [Wed, 13 Jul 2022 12:15:28 +0000 (14:15 +0200)]
HTTP: Add Skip Resolve Phase With Proxy option (#944)

* HTTP: Add Skip Resolve Phase With Proxy option

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
Co-authored-by: Suraj Nath <9503187+electron0zero@users.noreply.github.com>
2 years agoPrint to stdout, not stderr (#928)
Marcelo Magallon [Sat, 18 Jun 2022 12:55:10 +0000 (06:55 -0600)]
Print to stdout, not stderr (#928)

Following the change in
https://github.com/prometheus/prometheus/pull/8542 blackbox_exporter
will send all usage out to stdout, not stderr.

Fixes: #912
Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>
2 years agoMerge pull request #930 from prometheus/release-0.21
Julien Pivotto [Fri, 17 Jun 2022 12:46:30 +0000 (14:46 +0200)]
Merge pull request #930 from prometheus/release-0.21

Merge Release 0.21

2 years agoMake caser a local varialbe, not a global one.
Marcelo E. Magallon [Mon, 13 Jun 2022 23:21:41 +0000 (17:21 -0600)]
Make caser a local varialbe, not a global one.

The cases.Caser returned by calling cases.Title *cannot* be shared among
goroutines. This might happen when Prometheus tries to scrape multiple
targets at the same time. From the docs:

A Caser may be stateful and should therefore not be shared between
goroutines.

Fixes: #922

Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>
2 years agoRelease 0.21.1
Julien Pivotto [Fri, 17 Jun 2022 12:12:35 +0000 (14:12 +0200)]
Release 0.21.1

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2 years agoMake caser a local varialbe, not a global one.
Marcelo E. Magallon [Mon, 13 Jun 2022 23:21:41 +0000 (17:21 -0600)]
Make caser a local varialbe, not a global one.

The cases.Caser returned by calling cases.Title *cannot* be shared among
goroutines. This might happen when Prometheus tries to scrape multiple
targets at the same time. From the docs:

A Caser may be stateful and should therefore not be shared between
goroutines.

Fixes: #922

Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>
2 years agoAllow TTL to be explicitly set on ICMP packets from icmp prober (#919)
fhltang [Wed, 15 Jun 2022 17:27:05 +0000 (18:27 +0100)]
Allow TTL to be explicitly set on ICMP packets from icmp prober (#919)

This adds an option to the config file to specify the TTL value. If 0 or not specified, in some cases it defaults to 64 and in other cases it defaults to whatever is configured in the operating system. This matches previous behavior.

Signed-off-by: Francis Tang <francis.tang@gmail.com>
2 years agoUpdate common Prometheus files (#926)
PrometheusBot [Mon, 13 Jun 2022 22:15:58 +0000 (00:15 +0200)]
Update common Prometheus files (#926)

Signed-off-by: prombot <prometheus-team@googlegroups.com>
2 years agoSynchronize common files from prometheus/prometheus (#921)
PrometheusBot [Mon, 6 Jun 2022 10:02:50 +0000 (12:02 +0200)]
Synchronize common files from prometheus/prometheus (#921)

2 years agoRelease 0.21.0
Julien Pivotto [Mon, 30 May 2022 11:38:13 +0000 (13:38 +0200)]
Release 0.21.0

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2 years agoUpdate yamllint (#916)
Ben Kochie [Mon, 30 May 2022 10:51:26 +0000 (12:51 +0200)]
Update yamllint (#916)

* Include upstream yamllint config.
* Fix linting consistency issues.

Signed-off-by: SuperQ <superq@gmail.com>
2 years agoBlackbox exporter 0.21.0-rc.0
Julien Pivotto [Fri, 6 May 2022 11:52:17 +0000 (13:52 +0200)]
Blackbox exporter 0.21.0-rc.0

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2 years agoadd a link to guide "multi-target exporter pattern" (#878)
Baptiste Mille-Mathias [Mon, 9 May 2022 22:32:18 +0000 (00:32 +0200)]
add a link to guide "multi-target exporter pattern" (#878)

it helps getting the grasp of the purpose of the relabel_config.

Signed-off-by: Baptiste Mille-Mathias <baptiste.millemathias@gmail.com>
2 years agoUpdate builds & dependencies
Julien Pivotto [Fri, 6 May 2022 07:35:17 +0000 (09:35 +0200)]
Update builds & dependencies

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2 years agoUpdate common Prometheus files
prombot [Fri, 6 May 2022 11:02:56 +0000 (11:02 +0000)]
Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>
2 years agoMerge pull request #869 from zhdkirill/maxTimeoutSeconds
Suraj Nath [Fri, 6 May 2022 11:19:35 +0000 (16:49 +0530)]
Merge pull request #869 from zhdkirill/maxTimeoutSeconds

Negative maxTimeoutSeconds

2 years agoUpdate common Prometheus files (#889)
PrometheusBot [Fri, 6 May 2022 10:57:18 +0000 (12:57 +0200)]
Update common Prometheus files (#889)

Signed-off-by: prombot <prometheus-team@googlegroups.com>
2 years agoRename dns recursion flag to recursion_desired (#900)
Nikolay Eskov [Thu, 14 Apr 2022 12:10:25 +0000 (15:10 +0300)]
Rename dns recursion flag to recursion_desired (#900)

Signed-off-by: Nikolay Eskov <mr.eskov1@yandex.ru>
2 years agoRelease 0.20.0 (#895)
Julien Pivotto [Wed, 16 Mar 2022 17:41:16 +0000 (18:41 +0100)]
Release 0.20.0 (#895)

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2 years agogRPC added to README and Configuration (#894)
Arash Sami [Tue, 15 Mar 2022 23:11:17 +0000 (23:11 +0000)]
gRPC added to README and Configuration (#894)

* added grpc config

added grpc config

Signed-off-by: rshsm <arashsami@live.com>
2 years agoMerge pull request #887 from prometheus/repo_sync
Ben Kochie [Sat, 5 Mar 2022 08:56:36 +0000 (09:56 +0100)]
Merge pull request #887 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus

2 years agoUpdate common Prometheus files
prombot [Fri, 4 Mar 2022 19:50:44 +0000 (19:50 +0000)]
Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>
2 years agoMerge pull request #882 from roidelapluie/clorder
Ben Kochie [Fri, 18 Feb 2022 13:05:30 +0000 (14:05 +0100)]
Merge pull request #882 from roidelapluie/clorder

Reorder changelog

2 years agoReorder changelog
Julien Pivotto [Thu, 17 Feb 2022 20:36:03 +0000 (21:36 +0100)]
Reorder changelog

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2 years agoRelease 0.20.0-rc.0 (#881)
Julien Pivotto [Thu, 17 Feb 2022 19:27:30 +0000 (20:27 +0100)]
Release 0.20.0-rc.0 (#881)

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2 years agoDelay init of http phase values (#865)
Ben Kochie [Thu, 17 Feb 2022 16:49:37 +0000 (17:49 +0100)]
Delay init of http phase values (#865)

Don't init http probe phase labels until we're ready to send the
request.

Avoids exposing 0 value samples for things we haven't started to
measure.

Fix http resolve timing to report lookup time even if it's an error
(ie not found).

Fixes: https://github.com/prometheus/blackbox_exporter/issues/579

Signed-off-by: SuperQ <superq@gmail.com>
2 years agoImprove chooseProtocol logging (#873)
Ben Kochie [Thu, 17 Feb 2022 16:48:40 +0000 (17:48 +0100)]
Improve chooseProtocol logging (#873)

Add `target` and `ip_protocol` fields to the logging in teh
`chooseProtocol()` utility function. This makes debugging output easier.

Signed-off-by: SuperQ <superq@gmail.com>
2 years agoMerge pull request #876 from bmillemathias/master
Ben Kochie [Thu, 27 Jan 2022 15:11:00 +0000 (16:11 +0100)]
Merge pull request #876 from bmillemathias/master

Update IRC network in github issue template

2 years agoRemove outdated IRC and point to community website
Baptiste Mille-Mathias [Thu, 27 Jan 2022 14:25:25 +0000 (15:25 +0100)]
Remove outdated IRC and point to community website

Signed-off-by: Baptiste Mille-Mathias <baptiste.millemathias@gmail.com>
2 years agoMerge pull request #863 from prometheus/superq/fix_ip_hash
Ben Kochie [Wed, 26 Jan 2022 21:47:32 +0000 (22:47 +0100)]
Merge pull request #863 from prometheus/superq/fix_ip_hash

Fix IP hash

2 years agoMerge pull request #871 from prometheus/repo_sync
Ben Kochie [Wed, 26 Jan 2022 07:27:11 +0000 (08:27 +0100)]
Merge pull request #871 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus

2 years agoUpdate common Prometheus files
prombot [Wed, 26 Jan 2022 00:01:49 +0000 (00:01 +0000)]
Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>
2 years agoNegative maxTimeoutSeconds
Kirill Zhdanov [Tue, 25 Jan 2022 15:13:44 +0000 (16:13 +0100)]
Negative maxTimeoutSeconds

Fixes #868

Signed-off-by: Kirill Zhdanov <kzhdanov@mirantis.com>
2 years agoMerge pull request #859 from dgl/dns-rd
Ben Kochie [Tue, 25 Jan 2022 12:45:03 +0000 (13:45 +0100)]
Merge pull request #859 from dgl/dns-rd

Add control of recursion desired flag for DNS probes

2 years agoMerge pull request #864 from prometheus/superq/bump_go
Ben Kochie [Tue, 25 Jan 2022 11:38:54 +0000 (12:38 +0100)]
Merge pull request #864 from prometheus/superq/bump_go

Update Go version

2 years agoFixup chooseProtocol test.
SuperQ [Sat, 22 Jan 2022 17:18:46 +0000 (18:18 +0100)]
Fixup chooseProtocol test.

Verified this works all the way back to Go 1.13.

Signed-off-by: SuperQ <superq@gmail.com>
2 years agoReview comments
David Leadbeater [Mon, 24 Jan 2022 21:04:26 +0000 (08:04 +1100)]
Review comments

- Drop "desired"
- Drop go 1.17 compat, will be switched entirely to go 1.17 elsewhere

Signed-off-by: David Leadbeater <dgl@dgl.cx>
2 years agoMerge pull request #557 from nikonhub/feature-change_default_http_user_agent
Ben Kochie [Sat, 22 Jan 2022 19:03:14 +0000 (20:03 +0100)]
Merge pull request #557 from nikonhub/feature-change_default_http_user_agent

Change default user agent

2 years agoFix up deprecated grpc.WithInsecure()
SuperQ [Sat, 22 Jan 2022 16:26:26 +0000 (17:26 +0100)]
Fix up deprecated grpc.WithInsecure()

Signed-off-by: SuperQ <superq@gmail.com>
2 years agoUpdate Go version
SuperQ [Sat, 22 Jan 2022 15:53:06 +0000 (16:53 +0100)]
Update Go version

* Update Go to 1.17.
* Update Go modules to current releases.

Signed-off-by: SuperQ <superq@gmail.com>
2 years agoFix IP hash
SuperQ [Sat, 22 Jan 2022 15:37:30 +0000 (16:37 +0100)]
Fix IP hash

Select the correct slice of bytes to hash based on IPv4 or IPv6 address
family.

Signed-off-by: SuperQ <superq@gmail.com>
2 years agoAdd control of recursion desired flag for DNS probes
David Leadbeater [Sun, 2 Jan 2022 05:02:57 +0000 (16:02 +1100)]
Add control of recursion desired flag for DNS probes

This defaults recursion desired to on to preserve existing behaviour,
but allows it to be configured.

Signed-off-by: David Leadbeater <dgl@dgl.cx>
2 years agoAdd support for grpc health check (#835)
Alessandro Verzicco [Mon, 15 Nov 2021 08:41:34 +0000 (09:41 +0100)]
Add support for grpc health check (#835)

Signed-off-by: Alessandro Verzicco <8068317+averzicco@users.noreply.github.com>
2 years agoAdd hostname parameter (#823)
Evgeniy Y [Thu, 11 Nov 2021 00:35:41 +0000 (03:35 +0300)]
Add hostname parameter (#823)

* Add hostname parameter

Signed-off-by: anemyte <anemyte@gmail.com>
3 years agoUpdate common Prometheus files (#839)
PrometheusBot [Tue, 2 Nov 2021 22:41:17 +0000 (23:41 +0100)]
Update common Prometheus files (#839)

Signed-off-by: prombot <prometheus-team@googlegroups.com>
3 years agoUpdate dependencies (#822)
Marcelo Magallon [Sat, 23 Oct 2021 22:41:26 +0000 (16:41 -0600)]
Update dependencies (#822)

github.com/go-kit/kit/log has been replaced by github.com/go-kit/log.

Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>
3 years agoFix body_size_limit negative handling (#838)
Marcelo Magallon [Tue, 19 Oct 2021 22:37:07 +0000 (16:37 -0600)]
Fix body_size_limit negative handling (#838)

When body_size_limit is 0 (either explicitly or implicitly because it
wasn't specified) or less, we are setting it to math.MaxInt64. It turns
out that the implementation in http.MaxBytesReader tries to add 1 to the
specified value, and it wraps around. After that, it tries to use the
result to index an slice, causing it to panic.

Work around this by setting the limit to math.MaxInt64 - 1.

Also, if body_size_limit is exactly 0, leave it like that. That causes
the code to avoid setting up the limiter, saving some extra processing.

Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>
3 years agoAdd body_size_limit option to http module (#836)
Marcelo Magallon [Tue, 19 Oct 2021 16:50:47 +0000 (10:50 -0600)]
Add body_size_limit option to http module (#836)

This option limits the maximum body length that will be read from the
HTTP server. It's meant to prevent misconfigured servers from causing
the probe to use too many resources, even if temporarily. It's not an
additional check on the response, for that, use the resulting metrics
(probe_http_content_length, probe_http_uncompressed_body_length, etc).

Co-authored-by: Julien Pivotto <roidelapluie@inuits.eu>
3 years agoMerge pull request #824 from prometheus/repo_sync
Ben Kochie [Sun, 12 Sep 2021 10:47:33 +0000 (12:47 +0200)]
Merge pull request #824 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus

3 years agoUpdate common Prometheus files
prombot [Sun, 12 Sep 2021 00:02:50 +0000 (00:02 +0000)]
Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>
3 years agoMerge pull request #796 from roidelapluie/simple-one-call
Julien Pivotto [Fri, 23 Jul 2021 10:00:22 +0000 (12:00 +0200)]
Merge pull request #796 from roidelapluie/simple-one-call

Simplify prefered protocol DNS probe

3 years agoMerge pull request #807 from prometheus/repo_sync
Marcelo Magallon [Thu, 8 Jul 2021 20:39:36 +0000 (14:39 -0600)]
Merge pull request #807 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus

3 years agoUpdate common Prometheus files
prombot [Tue, 29 Jun 2021 00:01:45 +0000 (00:01 +0000)]
Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>
3 years agoSimple implementation of single-resolver-call without fallback
Julien Pivotto [Fri, 28 May 2021 21:40:32 +0000 (23:40 +0200)]
Simple implementation of single-resolver-call without fallback

This approach ensures that we only call a single time the resolver in
the dns probes.

Otherwise, if we got an error in the first call, we would do a second
call.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
3 years agoRevert "Use preferred protocol first when resolving hostname (#728)"
Julien Pivotto [Fri, 28 May 2021 21:23:21 +0000 (23:23 +0200)]
Revert "Use preferred protocol first when resolving hostname (#728)"

This reverts commit 847b668e93267b1b57a76db5876f123bff074315.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
3 years agoMerge pull request #785 from roidelapluie/rel-019cl
Julien Pivotto [Tue, 11 May 2021 13:35:46 +0000 (15:35 +0200)]
Merge pull request #785 from roidelapluie/rel-019cl

Fixes in the 0.19 changelog

3 years agoWe do not use ReadRequest
Julien Pivotto [Tue, 11 May 2021 11:24:01 +0000 (13:24 +0200)]
We do not use ReadRequest

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>