Uptime: filter by date, address, port, notification

CHANGELOG.md

@@ -2,6 +2,14 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [1.0.5] - 2023-07-
+### Added
+- Uptime: split date and time
+- Uptime: filter by date, address, port, notification
+
+### Changed
+- Connection timeout to 3 seconds
+
 ## [1.0.4] - 2023-07-14
 ### Added
 - Uptime: color Date

internal/check/in-slice.go

@@ -0,0 +1,14 @@
+package check
+
+// InSlice - check if element is in slice
+func InSlice(slice []string, elem string) bool {
+
+	for _, str := range slice {
+
+		if str == elem {
+			return true
+		}
+	}
+
+	return false
+}

internal/check/state.go

@@ -15,12 +15,11 @@ func State(host models.Host) bool {
 		host.Port = "80"
 	}
 
-	timeout := 1 * time.Second
+	timeout := 3 * time.Second
 	target := host.Addr + ":" + host.Port
 
 	conn, err := net.DialTimeout("tcp", target, timeout)
 	if err != nil {
-		// log.Println("ERROR:", err)
 		return false
 	}
 	conn.Close()

internal/web/templates/uptime.html

@@ -20,24 +20,32 @@
                 {{ range .UptimeMon }}
                 <tr>
                     <td>
-                        <a href="/uptime/?filter=yes&panel={{ .Panel }}">{{ .Panel }}</a>
+                        <a href="/uptime_filter/?panel={{ .Panel }}">{{ .Panel }}</a>
                     </td>
                     <td>
-                        <a href="/uptime/?filter=yes&panel={{ .Panel }}&host={{ .Host }}">{{ .Host }}</a>
+                        <a href="/uptime_filter/?panel={{ .Panel }}&host={{ .Host }}">{{ .Host }}</a>
+                    </td>
+                    <td>
+                        <a href="/uptime_filter/?addr={{ .Addr }}">{{ .Addr }}</a>
+                    </td>
+                    <td>
+                        <a href="/uptime_filter/?port={{ .Port }}">{{ .Port }}</a>
+                    </td>
+                    <td>
+                        <a style="color: #{{ .Color }};" href="/uptime_filter/?date={{ .Date }}">{{ .Date }}</a>
                     </td>
-                    <td>{{ .Addr }}</td>
-                    <td>{{ .Port }}</td>
-                    <td style="color: #{{ .Color }};">{{ .Date }}</td>
                     <td>{{ .Time }}</td>
                     <td>
                         {{ if .State }}
-                        <a href="/uptime/?filter=yes&state=on"><i class="bi bi-circle-fill my-col-on"></i></a>
+                        <a href="/uptime_filter/?state=on"><i class="bi bi-circle-fill my-col-on"></i></a>
                         {{ else }}
-                        <a href="/uptime/?filter=yes&state=off"><i class="bi bi-circle-fill my-col-off"></i></a>
+                        <a href="/uptime_filter/?state=off"><i class="bi bi-circle-fill my-col-off"></i></a>
                         {{ end }}
                     </td>
                     <td>
-                        {{ range .Notify }}{{ . }} {{ end }}
+                        {{ range .Notify }}
+                        <a href="/uptime_filter/?notify={{ . }}">{{ . }}</a>
+                        {{ end }}
                     </td>
                 </tr>
                 {{ end }}

internal/web/uptime-filter.go

@@ -2,28 +2,59 @@ package web
 
 import (
 	// "log"
+	"net/http"
+	"sort"
 
+	"github.com/aceberg/miniboard/internal/check"
 	"github.com/aceberg/miniboard/internal/models"
 )
 
