diff --git a/config.json.templ b/config.json.templ index 6abee90..e90679a 100644 --- a/config.json.templ +++ b/config.json.templ @@ -8,7 +8,6 @@ "username": "iot-relay", "password": "", "db": "grafana", - "measurement": "iot", "host": "iot-relay" } } \ No newline at end of file diff --git a/internal/client/client.go b/internal/client/client.go index 47e7149..ce68f62 100644 --- a/internal/client/client.go +++ b/internal/client/client.go @@ -11,9 +11,8 @@ import ( "time" ) -func lineProtocolPrefix(request types.Request, config config.Config) string { +func lineProtocolTags(request types.Request, config config.Config) string { var builder strings.Builder - builder.WriteString(config.Client.Measurement) builder.WriteString(",host=") builder.WriteString(config.Client.Host) builder.WriteString(",ip=") @@ -29,7 +28,7 @@ func lineProtocolPrefix(request types.Request, config config.Config) string { func GetHandler(config config.Config) types.Callback { return func(request types.Request) error { - prefix := lineProtocolPrefix(request, config) + tags := lineProtocolTags(request, config) timeString := strconv.FormatInt(time.Now().UnixNano(), 10) url := config.Client.Address + "/write?db=" + config.Client.DB @@ -40,10 +39,11 @@ func GetHandler(config config.Config) types.Callback { for key, value := range request.Data { builder.Reset() - builder.WriteString(prefix) builder.WriteString(key) - builder.WriteString("=") + builder.WriteString(tags) + + builder.WriteString("value=") builder.WriteString(value) builder.WriteString(" ") diff --git a/internal/config/config.go b/internal/config/config.go index 81e7a7c..a58b728 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -12,12 +12,11 @@ type Config struct { Timeout int `json:"timeout"` // in seconds } `json:"server"` Client struct { - Address string `json:"address"` - Username string `json:"username"` - Password string `json:"password"` - DB string `json:"db"` - Measurement string `json:"measurement"` - Host string `json:"host"` + Address string `json:"address"` + Username string `json:"username"` + Password string `json:"password"` + DB string `json:"db"` + Host string `json:"host"` } `json:"client"` }