diff --git a/datapoint.go b/datapoint.go index f02dfb8..055c7a3 100644 --- a/datapoint.go +++ b/datapoint.go @@ -117,8 +117,6 @@ func DatapointAdd[T any](name string, value T) (err error) { // {{{ return } - service.Db.Conn.Exec(`UPDATE datapoint SET last_value = NOW() WHERE name=$1`, name) - return } // }}} diff --git a/main.go b/main.go index 70192db..cdb81ce 100644 --- a/main.go +++ b/main.go @@ -26,13 +26,12 @@ import ( "time" ) -const VERSION = "v9" +const VERSION = "v7" var ( logger *slog.Logger flagConfigFile string flagDev bool - flagVersion bool service *ws.Service logFile *os.File parsedTemplates map[string]*template.Template @@ -60,7 +59,6 @@ func init() { // {{{ cfgPath := path.Join(confDir, "smon.yaml") flag.StringVar(&flagConfigFile, "config", cfgPath, "Path and filename of the YAML configuration file") flag.BoolVar(&flagDev, "dev", false, "reload templates on each request") - flag.BoolVar(&flagVersion, "version", false, "Display version and exit") flag.Parse() componentFilenames, err = getComponentFilenames(viewFS) @@ -72,11 +70,6 @@ func init() { // {{{ } // }}} func main() { // {{{ - if flagVersion { - fmt.Println(VERSION) - os.Exit(0) - } - var err error werr.Init() @@ -268,7 +261,7 @@ func entryDatapoint(w http.ResponseWriter, r *http.Request, sess *session.T) { / WHERE service=$1 AND prio=$2 - `, + `, (*notificationService).GetType(), (*notificationService).GetPrio(), problemID, diff --git a/views/components/head_fonts.gotmpl b/views/components/head_fonts.gotmpl index b6c0f89..18be2a7 100644 --- a/views/components/head_fonts.gotmpl +++ b/views/components/head_fonts.gotmpl @@ -1,2 +1,6 @@ {{ define "fonts" }} + + + + {{ end }} diff --git a/views/layouts/main.gotmpl b/views/layouts/main.gotmpl index f6cbe97..741061b 100644 --- a/views/layouts/main.gotmpl +++ b/views/layouts/main.gotmpl @@ -5,18 +5,6 @@ {{ template "fonts" }} - - - - - -
diff --git a/views/pages/datapoint_values.gotmpl b/views/pages/datapoint_values.gotmpl index f568b95..fe4651c 100644 --- a/views/pages/datapoint_values.gotmpl +++ b/views/pages/datapoint_values.gotmpl @@ -2,19 +2,8 @@ {{ $version := .VERSION }} - - {{ block "page_label" . }}{{end}} -
- -
-
{{ range .Data.Values }}
{{ format_time .Ts }}