Merge pull request #24 from henrywhitaker3/renovate/github.com-go-echarts-go-echarts-v2-2.x

Author: henrywhitaker3

go.mod

@@ -7,7 +7,7 @@ toolchain go1.23.6
 require (
 	github.com/DataDog/datadog-api-client-go/v2 v2.26.0
 	github.com/expr-lang/expr v1.16.9
-	github.com/go-echarts/go-echarts/v2 v2.3.3
+	github.com/go-echarts/go-echarts/v2 v2.5.0
 	github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b
 	github.com/henrywhitaker3/flow v1.10.0
 	github.com/labstack/echo-contrib v0.17.2

go.sum

@@ -13,8 +13,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/expr-lang/expr v1.16.9 h1:WUAzmR0JNI9JCiF0/ewwHB1gmcGw5wW7nWt8gc6PpCI=
 github.com/expr-lang/expr v1.16.9/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
-github.com/go-echarts/go-echarts/v2 v2.3.3 h1:uImZAk6qLkC6F9ju6mZ5SPBqTyK8xjZKwSmwnCg4bxg=
-github.com/go-echarts/go-echarts/v2 v2.3.3/go.mod h1:56YlvzhW/a+du15f3S2qUGNDfKnFOeJSThBIrVFHDtI=
+github.com/go-echarts/go-echarts/v2 v2.5.0 h1:P/JGanoIrpOOC4K9sRFeKSIUTIpPQwGHQJ/ELWre19Y=
+github.com/go-echarts/go-echarts/v2 v2.5.0/go.mod h1:56YlvzhW/a+du15f3S2qUGNDfKnFOeJSThBIrVFHDtI=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=

internal/resources/views/charts.go

@@ -66,7 +66,7 @@ func GenerateLineChart(series collector.Series, maxPoints int) (string, error) {
 	line := charts.NewLine()
 
 	yopts := opts.YAxis{
-		Show: false,
+		Show: opts.Bool(true),
 		Type: "value",
 	}
 	if series.Query.BoolValue {
@@ -83,11 +83,11 @@ func GenerateLineChart(series collector.Series, maxPoints int) (string, error) {
 		}),
 		charts.WithYAxisOpts(yopts),
 		charts.WithXAxisOpts(opts.XAxis{
-			Show: false,
+			Show: opts.Bool(true),
 			Type: "time",
 		}),
 		charts.WithLegendOpts(opts.Legend{
-			Show: false,
+			Show: opts.Bool(false),
 		}),
 	)
 
@@ -96,8 +96,14 @@ func GenerateLineChart(series collector.Series, maxPoints int) (string, error) {
 	line.SetXAxis(nil).
 		AddSeries("Metric", getYAxis(cd)).
 		SetSeriesOptions(
-			charts.WithLineChartOpts(opts.LineChart{Smooth: true, Color: "#5c6848"}),
+			charts.WithLineChartOpts(opts.LineChart{
+				Smooth:     opts.Bool(true),
+				ShowSymbol: opts.Bool(false),
+			}),
 			charts.WithAreaStyleOpts(opts.AreaStyle{Opacity: 0.2, Color: "#5c6848"}),
+			charts.WithLineStyleOpts(opts.LineStyle{
+				Color: "#5c6848",
+			}),
 		)
 
 	cr := newChartRenderer(line, line.Validate)

internal/resources/views/renderer.go

@@ -5,6 +5,7 @@ import (
 	"html/template"
 	"io"
 
+	"github.com/go-echarts/go-echarts/v2/render"
 	chartrender "github.com/go-echarts/go-echarts/v2/render"
 )
 
@@ -58,3 +59,11 @@ func (r *chartRenderer) Render(w io.Writer) error {
 	err := tpl.ExecuteTemplate(w, tplName, r.c)
 	return err
 }
+
+func (r *chartRenderer) RenderContent() []byte {
+	panic("not implemented")
+}
+
+func (r *chartRenderer) RenderSnippet() render.ChartSnippet {
+	panic("not implemented")
+}