drpuur
/
wo-bisch-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include vbat percent in download data

This commit is contained in:
Joerg Lehmann 2021-12-17 19:37:26 +01:00
parent 34fe1b107b
commit fbcebb980a
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
metrics.go
View File

@ -279,7 +279,7 @@ func downloadmetricsHandler(response http.ResponseWriter, request *http.Request)
|> range(start: %s, stop: %s) |> range(start: %s, stop: %s)
|> filter(fn: (r) => r._measurement == "measurement") |> filter(fn: (r) => r._measurement == "measurement")
|> filter(fn: (r) => r.deveui == "%s") |> filter(fn: (r) => r.deveui == "%s")
|> filter(fn: (r) => r._field == "lon" or r._field == "lat" or r._field == "flags") |> filter(fn: (r) => r._field == "lon" or r._field == "lat" or r._field == "flags" or r._field == "vbat")
|> pivot(rowKey:["_time"], columnKey: ["_field"], valueColumn: "_value")`, mystart, mystop, mydeveui)) |> pivot(rowKey:["_time"], columnKey: ["_field"], valueColumn: "_value")`, mystart, mystop, mydeveui))
req, err := http.NewRequest("POST", url, bytes.NewBuffer(data)) req, err := http.NewRequest("POST", url, bytes.NewBuffer(data))
@ -317,17 +317,17 @@ func downloadmetricsHandler(response http.ResponseWriter, request *http.Request)
for scanner.Scan() { for scanner.Scan() {
s := strings.Split(scanner.Text(), ",") s := strings.Split(scanner.Text(), ",")
fmt.Printf("Scanned Line: %v, elements: %d\n", s, len(s)) fmt.Printf("Scanned Line: %v, elements: %d\n", s, len(s))
if (len(s) >= 10) && !(strings.HasPrefix(s[5], "_")) { if (len(s) >= 11) && !(strings.HasPrefix(s[5], "_")) {
s_flags := "" s_flags := ""
lat := s[len(s)-2] lat := s[len(s)-3]
lon := s[len(s)-1] lon := s[len(s)-2]
if lat == "0" { if lat == "0" {
s_flags = "NOGPS" s_flags = "NOGPS"
} else { } else {
s_flags = "GPS" s_flags = "GPS"
} }
if len(s) == 11 { if len(s) == 12 {
flags, _ := strconv.Atoi(s[len(s)-3]) flags, _ := strconv.Atoi(s[len(s)-4])
if flags&1 == 1 { if flags&1 == 1 {
s_flags = s_flags + "+ALARM_BUTTON" s_flags = s_flags + "+ALARM_BUTTON"
} }
@ -341,7 +341,9 @@ func downloadmetricsHandler(response http.ResponseWriter, request *http.Request)
continue continue
} }
mytime := t.In(location).Format("02.01.2006 15:04") mytime := t.In(location).Format("02.01.2006 15:04")
fmt.Fprintf(response, "\"%s\",%s,%s,%s\n", mytime, lon, lat, s_flags) vbat := s[len(s)-1]
percent := vbat2percent(vbat)
fmt.Fprintf(response, "\"%s\",%s,%s,%d,%s\n", mytime, lon, lat, percent, s_flags)
} }
} }