Skip to content

Commit

Permalink
Merge branch 'main' into andrew/release-46
Browse files Browse the repository at this point in the history
  • Loading branch information
bossinc authored Jan 17, 2025
2 parents f21d259 + 1e6e34f commit bea1a3c
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 60 deletions.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ require (
github.com/ClickHouse/clickhouse-go/v2 v2.30.1
github.com/docker/docker v27.5.0+incompatible
github.com/docker/go-units v0.5.0
github.com/grafana/grafana-plugin-sdk-go v0.262.0
github.com/grafana/grafana-plugin-sdk-go v0.263.0
github.com/grafana/sqlds/v4 v4.1.7
github.com/paulmach/orb v0.11.1
github.com/pkg/errors v0.9.1
github.com/shopspring/decimal v1.4.0
github.com/stretchr/testify v1.10.0
github.com/testcontainers/testcontainers-go v0.33.0
github.com/testcontainers/testcontainers-go v0.35.0
golang.org/x/net v0.34.0
)

Expand Down Expand Up @@ -59,7 +59,7 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cheekybits/genny v1.0.0 // indirect
github.com/chromedp/cdproto v0.0.0-20230816033919-17ee49f3eb4f // indirect
github.com/cpuguy83/dockercfg v0.3.1 // indirect
github.com/cpuguy83/dockercfg v0.3.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/go-connections v0.5.0 // indirect
Expand Down
13 changes: 7 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
github.com/cpuguy83/dockercfg v0.3.1 h1:/FpZ+JaygUR/lZP2NlFI2DVfrOEMAIKP5wWEJdoYe9E=
github.com/cpuguy83/dockercfg v0.3.1/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
github.com/cpuguy83/dockercfg v0.3.2 h1:DlJTyZGBDlXqUZ2Dk2Q3xHs/FtnooJJVaad2S9GKorA=
github.com/cpuguy83/dockercfg v0.3.2/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
Expand Down Expand Up @@ -115,8 +115,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
github.com/grafana/dataplane/sdata v0.0.9 h1:AGL1LZnCUG4MnQtnWpBPbQ8ZpptaZs14w6kE/MWfg7s=
github.com/grafana/dataplane/sdata v0.0.9/go.mod h1:Jvs5ddpGmn6vcxT7tCTWAZ1mgi4sbcdFt9utQx5uMAU=
github.com/grafana/grafana-plugin-sdk-go v0.262.0 h1:R2DV6lwBQE5zaogxX3PorD9Seo8CXA8YuStf84oqwkk=
github.com/grafana/grafana-plugin-sdk-go v0.262.0/go.mod h1:U43Cnrj/9DNYyvFcNdeUWNjMXTKNB0jcTcQGpWKd2gw=
github.com/grafana/grafana-plugin-sdk-go v0.263.0 h1:y8vo7hUm50Ei7rdeNNivgehHNsOmCjc8wRmBat5yA3w=
github.com/grafana/grafana-plugin-sdk-go v0.263.0/go.mod h1:U43Cnrj/9DNYyvFcNdeUWNjMXTKNB0jcTcQGpWKd2gw=
github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8=
github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls=
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg=
Expand Down Expand Up @@ -285,6 +285,7 @@ github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:s
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
Expand All @@ -296,8 +297,8 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/testcontainers/testcontainers-go v0.33.0 h1:zJS9PfXYT5O0ZFXM2xxXfk4J5UMw/kRiISng037Gxdw=
github.com/testcontainers/testcontainers-go v0.33.0/go.mod h1:W80YpTa8D5C3Yy16icheD01UTDu+LmXIA2Keo+jWtT8=
github.com/testcontainers/testcontainers-go v0.35.0 h1:uADsZpTKFAtp8SLK+hMwSaa+X+JiERHtd4sQAFmXeMo=
github.com/testcontainers/testcontainers-go v0.35.0/go.mod h1:oEVBj5zrfJTrgjwONs1SsRbnBtH9OKl+IGl3UMcr2B4=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"devDependencies": {
"@babel/core": "^7.25.7",
"@grafana/eslint-config": "^7.0.0",
"@grafana/plugin-e2e": "^1.12.3",
"@grafana/plugin-e2e": "^1.15.0",
"@grafana/tsconfig": "^2.0.0",
"@playwright/test": "^1.49.1",
"@swc/core": "^1.7.26",
Expand Down Expand Up @@ -74,8 +74,8 @@
},
"dependencies": {
"@emotion/css": "11.13.4",
"@grafana/data": "^11.3.1",
"@grafana/runtime": "^11.3.1",
"@grafana/data": "^11.4.0",
"@grafana/runtime": "^11.4.0",
"@grafana/schema": "^11.2.2",
"@grafana/ui": "^11.2.2",
"js-sql-parser": "^1.6.0",
Expand Down
101 changes: 53 additions & 48 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -952,13 +952,13 @@
dependencies:
tslib "^2.4.0"

"@grafana/data@11.3.1", "@grafana/data@^11.3.1":
version "11.3.1"
resolved "https://registry.yarnpkg.com/@grafana/data/-/data-11.3.1.tgz#9d1d74a4330bb9468ed865ef94867973ece86951"
integrity sha512-65YHLouah5gId58ov0l5ZxoRSjAFWqv4Be0Apght69Ko1rLPVdfIAlZCwREfEN+OiSJ4d4t8AFtaD8CRbawmrw==
"@grafana/data@11.4.0", "@grafana/data@^11.4.0":
version "11.4.0"
resolved "https://registry.yarnpkg.com/@grafana/data/-/data-11.4.0.tgz#d30fb918aac1e21120bac27b54f59a4ad42fc999"
integrity sha512-/Og3njCvDRR+jYWAYlEjNZfyO0KaYiH/3Hvz5lXYd/B29sN8ZOfyvdB3lp+727y4sHIG+Jb1NiX0L3qHD7dLgQ==
dependencies:
"@braintree/sanitize-url" "7.0.1"
"@grafana/schema" "11.3.1"
"@grafana/schema" "11.4.0"
"@types/d3-interpolate" "^3.0.0"
"@types/string-hash" "1.1.3"
d3-interpolate "3.0.1"
Expand All @@ -982,24 +982,24 @@
uplot "1.6.31"
xss "^1.0.14"

"@grafana/e2e-selectors@11.3.1":
version "11.3.1"
resolved "https://registry.yarnpkg.com/@grafana/e2e-selectors/-/e2e-selectors-11.3.1.tgz#9732d8d8237639c49b5d2a51c432e5a20f48af1d"
integrity sha512-197q3gqIJOcpq+pD/5CycwBbbxruqx2p29dkeVwb+QlnjGvmc3Fx6YUf9yCHtvhmETceRYCoLZwQwuwdju/+Mg==
"@grafana/e2e-selectors@11.4.0":
version "11.4.0"
resolved "https://registry.yarnpkg.com/@grafana/e2e-selectors/-/e2e-selectors-11.4.0.tgz#ea9460cfc4112406ea954204d3296f9a4a652118"
integrity sha512-6VRsmTpqtmNuXJvuUNJudHFdZJR7oc1DtZMDoaOY+3Y3yPU+4oEdM2MtsyYHPkMbfTONlJ4fdIC0WFnWhDIhLA==
dependencies:
"@grafana/tsconfig" "^2.0.0"
tslib "2.7.0"
typescript "5.5.4"

"@grafana/e2e-selectors@^11.4.0-209710":
version "11.4.0-209816"
resolved "https://registry.yarnpkg.com/@grafana/e2e-selectors/-/e2e-selectors-11.4.0-209816.tgz#3c1974b60479403d32182dfe4a4ca3867664ce57"
integrity sha512-Ssec69xJrV7kcssq6JTNyR/BgBn8lu68JT/eNEabEWXgzZukhafWWUzm9+DelqTcCDAxs2HwaaaKVko9+Y2udA==
"@grafana/e2e-selectors@^11.5.0-216908":
version "11.5.0-217903"
resolved "https://registry.yarnpkg.com/@grafana/e2e-selectors/-/e2e-selectors-11.5.0-217903.tgz#14a4942150b1ef0ce78dd8f8302e67ca02a2bfbb"
integrity sha512-94F3m0Ec7a6ghtDLvcdhMXv7/2NXJc/cgdyFLtHF2DjgHklXw8ncUNCx6qgrrLyTUnaVEKpetJfXP+rNyUoJnA==
dependencies:
"@grafana/tsconfig" "^2.0.0"
semver "7.6.3"
tslib "2.7.0"
typescript "5.5.4"
tslib "2.8.1"
typescript "5.7.3"

"@grafana/eslint-config@^7.0.0":
version "7.0.0"
Expand Down Expand Up @@ -1032,35 +1032,35 @@
ua-parser-js "^1.0.32"
web-vitals "^4.0.1"

"@grafana/plugin-e2e@^1.12.3":
version "1.12.3"
resolved "https://registry.yarnpkg.com/@grafana/plugin-e2e/-/plugin-e2e-1.12.3.tgz#5f3b6251cfc081a27bfc05326e3071e06e2de322"
integrity sha512-xSqQH1WiStc8IVE9Tu6pdPIDHM1ueoRscjU096nk09anFBdoLLwiz+vTY0TKB4KJDUaNJhYP2WVEMlFnbURw8w==
"@grafana/plugin-e2e@^1.15.0":
version "1.15.0"
resolved "https://registry.yarnpkg.com/@grafana/plugin-e2e/-/plugin-e2e-1.15.0.tgz#5d2082acf5400d5b1752f9abb0c8881b171ccc38"
integrity sha512-cP3uekIPVlBNtyBynNIJl3y225MJWHYxlLIhkE74WIsLNH8gC8QtTTLO4w/Quiiz/xL171IgSE+t0EHtkesx/Q==
dependencies:
"@grafana/e2e-selectors" "^11.4.0-209710"
"@grafana/e2e-selectors" "^11.5.0-216908"
semver "^7.5.4"
uuid "^11.0.2"
yaml "^2.3.4"

"@grafana/runtime@^11.3.1":
version "11.3.1"
resolved "https://registry.yarnpkg.com/@grafana/runtime/-/runtime-11.3.1.tgz#b295b7db45e925354aaf0b0941df784b84b28fd7"
integrity sha512-9/WvZL4fnpfKg98O6J4qTT7akF+dycnh4hmX2hzCnM5ZDowTVXXr6rGJUhu7+9c6V0Xw96++puLc8WqIudmj6g==
"@grafana/runtime@^11.4.0":
version "11.4.0"
resolved "https://registry.yarnpkg.com/@grafana/runtime/-/runtime-11.4.0.tgz#32812909c824026bd7d84c6427b49da54921460b"
integrity sha512-yZIaNqHKncf97/6QjjHvI+v02+PvGpG6wWNDN+/H1R8vzrMe21asBNDm0EEW/mPUlRLtmAAGcUAt6jL6vRe+6g==
dependencies:
"@grafana/data" "11.3.1"
"@grafana/e2e-selectors" "11.3.1"
"@grafana/data" "11.4.0"
"@grafana/e2e-selectors" "11.4.0"
"@grafana/faro-web-sdk" "^1.3.6"
"@grafana/schema" "11.3.1"
"@grafana/ui" "11.3.1"
"@grafana/schema" "11.4.0"
"@grafana/ui" "11.4.0"
history "4.10.1"
lodash "4.17.21"
rxjs "7.8.1"
tslib "2.7.0"

"@grafana/schema@11.3.1", "@grafana/schema@^11.2.2":
version "11.3.1"
resolved "https://registry.yarnpkg.com/@grafana/schema/-/schema-11.3.1.tgz#e99472a441596c0d5f23c276469f9e066f6c67f6"
integrity sha512-/q8v4u1+/WzTRjz7Qniwfea5rF3EmkSrk5XDhM8o2n+G/z2G1VL7k/oqp151MsulM82g9hE+UvcpmmWEd4mD8Q==
"@grafana/schema@11.4.0", "@grafana/schema@^11.2.2":
version "11.4.0"
resolved "https://registry.yarnpkg.com/@grafana/schema/-/schema-11.4.0.tgz#5733ae4fb362be4858702ab1042c3c92e42856a0"
integrity sha512-ZcUZtVdNSuBmTjwPAgWwQ/9/ilozAXggfXye797Odp3mXU9erQX7CqV9JV3y5pyj1+KMd+khzfjxEZotsjHWIA==
dependencies:
tslib "2.7.0"

Expand All @@ -1069,19 +1069,19 @@
resolved "https://registry.yarnpkg.com/@grafana/tsconfig/-/tsconfig-2.0.0.tgz#277aba907ddbe0301dc37248923e6bd2b68f5151"
integrity sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==

"@grafana/ui@11.3.1", "@grafana/ui@^11.2.2":
version "11.3.1"
resolved "https://registry.yarnpkg.com/@grafana/ui/-/ui-11.3.1.tgz#0b83905cc87d9ba00b11e8c18de8cf33472ffdad"
integrity sha512-Xl15hAmsNFa5rANYPnMjna0nasNiyID6bXNl4Ze1AopIEiiqMZidC3ldAUumXd/ivh84QYbfCuyWrPrg47xYRg==
"@grafana/ui@11.4.0", "@grafana/ui@^11.2.2":
version "11.4.0"
resolved "https://registry.yarnpkg.com/@grafana/ui/-/ui-11.4.0.tgz#bb451e236f379a917afe19a65de061ca3bd44b15"
integrity sha512-Z2J+b6RCizecdn7gbribmzkJIZxANXFp6wvt0pZa4toZ/BTe9CK30Y2/x1KiGa9VAzIhS1pqihc+PrcJU9I5LA==
dependencies:
"@emotion/css" "11.13.4"
"@emotion/react" "11.13.3"
"@emotion/serialize" "1.3.2"
"@floating-ui/react" "0.26.24"
"@grafana/data" "11.3.1"
"@grafana/e2e-selectors" "11.3.1"
"@grafana/data" "11.4.0"
"@grafana/e2e-selectors" "11.4.0"
"@grafana/faro-web-sdk" "^1.3.6"
"@grafana/schema" "11.3.1"
"@grafana/schema" "11.4.0"
"@hello-pangea/dnd" "16.6.0"
"@leeoniya/ufuzzy" "1.0.14"
"@monaco-editor/react" "4.6.0"
Expand Down Expand Up @@ -6476,9 +6476,9 @@ nano-css@^5.6.2:
stylis "^4.3.0"

nanoid@^3.3.7:
version "3.3.7"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
version "3.3.8"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==

natural-compare@^1.4.0:
version "1.4.0"
Expand Down Expand Up @@ -8470,6 +8470,11 @@ [email protected], tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.6.2:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==

[email protected]:
version "2.8.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==

type-check@^0.4.0, type-check@~0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
Expand Down Expand Up @@ -8561,6 +8566,11 @@ [email protected]:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0"
integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==

[email protected]:
version "5.7.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.3.tgz#919b44a7dbb8583a9b856d162be24a54bf80073e"
integrity sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==

ua-parser-js@^1.0.32:
version "1.0.39"
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.39.tgz#bfc07f361549bf249bd8f4589a4cccec18fd2018"
Expand Down Expand Up @@ -9005,12 +9015,7 @@ yaml@^1.10.0:
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==

yaml@^2.3.4:
version "2.6.0"
resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.0.tgz#14059ad9d0b1680d0f04d3a60fe00f3a857303c3"
integrity sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==

yaml@^2.7.0:
yaml@^2.3.4, yaml@^2.7.0:
version "2.7.0"
resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.7.0.tgz#aef9bb617a64c937a9a748803786ad8d3ffe1e98"
integrity sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==
Expand Down

0 comments on commit bea1a3c

Please sign in to comment.