Updated influxdb

etc/systemd/argonone.env

@@ -6,7 +6,7 @@ DEBUG=false
 # when empty string no measurements are written
 MEASUREMENT="cpufan"
 
-# Set host and database to write metrics to
-INFLUXDB="localhost/metrics"
-
-
+# Set host, database, username and password to write metrics to
+INFLUX_DB="https://localhost/metrics"
+INFLUX_USERNAME=""
+INFLUX_PASSWORD=""

etc/systemd/argonone.service

@@ -13,5 +13,5 @@ EnvironmentFile=/opt/gopi/etc/argonone.env
 ExecStart=/opt/gopi/bin/argonone \
     -debug=${DEBUG} \
     -argonone.measurement=${MEASUREMENT} \
-    -influxdb.url=${INFLUXDB}
+    -influxdb.url=${INFLUX_DB}
 Restart=on-failure

pkg/db/influxdb/writer.go

@@ -10,6 +10,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"os"
 	"strconv"
 	"strings"
 	"sync"
@@ -54,6 +55,9 @@ const (
 	DefaultScheme   = "http"
 	DefaultEndpoint = DefaultScheme + "://localhost/metrics"
 	DefaultPort     = 8086
+
+	EnvUsername = "INFLUX_USERNAME"
+	EnvPassword = "INFLUX_PASSWORD"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -294,6 +298,8 @@ func parseUrl(value string) (endpoint, error) {
 	// Check various styles
 	if value == "" {
 		value = DefaultEndpoint
+	} else if strings.HasPrefix(value, "http://") || strings.HasPrefix(value, "https://") {
+		// Skip
 	} else if host, port, err := net.SplitHostPort(value); err == nil {
 		value = DefaultScheme + "://" + host
 		if port != "" {
@@ -330,12 +336,14 @@ func parseUrl(value string) (endpoint, error) {
 	} else if db, err := parseDatabase(u); err != nil {
 		return endpoint{}, err
 	} else {
-		user, password := "", ""
-		if u.User != nil {
+		user := os.Getenv(EnvUsername)
+		password := os.Getenv(EnvPassword)
+		if u.User != nil && u.User.Username() != "" {
 			user = u.User.Username()
 			password, _ = u.User.Password()
 		}
 		u.Path = "/"
+		u.User = nil
 		return endpoint{*u, db, user, password}, nil
 	}
 }

pkg/db/influxdb/writer_test.go

@@ -159,3 +159,27 @@ func Test_Writer_008(t *testing.T) {
 		}
 	})
 }
+
+func Test_Writer_009(t *testing.T) {
+	tool.Test(t, []string{"-influxdb.url=https://rpi4b/metrics"}, new(WriterApp), func(app *WriterApp) {
+		if ep := app.Writer.Endpoint(); ep == nil {
+			t.Error("Unexpected nil")
+		} else if ep.String() != "https://rpi4b:8086/" {
+			t.Error("Unexpected endpoint", ep)
+		} else {
+			t.Log("endpoint=", ep)
+		}
+	})
+}
+
+func Test_Writer_010(t *testing.T) {
+	tool.Test(t, []string{"-influxdb.url=http://user:pass@rpi4:99/metrics"}, new(WriterApp), func(app *WriterApp) {
+		if ep := app.Writer.Endpoint(); ep == nil {
+			t.Error("Unexpected nil")
+		} else if ep.User.String() != "" {
+			t.Error("Unexpected username/password", ep)
+		} else {
+			t.Log("endpoint=", ep)
+		}
+	})
+}