blackbox_exporter.git
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>
3 years agoFix redirects options
Julien Pivotto [Tue, 11 May 2021 07:29:26 +0000 (09:29 +0200)]
Fix redirects options

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
3 years agoFixes in the changelog
Julien Pivotto [Mon, 10 May 2021 16:30:21 +0000 (18:30 +0200)]
Fixes in the changelog

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
3 years agoFix release date
Julien Pivotto [Mon, 10 May 2021 12:59:05 +0000 (14:59 +0200)]
Fix release date

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
3 years agoMerge pull request #784 from roidelapluie/rel-019
Julien Pivotto [Mon, 10 May 2021 12:54:23 +0000 (14:54 +0200)]
Merge pull request #784 from roidelapluie/rel-019

Release 0.19.0

3 years agoMerge pull request #783 from Cytrian/master
Ben Kochie [Sat, 8 May 2021 17:19:22 +0000 (19:19 +0200)]
Merge pull request #783 from Cytrian/master

Fix example ssh_banner check: Send identification string

3 years agoUse upstream parameter follow_redirects
Julien Pivotto [Fri, 7 May 2021 15:03:00 +0000 (17:03 +0200)]
Use upstream parameter follow_redirects

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
3 years agoRelease 0.19.0
Julien Pivotto [Fri, 7 May 2021 06:57:24 +0000 (08:57 +0200)]
Release 0.19.0

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
3 years agoFix example ssh_banner check: Send identificaation string
Marcus Röder [Wed, 5 May 2021 12:59:18 +0000 (14:59 +0200)]
Fix example ssh_banner check: Send identificaation string

This is to reduce log spam:

"sshd[3750]: Did not receive identification string from ..:"

There will still be a "Connection closed by" message.

Signed-off-by: Marcus Röder <m.roeder@yieldlab.de>
3 years agoMerge pull request #764 from prometheus/handle_compressed_payload
Marcelo Magallon [Mon, 19 Apr 2021 22:23:26 +0000 (16:23 -0600)]
Merge pull request #764 from prometheus/handle_compressed_payload

Add support for decompression of HTTP responses

3 years agoAdd support for decompression of HTTP responses
Marcelo E. Magallon [Wed, 10 Mar 2021 14:05:14 +0000 (08:05 -0600)]
Add support for decompression of HTTP responses

If the module configuration specifies the "compression" option
blackbox_exporter will try to decompress the response using the
specified algorithm. If the response is not compressed using that
algorithm, the probe will fail.

It validates that the "Accept-Encoding" header is either absent, or that
it specifies the same algorithm as the "compression" option. If the
"Accept-Encoding" header is present but it specifies a different
algorithm, the probe will fail.

If the compression option is *not* used, probe_http_content_length and
probe_http_uncompressed_body_length will have the same value
corresponding to the original content length. If the compression option
is used and the content can be decompressed, probe_http_content_length
will report the original content length as it currently does, and
probe_http_uncompressed_body_length will report the length of the body
after decompression as expected.

Fixes #684

Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>
3 years agoMerge pull request #776 from prometheus/repo_sync
Marcelo Magallon [Fri, 16 Apr 2021 15:08:32 +0000 (09:08 -0600)]
Merge pull request #776 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus

3 years agoUpdate common Prometheus files
prombot [Wed, 14 Apr 2021 00:02:28 +0000 (00:02 +0000)]
Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>
3 years agoMerge pull request #770 from prometheus/repo_sync
Marcelo Magallon [Wed, 31 Mar 2021 18:37:39 +0000 (12:37 -0600)]
Merge pull request #770 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus

3 years agoUpdate common Prometheus files
prombot [Wed, 31 Mar 2021 00:02:11 +0000 (00:02 +0000)]
Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>
3 years agoMerge pull request #768 from prometheus/repo_sync
Ben Kochie [Mon, 22 Mar 2021 08:25:56 +0000 (09:25 +0100)]
Merge pull request #768 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus

3 years agoUpdate common Prometheus files
prombot [Mon, 22 Mar 2021 00:01:40 +0000 (00:01 +0000)]
Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>
3 years agoMerge pull request #758 from kgersen/master
Marcelo Magallon [Thu, 18 Mar 2021 01:24:43 +0000 (19:24 -0600)]
Merge pull request #758 from kgersen/master

http probe - fix how the tls phase is calculated

3 years agoMerge pull request #767 from prometheus/repo_sync
Marcelo Magallon [Thu, 18 Mar 2021 01:23:16 +0000 (19:23 -0600)]
Merge pull request #767 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus

3 years agoUpdate common Prometheus files
prombot [Thu, 18 Mar 2021 00:01:34 +0000 (00:01 +0000)]
Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>
3 years agoMerge pull request #752 from Jimdo/add-health-endpoint
Marcelo Magallon [Tue, 16 Mar 2021 15:40:16 +0000 (09:40 -0600)]
Merge pull request #752 from Jimdo/add-health-endpoint

Add health endpoint

