Dockerfile

@@ -1,5 +1,5 @@
 # Use buildx for multi-architecture support
-FROM --platform=${BUILDPLATFORM} golang:1.23 AS builder
+FROM --platform=${BUILDPLATFORM} golang:1.22 AS builder
 
 WORKDIR /app
 
@@ -11,10 +11,7 @@ RUN go mod download
 COPY . .
 
 # Build the application for the specified target architecture
-# https://www.docker.com/blog/faster-multi-platform-builds-dockerfile-cross-compilation-guide/
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} go build -o opendtu-logger .
-# Declare TARGETOS and TARGETARCH in the local scope so they can be used in the build stage.
-ARG TARGETOS TARGETARCH
-RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o opendtu-logger .
 
 # Create a minimal runtime image
 FROM --platform=${TARGETPLATFORM} scratch

docker/compose.with-database-grafana.yml

@@ -32,7 +32,6 @@ services:
       OPENDTU_PASSWORD: ${OPENDTU_PASSWORD}
       TIMESCALEDB_ENABLED: ${TIMESCALEDB_ENABLED}
       TZ: ${TZ}
-      LOG_LEVEL: ${LOG_LEVEL}
     depends_on:
       timescaledb:
         condition: service_healthy

docker/compose.with-database.yml

@@ -32,8 +32,6 @@ services:
       OPENDTU_PASSWORD: ${OPENDTU_PASSWORD}
       TIMESCALEDB_ENABLED: ${TIMESCALEDB_ENABLED}
       TZ: ${TZ}
-      LOG_LEVEL: ${LOG_LEVEL}
-
     depends_on:
       timescaledb:
         condition: service_healthy

docker/compose.yml

@@ -11,7 +11,6 @@ services:
       OPENDTU_PASSWORD: ${OPENDTU_PASSWORD}
       TIMESCALEDB_ENABLED: ${TIMESCALEDB_ENABLED}
       TZ: ${TZ}
-      LOG_LEVEL: ${LOG_LEVEL}
     depends_on:
       timescaledb:
         condition: service_healthy

docker/example.env

@@ -1,11 +0,0 @@
-# OpenDTU
-OPENDTU_ADDRESS="192.168.1.89:80"
-OPENDTU_AUTH=false
-OPENDTU_USERNAME=admin
-OPENDTU_PASSWORD=
-
-# OpenDTU Logger
-DB_URL="host=timescaledb port=5432 user=postgres password=secret dbname=opendtu_logger sslmode=disable"
-TIMESCALEDB_ENABLED=true
-TZ="Europe/Amsterdam"
-LOG_LEVEL=INFO"

docker/example.with-database.env

@@ -1,15 +1,12 @@
 # OpenDTU
 OPENDTU_ADDRESS="192.168.1.89:80"
 OPENDTU_AUTH=false
-OPENDTU_USERNAME=admin
+OPENDTU_USERNAME=
 OPENDTU_PASSWORD=
-
 # OpenDTU Logger
 DB_URL="host=timescaledb port=5432 user=postgres password=secret dbname=opendtu_logger sslmode=disable"
 TIMESCALEDB_ENABLED=true
 TZ="Europe/Amsterdam"
-LOG_LEVEL=INFO"
-
 # Database configuration
 PG_USER=postgres
 PG_PASSWORD=

go.mod

@@ -1,16 +1,17 @@
 module git.hollander.online/energy/opendtu-logger
 
-go 1.23
+go 1.22
 
 require (
 	github.com/gorilla/websocket v1.5.3
 	github.com/lib/pq v1.10.9
-	github.com/pressly/goose/v3 v3.22.0
+	github.com/pressly/goose/v3 v3.21.1
 )
 
 require (
 	github.com/mfridman/interpolate v0.0.2 // indirect
-	github.com/sethvargo/go-retry v0.3.0 // indirect
+	github.com/sethvargo/go-retry v0.2.4 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/net v0.27.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
 )

go.sum

@@ -4,6 +4,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
+github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
@@ -18,32 +20,37 @@ github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdh
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pressly/goose/v3 v3.22.0 h1:wd/7kNiPTuNAztWun7iaB98DrhulbWPrzMAaw2DEZNw=
+github.com/pressly/goose/v3 v3.21.1 h1:5SSAKKWej8LVVzNLuT6KIvP1eFDuPvxa+B6H0w78buQ=
-github.com/pressly/goose/v3 v3.22.0/go.mod h1:yJM3qwSj2pp7aAaCvso096sguezamNb2OBgxCnh/EYg=
+github.com/pressly/goose/v3 v3.21.1/go.mod h1:sqthmzV8PitchEkjecFJII//l43dLOCzfWh8pHEe+vE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/sethvargo/go-retry v0.3.0 h1:EEt31A35QhrcRZtrYFDTBg91cqZVnFL2navjDrah2SE=
+github.com/sethvargo/go-retry v0.2.4 h1:T+jHEQy/zKJf5s95UkguisicE0zuF9y7+/vgz08Ocec=
-github.com/sethvargo/go-retry v0.3.0/go.mod h1:mNX17F0C/HguQMyMyJxcnU471gOZGxCLyYaFyAZraas=
+github.com/sethvargo/go-retry v0.2.4/go.mod h1:1afjQuvh7s4gflMObvjLPaWgluLLyhA1wmVZ6KLpICw=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
+golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 h1:5D53IMaUuA5InSeMu9eJtlQXS2NxAhyWQvkKEgXZhHI=
 modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
