Skip to content

Update grafana-tools/sdk dependency to support datasources as a map #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rgeyer wants to merge 1 commit into from
Closed

Update grafana-tools/sdk dependency to support datasources as a map #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,7 @@ replace github.com/bradfitz/gomemcache => github.com/themihai/gomemcache v0.0.0-
// Required for Alertmanager

replace github.com/hashicorp/consul => github.com/hashicorp/consul v1.8.1

// Grafana SDK override. This can be removed when the SDK natively supports a dashboard -> panel -> datasource which is
// a map, rather than a string. https://github.com/grafana-tools/sdk/pull/190
replace github.com/grafana-tools/sdk => github.com/csmarchbanks/sdk v0.0.0-20220120205302-870d00a83f4e
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/csmarchbanks/sdk v0.0.0-20220120205302-870d00a83f4e h1:FjcnI9tmUibKj0UH9P761WwkEhAWUAinuuKVI2SyEB4=
github.com/csmarchbanks/sdk v0.0.0-20220120205302-870d00a83f4e/go.mod h1:AHHlOEv1+GGQ3ktHMlhuTUwo3zljV3QJbC0+8o2kn+4=
github.com/cucumber/godog v0.8.1/go.mod h1:vSh3r/lM+psC1BPXvdkSEuNjmXfpVqrMGYAElF6hxnA=
github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
Expand Down
36 changes: 18 additions & 18 deletions vendor/github.com/grafana-tools/sdk/board.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 48 additions & 13 deletions vendor/github.com/grafana-tools/sdk/panel.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 10 additions & 7 deletions vendor/github.com/grafana-tools/sdk/rest-request.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ github.com/googleapis/gax-go/v2/apierror/internal/proto
github.com/gorilla/mux
# github.com/gosimple/slug v1.1.1
github.com/gosimple/slug
# github.com/grafana-tools/sdk v0.0.0-20210808170449-9de4d14888c5
# github.com/grafana-tools/sdk v0.0.0-20210808170449-9de4d14888c5 => github.com/csmarchbanks/sdk v0.0.0-20220120205302-870d00a83f4e
## explicit
github.com/grafana-tools/sdk
# github.com/grafana/dskit v0.0.0-20211103155626-4e784973d341
Expand Down Expand Up @@ -1184,3 +1184,4 @@ rsc.io/binaryregexp/syntax
# github.com/gocql/gocql => github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85
# github.com/bradfitz/gomemcache => github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab
# github.com/hashicorp/consul => github.com/hashicorp/consul v1.8.1
# github.com/grafana-tools/sdk => github.com/csmarchbanks/sdk v0.0.0-20220120205302-870d00a83f4e