Skip to content

Commit 0f772b7

Browse files
author
Hagai Barel
committed
Refactor crdential loading and restructured project
1 parent f14b18a commit 0f772b7

File tree

6 files changed

+127
-27
lines changed

6 files changed

+127
-27
lines changed

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ vet: init ## Vet code using go vet
2323

2424
build: fmt vet test ## Build binaries
2525
@echo ">> building binaries"
26-
$(GO) build -o ./bin/emq_exporter emq_exporter.go
26+
$(GO) build -o ./bin/emq_exporter ./...
2727

2828
test: fmt vet ## Run tests using go test
2929
@echo ">> running tests"
@@ -38,9 +38,9 @@ local: ## Start a local emq container for development
3838
@docker run --rm -d --name emqx -h emqx -p 18083:18083 -p 8080:8080 emqx/emqx:latest
3939

4040
run: build local ## Run the exporter locally using a local container
41-
./bin/emq_exporter --emq.node="emqx@$(IP)" --emq.api-version="v3" --log.level="debug"
41+
./bin/emq_exporter -n "emqx@$(IP)" -f "testdata/auth-example.json" --emq.api-version "v3" --log.level "debug"
4242

4343
help: ## Print this message and exit
4444
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "%-20s %s\n", $$1, $$2}'
4545

46-
.PHONY: all fmt vet build docker bootstrap help
46+
.PHONY: all fmt vet build docker bootstrap local run help

‎creds.go

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
package main
2+
3+
import (
4+
"encoding/json"
5+
"fmt"
6+
"io/ioutil"
7+
"os"
8+
"path/filepath"
9+
10+
"github.com/prometheus/common/log"
11+
)
12+
13+
//LoadCreds tries to load credentials in the follwing precedence:
14+
//1. Env vars - EMQ_USERNAME && EMQ_PASSWORD
15+
//2. A file under the specified path
16+
//returns the found username and password or error
17+
func LoadCreds(path string) (string, string, error) {
18+
log.Debugln("Trying to load credentails from environment")
19+
u, p, err := loadFromEnv()
20+
21+
if err != nil {
22+
log.Debugln(err)
23+
log.Debugln("Trying to load credentails from file")
24+
return loadFromFile(path)
25+
}
26+
27+
return u, p, nil
28+
}
29+
30+
//Try to find auth details in env vars
31+
func loadFromEnv() (string, string, error) {
32+
var u, p string
33+
var ok bool
34+
35+
u, ok = os.LookupEnv("EMQ_USERNAME")
36+
if !ok {
37+
return u, p, fmt.Errorf("Can't find EMQ_USERNAME")
38+
}
39+
40+
p, ok = os.LookupEnv("EMQ_PASSWORD")
41+
if !ok {
42+
return u, p, fmt.Errorf("Can't find EMQ_PASSWORD")
43+
}
44+
45+
return u, p, nil
46+
}
47+
48+
//Try to load auth details from file
49+
func loadFromFile(path string) (string, string, error) {
50+
type creds struct {
51+
Username string `json:"username"`
52+
Password string `json:"password"`
53+
}
54+
55+
var err error
56+
57+
c := &creds{}
58+
59+
absPath, err := filepath.Abs(path)
60+
if err != nil {
61+
return c.Username, c.Password, err
62+
}
63+
64+
f, err := ioutil.ReadFile(absPath)
65+
if err != nil {
66+
return c.Username, c.Password, err
67+
}
68+
69+
if err := json.Unmarshal(f, c); err != nil {
70+
return c.Username, c.Password, err
71+
}
72+
73+
if c.Username == "" {
74+
err = fmt.Errorf("missing username in %s", path)
75+
}
76+
if c.Password == "" {
77+
err = fmt.Errorf("missing password in %s", path)
78+
}
79+
80+
return c.Username, c.Password, err
81+
}

‎emq_exporter.go

