Merge pull request #1067 from prometheus/superq/toolkit

Update exporter-toolkit

Update exporter-toolkit

* Update exporter-toolkit package.
* Use new kingping package location.

Signed-off-by: SuperQ <superq@gmail.com>

Merge pull request #1056 from grafana/unregister_metrics

Remove initialization of metrics from init functions

Remove initialization of metrics from init functions

Signed-off-by: Marc Tuduri <marctc@protonmail.com>

Add support for HTTP request body as file (#987)

* Add HTTP request body test

This commit adds a test for specifying a request body for HTTP probes.

Signed-off-by: Daniel Teunis <daniel@teunis.cc>
* Add support for HTTP request body as file

Resolves #391

Signed-off-by: Daniel Teunis <daniel@teunis.cc>
* Use io instead of io/ioutil

Signed-off-by: Marcelo Magallon <marcelo.magallon@gmail.com>
---------

Signed-off-by: Daniel Teunis <daniel@teunis.cc>
Signed-off-by: Marcelo Magallon <marcelo.magallon@gmail.com>
Co-authored-by: Marcelo Magallon <marcelo.magallon@gmail.com>

Add oauth2 client-credentials example (#1044)

* Add oauth2 client-credentials example

Add an example for oauth2 config with client-credentials, valid status response codes, token url, etc.

Signed-off-by: javivaz <javier.vazquez.romera@gmail.com>
* Remove commented config

Signed-off-by: Suraj Nath <9503187+electron0zero@users.noreply.github.com>
---------

Signed-off-by: javivaz <javier.vazquez.romera@gmail.com>
Signed-off-by: Suraj Nath <9503187+electron0zero@users.noreply.github.com>
Co-authored-by: Suraj Nath <9503187+electron0zero@users.noreply.github.com>

Fix example.yml: no_follow_redirects is deprecated in favor of follow_redirects (#1031)

Signed-off-by: Samuel Berthe <dev@samuel-berthe.fr>

Synchronize common files from prometheus/prometheus (#1045)

Signed-off-by: prombot <prometheus-team@googlegroups.com>

Merge pull request #1040 from simonpasquier/bump-prometheus-orbs

.circleci/config.yml: bump Prometheus CircleCI orbs version

.circleci/config.yml: bump Prometheus CircleCI orbs version

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

Merge pull request #1032 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus

Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>

Merge pull request #1028 from prometheus/dependabot/go_modules/golang.org/x/net-0.7.0

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

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

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

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Add hostname parameter for TCP probe (#981)

This adds the ability to set the TLS server name for TCP probes using the hostname parameter,
just like #823 did for HTTP probes

* add hostname parameter for tcp probe
* only add servername if TLS is true
* add even if TLS isn't true in case of STARTTLS
* added test hostname parameter with TCP probe
* remove unnecessary function and inline assignment

---------

Signed-off-by: Lyas Spiehler <lspiehler@gmail.com>
Co-authored-by: Lyas Spiehler <lyas.spiehler@sapphirehealth.org>

Merge pull request #1021 from prometheus/dependabot/go_modules/google.golang.org/grpc-1.52.3

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

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

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

---
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>

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

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>

Synchronize common files from prometheus/prometheus (#1015)

Signed-off-by: prombot <prometheus-team@googlegroups.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>

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>

Synchronize common files from prometheus/prometheus (#1010)

Signed-off-by: prombot <prometheus-team@googlegroups.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>

Merge pull request #1008 from roidelapluie/consistentdoc

Make Proxy Connect Headers consistent with Prometheus

Make Proxy Connect Headers consistent with Prometheus

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

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>

Update common Prometheus files (#1004)

Signed-off-by: prombot <prometheus-team@googlegroups.com>

Merge pull request #1000 from roidelapluie/rel0230

Release 0.23.0

Update changelog with #990

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

Release 0.23.0

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

Merge pull request #990 from danteu/dns_target_reachable

Add probe_dns_query_succeeded metric

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>

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

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>

Merge pull request #997 from prometheus/update_toolkit

Update prometheus/exporter-toolkit to v0.7.2

Update prometheus/exporter-toolkit to v0.7.2

Signed-off-by: Suraj Nath <9503187+electron0zero@users.noreply.github.com>

Merge pull request #985 from paketb0te/master

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

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

Signed-off-by: Manuel Stausberg <stausberg@denic.de>

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

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>

Merge pull request #994 from prometheus/superq/bump_go

Update Go

Update Go

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

Signed-off-by: SuperQ <superq@gmail.com>

Merge pull request #993 from prometheus/superq/update_docker_docs

Update Docker run docs

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>

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>

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

bump exporter-toolkit to v0.8.1

Signed-off-by: Perry Naseck <git@perrynaseck.com>

fix deps for update to exporter-toolkit v0.8.0

Signed-off-by: Perry Naseck <git@perrynaseck.com>

update to exporter-toolkit v0.8.0

Signed-off-by: Perry Naseck <git@perrynaseck.com>

Refactor prober gauges (#972)

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

Signed-off-by: SuperQ superq@gmail.com

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>

Consistent HELP message of gauge metrics across check types (#970)

Co-authored-by: Suraj Nath <9503187+electron0zero@users.noreply.github.com>

Merge pull request #968 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus

Refactor proberHandler as an exported function (#957)

* Refactor proberHandler as an exported function

Signed-off-by: Marc Tuduri <marctc@protonmail.com>

Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>

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>

Release 0.22.0 (#954)

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

Use BBE user agent for oauth2

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

Merge pull request #952 from inosato/remove-ioutil

Remove ioutil

Remove ioutil

Signed-off-by: inosato <si17_21@yahoo.co.jp>

add example to skip dns resolve and using proxy

Signed-off-by: Alireza (Ali) Mansoori <amansoori@gmail.com>

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>

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>

Merge pull request #930 from prometheus/release-0.21

Merge Release 0.21

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>

Release 0.21.1

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

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>

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>

Update common Prometheus files (#926)

Signed-off-by: prombot <prometheus-team@googlegroups.com>

Synchronize common files from prometheus/prometheus (#921)

Release 0.21.0

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

Update yamllint (#916)

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

Signed-off-by: SuperQ <superq@gmail.com>

Blackbox exporter 0.21.0-rc.0

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

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>

Update builds & dependencies

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

Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>

Merge pull request #869 from zhdkirill/maxTimeoutSeconds

Negative maxTimeoutSeconds

Update common Prometheus files (#889)

Signed-off-by: prombot <prometheus-team@googlegroups.com>

Rename dns recursion flag to recursion_desired (#900)

Signed-off-by: Nikolay Eskov <mr.eskov1@yandex.ru>

Release 0.20.0 (#895)

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

gRPC added to README and Configuration (#894)

* added grpc config

added grpc config

Signed-off-by: rshsm <arashsami@live.com>

Merge pull request #887 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus

Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>

Merge pull request #882 from roidelapluie/clorder

Reorder changelog

Reorder changelog

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

Release 0.20.0-rc.0 (#881)

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

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>

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>

Merge pull request #876 from bmillemathias/master

Update IRC network in github issue template

Remove outdated IRC and point to community website

Signed-off-by: Baptiste Mille-Mathias <baptiste.millemathias@gmail.com>

Merge pull request #863 from prometheus/superq/fix_ip_hash

Fix IP hash

Merge pull request #871 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus

Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>

Negative maxTimeoutSeconds

Fixes #868

Signed-off-by: Kirill Zhdanov <kzhdanov@mirantis.com>

Merge pull request #859 from dgl/dns-rd

Add control of recursion desired flag for DNS probes

Merge pull request #864 from prometheus/superq/bump_go

Update Go version

Fixup chooseProtocol test.

Verified this works all the way back to Go 1.13.

Signed-off-by: SuperQ <superq@gmail.com>

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>

Merge pull request #557 from nikonhub/feature-change_default_http_user_agent

Change default user agent

Fix up deprecated grpc.WithInsecure()

Signed-off-by: SuperQ <superq@gmail.com>

Update Go version

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

Signed-off-by: SuperQ <superq@gmail.com>