move to postgres

herrphon-docker-stuff · Nov 12, 2023 · 3caf192 · 3caf192
1 parent 92c54b3
commit 3caf192
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 419 deletions.
diff --git a/get.go b/get.go
diff --git a/go.mod b/go.mod
@@ -7,6 +7,7 @@ toolchain go1.21.3
 require (
 	github.com/go-kit/kit v0.13.0
 	github.com/influxdata/influxdb-client-go/v2 v2.3.1-0.20210518120617-5d1fff431040
+	github.com/lib/pq v1.10.9
 	github.com/spf13/cobra v1.7.0
 	github.com/tgulacsi/go v0.27.1
 )

diff --git a/go.sum b/go.sum
@@ -31,6 +31,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=

diff --git a/push.go → http.go b/push.go → http.go
@@ -28,7 +28,7 @@ import (
 )
 
 type solarAPIAccept struct {
-	influxClient
+	postgresClient
 }
 
 func (sa solarAPIAccept) ServeHTTP(w http.ResponseWriter, r *http.Request) {
@@ -49,23 +49,17 @@ func (sa solarAPIAccept) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	level.Debug(sa.Logger).Log("msg", "decoded", "data", fmt.Sprintf("%#v", data))
 	w.WriteHeader(200)
 
-	if err := sa.influxClient.Put("fronius energy",
-		[]dataPoint{
-			{Name: "pac", Time: data.Head.Timestamp,
-				Unit:  data.Body.Pac.Unit,
-				Value: data.Body.Pac.Values["1"]},
-			{Name: "day", Time: data.Head.Timestamp,
-				Unit:  data.Body.Day.Unit,
-				Value: data.Body.Day.Values["1"]},
-			{Name: "year", Time: data.Head.Timestamp,
-				Unit:  data.Body.Year.Unit,
-				Value: data.Body.Year.Values["1"]},
-			{Name: "total", Time: data.Head.Timestamp,
-				Unit:  data.Body.Total.Unit,
-				Value: data.Body.Total.Values["1"]},
-		}...); err != nil {
-		level.Error(sa.Logger).Log("msg", "write batch to db", "error", err)
-	}
+	sa.postgresClient.Put(
+		data.Body.Pac.Values["1"],
+		data.Body.Pac.Unit,
+		data.Body.Day.Values["1"],
+		data.Body.Day.Unit,
+		data.Body.Year.Values["1"],
+		data.Body.Year.Unit,
+		data.Body.Total.Values["1"],
+		data.Body.Total.Unit,
+	)
+
 }
 
 type solarV1CurrentInverter struct {