Merge pull request #85 from K-Phoen/grabana-v0.18.0

Use grabana v0.18.0
K-Phoen · Nov 19, 2021 · 576edbc · 576edbc
2 parents 9df8722 + f51fcd3
commit 576edbc
Show file tree

Hide file tree

Showing 56 changed files with 184 additions and 63 deletions.
diff --git a/go.mod b/go.mod
@@ -3,8 +3,8 @@ module github.com/K-Phoen/dark
 go 1.17
 
 require (
-	github.com/K-Phoen/grabana v0.17.6
-	github.com/grafana-tools/sdk v0.0.0-20211109141249-6856e1821d44
+	github.com/K-Phoen/grabana v0.18.1
+	github.com/K-Phoen/sdk v0.0.0-20211119151408-adef1e5fdd11
 	github.com/spf13/cobra v1.2.1
 	github.com/stretchr/testify v1.7.0
 	github.com/voi-oss/svc v0.7.6

diff --git a/go.sum b/go.sum
@@ -51,8 +51,10 @@ github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6L
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/K-Phoen/grabana v0.17.6 h1:kJc5TVW6D2d2hr4yOTJcB8f9KicQ10EtHUZ6oCVCaeg=
-github.com/K-Phoen/grabana v0.17.6/go.mod h1:iStLPl5QAzykF/zI8UDPMOFO1hLd8lohUoHj6QauPyg=
+github.com/K-Phoen/grabana v0.18.1 h1:L9kFCCRyaH6EucYZ2sepgLUXicNEtrdPa0l84DbRb+M=
+github.com/K-Phoen/grabana v0.18.1/go.mod h1:e6GwAnk6L0g+tba2yhKdzWvDah8cPPlwPptyrnkK8ng=
+github.com/K-Phoen/sdk v0.0.0-20211119151408-adef1e5fdd11 h1:bcJqfzSQge+pyJ1beMzUmf3bh9bRyIzEFu8PXUx8Hgk=
+github.com/K-Phoen/sdk v0.0.0-20211119151408-adef1e5fdd11/go.mod h1:fnbOsbRksULSfcXjOI6W1/HISz5o/u1iEhF/fLedqTg=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
@@ -257,8 +259,6 @@ github.com/gosimple/slug v1.11.2 h1:MxFR0TmQ/qz0KvIrBbf4phu+G0RBgpwxOn6jPKFKFOw=
 github.com/gosimple/slug v1.11.2/go.mod h1:UiRaFH+GEilHstLUmcBgWcI42viBN7mAb818JrYOeFQ=
 github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6T/o=
 github.com/gosimple/unidecode v1.0.1/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc=
-github.com/grafana-tools/sdk v0.0.0-20211109141249-6856e1821d44 h1:cze5Hg068vDXQl8x/mmO8rMuJ49g/UBCl/VM/62eLJ8=
-github.com/grafana-tools/sdk v0.0.0-20211109141249-6856e1821d44/go.mod h1:AHHlOEv1+GGQ3ktHMlhuTUwo3zljV3QJbC0+8o2kn+4=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=

diff --git a/internal/pkg/converter/json.go b/internal/pkg/converter/json.go
@@ -14,7 +14,7 @@ import (
 	"github.com/K-Phoen/grabana/singlestat"
 	grabanaTable "github.com/K-Phoen/grabana/table"
 	"github.com/K-Phoen/grabana/target/stackdriver"
-	"github.com/grafana-tools/sdk"
+	"github.com/K-Phoen/sdk"
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v3"
 )
@@ -1011,7 +1011,7 @@ func (converter *JSON) convertStackdriverTarget(target sdk.Target) *grabana.Targ
 			Filters:     converter.convertStackdriverFilters(target),
 			Aggregation: aggregation,
 			Alignment:   alignment,
-			GroupBy:     target.GroupBy,
+			GroupBy:     target.GroupBys,
 			Legend:      target.AliasBy,
 			Ref:         target.RefID,
 			Hidden:      target.Hide,

diff --git a/internal/pkg/converter/json_test.go b/internal/pkg/converter/json_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	grabana "github.com/K-Phoen/grabana/decoder"
-	"github.com/grafana-tools/sdk"
+	"github.com/K-Phoen/sdk"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 )
@@ -454,7 +454,7 @@ func TestConvertTargetWithStackdriverTarget(t *testing.T) {
 		CrossSeriesReducer: "REDUCE_MEAN",
 		PerSeriesAligner:   "ALIGN_DELTA",
 		AlignmentPeriod:    "stackdriver-auto",
-		GroupBy:            []string{"field"},
+		GroupBys:           []string{"field"},
 		AliasBy:            "legend",
 		RefID:              "A",
 		Filters: []string{

diff --git a/vendor/github.com/K-Phoen/grabana/alert/alert.go b/vendor/github.com/K-Phoen/grabana/alert/alert.go
diff --git a/vendor/github.com/K-Phoen/grabana/alert/condition.go b/vendor/github.com/K-Phoen/grabana/alert/condition.go
diff --git a/vendor/github.com/K-Phoen/grabana/axis/axis.go b/vendor/github.com/K-Phoen/grabana/axis/axis.go
diff --git a/vendor/github.com/K-Phoen/grabana/client.go b/vendor/github.com/K-Phoen/grabana/client.go
diff --git a/vendor/github.com/K-Phoen/grabana/dashboard/dashboard.go b/vendor/github.com/K-Phoen/grabana/dashboard/dashboard.go
diff --git a/vendor/github.com/K-Phoen/grabana/dashboard/link.go b/vendor/github.com/K-Phoen/grabana/dashboard/link.go
diff --git a/vendor/github.com/K-Phoen/grabana/decoder/target.go b/vendor/github.com/K-Phoen/grabana/decoder/target.go
diff --git a/vendor/github.com/K-Phoen/grabana/graph/graph.go b/vendor/github.com/K-Phoen/grabana/graph/graph.go
diff --git a/vendor/github.com/K-Phoen/grabana/graph/series/override.go b/vendor/github.com/K-Phoen/grabana/graph/series/override.go
diff --git a/vendor/github.com/K-Phoen/grabana/heatmap/heatmap.go b/vendor/github.com/K-Phoen/grabana/heatmap/heatmap.go
diff --git a/vendor/github.com/K-Phoen/grabana/row/row.go b/vendor/github.com/K-Phoen/grabana/row/row.go
diff --git a/vendor/github.com/K-Phoen/grabana/singlestat/singlestat.go b/vendor/github.com/K-Phoen/grabana/singlestat/singlestat.go
diff --git a/vendor/github.com/K-Phoen/grabana/table/table.go b/vendor/github.com/K-Phoen/grabana/table/table.go
diff --git a/vendor/github.com/K-Phoen/grabana/target/graphite/graphite.go b/vendor/github.com/K-Phoen/grabana/target/graphite/graphite.go
diff --git a/vendor/github.com/K-Phoen/grabana/target/influxdb/influxdb.go b/vendor/github.com/K-Phoen/grabana/target/influxdb/influxdb.go
diff --git a/vendor/github.com/K-Phoen/grabana/target/stackdriver/alignment_options.go b/vendor/github.com/K-Phoen/grabana/target/stackdriver/alignment_options.go
diff --git a/vendor/github.com/K-Phoen/grabana/target/stackdriver/stackdriver.go b/vendor/github.com/K-Phoen/grabana/target/stackdriver/stackdriver.go
diff --git a/vendor/github.com/K-Phoen/grabana/text/text.go b/vendor/github.com/K-Phoen/grabana/text/text.go
diff --git a/vendor/github.com/K-Phoen/grabana/variable/constant/constant.go b/vendor/github.com/K-Phoen/grabana/variable/constant/constant.go
diff --git a/vendor/github.com/K-Phoen/grabana/variable/custom/custom.go b/vendor/github.com/K-Phoen/grabana/variable/custom/custom.go
diff --git a/vendor/github.com/K-Phoen/grabana/variable/datasource/datasource.go b/vendor/github.com/K-Phoen/grabana/variable/datasource/datasource.go
diff --git a/vendor/github.com/K-Phoen/grabana/variable/interval/interval.go b/vendor/github.com/K-Phoen/grabana/variable/interval/interval.go
diff --git a/vendor/github.com/K-Phoen/grabana/variable/query/query.go b/vendor/github.com/K-Phoen/grabana/variable/query/query.go
diff --git a/...r/github.com/grafana-tools/sdk/.gitignore → vendor/github.com/K-Phoen/sdk/.gitignore b/...r/github.com/grafana-tools/sdk/.gitignore → vendor/github.com/K-Phoen/sdk/.gitignore
diff --git a/vendor/github.com/grafana-tools/sdk/LICENSE → vendor/github.com/K-Phoen/sdk/LICENSE b/vendor/github.com/grafana-tools/sdk/LICENSE → vendor/github.com/K-Phoen/sdk/LICENSE
diff --git a/...or/github.com/grafana-tools/sdk/README.md → vendor/github.com/K-Phoen/sdk/README.md b/...or/github.com/grafana-tools/sdk/README.md → vendor/github.com/K-Phoen/sdk/README.md
diff --git a/...r/github.com/grafana-tools/sdk/address.go → vendor/github.com/K-Phoen/sdk/address.go b/...r/github.com/grafana-tools/sdk/address.go → vendor/github.com/K-Phoen/sdk/address.go
diff --git a/...om/grafana-tools/sdk/alertnotification.go → ...thub.com/K-Phoen/sdk/alertnotification.go b/...om/grafana-tools/sdk/alertnotification.go → ...thub.com/K-Phoen/sdk/alertnotification.go
diff --git a/...ithub.com/grafana-tools/sdk/annotation.go → vendor/github.com/K-Phoen/sdk/annotation.go b/...ithub.com/grafana-tools/sdk/annotation.go → vendor/github.com/K-Phoen/sdk/annotation.go
diff --git a/vendor/github.com/grafana-tools/sdk/board.go → vendor/github.com/K-Phoen/sdk/board.go b/vendor/github.com/grafana-tools/sdk/board.go → vendor/github.com/K-Phoen/sdk/board.go
diff --git a/...hub.com/grafana-tools/sdk/custom-types.go → ...or/github.com/K-Phoen/sdk/custom-types.go b/...hub.com/grafana-tools/sdk/custom-types.go → ...or/github.com/K-Phoen/sdk/custom-types.go
diff --git a/...ithub.com/grafana-tools/sdk/datasource.go → vendor/github.com/K-Phoen/sdk/datasource.go b/...ithub.com/grafana-tools/sdk/datasource.go → vendor/github.com/K-Phoen/sdk/datasource.go
diff --git a/....com/grafana-tools/sdk/docker-compose.yml → ...github.com/K-Phoen/sdk/docker-compose.yml b/....com/grafana-tools/sdk/docker-compose.yml → ...github.com/K-Phoen/sdk/docker-compose.yml
diff --git a/...or/github.com/grafana-tools/sdk/folder.go → vendor/github.com/K-Phoen/sdk/folder.go b/...or/github.com/grafana-tools/sdk/folder.go → vendor/github.com/K-Phoen/sdk/folder.go
diff --git a/vendor/github.com/grafana-tools/sdk/org.go → vendor/github.com/K-Phoen/sdk/org.go b/vendor/github.com/grafana-tools/sdk/org.go → vendor/github.com/K-Phoen/sdk/org.go