commit once in a while...
This commit is contained in:
parent
3501158ad0
commit
23aa879522
|
|
@ -272,7 +272,7 @@ func getLastMetrics(deveui string) OneMetric {
|
||||||
|> range(start:-5d)
|
|> range(start:-5d)
|
||||||
|> filter(fn: (r) => r._measurement == "measurement" and r.deveui == "%s")
|
|> filter(fn: (r) => r._measurement == "measurement" and r.deveui == "%s")
|
||||||
|> filter(fn: (r) => r._field == "vp")
|
|> filter(fn: (r) => r._field == "vp")
|
||||||
|> last() |> yield(name: "last")`, deveui))
|
|> last(column: "_time") |> yield(name: "last")`, deveui))
|
||||||
|
|
||||||
req, err := http.NewRequest("POST", url, bytes.NewBuffer(data))
|
req, err := http.NewRequest("POST", url, bytes.NewBuffer(data))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -52,13 +52,12 @@ func metricsHandler(response http.ResponseWriter, request *http.Request) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!validProperty(property[0])) {
|
if !validProperty(property[0]) {
|
||||||
log.Println("Url Param 'property' is invalid")
|
log.Println("Url Param 'property' is invalid")
|
||||||
fmt.Fprintf(response, "{ \"msg\": \"error: invalid property\" }")
|
fmt.Fprintf(response, "{ \"msg\": \"error: invalid property\" }")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
deveui, ok := request.URL.Query()["deveui"]
|
deveui, ok := request.URL.Query()["deveui"]
|
||||||
|
|
||||||
if !ok || len(deveui[0]) < 1 {
|
if !ok || len(deveui[0]) < 1 {
|
||||||
|
|
@ -300,7 +299,8 @@ func getLastMetrics(deveui string) OneMetric {
|
||||||
|> 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")
|
||||||
|> filter(fn: (r) => r._field == "t" or r._field == "h" or r._field == "w" or r._field == "p" or r._field == "vp")
|
|> filter(fn: (r) => r._field == "t" or r._field == "h" or r._field == "w" or r._field == "p" or r._field == "vp")
|
||||||
|> last() |> yield(name: "last")`, deveui))
|
|> last(column: "_time")
|
||||||
|
|> yield(name: "last")`, deveui))
|
||||||
|
|
||||||
req, err := http.NewRequest("POST", url, bytes.NewBuffer(data))
|
req, err := http.NewRequest("POST", url, bytes.NewBuffer(data))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/apexcharts"></script>
|
<script src="https://cdn.jsdelivr.net/npm/apexcharts@3.22.1"></script>
|
||||||
|
|
||||||
<script src="static/js/chart.js"></script>
|
<script src="static/js/chart.js"></script>
|
||||||
|
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Reference in New Issue