prometheus/ssl_exporter
1
0
Fork 0
mirror of https://github.com/ribbybibby/ssl_exporter.git synced 2025-07-15 23:54:18 +02:00
Code Issues Releases Activity

Refactor prober function and metrics collection

Browse Source 
The existing implementation consists of a collector that exports
information from a tls.ConnectionState returned by the prober function.
This won't necessarily integrate well with additional probers that
retrieve certs from sources other than a tls handshake (from file, for
instance).

I've made the probing more generically expandable by removing the
collector and instead registering and collecting metrics inside the
prober. This makes it possible to collect the same metrics in a
different way, or collect different metrics depending on the prober.
This commit is contained in:
Rob Best
2020-11-07 17:17:06 +00:00
parent e05745b959
commit c74c0de901
8 changed files with 439 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
prober/tcp_test.go
View File

@ -9,6 +9,7 @@ import (
"github.com/ribbybibby/ssl_exporter/config"
"github.com/ribbybibby/ssl_exporter/test"
"github.com/prometheus/client_golang/prometheus"
pconfig "github.com/prometheus/common/config"
)
@ -30,7 +31,9 @@ func TestProbeTCP(t *testing.T) {
},
}
if _, err := ProbeTCP(server.Listener.Addr().String(), module, 10*time.Second); err != nil {
registry := prometheus.NewRegistry()
if err := ProbeTCP(server.Listener.Addr().String(), module, 10*time.Second, registry); err != nil {
t.Fatalf("error: %s", err)
}
}
@ -56,7 +59,9 @@ func TestProbeTCPInvalidName(t *testing.T) {
_, listenPort, _ := net.SplitHostPort(server.Listener.Addr().String())
if _, err := ProbeTCP("localhost:"+listenPort, module, 10*time.Second); err == nil {
registry := prometheus.NewRegistry()
if err := ProbeTCP("localhost:"+listenPort, module, 10*time.Second, registry); err == nil {
t.Fatalf("expected error but err was nil")
}
}
@ -83,7 +88,9 @@ func TestProbeTCPServerName(t *testing.T) {
},
}
if _, err := ProbeTCP("localhost:"+listenPort, module, 10*time.Second); err != nil {
registry := prometheus.NewRegistry()
if err := ProbeTCP("localhost:"+listenPort, module, 10*time.Second, registry); err != nil {
t.Fatalf("error: %s", err)
}
}
@ -114,7 +121,9 @@ func TestProbeTCPExpired(t *testing.T) {
},
}
if _, err := ProbeTCP(server.Listener.Addr().String(), module, 5*time.Second); err == nil {
registry := prometheus.NewRegistry()
if err := ProbeTCP(server.Listener.Addr().String(), module, 5*time.Second, registry); err == nil {
t.Fatalf("expected error but err is nil")
}
}
@ -146,13 +155,12 @@ func TestProbeTCPExpiredInsecure(t *testing.T) {
},
}
state, err := ProbeTCP(server.Listener.Addr().String(), module, 5*time.Second)
if err != nil {
registry := prometheus.NewRegistry()
if err := ProbeTCP(server.Listener.Addr().String(), module, 5*time.Second, registry); err != nil {
t.Fatalf("error: %s", err)
}
if state == nil {
t.Fatalf("expected state but got nil")
}
}
// TestProbeTCPStartTLSSMTP tests STARTTLS against a mock SMTP server
@ -176,7 +184,9 @@ func TestProbeTCPStartTLSSMTP(t *testing.T) {
},
}
if _, err := ProbeTCP(server.Listener.Addr().String(), module, 10*time.Second); err != nil {
registry := prometheus.NewRegistry()
if err := ProbeTCP(server.Listener.Addr().String(), module, 10*time.Second, registry); err != nil {
t.Fatalf("error: %s", err)
}
}
@ -202,7 +212,9 @@ func TestProbeTCPStartTLSFTP(t *testing.T) {
},
}
if _, err := ProbeTCP(server.Listener.Addr().String(), module, 10*time.Second); err != nil {
registry := prometheus.NewRegistry()
if err := ProbeTCP(server.Listener.Addr().String(), module, 10*time.Second, registry); err != nil {
t.Fatalf("error: %s", err)
}
}
@ -228,7 +240,9 @@ func TestProbeTCPStartTLSIMAP(t *testing.T) {
},
}
if _, err := ProbeTCP(server.Listener.Addr().String(), module, 10*time.Second); err != nil {
registry := prometheus.NewRegistry()
if err := ProbeTCP(server.Listener.Addr().String(), module, 10*time.Second, registry); err != nil {
t.Fatalf("error: %s", err)
}
}