-modernc.org/libc v1.55.3 h1:AzcW1mhlPNrRtjS5sS+eW2ISCgSOLLNyFzRh/V3Qj/U=
+modernc.org/libc v1.41.0 h1:g9YAc6BkKlgORsUWj+JwqoB1wU3o4DE3bM3yvA3k+Gk=
-modernc.org/libc v1.55.3/go.mod h1:qFXepLhz+JjFThQ4kzwzOjA/y/artDeg+pcYnY+Q83w=
+modernc.org/libc v1.41.0/go.mod h1:w0eszPsiXoOnoMJgrXjglgLuDy/bt5RR4y3QzUUeodY=
 modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
 modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
-modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=
+modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
-modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU=
+modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=
-modernc.org/sqlite v1.32.0 h1:6BM4uGza7bWypsw4fdLRsLxut6bHe4c58VeqjRgST8s=
+modernc.org/sqlite v1.29.6 h1:0lOXGrycJPptfHDuohfYgNqoe4hu+gYuN/pKgY5XjS4=
-modernc.org/sqlite v1.32.0/go.mod h1:UqoylwmTb9F+IqXERT8bW9zzOWN8qwAIcLdzeBZs4hA=
+modernc.org/sqlite v1.29.6/go.mod h1:S02dvcmm7TnTRvGhv8IGYyLnIt7AS2KPaB1F/71p75U=
 modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
 modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=

main.go

@@ -4,7 +4,6 @@
 // Idea: Gather settings only on start-up.
 // TODO: Only update meter readings such as yieldday, yieldtotal on-change.
 // TODO: Add a health check endpoint, potentially log to it.
-// TODO: Add support for monitoring multiple OpenDTU's at once.
 package main
 
 import (
@@ -157,7 +156,6 @@ type Config struct {
 	OpenDTUPassword string `json:"opendtu_password"`
 	TimescaleDB     bool   `json:"timescaledb"`
 	TZ              string `json:"tz"`
-	LogLevel        string `json:"log_level"`
 }
 
 var logger = slog.New(slog.NewJSONHandler(os.Stdout, nil))
@@ -233,7 +231,6 @@ func loadConfig() Config {
 			config.TimescaleDB = timescaleDB
 		}
 		config.TZ = os.Getenv("TZ")
-		config.LogLevel = os.Getenv("LOG_LEVEL")
 	}
 	_, err = time.LoadLocation(config.TZ)
 	if err != nil {
@@ -243,30 +240,6 @@ func loadConfig() Config {
 	return config
 }
 
-// Helper function to map environment variable to slog.Level
-func getLogLevel(defaultLevel slog.Level) slog.Level {
-	logLevelStr := config.LogLevel
-	switch logLevelStr {
-	case "DEBUG":
-		return slog.LevelDebug
-	case "INFO":
-		return slog.LevelInfo
-	case "WARN":
-		return slog.LevelWarn
-	case "ERROR":
-		return slog.LevelError
-	default:
-		return defaultLevel
-	}
-}
-
-// Function to create a new logger with a specified log level
-func createLoggerWithLevel(level slog.Level) *slog.Logger {
-	return slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
-		Level: level,
-	}))
-}
-
 // Main program
 func main() {
 	// Initial logger setup
@@ -275,10 +248,6 @@ func main() {
 	// Load the configuration
 	config := loadConfig()
 
-	// Set the logLevel
-	logLevel := getLogLevel(slog.LevelInfo) // Default to info level
-	logger = createLoggerWithLevel(logLevel)
-
 	dbConnStr := config.DB
 	// Connect to PostgreSQL
 	db, err := sql.Open("postgres", dbConnStr)
@@ -293,8 +262,6 @@ func main() {
 	// Create WebSocket URL from config variable
 	wsURL := "ws://" + config.OpenDTUAddress + "/livedata"
 
-	logger.Debug(wsURL)
-
 	// Create headers with optional Basic Auth
 	headers := http.Header{}
 	if config.OpenDTUAuth {
@@ -564,9 +531,7 @@ func getPreviousEventsCount(db *sql.DB, inverterSerial string) int {
 }
 
 func insertEvents(db *sql.DB, inverterSerial string, events *EventsResponse) {
-	timeZone := config.TZ
+	timestamp := time.Now()
-	loc, _ := time.LoadLocation(timeZone)
-	timestamp := time.Now().In(loc)
 
 	for _, event := range events.Events {
 		// Insert events data into the events table

systemd/opendtu-logger.service

@@ -23,8 +23,6 @@ Environment="OPENDTU_PASSWORD=your_super_secret_password"
 Environment="DB_URL=host=localhost port=5432 user=postgres password=secret dbname=dtu sslmode=disable"
 Environment="TIMESCALEDB_ENABLED=true"
 Environment="TZ=Europe/Amsterdam"
-Environment="LOG_LEVEL=INFO"
-
 
 WorkingDirectory=/opt/opendtu-logger/
 ExecStart=/opt/opendtu-logger/opendtu-logger