+11-24
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ import (
44
"encoding/json"
55
"fmt"
66
"net/http"
7-
"strconv"
87
"strings"
98
"time"
109

11-
"code.cloudfoundry.org/bytefmt"
1210
"github.com/prometheus/client_golang/prometheus"
1311
"github.com/prometheus/client_golang/prometheus/promhttp"
1412
"github.com/prometheus/common/log"
@@ -232,31 +230,13 @@ func (e *Exporter) fetch(target string) (*emqResponse, error) {
232230
return dat, nil
233231
}
234232

235-
//Try to parse value from string to float64, return error on failure
236-
func parseString(s string) (float64, error) {
237-
v, err := strconv.ParseFloat(s, 64)
238-
239-
if err != nil {
240-
//try to convert to bytes
241-
u, err := bytefmt.ToBytes(s)
242-
if err != nil {
243-
log.Debugln("can't parse", s, err)
244-
return v, err
245-
}
246-
v = float64(u)
247-
}
248-
249-
return v, nil
250-
}
251-
252233
func main() {
253234
var (
254235
listenAddress = kingpin.Flag("web.listen-address", "Address to listen on for web interface and telemetry.").Default(":9540").String()
255236
metricsPath = kingpin.Flag("web.telemetry-path", "Path under which to expose metrics.").Default("/metrics").String()
256-
emqURI = kingpin.Flag("emq.uri", "HTTP API address of the EMQ node.").Default("http://127.0.0.1:18083").String()
257-
emqUsername = kingpin.Flag("emq.username", "EMQ username (or use $EMQ_USERNAME env var)").Default("admin").Envar("EMQ_USERNAME").String()
258-
emqPassword = kingpin.Flag("emq.password", "EMQ password (or use $EMQ_PASSWORD env var)").Default("public").Envar("EMQ_PASSWORD").String()
259-
emqNodeName = kingpin.Flag("emq.node", "Node name of the emq node to scrape.").Default("[email protected]").String()
237+
emqURI = kingpin.Flag("emq.uri", "HTTP API address of the EMQ node.").Default("http://127.0.0.1:18083").Short('u').String()
238+
emqCreds = kingpin.Flag("emq.creds-file", "Path to json file containing emq credentials").Default("./auth.json").Short('f').String()
239+
emqNodeName = kingpin.Flag("emq.node", "Node name of the emq node to scrape.").Default("[email protected]").Short('n').String()
260240
emqTimeout = kingpin.Flag("emq.timeout", "Timeout for trying to get stats from emq").Default("5s").Duration()
261241
emqAPIVersion = kingpin.Flag("emq.api-version", "The API version used by EMQ. Valid values: [v2, v3]").Default("v2").Enum("v2", "v3")
262242
)
@@ -267,10 +247,17 @@ func main() {
267247

268248
kingpin.Parse()
269249

250+
log.Infoln("Loading authentication credentials")
251+
252+
username, password, err := LoadCreds(*emqCreds)
253+
if err != nil {
254+
log.Fatalf("Failed to load credentials: %v", err)
255+
}
256+
270257
log.Infoln("Starting emq_exporter")
271258
log.Infof("Version %s (git-%s)", GitTag, GitCommit)
272259

273-
exporter := NewExporter(*emqURI, *emqUsername, *emqPassword, *emqNodeName, *emqAPIVersion, *emqTimeout)
260+
exporter := NewExporter(*emqURI, username, password, *emqNodeName, *emqAPIVersion, *emqTimeout)
274261

275262
prometheus.MustRegister(exporter)
276263

‎testdata/authfull.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"password": "public",
3+
"username": "admin"
4+
}

‎testdata/authmissing.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"password": "public"
3+
}

‎utils.go

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package main
2+
3+
import (
4+
"strconv"
5+
6+
"code.cloudfoundry.org/bytefmt"
7+
"github.com/prometheus/common/log"
8+
)
9+
10+
//Try to parse value from string to float64, return error on failure
11+
func parseString(s string) (float64, error) {
12+
v, err := strconv.ParseFloat(s, 64)
13+
14+
if err != nil {
15+
//try to convert to bytes
16+
u, err := bytefmt.ToBytes(s)
17+
if err != nil {
18+
log.Debugln("can't parse", s, err)
19+
return v, err
20+
}
21+
v = float64(u)
22+
}
23+
24+
return v, nil
25+
}

0 commit comments

Comments
 (0)