improve configuration options and allow to define a host to listen on

Author: emschu

Makefile

@@ -19,7 +19,7 @@ SHELL := /bin/bash
 
 GO := GO111MODULE=on go
 GO_PATH = $(shell $(GO) env GOPATH)
-APP_VERSION_DOT = "1.0.2"
+APP_VERSION_DOT = "1.0.3"
 
 .PHONY: all
 all: help

config.go

@@ -23,6 +23,7 @@ type dump1090MetricCollectorConfig struct {
 	IsDistanceCalculationEnabled   bool
 	IsAirlineLabellingEnabled      bool
 	IsExposingOriginalFilesEnabled bool
+	Host                           string
 	Port                           int
 	ReceiverPositionLat            *float64
 	ReceiverPositionLon            *float64
@@ -31,12 +32,12 @@ type dump1090MetricCollectorConfig struct {
 }
 
 func newDump1090MetricCollectorConfig(source MetricSource) *dump1090MetricCollectorConfig {
-	// TODO fully integrate
 	return &dump1090MetricCollectorConfig{
 		Source:                         source,
 		IsDistanceCalculationEnabled:   true,
 		IsAirlineLabellingEnabled:      true,
 		IsExposingOriginalFilesEnabled: true,
+		Host:                           "127.0.0.1",
 		Port:                           8080,
 		ReceiverPositionLat:            nil,
 		ReceiverPositionLon:            nil,

dev/dump1090prom.service

@@ -9,7 +9,7 @@ Type=simple
 User=pi
 Group=pi
 
-ExecStart=/usr/local/bin/dump1090prom --base-path /run/readsb --verbose --port 8081
+ExecStart=/usr/local/bin/dump1090prom --base-path /run/readsb --verbose --host 127.0.0.1 --port 8080
 
 NoNewPrivileges=yes
 PrivateTmp=yes

main.go

@@ -30,7 +30,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
-var VERSION = "1.0.2"
+var VERSION = "1.0.3"
 
 //go:embed data/wikipedia-airlines.csv
 var wikipediaAirlinesCsvFileContent string
@@ -42,8 +42,13 @@ func main() {
 	file := flag.String("base-path", "", "Path to the directory where aircraft.json and receiver.json are located")
 	lat := flag.Float64("lat", 0.0, "Custom latitude of the receiver")
 	lon := flag.Float64("lon", 0.0, "Custom longitude of the receiver")
+	host := flag.String("host", "0.0.0.0", "Host to listen on (default: 0.0.0.0)")
 	port := flag.Int("port", 8080, "Port to listen on (default: 8080)")
 	verbose := flag.Bool("verbose", false, "Enable verbose output")
+	distanceCalc := flag.Bool("distance-calc", true, "Enable distance calculation to aircraft")
+	airlineLabel := flag.Bool("airline-label", true, "Enable airline labelling")
+	exposeFiles := flag.Bool("expose-files", true, "Expose original aircraft.json and receiver.json files")
+	rollingMapSize := flag.Int("rolling-map-size", 1000, "Default size of the rolling map for caching")
 	flag.Parse()
 	log.Printf("Dump1090Prom - A bridge between the dump1090 JSON data and prometheus – Version %s", VERSION)
 	source := findMetricSource(url, file)
@@ -54,6 +59,19 @@ func main() {
 		log.Printf("Verbose: %t", *verbose)
 		CONFIG.IsVerbose = *verbose
 	}
+	if distanceCalc != nil {
+		CONFIG.IsDistanceCalculationEnabled = *distanceCalc
+	}
+	if airlineLabel != nil {
+		CONFIG.IsAirlineLabellingEnabled = *airlineLabel
+	}
+	if exposeFiles != nil {
+		CONFIG.IsExposingOriginalFilesEnabled = *exposeFiles
+	}
+	if rollingMapSize != nil {
+		CONFIG.RollingMapDefaultSize = *rollingMapSize
+	}
+	initRollingMaps()
 	receiverData, err := source.fetchReceiverMetrics()
 	if err != nil {
 		log.Printf("Cannot open receiver.json: %v", err)
@@ -81,6 +99,9 @@ func main() {
 	if port != nil {
 		CONFIG.Port = *port
 	}
+	if host != nil {
+		CONFIG.Host = *host
+	}
 
 	// Read airline data
 	data, err := readAirlinesData(wikipediaAirlinesCsvFileContent)
@@ -114,7 +135,7 @@ func main() {
 		}
 	}
 
-	log.Printf("Starting server on port %d\n", CONFIG.Port)
+	log.Printf("Starting server on %s:%d\n", CONFIG.Host, CONFIG.Port)
 
 	if CONFIG.IsExposingOriginalFilesEnabled {
 		http.HandleFunc("/aircraft.json", func(w http.ResponseWriter, r *http.Request) {
@@ -131,9 +152,9 @@ func main() {
 	}
 
 	http.Handle("/metrics", promhttp.Handler())
-	err = http.ListenAndServe(fmt.Sprintf(":%d", CONFIG.Port), nil)
+	err = http.ListenAndServe(fmt.Sprintf("%s:%d", CONFIG.Host, CONFIG.Port), nil)
 	if err != nil {
-		log.Fatalf("failed to start server on port %d: %v", CONFIG.Port, err)
+		log.Fatalf("failed to start server on %s:%d: %v", CONFIG.Host, CONFIG.Port, err)
 	}
 }
 

metric.go

@@ -342,11 +342,21 @@ type dump1090Metric struct {
 }
 
 // used to keep the flight info cached once found, and limits entries
-var flightMap = NewRollingFlightMap(CONFIG.RollingMapDefaultSize)
-var flightAirLineMap = NewRollingAirLineMap(CONFIG.RollingMapDefaultSize)
-var flightAirLineLabelMap = NewRollingAirLineLabelMap(CONFIG.RollingMapDefaultSize)
+var flightMap *RollingFlightMap
+var flightAirLineMap *RollingAirlineMap
+var flightAirLineLabelMap *RollingAirlineLabelMap
+
+func initRollingMaps() {
+	if flightMap != nil {
+		return
+	}
+	flightMap = NewRollingFlightMap(CONFIG.RollingMapDefaultSize)
+	flightAirLineMap = NewRollingAirLineMap(CONFIG.RollingMapDefaultSize)
+	flightAirLineLabelMap = NewRollingAirLineLabelMap(CONFIG.RollingMapDefaultSize)
+}
 
 func newDump1090Metric(source MetricSource) *dump1090Metric {
+	initRollingMaps()
 	var metric = &dump1090Metric{
 		aircraftJsonFilePath: source.getPath(),
 	}