Skip to content

Commit 3a5f264

Browse files
dwillcocksdwillcocks
committed
Add serverID options
1 parent c6444ff commit 3a5f264

File tree

5 files changed

+47
-19
lines changed

5 files changed

+47
-19
lines changed

‎README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ A [Speedtest](https://www.speedtest.net) exporter for Prometheus.
2727
$ ./speedtest_exporter --help
2828
Usage of speedtest_exporter
2929
-port string
30-
Listening port for prometheus endpoint (default 9090)
30+
listening port to expose metrics on (default "9090")
31+
-server_fallback
32+
If the serverID given is not available, should we fallback to closest available server
33+
-server_id int
34+
Speedtest.net server ID to run test against, -1 will pick the closest server to your location (default -1)
3135

3236
```
3337

‎cmd/speedtest_exporter/main.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ const (
1818

1919
func main() {
2020
port := flag.String("port", "9090", "listening port to expose metrics on")
21+
serverID := flag.Int("server_id", -1, "Speedtest.net server ID to run test against, -1 will pick the closest server to your location")
22+
serverFallback := flag.Bool("server_fallback", false, "If the server_id given is not available, should we fallback to closest available server")
2123
flag.Parse()
2224

23-
exporter, err := exporter.New()
25+
exporter, err := exporter.New(*serverID, *serverFallback)
2426
if err != nil {
2527
panic(err)
2628
}

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ go 1.16
44

55
require (
66
github.com/golang/protobuf v1.5.1 // indirect
7-
github.com/google/uuid v1.0.0
7+
github.com/google/uuid v1.3.0
88
github.com/prometheus/client_golang v1.11.0
99
github.com/prometheus/common v0.29.0 // indirect
10-
github.com/showwin/speedtest-go v1.1.2
10+
github.com/showwin/speedtest-go v1.1.3
1111
github.com/sirupsen/logrus v1.8.1
1212
github.com/stretchr/testify v1.7.0 // indirect
1313
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect

‎go.sum

+7-6
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
3838
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
3939
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
4040
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
41-
github.com/alecthomas/units v0.0.0-20201120081800-1786d5ef83d4/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
41+
github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
4242
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
4343
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
4444
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -120,8 +120,8 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf
120120
github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
121121
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
122122
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
123-
github.com/google/uuid v1.0.0 h1:b4Gk+7WdP/d3HZH8EJsZpvV7EtDOgaZLtnaNGIu1adA=
124-
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
123+
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
124+
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
125125
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
126126
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
127127
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -176,8 +176,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
176176
github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
177177
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
178178
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
179-
github.com/showwin/speedtest-go v1.1.2 h1:QPWG8UWQaert3/F2Vm692GhHgM3+sHi5v7o5llG5JP4=
180-
github.com/showwin/speedtest-go v1.1.2/go.mod h1:Evr4so/j097J4zgdEyYvaBhzyKMgrTNUOwFQcXqUUzc=
179+
github.com/showwin/speedtest-go v1.1.3 h1:nM1XYWyUr6E6pYR4ZAborvSlexvMRuzfrYjXeJlWmlg=
180+
github.com/showwin/speedtest-go v1.1.3/go.mod h1:dJugxvC/AQDt4HQQKZ9lKNa2+b1c8nzj9IL0a/F8l1U=
181181
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
182182
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
183183
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
@@ -277,8 +277,9 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
277277
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
278278
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
279279
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
280-
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs=
281280
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
281+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
282+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
282283
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
283284
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
284285
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

‎internal/exporter/exporter.go

+30-9
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,17 @@ var (
4747

4848
// Exporter runs speedtest and exports them using
4949
// the prometheus metrics package.
50-
type Exporter struct{}
50+
type Exporter struct {
51+
serverID int
52+
serverFallback bool
53+
}
5154

5255
// New returns an initialized Exporter.
53-
func New() (*Exporter, error) {
54-
return &Exporter{}, nil
56+
func New(serverID int, serverFallback bool) (*Exporter, error) {
57+
return &Exporter{
58+
serverID: serverID,
59+
serverFallback: serverFallback,
60+
}, nil
5561
}
5662

5763
// Describe describes all the metrics. It implements prometheus.Collector.
@@ -66,18 +72,17 @@ func (e *Exporter) Describe(ch chan<- *prometheus.Desc) {
6672
// Collect fetches the stats from Starlink dish and delivers them
6773
// as Prometheus metrics. It implements prometheus.Collector.
6874
func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
69-
start := time.Now()
7075
testUUID := uuid.New().String()
76+
start := time.Now()
7177
ok := e.speedtest(testUUID, ch)
72-
d := time.Since(start).Seconds()
7378

7479
if ok {
7580
ch <- prometheus.MustNewConstMetric(
7681
up, prometheus.GaugeValue, 1.0,
7782
testUUID,
7883
)
7984
ch <- prometheus.MustNewConstMetric(
80-
scrapeDurationSeconds, prometheus.GaugeValue, d,
85+
scrapeDurationSeconds, prometheus.GaugeValue, time.Since(start).Seconds(),
8186
testUUID,
8287
)
8388
} else {
@@ -101,9 +106,25 @@ func (e *Exporter) speedtest(testUUID string, ch chan<- prometheus.Metric) bool
101106
log.Errorf("could not fetch server list: %s", err.Error())
102107
return false
103108
}
104-
// taking the closes server
105-
servers := serverList.Servers
106-
server := servers[0]
109+
110+
var server *speedtest.Server
111+
112+
if e.serverID == -1 {
113+
server = serverList.Servers[0]
114+
} else {
115+
servers, err := serverList.FindServer([]int{e.serverID})
116+
if err != nil {
117+
log.Error(err)
118+
return false
119+
}
120+
121+
if servers[0].ID != fmt.Sprintf("%d", e.serverID) && !e.serverFallback {
122+
log.Errorf("could not find your choosen server ID %d in the list of avaiable servers, server_fallback is not set so failing this test", e.serverID)
123+
return false
124+
}
125+
126+
server = servers[0]
127+
}
107128

108129
ok := pingTest(testUUID, user, server, ch)
109130
ok = downloadTest(testUUID, user, server, ch) && ok

0 commit comments

Comments
 (0)