Merge pull request #7 from henrywhitaker3/feat/extra-queries

Author: henrywhitaker3

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/expr-lang/expr v1.16.7
 	github.com/go-echarts/go-echarts/v2 v2.3.3
 	github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b
+	github.com/henrywhitaker3/flow v1.5.0
 	github.com/labstack/echo-contrib v0.17.1
 	github.com/labstack/echo/v4 v4.12.0
 	github.com/prometheus/client_golang v1.19.1

go.sum

@@ -20,6 +20,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b h1:wDUNC2eKiL35DbLvsDhiblTUXHxcOPwQSCzi7xpQUN4=
 github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b/go.mod h1:VzxiSdG6j1pi7rwGm/xYI5RbtpBgM8sARDXlvEvxlu0=
+github.com/henrywhitaker3/flow v1.5.0 h1:jZjs3a2/2Ym7ge3tgSlh9I9iB2GVTGaTb5di2q917Bw=
+github.com/henrywhitaker3/flow v1.5.0/go.mod h1:5ELoprHvmkLtpgvzbRB6faq/8/jcdFwUkkckArAH+CU=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=

internal/collector/collector.go

@@ -31,6 +31,8 @@ type Result struct {
 	Uptime float32
 	// The series of values for the range query
 	Series Series
+	// The servies of extra queries to graph
+	Extras map[string]Series
 }
 
 type Collector struct {
@@ -81,6 +83,7 @@ func (c *Collector) collectService(ctx context.Context, svc config.Service, ch c
 		Status:  false,
 		Success: true,
 		Uptime:  0,
+		Extras:  map[string]Series{},
 	}
 	log.Printf("collecting metrics for %s\n", svc.Name)
 
@@ -95,6 +98,14 @@ func (c *Collector) collectService(ctx context.Context, svc config.Service, ch c
 		res.Success = false
 	}
 
+	for _, extra := range svc.Extras {
+		_, series, err := c.q.Uptime(ctx, extra)
+		if err != nil {
+			log.Printf("ERROR - Failed to scrape uptime metric for %s query %s: %s", svc.Name, extra.Name, err)
+		}
+		res.Extras[extra.Name] = c.mapQuerierSeries(extra, series)
+	}
+
 	res.Series = c.mapQuerierSeries(svc.Query, series)
 	res.Status = status
 	res.Uptime = uptime

internal/config/config.go

@@ -20,10 +20,10 @@ type Query struct {
 }
 
 type Service struct {
-	Name  string `yaml:"name"`
-	Query Query  `yaml:"query"`
-	Group string `yaml:"group"`
-	// Extras []Query `yaml:"extras"`
+	Name   string  `yaml:"name"`
+	Query  Query   `yaml:"query"`
+	Group  string  `yaml:"group"`
+	Extras []Query `yaml:"extras"`
 }
 
 type UI struct {
@@ -85,15 +85,18 @@ func setDefaults(conf *Config) {
 
 	for i, svc := range conf.Services {
 		svc.Query.Name = "main"
-		if svc.Query.Range == 0 {
-			svc.Query.Range = time.Hour * 24
-		}
-		if svc.Query.Step == 0 {
-			svc.Query.Step = time.Minute * 5
-		}
 		if svc.Group == "" {
 			svc.Group = "default"
 		}
+		setDefaultQueryValues(&svc.Query)
+
+		for i, query := range svc.Extras {
+			if query.Expression == "" {
+				query.Expression = "float(result)"
+			}
+			setDefaultQueryValues(&query)
+			svc.Extras[i] = query
+		}
 		conf.Services[i] = svc
 	}
 
@@ -112,10 +115,27 @@ func setDefaults(conf *Config) {
 	}
 }
 
+func setDefaultQueryValues(q *Query) {
+	if q.Range == 0 {
+		q.Range = time.Hour * 24
+	}
+	if q.Step == 0 {
+		q.Step = time.Minute * 5
+	}
+}
+
 func (c *Config) Validate() error {
 	if c.Prometheus == "" {
 		return errors.New("prometheus cannot be empty")
 	}
 
+	for _, svc := range c.Services {
+		for _, extra := range svc.Extras {
+			if extra.Name == "" {
+				return errors.New("extra query name cannot be empty")
+			}
+		}
+	}
+
 	return nil
 }

internal/http/http.go

@@ -4,11 +4,13 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/henrywhitaker3/prompage/internal/app"
 	"github.com/henrywhitaker3/prompage/internal/resources/static"
 	"github.com/labstack/echo-contrib/echoprometheus"
 	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 type Http struct {
@@ -22,6 +24,9 @@ func NewHttp(app *app.App, cache *ResultCache) *Http {
 	e.HideBanner = true
 
 	e.Use(echoprometheus.NewMiddleware("prompage"))
+	e.Use(middleware.TimeoutWithConfig(middleware.TimeoutConfig{
+		Timeout: time.Second * 5,
+	}))
 
 	e.GET("/", NewStatusPageHandler(app, cache))
 	e.GET("/:name", NewGetServiceHandler(app, cache))

internal/http/service.go

@@ -1,12 +1,14 @@
 package http
 
 import (
+	"context"
 	"errors"
 	"html/template"
 	"log"
 	"net/http"
 	"time"
 
+	"github.com/henrywhitaker3/flow"
 	"github.com/henrywhitaker3/prompage/internal/app"
 	"github.com/henrywhitaker3/prompage/internal/collector"
 	"github.com/henrywhitaker3/prompage/internal/config"
@@ -22,6 +24,7 @@ type getServiceData struct {
 	Version string
 	Result  collector.Result
 	Graph   template.HTML
+	Extras  map[string]template.HTML
 }
 
 func NewGetServiceHandler(app *app.App, cache *ResultCache) echo.HandlerFunc {
@@ -35,14 +38,44 @@ func NewGetServiceHandler(app *app.App, cache *ResultCache) echo.HandlerFunc {
 			log.Printf("ERROR - could not find service: %s\n", name)
 			return err
 		}
-		graph, err := views.GenerateLineChart(svc.Series, app.Config.UI.Graphs.Points)
-		if err != nil {
+
+		group := &flow.ResultGroup{}
+
+		graph := flow.Eventually(c.Request().Context(), func(ctx context.Context) (string, error) {
+			return views.GenerateLineChart(svc.Series, app.Config.UI.Graphs.Points)
+		})
+		group.Add(graph)
+
+		extraGraphs := map[string]*flow.Result[string]{}
+
+		for _, extra := range svc.Extras {
+			res := flow.Eventually(c.Request().Context(), func(ctx context.Context) (string, error) {
+				return views.GenerateLineChart(extra, app.Config.UI.Graphs.Points)
+			})
+			group.Add(res)
+			extraGraphs[extra.Query.Name] = res
+		}
+
+		// Wait for all the graphs to generate
+		group.Wait()
+
+		if graph.Err() != nil {
 			log.Printf("ERROR - could not generate graph: %s\n", err)
 		}
+
 		data := getServiceData{
 			Age:    time.Since(age).Round(time.Second),
 			Result: svc,
-			Graph:  template.HTML(graph),
+			Graph:  template.HTML(graph.Out()),
+			Extras: map[string]template.HTML{},
+		}
+
+		for name, res := range extraGraphs {
+			if res.Err() != nil {
+				log.Printf("ERROR - could not generate graph: %s\n", res.Err())
+				continue
+			}
+			data.Extras[name] = template.HTML(res.Out())
 		}
 
 		out, err := views.Build(views.SERVICE, data)

internal/querier/querier.go

@@ -64,24 +64,25 @@ func (q *Querier) Uptime(ctx context.Context, query config.Query) (float32, []It
 		total := 0
 		series := []Item{}
 		for _, val := range r[0].Values {
-			res, err := q.vector(val.Value, query)
-			if err != nil {
-				return 0, nil, err
-			}
-			total++
-
 			value := float64(0)
-			if res {
-				passing++
-				value = 1
-			}
-			if !query.BoolValue {
+			if query.BoolValue {
+				res, err := q.vector(val.Value, query)
+				if err != nil {
+					return 0, nil, err
+				}
+				if res {
+					passing++
+					value = 1
+				}
+			} else {
 				f, err := q.asFloat(val.Value)
 				if err != nil {
 					return 0, nil, err
 				}
 				value = f
 			}
+			total++
+
 			series = append(series, Item{Time: val.Timestamp.Time(), Value: value})
 		}
 

internal/resources/views/charts.go

@@ -67,26 +67,33 @@ func GenerateLineChart(series collector.Series, maxPoints int) (string, error) {
 
 	yopts := opts.YAxis{
 		Show: false,
+		Type: "value",
 	}
 	if series.Query.BoolValue {
 		yopts.Max = 2
 		yopts.Min = 0
 	}
+	if series.Query.Units != "" {
+		yopts.Name = series.Query.Units
+	}
 
 	line.SetGlobalOptions(
 		charts.WithInitializationOpts(opts.Initialization{
 			Theme: types.ThemeWesteros,
 		}),
 		charts.WithYAxisOpts(yopts),
-		charts.WithXAxisOpts(opts.XAxis{Show: false}),
+		charts.WithXAxisOpts(opts.XAxis{
+			Show: false,
+			Type: "time",
+		}),
 		charts.WithLegendOpts(opts.Legend{
 			Show: false,
 		}),
 	)
 
 	cd := condense(series, maxPoints)
 
-	line.SetXAxis(getXAxis(cd)).
+	line.SetXAxis(nil).
 		AddSeries("Metric", getYAxis(cd)).
 		SetSeriesOptions(
 			charts.WithLineChartOpts(opts.LineChart{Smooth: true, Color: "#5c6848"}),
@@ -104,19 +111,11 @@ func GenerateLineChart(series collector.Series, maxPoints int) (string, error) {
 	return chart, nil
 }
 
-func getXAxis(series collector.Series) []string {
-	out := []string{}
-	for _, i := range series.Data {
-		out = append(out, i.Time.String())
-	}
-	return out
-}
-
 func getYAxis(series collector.Series) []opts.LineData {
 	out := []opts.LineData{}
 	for _, i := range series.Data {
 		out = append(out, opts.LineData{
-			Value: i.Value,
+			Value: []interface{}{i.Time.Format(time.RFC3339), i.Value},
 		})
 	}
 	return out

internal/resources/views/service.html

@@ -7,6 +7,13 @@ <h1 class="text-xl font-bold md:inline-block md:mr-2 text-avocado-800" >{{ .Resu
     </div>
 
     <div class="h-64 md:h-96 w-full">{{ .Graph }}</div>
+
+    <div class="w-full">
+    {{- range $name, $graph := .Extras }}
+        <h2 class="text-center text-avocado-800">{{ $name }}</h2>
+        <div class="h-64 md:h-96 w-full">{{ $graph }}</div>
+    {{- end }}
+    </div>
 </div>
 {{- end }}
 {{- end }}