Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions observability-lib/grafana/builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,37 @@ func TestBuilder_AddVars(t *testing.T) {
}
require.Len(t, o.Dashboard.Templating.List, 1)
})

t.Run("AddVars adds variables with AllValue to the dashboard", func(t *testing.T) {
builder := grafana.NewBuilder(&grafana.BuilderOptions{
Name: "Dashboard Name",
})

variable := grafana.NewQueryVariable(&grafana.QueryVariableOptions{
VariableOption: &grafana.VariableOption{
Name: "Variable Name",
Label: "Variable Label",
},
Query: "query",
Datasource: grafana.NewDataSource("Prometheus", "").Name,
IncludeAll: true,
AllValue: ".*",
})

builder.AddVars(variable)
o, err := builder.Build()
if err != nil {
t.Errorf("Error building dashboard: %v", err)
}
require.Len(t, o.Dashboard.Templating.List, 1)

// Verify the AllValue is set correctly
varModel := o.Dashboard.Templating.List[0]
require.NotNil(t, varModel.AllValue)
require.Equal(t, ".*", *varModel.AllValue)
require.NotNil(t, varModel.IncludeAll)
require.True(t, *varModel.IncludeAll)
})
}

func TestBuilder_AddRow(t *testing.T) {
Expand Down
4 changes: 3 additions & 1 deletion observability-lib/grafana/variables.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ type QueryVariableOptions struct {
Sort dashboard.VariableSort
Refresh *dashboard.VariableRefresh
IncludeAll bool
AllValue string
QueryWithType map[string]any
}

Expand All @@ -112,7 +113,8 @@ func NewQueryVariable(options *QueryVariableOptions) *dashboard.QueryVariableBui
Sort(options.Sort).
Refresh(*options.Refresh).
Multi(options.Multi).
IncludeAll(options.IncludeAll)
IncludeAll(options.IncludeAll).
AllValue(options.AllValue)

if options.Query != "" {
variable.Query(dashboard.StringOrMap{String: cog.ToPtr[string](options.Query)})
Expand Down
Loading