Skip to content

Commit 2c670e6

Browse files
Atrax1Atrax1
committed
feat(observability-lib): compatibility with grafana 11.6 and 12+
1 parent 33cb8e0 commit 2c670e6

File tree

4 files changed

+37
-31
lines changed

4 files changed

+37
-31
lines changed

‎observability-lib/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ go 1.24.5
55
toolchain go1.24.10
66

77
require (
8-
github.com/go-resty/resty/v2 v2.15.3
9-
github.com/grafana/grafana-foundation-sdk/go v0.0.0-20241009194022-923b32e3e69b
10-
github.com/spf13/cobra v1.8.1
11-
github.com/stretchr/testify v1.10.0
8+
github.com/go-resty/resty/v2 v2.17.1
9+
github.com/grafana/grafana-foundation-sdk/go v0.0.0-20251008104447-4b342c01ab41
10+
github.com/spf13/cobra v1.10.2
11+
github.com/stretchr/testify v1.11.1
1212
gopkg.in/yaml.v3 v3.0.1
1313
)
1414

@@ -18,7 +18,7 @@ require (
1818
github.com/kr/pretty v0.3.1 // indirect
1919
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
2020
github.com/rogpeppe/go-internal v1.10.0 // indirect
21-
github.com/spf13/pflag v1.0.5 // indirect
22-
golang.org/x/net v0.38.0 // indirect
21+
github.com/spf13/pflag v1.0.10 // indirect
22+
golang.org/x/net v0.49.0 // indirect
2323
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
2424
)

‎observability-lib/go.sum‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
1+
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
22
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
33
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
44
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/go-resty/resty/v2 v2.15.3 h1:bqff+hcqAflpiF591hhJzNdkRsFhlB96CYfBwSFvql8=
6-
github.com/go-resty/resty/v2 v2.15.3/go.mod h1:0fHAoK7JoBy/Ch36N8VFeMsK7xQOHhvWaC3iOktwmIU=
7-
github.com/grafana/grafana-foundation-sdk/go v0.0.0-20241009194022-923b32e3e69b h1:YxlugK0wL5hh86wT0hZSGw9cPTvacOUmHxjP15fsIlE=
8-
github.com/grafana/grafana-foundation-sdk/go v0.0.0-20241009194022-923b32e3e69b/go.mod h1:WtWosval1KCZP9BGa42b8aVoJmVXSg0EvQXi9LDSVZQ=
5+
github.com/go-resty/resty/v2 v2.17.1 h1:x3aMpHK1YM9e4va/TMDRlusDDoZiQ+ViDu/WpA6xTM4=
6+
github.com/go-resty/resty/v2 v2.17.1/go.mod h1:kCKZ3wWmwJaNc7S29BRtUhJwy7iqmn+2mLtQrOyQlVA=
7+
github.com/grafana/grafana-foundation-sdk/go v0.0.0-20251008104447-4b342c01ab41 h1:E6rjkhLvfCXXpP/seDA9fFzNWpV8JbbZ8UCE+mdDIqU=
8+
github.com/grafana/grafana-foundation-sdk/go v0.0.0-20251008104447-4b342c01ab41/go.mod h1:48EA8jF85SrReYflLa39Sk34b6NpxwJPBwjF3TJgRpE=
99
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
1010
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
1111
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -22,16 +22,18 @@ github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/f
2222
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
2323
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
2424
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
25-
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
26-
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
27-
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
28-
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
29-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
30-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
31-
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
32-
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
33-
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
34-
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
25+
github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
26+
github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
27+
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
28+
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
29+
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
30+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
31+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
32+
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
33+
golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
34+
golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
35+
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
36+
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
3537
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
3638
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
3739
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎observability-lib/grafana/alerts.go‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,9 @@ type ThresholdExpression struct {
8787

8888
type TypeThresholdType string
8989

90-
const (
91-
TypeThresholdTypeGt TypeThresholdType = "gt"
92-
TypeThresholdTypeLt TypeThresholdType = "lt"
93-
TypeThresholdTypeWithinRange TypeThresholdType = "within_range"
94-
TypeThresholdTypeOutsideRange TypeThresholdType = "outside_range"
95-
)
96-
9790
type ThresholdConditionsOption struct {
9891
Params []float64
99-
Type TypeThresholdType
92+
Type expr.ExprTypeThresholdConditionsEvaluatorType
10093
}
10194

10295
func newThresholdConditionsOptions(options ThresholdConditionsOption) []cog.Builder[expr.ExprTypeThresholdConditions] {
@@ -113,7 +106,7 @@ func newThresholdConditionsOptions(options ThresholdConditionsOption) []cog.Buil
113106
Evaluator(
114107
expr.NewExprTypeThresholdConditionsEvaluatorBuilder().
115108
Params(params).
116-
Type(expr.TypeThresholdType(options.Type)),
109+
Type(options.Type),
117110
),
118111
)
119112

@@ -124,7 +117,7 @@ func newReduceSettingsOptions(options expr.ExprTypeReduceSettings) cog.Builder[e
124117
builder := expr.NewExprTypeReduceSettingsBuilder().
125118
Mode(options.Mode)
126119

127-
if options.Mode == expr.TypeReduceModeReplaceNN && options.ReplaceWithValue != nil {
120+
if options.Mode == expr.ExprTypeReduceSettingsModeReplaceNN && options.ReplaceWithValue != nil {
128121
builder.ReplaceWithValue(*options.ReplaceWithValue)
129122
}
130123

‎observability-lib/grafana/dashboard.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,17 @@ func (o *Observability) DeployToGrafana(options *DeployOptions) error {
106106
// Create or update dashboard
107107
var newDashboard api.PostDashboardResponse
108108
var errPostDashboard error
109+
110+
dashboardFound, _, err := grafanaClient.GetDashboardByName(*o.Dashboard.Title)
111+
if err != nil {
112+
return err
113+
}
114+
if dashboardFound.UID != nil {
115+
if o.Dashboard.Uid == nil {
116+
o.Dashboard.Uid = dashboardFound.UID
117+
}
118+
}
119+
109120
if folder != nil && o.Dashboard != nil {
110121
newDashboard, _, errPostDashboard = grafanaClient.PostDashboard(api.PostDashboardRequest{
111122
Dashboard: o.Dashboard,

0 commit comments

Comments
 (0)