Compare commits
No commits in common. "fe9571c4665231eca8082a72d4f54b6a6b506e50" and "6629b834fd8ce1a17064951690b416de81016fa7" have entirely different histories.
fe9571c466
...
6629b834fd
32
datapoint.go
32
datapoint.go
@ -29,8 +29,6 @@ type Datapoint struct {
|
||||
DatapointValueJSON []byte `db:"datapoint_value_json"`
|
||||
LastDatapointValue DatapointValue
|
||||
Found bool
|
||||
NodataProblemSeconds int `db:"nodata_problem_seconds"`
|
||||
NodataIsProblem bool `db:"nodata_is_problem"`
|
||||
}
|
||||
|
||||
type DatapointValue struct {
|
||||
@ -73,44 +71,20 @@ func (dp Datapoint) Update() (err error) { // {{{
|
||||
|
||||
if dp.ID == 0 {
|
||||
_, err = service.Db.Conn.Exec(
|
||||
`INSERT INTO datapoint("group", name, datatype) VALUES($1, $2, $3, $4)`,
|
||||
`INSERT INTO datapoint("group", name, datatype) VALUES($1, $2, $3)`,
|
||||
dp.Group,
|
||||
name,
|
||||
dp.Datatype,
|
||||
dp.NodataProblemSeconds,
|
||||
)
|
||||
} else {
|
||||
/* Keep nodata_is_problem as is unless the nodata_problem_seconds is changed.
|
||||
* Otherwise unnecessary nodata problems could be notified when updating unrelated
|
||||
* datapoint properties. */
|
||||
_, err = service.Db.Conn.Exec(
|
||||
`
|
||||
UPDATE datapoint
|
||||
SET
|
||||
"group"=$2,
|
||||
name=$3,
|
||||
datatype=$4,
|
||||
nodata_problem_seconds=$5,
|
||||
nodata_is_problem = (
|
||||
CASE
|
||||
WHEN $5 != nodata_problem_seconds THEN false
|
||||
ELSE
|
||||
nodata_is_problem
|
||||
END
|
||||
)
|
||||
WHERE
|
||||
id=$1
|
||||
`,
|
||||
`UPDATE datapoint SET "group"=$2, name=$3, datatype=$4 WHERE id=$1`,
|
||||
dp.ID,
|
||||
dp.Group,
|
||||
name,
|
||||
dp.Datatype,
|
||||
dp.NodataProblemSeconds,
|
||||
)
|
||||
}
|
||||
if err != nil {
|
||||
err = werr.Wrap(err)
|
||||
}
|
||||
|
||||
return
|
||||
}// }}}
|
||||
@ -146,7 +120,7 @@ func DatapointAdd[T any](name string, value T) (err error) { // {{{
|
||||
return
|
||||
}
|
||||
|
||||
service.Db.Conn.Exec(`UPDATE datapoint SET last_value = NOW(), nodata_is_problem = false WHERE id=$1`, dpID)
|
||||
service.Db.Conn.Exec(`UPDATE datapoint SET last_value = NOW() WHERE name=$1`, name)
|
||||
|
||||
return
|
||||
} // }}}
|
||||
|
||||
4
go.mod
4
go.mod
@ -6,14 +6,14 @@ require (
|
||||
git.gibonuddevalla.se/go/webservice v0.2.15
|
||||
git.gibonuddevalla.se/go/wrappederror v0.3.4
|
||||
github.com/expr-lang/expr v1.16.5
|
||||
github.com/jmoiron/sqlx v1.3.5
|
||||
github.com/lib/pq v1.10.9
|
||||
)
|
||||
|
||||
require (
|
||||
git.gibonuddevalla.se/go/dbschema v1.3.0 // indirect
|
||||
github.com/google/uuid v1.5.0 // indirect
|
||||
github.com/gorilla/websocket v1.5.1 // indirect
|
||||
github.com/jmoiron/sqlx v1.3.5 // indirect
|
||||
github.com/lib/pq v1.10.9 // indirect
|
||||
golang.org/x/net v0.17.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
||||
4
go.sum
4
go.sum
@ -1,7 +1,7 @@
|
||||
git.gibonuddevalla.se/go/dbschema v1.3.0 h1:HzFMR29tWfy/ibIjltTbIMI4inVktj/rh8bESALibgM=
|
||||
git.gibonuddevalla.se/go/dbschema v1.3.0/go.mod h1:BNw3q/574nXbGoeWyK+tLhRfggVkw2j2aXZzrBKC3ig=
|
||||
git.gibonuddevalla.se/go/webservice v0.2.15 h1:ECe63fRDSrg3RJcgYV2pG+WsAQLVG8wvfHennz7aHsY=
|
||||
git.gibonuddevalla.se/go/webservice v0.2.15/go.mod h1:3uBS6nLbK9qbuGzDls8MZD5Xr9ORY1Srbj6v06BIhws=
|
||||
git.gibonuddevalla.se/go/webservice v0.2.12 h1:IcaIycmF7eO88RmFQkslHaKRWYxXdciVQXUAvJ36b4g=
|
||||
git.gibonuddevalla.se/go/webservice v0.2.12/go.mod h1:3uBS6nLbK9qbuGzDls8MZD5Xr9ORY1Srbj6v06BIhws=
|
||||
git.gibonuddevalla.se/go/wrappederror v0.3.4 h1:dcKp9/+QrZSO3S4fVnq7yG2p7DUZVmlztBAb/OzoZNY=
|
||||
git.gibonuddevalla.se/go/wrappederror v0.3.4/go.mod h1:j4w320Hk1wvhOPjUaK4GgLvmtnjUUM5yVu6JFO1OCSc=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
|
||||
6
main.go
6
main.go
@ -140,8 +140,6 @@ func main() { // {{{
|
||||
service.Register("/configuration", false, false, pageConfiguration)
|
||||
service.Register("/entry/{datapoint}", false, false, entryDatapoint)
|
||||
|
||||
go nodataLoop()
|
||||
|
||||
err = service.Start()
|
||||
if err != nil {
|
||||
logger.Error("webserver", "error", werr.Wrap(err))
|
||||
@ -555,15 +553,11 @@ func pageDatapointUpdate(w http.ResponseWriter, r *http.Request, _ *session.T) {
|
||||
return
|
||||
}
|
||||
|
||||
var nodataSeconds int
|
||||
nodataSeconds, _ = strconv.Atoi(r.FormValue("nodata_seconds"))
|
||||
|
||||
var dp Datapoint
|
||||
dp.ID = id
|
||||
dp.Group = r.FormValue("group")
|
||||
dp.Name = r.FormValue("name")
|
||||
dp.Datatype = DatapointType(r.FormValue("datatype"))
|
||||
dp.NodataProblemSeconds = nodataSeconds
|
||||
err = dp.Update()
|
||||
if err != nil {
|
||||
httpError(w, werr.Wrap(err).Log())
|
||||
|
||||
75
nodata.go
75
nodata.go
@ -1,75 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
// External
|
||||
werr "git.gibonuddevalla.se/go/wrappederror"
|
||||
|
||||
// Standard
|
||||
"database/sql"
|
||||
"time"
|
||||
)
|
||||
|
||||
// nodataLoop checks if datapoint last_value is larger than the nodata_problem_seconds period and
|
||||
// marks them as problems. They are then notified.
|
||||
func nodataLoop() {
|
||||
var ids []int
|
||||
var err error
|
||||
|
||||
// TODO - should be configurable
|
||||
ticker := time.NewTicker(time.Second * 5)
|
||||
for {
|
||||
<-ticker.C
|
||||
ids, err = nodataDatapointIDs()
|
||||
if err != nil {
|
||||
err = werr.Wrap(err).Log()
|
||||
logger.Error("nodata", "error", err)
|
||||
continue
|
||||
}
|
||||
|
||||
if len(ids) == 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
logger.Info("nodata", "problem_ids", ids)
|
||||
}
|
||||
}
|
||||
|
||||
func nodataDatapointIDs() (ids []int, err error) {
|
||||
ids = []int{}
|
||||
|
||||
var rows *sql.Rows
|
||||
rows, err = service.Db.Conn.Query(`
|
||||
UPDATE datapoint
|
||||
SET
|
||||
nodata_is_problem = true
|
||||
FROM (
|
||||
SELECT
|
||||
id
|
||||
FROM
|
||||
datapoint
|
||||
WHERE
|
||||
NOT nodata_is_problem AND
|
||||
extract(EPOCH from (NOW() - last_value))::int > nodata_problem_seconds
|
||||
) AS subquery
|
||||
WHERE
|
||||
datapoint.id = subquery.id
|
||||
RETURNING
|
||||
datapoint.id
|
||||
|
||||
`)
|
||||
if err != nil {
|
||||
err = werr.Wrap(err)
|
||||
return
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var id int
|
||||
for rows.Next() {
|
||||
if err = rows.Scan(&id); err != nil {
|
||||
err = werr.Wrap(err)
|
||||
return
|
||||
}
|
||||
ids = append(ids, id)
|
||||
}
|
||||
return
|
||||
}
|
||||
@ -1,4 +0,0 @@
|
||||
ALTER TABLE datapoint ADD COLUMN nodata_problem_seconds INT4 NOT NULL DEFAULT 0;
|
||||
ALTER TABLE datapoint ADD COLUMN nodata_is_problem BOOL NOT NULL DEFAULT false;
|
||||
|
||||
CREATE INDEX datapoint_last_value_idx ON public.datapoint ("last_value");
|
||||
@ -19,7 +19,7 @@ body {
|
||||
}
|
||||
body {
|
||||
background: #282828;
|
||||
font-family: sans-serif;
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 300;
|
||||
color: #d5c4a1;
|
||||
font-size: 11pt;
|
||||
@ -48,16 +48,25 @@ a:hover {
|
||||
b {
|
||||
font-weight: 500;
|
||||
}
|
||||
.roboto-light {
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 300;
|
||||
font-style: normal;
|
||||
}
|
||||
.roboto-medium {
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
}
|
||||
input[type="text"],
|
||||
textarea,
|
||||
select {
|
||||
font-family: monospace;
|
||||
font-family: "Roboto Mono", monospace;
|
||||
background: #202020;
|
||||
color: #d5c4a1;
|
||||
padding: 4px 8px;
|
||||
border: none;
|
||||
font-size: 1em;
|
||||
line-height: 1.5em;
|
||||
}
|
||||
button {
|
||||
background: #202020;
|
||||
@ -88,16 +97,6 @@ span.seconds {
|
||||
label {
|
||||
user-select: none;
|
||||
}
|
||||
.description {
|
||||
border: 1px solid #737373;
|
||||
color: #3f9da1;
|
||||
background: #202020;
|
||||
padding: 4px 8px;
|
||||
margin-top: 8px;
|
||||
white-space: nowrap;
|
||||
width: min-content;
|
||||
border-radius: 8px;
|
||||
}
|
||||
#datapoints {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(5, min-content);
|
||||
@ -138,7 +137,6 @@ label {
|
||||
}
|
||||
.widgets .label {
|
||||
margin-top: 4px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.widgets input[type="text"],
|
||||
.widgets textarea {
|
||||
|
||||
@ -19,7 +19,7 @@ body {
|
||||
}
|
||||
body {
|
||||
background: #282828;
|
||||
font-family: sans-serif;
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 300;
|
||||
color: #d5c4a1;
|
||||
font-size: 11pt;
|
||||
@ -48,16 +48,25 @@ a:hover {
|
||||
b {
|
||||
font-weight: 500;
|
||||
}
|
||||
.roboto-light {
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 300;
|
||||
font-style: normal;
|
||||
}
|
||||
.roboto-medium {
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
}
|
||||
input[type="text"],
|
||||
textarea,
|
||||
select {
|
||||
font-family: monospace;
|
||||
font-family: "Roboto Mono", monospace;
|
||||
background: #202020;
|
||||
color: #d5c4a1;
|
||||
padding: 4px 8px;
|
||||
border: none;
|
||||
font-size: 1em;
|
||||
line-height: 1.5em;
|
||||
}
|
||||
button {
|
||||
background: #202020;
|
||||
@ -88,16 +97,6 @@ span.seconds {
|
||||
label {
|
||||
user-select: none;
|
||||
}
|
||||
.description {
|
||||
border: 1px solid #737373;
|
||||
color: #3f9da1;
|
||||
background: #202020;
|
||||
padding: 4px 8px;
|
||||
margin-top: 8px;
|
||||
white-space: nowrap;
|
||||
width: min-content;
|
||||
border-radius: 8px;
|
||||
}
|
||||
#layout {
|
||||
display: grid;
|
||||
grid-template-areas: "menu content";
|
||||
|
||||
@ -19,7 +19,7 @@ body {
|
||||
}
|
||||
body {
|
||||
background: #282828;
|
||||
font-family: sans-serif;
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 300;
|
||||
color: #d5c4a1;
|
||||
font-size: 11pt;
|
||||
@ -48,16 +48,25 @@ a:hover {
|
||||
b {
|
||||
font-weight: 500;
|
||||
}
|
||||
.roboto-light {
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 300;
|
||||
font-style: normal;
|
||||
}
|
||||
.roboto-medium {
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
}
|
||||
input[type="text"],
|
||||
textarea,
|
||||
select {
|
||||
font-family: monospace;
|
||||
font-family: "Roboto Mono", monospace;
|
||||
background: #202020;
|
||||
color: #d5c4a1;
|
||||
padding: 4px 8px;
|
||||
border: none;
|
||||
font-size: 1em;
|
||||
line-height: 1.5em;
|
||||
}
|
||||
button {
|
||||
background: #202020;
|
||||
@ -88,16 +97,6 @@ span.seconds {
|
||||
label {
|
||||
user-select: none;
|
||||
}
|
||||
.description {
|
||||
border: 1px solid #737373;
|
||||
color: #3f9da1;
|
||||
background: #202020;
|
||||
padding: 4px 8px;
|
||||
margin-top: 8px;
|
||||
white-space: nowrap;
|
||||
width: min-content;
|
||||
border-radius: 8px;
|
||||
}
|
||||
#problems-list,
|
||||
#acknowledged-list {
|
||||
display: grid;
|
||||
|
||||
@ -19,7 +19,7 @@ body {
|
||||
}
|
||||
body {
|
||||
background: #282828;
|
||||
font-family: sans-serif;
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 300;
|
||||
color: #d5c4a1;
|
||||
font-size: 11pt;
|
||||
@ -48,16 +48,25 @@ a:hover {
|
||||
b {
|
||||
font-weight: 500;
|
||||
}
|
||||
.roboto-light {
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 300;
|
||||
font-style: normal;
|
||||
}
|
||||
.roboto-medium {
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
}
|
||||
input[type="text"],
|
||||
textarea,
|
||||
select {
|
||||
font-family: monospace;
|
||||
font-family: "Roboto Mono", monospace;
|
||||
background: #202020;
|
||||
color: #d5c4a1;
|
||||
padding: 4px 8px;
|
||||
border: none;
|
||||
font-size: 1em;
|
||||
line-height: 1.5em;
|
||||
}
|
||||
button {
|
||||
background: #202020;
|
||||
@ -88,13 +97,3 @@ span.seconds {
|
||||
label {
|
||||
user-select: none;
|
||||
}
|
||||
.description {
|
||||
border: 1px solid #737373;
|
||||
color: #3f9da1;
|
||||
background: #202020;
|
||||
padding: 4px 8px;
|
||||
margin-top: 8px;
|
||||
white-space: nowrap;
|
||||
width: min-content;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ body {
|
||||
}
|
||||
body {
|
||||
background: #282828;
|
||||
font-family: sans-serif;
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 300;
|
||||
color: #d5c4a1;
|
||||
font-size: 11pt;
|
||||
@ -48,16 +48,25 @@ a:hover {
|
||||
b {
|
||||
font-weight: 500;
|
||||
}
|
||||
.roboto-light {
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 300;
|
||||
font-style: normal;
|
||||
}
|
||||
.roboto-medium {
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
}
|
||||
input[type="text"],
|
||||
textarea,
|
||||
select {
|
||||
font-family: monospace;
|
||||
font-family: "Roboto Mono", monospace;
|
||||
background: #202020;
|
||||
color: #d5c4a1;
|
||||
padding: 4px 8px;
|
||||
border: none;
|
||||
font-size: 1em;
|
||||
line-height: 1.5em;
|
||||
}
|
||||
button {
|
||||
background: #202020;
|
||||
@ -88,16 +97,6 @@ span.seconds {
|
||||
label {
|
||||
user-select: none;
|
||||
}
|
||||
.description {
|
||||
border: 1px solid #737373;
|
||||
color: #3f9da1;
|
||||
background: #202020;
|
||||
padding: 4px 8px;
|
||||
margin-top: 8px;
|
||||
white-space: nowrap;
|
||||
width: min-content;
|
||||
border-radius: 8px;
|
||||
}
|
||||
.widgets {
|
||||
display: grid;
|
||||
grid-template-columns: min-content 1fr;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
export class UI {
|
||||
constructor() {
|
||||
document.addEventListener('keydown', evt=>this.keyHandler(evt))
|
||||
document.querySelector('input[name="group"]').focus()
|
||||
document.querySelector('input[name="name"]').focus()
|
||||
}
|
||||
keyHandler(evt) {
|
||||
if (!(evt.altKey && evt.shiftKey))
|
||||
|
||||
@ -47,7 +47,6 @@
|
||||
|
||||
.label {
|
||||
margin-top: 4px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
input[type="text"], textarea {
|
||||
|
||||
@ -44,7 +44,7 @@ body {
|
||||
|
||||
body {
|
||||
background: @bg1;
|
||||
font-family: sans-serif;
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 300;
|
||||
color: @text1;
|
||||
font-size: 11pt;
|
||||
@ -80,16 +80,27 @@ b {
|
||||
font-weight: @bold;
|
||||
}
|
||||
|
||||
.roboto-light {
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 300;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
.roboto-medium {
|
||||
font-family: "Roboto", sans-serif;
|
||||
font-weight: 500;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
input[type="text"],
|
||||
textarea,
|
||||
select {
|
||||
font-family: monospace;
|
||||
font-family: "Roboto Mono", monospace;
|
||||
background: @bg2;
|
||||
color: @text1;
|
||||
padding: 4px 8px;
|
||||
border: none;
|
||||
font-size: 1em;
|
||||
line-height: 1.5em; // fix for chrome hiding underscores
|
||||
}
|
||||
|
||||
button {
|
||||
@ -127,14 +138,3 @@ span.seconds {
|
||||
label {
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.description {
|
||||
border: 1px solid .lighterOrDarker(@bg3, 25%)[@result];
|
||||
color: @color4;
|
||||
background: @bg2;
|
||||
padding: 4px 8px;
|
||||
margin-top: 8px;
|
||||
white-space: nowrap;
|
||||
width: min-content;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
@ -25,13 +25,6 @@
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="label">No data<br>problem time<br>(seconds)</div>
|
||||
<div>
|
||||
<input type="text" name="nodata_seconds" value="{{ .Data.Datapoint.NodataProblemSeconds }}">
|
||||
<div class="description">A problem is raised and notified if an entry isn't made within this time.</div>
|
||||
<div class="description">Set to 0 to disable.</div>
|
||||
</div>
|
||||
|
||||
<div></div>
|
||||
<div class="action">
|
||||
{{ if eq .Data.Datapoint.ID 0 }}
|
||||
|
||||
@ -2,8 +2,19 @@
|
||||
{{ $version := .VERSION }}
|
||||
<link rel="stylesheet" type="text/css" href="/css/{{ .VERSION }}/datapoints.css">
|
||||
|
||||
<script type="module" defer>
|
||||
import { DataGraph } from "/js/{{ .VERSION }}/datapoint_graph.mjs"
|
||||
const graph = new DataGraph({{ .Data.Datapoint }})
|
||||
graph.setData({{ .Data.Values }})
|
||||
graph.render('chart')
|
||||
</script>
|
||||
|
||||
{{ block "page_label" . }}{{end}}
|
||||
|
||||
<div>
|
||||
<canvas id="chart"></canvas>
|
||||
</div>
|
||||
|
||||
<div id="values">
|
||||
{{ range .Data.Values }}
|
||||
<div class="value">{{ format_time .Ts }}</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user