3 years agoMerge pull request #745 from prometheus/fix_738
Marcelo Magallon [Tue, 16 Mar 2021 15:34:25 +0000 (09:34 -0600)]
Merge pull request #745 from prometheus/fix_738

Update golangci-lint to 1.36.0

3 years ago- revert 'connect' phase duration
kgersen [Tue, 16 Mar 2021 12:23:12 +0000 (13:23 +0100)]
- revert 'connect' phase duration

Signed-off-by: kgersen <kgersen@hotmail.com>
3 years ago- fix how tls phase is computed
kgersen [Sun, 14 Mar 2021 17:38:43 +0000 (18:38 +0100)]
- fix how tls phase is computed

Signed-off-by: kgersen <kgersen@hotmail.com>
3 years agoAdd health endpoint
Mitja Adebahr [Thu, 25 Feb 2021 10:51:14 +0000 (11:51 +0100)]
Add health endpoint

The root endpoint exposes too much data. So it cannot be used as public
health check endpoint.

Signed-off-by: Mitja Adebahr <extern.mitja.adebahr@jimdo.com>
3 years agomakefile: update Makefile.common with newer version
Marcelo E. Magallon [Wed, 3 Feb 2021 20:43:07 +0000 (14:43 -0600)]
makefile: update Makefile.common with newer version

This updates golangci-lint from version 1.18.0 to 1.36.0. Newer versions
flag a possible nil pointer dereference, so rework some of the logic to
make sure that's not the case.

Add a test that covers the case of the changed code.

Closes #738

Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>
3 years agoMerge pull request #755 from prometheus/superq/vendor
Ben Kochie [Tue, 9 Mar 2021 12:50:19 +0000 (13:50 +0100)]
Merge pull request #755 from prometheus/superq/vendor

Update build

3 years agoUpdate build
Ben Kochie [Tue, 9 Mar 2021 11:26:17 +0000 (12:26 +0100)]
Update build

* Drop /vendor.
* Update go deps.
* Update to Go 1.16.

Signed-off-by: Ben Kochie <superq@gmail.com>
3 years agoMerge pull request #744 from prometheus/beorn7/maintainers
Björn Rabenstein [Tue, 2 Feb 2021 15:23:12 +0000 (16:23 +0100)]
Merge pull request #744 from prometheus/beorn7/maintainers

Change maintainer from @brian-brazil to @roidelapluie, @mem, @electron0zero

3 years agoChange maintainer from @brian-brazil to @roidelapluie, @mem, @electron0zero
beorn7 [Fri, 29 Jan 2021 19:34:38 +0000 (20:34 +0100)]
Change maintainer from @brian-brazil to @roidelapluie, @mem, @electron0zero

Signed-off-by: beorn7 <beorn@grafana.com>
3 years agoMerge pull request #737 from roidelapluie/security-dot-md
Julien Pivotto [Fri, 15 Jan 2021 14:42:31 +0000 (15:42 +0100)]
Merge pull request #737 from roidelapluie/security-dot-md

Add SECURITY.md

3 years agoAdd SECURITY.md
Julien Pivotto [Fri, 15 Jan 2021 00:01:11 +0000 (01:01 +0100)]
Add SECURITY.md

This commit adds a security policy to this repository. SECURITY.md files
are handled in a special way by GitHub, helping users to know how to
best submit security issues for the projects.

In this case, we simply point to our existing documentation on
prometheus.io.

The content of this file will be synced automatically with the
prometheus/prometheus repository, as our security policy covers all the
repositories. This sync is automated with prombot, like other files
(LICENSE, Makefile.common).

https://docs.github.com/en/free-pro-team@latest/github/managing-security-vulnerabilities/adding-a-security-policy-to-your-repository
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
3 years agoMerge pull request #735 from roidelapluie/toolkit-update
Julien Pivotto [Wed, 13 Jan 2021 21:38:48 +0000 (22:38 +0100)]
Merge pull request #735 from roidelapluie/toolkit-update

Update exporter-toolkit to 0.5.0

3 years agoUpdate exporter-toolkit to 0.5.0
Julien Pivotto [Wed, 13 Jan 2021 20:53:54 +0000 (21:53 +0100)]
Update exporter-toolkit to 0.5.0

The exporter-toolkit has a new release that renames the https package to
web to make it more meaningful.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
3 years agoImprove the test code. (#733)
Yuchen Ying [Thu, 7 Jan 2021 19:39:06 +0000 (11:39 -0800)]
Improve the test code. (#733)

Signed-off-by: Yuchen Ying <github.com@yegle.net>
3 years agoEnable TLS and basic authentication (#730)
Julien Pivotto [Wed, 6 Jan 2021 19:34:11 +0000 (20:34 +0100)]
Enable TLS and basic authentication (#730)

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
3 years agoSolve #717 Validating config should try to compile regexes (#729)
Suzuki Shota [Wed, 6 Jan 2021 13:52:00 +0000 (22:52 +0900)]
Solve #717 Validating config should try to compile regexes (#729)

* Solve issue: #717:Validating config includes trying to compile regexes

Signed-off-by: sshota0809 <8736380+sshota0809@users.noreply.github.com>