Merge branch 'main' into fix_adhoc_filters

README.md

@@ -72,8 +72,17 @@ datasources:
       server: localhost
       username: username
       tlsSkipVerify: false
+      # tlsAuth: <bool>
+      # tlsAuthWithCACert: <bool>
+      # secure: <bool>
+      # timeout: <seconds>
+      # queryTimeout: <seconds>
+      # protocol: <native|http>
     secureJsonData:
       password: password
+      # tlsCACert: <string>
+      # tlsClientCert: <string>
+      # tlsClientKey: <string>
 ```
 
 ## Building queries

e2e/e2e_test.go

@@ -160,7 +160,7 @@ func startGrafana(client *dagger.Client, clickHouseDist *dagger.Directory, click
 		From("grafana/grafana:main").
 		WithFile("/etc/grafana/grafana.ini", client.Host().File("e2e/custom.ini")).
 		WithMountedDirectory("/var/lib/grafana/plugins/clickhouse-datasource", clickHouseDist).
-		WithServiceBinding("clickhouse", clickhouseContainer).
+		WithServiceBinding("clickhouse", clickhouseContainer.AsService()).
 		WithExposedPort(3000)
 
 	fmt.Println("Grafana built")
@@ -183,7 +183,7 @@ func runK6(client *dagger.Client, ctx context.Context, grafanaContainer *dagger.
 	value, err := client.
 		Container().
 		From("grafana/k6:master-with-browser").
-		WithServiceBinding("grafana", grafanaContainer).
+		WithServiceBinding("grafana", grafanaContainer.AsService()).
 		WithEnvVariable("K6_BROWSER_ARGS", "no-sandbox").
 		WithFile("k6.test.js", testFile).
 		WithExec([]string{"run", "k6.test.js"}, dagger.ContainerWithExecOpts{InsecureRootCapabilities: true}).Stderr(ctx)

go.mod

@@ -5,18 +5,18 @@ go 1.21
 toolchain go1.21.4
 
 require (
-	dagger.io/dagger v0.8.4
+	dagger.io/dagger v0.9.6
 	github.com/ClickHouse/clickhouse-go/v2 v2.17.1
 	github.com/docker/docker v24.0.7+incompatible
 	github.com/docker/go-units v0.5.0
-	github.com/grafana/grafana-plugin-sdk-go v0.195.0
+	github.com/grafana/grafana-plugin-sdk-go v0.199.0
 	github.com/grafana/sqlds/v2 v2.7.2
-	github.com/paulmach/orb v0.10.0
+	github.com/paulmach/orb v0.11.0
 	github.com/pkg/errors v0.9.1
 	github.com/shopspring/decimal v1.3.1
 	github.com/stretchr/testify v1.8.4
 	github.com/testcontainers/testcontainers-go v0.27.0
-	golang.org/x/net v0.19.0
+	golang.org/x/net v0.20.0
 )
 
 require (
@@ -26,14 +26,13 @@ require (
 	github.com/apache/arrow/go/v13 v13.0.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/goccy/go-json v0.10.0 // indirect
-	github.com/iancoleman/strcase v0.3.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.3 // indirect
 	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/vektah/gqlparser/v2 v2.5.6 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
 	go.opentelemetry.io/contrib/samplers/jaegerremote v0.15.1 // indirect
-	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/sync v0.4.0 // indirect
 	google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
 )
 
@@ -58,7 +57,7 @@ require (
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a // indirect
 	github.com/fatih/color v1.15.0 // indirect
-	github.com/getkin/kin-openapi v0.122.0 // indirect
+	github.com/getkin/kin-openapi v0.120.0 // indirect
 	github.com/go-faster/city v1.0.1 // indirect
 	github.com/go-faster/errors v0.6.1 // indirect
 	github.com/go-logr/logr v1.3.0 // indirect
@@ -75,7 +74,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect
-	github.com/hashicorp/go-hclog v1.5.0 // indirect
+	github.com/hashicorp/go-hclog v1.6.2 // indirect
 	github.com/hashicorp/go-plugin v1.6.0 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/invopop/yaml v0.2.0 // indirect
@@ -113,10 +112,10 @@ require (
 	github.com/pierrec/lz4/v4 v4.1.18 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/prometheus/client_golang v1.17.0 // indirect
-	github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
+	github.com/prometheus/client_golang v1.18.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.45.0 // indirect
-	github.com/prometheus/procfs v0.11.1 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
 	github.com/shirou/gopsutil/v3 v3.23.11 // indirect
@@ -142,18 +141,18 @@ require (
 	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
 	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
-	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/crypto v0.18.0 // indirect
+	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
+	golang.org/x/mod v0.13.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/term v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
+	golang.org/x/tools v0.14.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
-	google.golang.org/grpc v1.59.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	google.golang.org/grpc v1.60.1 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )