use measurements instead of fields for values

This commit is contained in:
overflowerror 2021-11-14 14:25:12 +01:00
parent c8dc8a1338
commit 9e36adc44f
3 changed files with 10 additions and 12 deletions

View file

@ -8,7 +8,6 @@
"username": "iot-relay", "username": "iot-relay",
"password": "", "password": "",
"db": "grafana", "db": "grafana",
"measurement": "iot",
"host": "iot-relay" "host": "iot-relay"
} }
} }

View file

@ -11,9 +11,8 @@ import (
"time" "time"
) )
func lineProtocolPrefix(request types.Request, config config.Config) string { func lineProtocolTags(request types.Request, config config.Config) string {
var builder strings.Builder var builder strings.Builder
builder.WriteString(config.Client.Measurement)
builder.WriteString(",host=") builder.WriteString(",host=")
builder.WriteString(config.Client.Host) builder.WriteString(config.Client.Host)
builder.WriteString(",ip=") builder.WriteString(",ip=")
@ -29,7 +28,7 @@ func lineProtocolPrefix(request types.Request, config config.Config) string {
func GetHandler(config config.Config) types.Callback { func GetHandler(config config.Config) types.Callback {
return func(request types.Request) error { return func(request types.Request) error {
prefix := lineProtocolPrefix(request, config) tags := lineProtocolTags(request, config)
timeString := strconv.FormatInt(time.Now().UnixNano(), 10) timeString := strconv.FormatInt(time.Now().UnixNano(), 10)
url := config.Client.Address + "/write?db=" + config.Client.DB 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 { for key, value := range request.Data {
builder.Reset() builder.Reset()
builder.WriteString(prefix)
builder.WriteString(key) builder.WriteString(key)
builder.WriteString("=") builder.WriteString(tags)
builder.WriteString("value=")
builder.WriteString(value) builder.WriteString(value)
builder.WriteString(" ") builder.WriteString(" ")

View file

@ -16,7 +16,6 @@ type Config struct {
Username string `json:"username"` Username string `json:"username"`
Password string `json:"password"` Password string `json:"password"`
DB string `json:"db"` DB string `json:"db"`
Measurement string `json:"measurement"`
Host string `json:"host"` Host string `json:"host"`
} `json:"client"` } `json:"client"`
} }