-func filterUptimeMon(panel, host, state string) []models.MonData {
+func uptimeFilterHandler(w http.ResponseWriter, r *http.Request) {
 	var resultUptimeMon []models.MonData
+	var guiData models.GuiData
+	guiData.Config = AppConfig
+	guiData.CurrentTab = "Uptime Monitor"
+	guiData.Links = AllLinks
 
-	if panel != "" {
-		for _, mon := range UptimeMon {
-			if panel == mon.Panel && (host == "" || (host != "" && host == mon.Host)) {
-				resultUptimeMon = append(resultUptimeMon, mon)
-			}
+	panel := r.FormValue("panel")
+	host := r.FormValue("host")
+	state := r.FormValue("state")
+	date := r.FormValue("date")
+	addr := r.FormValue("addr")
+	port := r.FormValue("port")
+	notify := r.FormValue("notify")
+
+	for _, mon := range UptimeMon {
+
+		if panel == mon.Panel && (host == "" || (host != "" && host == mon.Host)) {
+			resultUptimeMon = append(resultUptimeMon, mon)
+		}
+
+		if (mon.State && state == "on") || (!mon.State && state == "off") {
+			resultUptimeMon = append(resultUptimeMon, mon)
+		}
+
+		if mon.Date == date || mon.Addr == addr || mon.Port == port {
+			resultUptimeMon = append(resultUptimeMon, mon)
 		}
-	}
 
-	if state != "" {
-		for _, mon := range UptimeMon {
-			if (mon.State && state == "on") || (!mon.State && state == "off") {
-				resultUptimeMon = append(resultUptimeMon, mon)
-			}
+		if check.InSlice(mon.Notify, notify) {
+			resultUptimeMon = append(resultUptimeMon, mon)
 		}
 	}
 
-	return resultUptimeMon
+	guiData.UptimeMon = resultUptimeMon
+
+	sort.Slice(guiData.UptimeMon, func(i, j int) bool {
+		return guiData.UptimeMon[i].Time > guiData.UptimeMon[j].Time
+	})
+
+	if AllLinks.Uptime.Show < 1 {
+		AllLinks.Uptime.Show = 20
+	}
+	if len(guiData.UptimeMon) > AllLinks.Uptime.Show {
+		guiData.UptimeMon = guiData.UptimeMon[0:AllLinks.Uptime.Show]
+	}
+
+	execTemplate(w, "uptime", guiData)
 }

internal/web/uptime.go

@@ -14,19 +14,10 @@ func uptimeHandler(w http.ResponseWriter, r *http.Request) {
 	guiData.CurrentTab = "Uptime Monitor"
 	guiData.Links = AllLinks
 
-	filter := r.FormValue("filter")
-	panel := r.FormValue("panel")
-	host := r.FormValue("host")
-	state := r.FormValue("state")
-
-	if filter == "yes" {
-		guiData.UptimeMon = filterUptimeMon(panel, host, state) // uptime-filter.go
-	} else {
-		guiData.UptimeMon = UptimeMon
-	}
+	guiData.UptimeMon = UptimeMon
 
 	sort.Slice(guiData.UptimeMon, func(i, j int) bool {
-		return guiData.UptimeMon[i].Date > guiData.UptimeMon[j].Date
+		return guiData.UptimeMon[i].Time > guiData.UptimeMon[j].Time
 	})
 
 	if AllLinks.Uptime.Show < 1 {

internal/web/webgui.go

@@ -32,16 +32,17 @@ func Gui(confPath, yamlPath, nodePath string) {
 	log.Printf("Web GUI at http://%s", address)
 	log.Println("=================================== ")
 
-	http.HandleFunc("/", indexHandler)                  // index.go
-	http.HandleFunc("/config/", configHandler)          // config.go
-	http.HandleFunc("/config_save/", saveConfigHandler) // config.go
-	http.HandleFunc("/host/", hostHandler)              // host.go
-	http.HandleFunc("/panels/", panelsHandler)          // panels.go
-	http.HandleFunc("/panel_edit/", panelEditHandler)   // panel-edit.go
-	http.HandleFunc("/tabs/", tabsHandler)              // tabs.go
-	http.HandleFunc("/tab_edit/", tabEditHandler)       // tab-edit.go
-	http.HandleFunc("/uptime/", uptimeHandler)          // uptime.go
-	http.HandleFunc("/uptime_edit/", uptimeEditHandler) // uptime-edit.go
+	http.HandleFunc("/", indexHandler)                      // index.go
+	http.HandleFunc("/config/", configHandler)              // config.go
+	http.HandleFunc("/config_save/", saveConfigHandler)     // config.go
+	http.HandleFunc("/host/", hostHandler)                  // host.go
+	http.HandleFunc("/panels/", panelsHandler)              // panels.go
+	http.HandleFunc("/panel_edit/", panelEditHandler)       // panel-edit.go
+	http.HandleFunc("/tabs/", tabsHandler)                  // tabs.go
+	http.HandleFunc("/tab_edit/", tabEditHandler)           // tab-edit.go
+	http.HandleFunc("/uptime/", uptimeHandler)              // uptime.go
+	http.HandleFunc("/uptime_edit/", uptimeEditHandler)     // uptime-edit.go
+	http.HandleFunc("/uptime_filter/", uptimeFilterHandler) // uptime-filter.go
 	err := http.ListenAndServe(address, nil)
 	check.IfError(err)
 }