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

make container ready

This commit is contained in:
Joerg Lehmann 2022-07-20 18:18:00 +02:00
parent 05e9ff34df
commit 9ae18a7da8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
metrics.go
View File

@ -119,7 +119,7 @@ func metricsHandler(response http.ResponseWriter, request *http.Request) {
mystart = start[0] mystart = start[0]
} }
url := "http://localhost:8086/api/v2/query?org=minibeieliorg" url := getenv("INFLUX_URL", "http://localhost:8086/api/v2/query?org=minibeieliorg")
data := []byte(fmt.Sprintf(`from(bucket:"minibeielibucket") |> range(start: %s, stop: %s) |> filter(fn: (r) => r._measurement == "measurement") |> filter(fn: (r) => r._field == "%s") |> filter(fn: (r) => r.deveui == "%s")`, mystart, mystop, property[0], mydeveui)) data := []byte(fmt.Sprintf(`from(bucket:"minibeielibucket") |> range(start: %s, stop: %s) |> filter(fn: (r) => r._measurement == "measurement") |> filter(fn: (r) => r._field == "%s") |> filter(fn: (r) => r.deveui == "%s")`, mystart, mystop, property[0], mydeveui))
req, err := http.NewRequest("POST", url, bytes.NewBuffer(data)) req, err := http.NewRequest("POST", url, bytes.NewBuffer(data))
@ -200,7 +200,7 @@ func lastmetricsHandler(response http.ResponseWriter, request *http.Request) {
log.Println("Url Param 'deveui' is: " + string(mydeveui)) log.Println("Url Param 'deveui' is: " + string(mydeveui))
url := "http://localhost:8086/api/v2/query?org=minibeieliorg" url := getenv("INFLUX_URL", "http://localhost:8086/api/v2/query?org=minibeieliorg")
//data := []byte(fmt.Sprintf(`from(bucket:"minibeielibucket") |> range(start:-365d) |> filter(fn: (r) => r.deveui == "%s") |> filter(fn: (r) => r._field == "v" or r._field == "t") |> last() |> yield(name: "last")`,mydeveui)) //data := []byte(fmt.Sprintf(`from(bucket:"minibeielibucket") |> range(start:-365d) |> filter(fn: (r) => r.deveui == "%s") |> filter(fn: (r) => r._field == "v" or r._field == "t") |> last() |> yield(name: "last")`,mydeveui))
data := []byte(fmt.Sprintf(`from(bucket:"minibeielibucket") data := []byte(fmt.Sprintf(`from(bucket:"minibeielibucket")
|> range(start:-365d) |> range(start:-365d)
@ -298,7 +298,7 @@ func CalcDaysUntil(mydate string) int {
func getLastMetrics(deveui string) OneMetric { func getLastMetrics(deveui string) OneMetric {
var res OneMetric var res OneMetric
url := "http://localhost:8086/api/v2/query?org=minibeieliorg" url := getenv("INFLUX_URL", "http://localhost:8086/api/v2/query?org=minibeieliorg")
data := []byte(fmt.Sprintf(`from(bucket:"minibeielibucket") data := []byte(fmt.Sprintf(`from(bucket:"minibeielibucket")
|> range(start:-365d) |> range(start:-365d)
|> filter(fn: (r) => r._measurement == "measurement" and r.deveui == "%s") |> filter(fn: (r) => r._measurement == "measurement" and r.deveui == "%s")