Merge pull request #18 from heubeck/update/depsAndLibsml

Update/deps and libsml

.editorconfig

@@ -0,0 +1,7 @@
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true

.github/workflows/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.19
+FROM golang:1.20
 
 # Injected from the build
 ARG VERSION

.github/workflows/ci.yaml

@@ -41,7 +41,7 @@ jobs:
                 make test
 
             - name: Build AMD64 binary
-              uses: docker/build-push-action@v3
+              uses: docker/build-push-action@v4
               with:
                 tags: result:amd64
                 platforms: linux/amd64
@@ -52,7 +52,7 @@ jobs:
                 push: false
 
             - name: Build ARM v7 binary
-              uses: docker/build-push-action@v3
+              uses: docker/build-push-action@v4
               with:
                 tags: result:arm-v7
                 platforms: linux/arm/v7

LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022  Florian Heubeck
+    Copyright (C) 2023  Florian Heubeck
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) 2022  Florian Heubeck
+    <program>  Copyright (C) 2023  Florian Heubeck
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

Makefile

@@ -1,16 +1,16 @@
 # SaMLer - Smart Meter data colletor at the edge
-# Copyright (C) 2022  Florian Heubeck
-# 
+# Copyright (C) 2023  Florian Heubeck
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 

README.md

@@ -20,24 +20,25 @@ SaMLer is configured using environment variables, just run it, to let it print i
 
 ```shell
 > ./samler.amd64
-SaMLer v0.3.0  Copyright (C) 2022  Florian Heubeck
+SaMLer v0.4.0  Copyright (C) 2023  Florian Heubeck
 This program comes with ABSOLUTELY NO WARRANTY.
 This is free software, and you are welcome to redistribute it under certain conditions.
 
 # Configuration options, set them as ENV:
-SAMLER_MYSQL_DSN (default: -)
-SAMLER_DEVICE_BAUD_RATE (default: 9600)
+SAMLER_INFLUX_TOKEN (default: -)
+SAMLER_DEVICE (default: /dev/ttyUSB0)
 SAMLER_DEVICE_MODE (default: 8-N-1)
 SAMLER_INFLUX_URL (default: -)
-SAMLER_INFLUX_TOKEN (default: -)
-SAMLER_INFLUX_BUCKET (default: home)
-SAMLER_INFLUX_MEASUREMENT (default: power)
+SAMLER_INFLUX_ORG (default: -)
 SAMLER_MYSQL_TABLE (default: home_power)
-SAMLER_DEVICE (default: /dev/ttyUSB0)
-SAMLER_DEBUG (default: false)
+SAMLER_DEVICE_BAUD_RATE (default: 9600)
 SAMLER_CACHE_PATH (default: /home/heubeck/.samler)
+SAMLER_IDENT_FILTER (default: ) # Comma separated idents to forward, e.g. "1.8.0,16.7.0"
+SAMLER_DEBUG (default: false)
+SAMLER_MYSQL_DSN (default: -)
+SAMLER_INFLUX_MEASUREMENT (default: power)
 SAMLER_BACKEND (options: influx, mysql)
-SAMLER_INFLUX_ORG (default: -)
+SAMLER_INFLUX_BUCKET (default: home)
 
 Please set all values without default depending on the chosen backend
 ```

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/go-sql-driver/mysql v1.7.0
-	github.com/influxdata/influxdb-client-go/v2 v2.12.1
+	github.com/influxdata/influxdb-client-go/v2 v2.12.2
 	github.com/nsqio/go-diskqueue v1.1.1-0.20211017194114-cc41549f81d5
 	github.com/testcontainers/testcontainers-go v0.15.0
 )
@@ -13,10 +13,11 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/Microsoft/go-winio v0.5.2 // indirect
 	github.com/Microsoft/hcsshim v0.9.4 // indirect
+	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
 	github.com/containerd/cgroups v1.0.4 // indirect
 	github.com/containerd/containerd v1.6.8 // indirect
-	github.com/deepmap/oapi-codegen v1.8.2 // indirect
+	github.com/deepmap/oapi-codegen v1.12.4 // indirect
 	github.com/docker/distribution v2.8.1+incompatible // indirect
 	github.com/docker/docker v20.10.17+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
@@ -37,10 +38,10 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/sirupsen/logrus v1.8.1 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect
-	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
+	golang.org/x/net v0.5.0 // indirect
+	golang.org/x/sys v0.4.0 // indirect
 	google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad // indirect
 	google.golang.org/grpc v1.47.0 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )