Update dependencies and rework logging
This commit is contained in:
parent
0d17408255
commit
09785448e2
6 changed files with 127 additions and 439 deletions
34
main.go
34
main.go
|
|
@ -6,7 +6,9 @@ import (
|
|||
"github.com/fluepke/vodafone-station-exporter/collector"
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
"github.com/prometheus/client_golang/prometheus/promhttp"
|
||||
"github.com/prometheus/common/log"
|
||||
"github.com/prometheus/common/promslog"
|
||||
stdlog "log"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"os"
|
||||
"reflect"
|
||||
|
|
@ -14,23 +16,29 @@ import (
|
|||
|
||||
const version = "0.0.1"
|
||||
|
||||
var logger *slog.Logger
|
||||
|
||||
type slogWriter struct{}
|
||||
|
||||
func (s *slogWriter) Write(p []byte) (n int, err error) {
|
||||
logger.Error("promhttp error", slog.String("err", string(p)))
|
||||
return len(p), nil
|
||||
}
|
||||
|
||||
var (
|
||||
showVersion = flag.Bool("version", false, "Print version and exit")
|
||||
showMetrics = flag.Bool("show-metrics", false, "Show available metrics and exit")
|
||||
listenAddress = flag.String("web.listen-address", "[::]:9420", "Address to listen on")
|
||||
metricsPath = flag.String("web.telemetry-path", "/metrics", "Path under which to expose metrics")
|
||||
logLevel = flag.String("log.level", "info", "Logging level")
|
||||
vodafoneStationUrl = flag.String("vodafone.station-url", "http://192.168.0.1", "Vodafone station URL. For bridge mode this is 192.168.100.1 (note: Configure a route if using bridge mode)")
|
||||
vodafoneStationPassword = flag.String("vodafone.station-password", "How is the default password calculated? mhmm", "Password for logging into the Vodafone station")
|
||||
)
|
||||
|
||||
func main() {
|
||||
flag.Parse()
|
||||
err := log.Base().SetLevel(*logLevel)
|
||||
if err != nil {
|
||||
fmt.Println("Invalid log level")
|
||||
os.Exit(2)
|
||||
}
|
||||
|
||||
cfg := &promslog.Config{}
|
||||
logger = promslog.New(cfg)
|
||||
|
||||
if *showMetrics {
|
||||
describeMetrics()
|
||||
|
|
@ -85,7 +93,7 @@ func describeMetric(desc *prometheus.Desc) {
|
|||
}
|
||||
|
||||
func startServer() {
|
||||
log.Infof("Starting vodafone-station-exporter (version %s)", version)
|
||||
logger.Info("Starting vodafone-station-exporter", slog.String("version", version))
|
||||
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Write([]byte(`<html>
|
||||
<head><title>vodafone-station-exporter (Version ` + version + `)</title></head>
|
||||
|
|
@ -97,17 +105,21 @@ func startServer() {
|
|||
})
|
||||
http.HandleFunc(*metricsPath, handleMetricsRequest)
|
||||
|
||||
log.Infof("Listening on %s", *listenAddress)
|
||||
log.Fatal(http.ListenAndServe(*listenAddress, nil))
|
||||
logger.Info("Listening on address", slog.String("address", *listenAddress))
|
||||
if err := http.ListenAndServe(*listenAddress, nil); err != nil {
|
||||
logger.Error("HTTP server failed", slog.String("err", err.Error()))
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
func handleMetricsRequest(w http.ResponseWriter, request *http.Request) {
|
||||
registry := prometheus.NewRegistry()
|
||||
registry.MustRegister(&collector.Collector{
|
||||
Station: collector.NewVodafoneStation(*vodafoneStationUrl, *vodafoneStationPassword),
|
||||
Logger: logger,
|
||||
})
|
||||
promhttp.HandlerFor(registry, promhttp.HandlerOpts{
|
||||
ErrorLog: log.NewErrorLogger(),
|
||||
ErrorLog: stdlog.New(&slogWriter{}, "", 0),
|
||||
ErrorHandling: promhttp.ContinueOnError,
|
||||
}).ServeHTTP(w, request)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue