Merge branch 'master' into feature/3703-typescript-support

grafana · May 23, 2024 · 93048e5 · 93048e5
2 parents daf55ee + befc4d5
commit 93048e5
Show file tree

Hide file tree

Showing 21 changed files with 491 additions and 131 deletions.
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/golang/protobuf v1.5.4
 	github.com/gorilla/websocket v1.5.1
 	github.com/grafana/xk6-browser v1.5.1
-	github.com/grafana/xk6-dashboard v0.7.2
+	github.com/grafana/xk6-dashboard v0.7.3
 	github.com/grafana/xk6-output-prometheus-remote v0.3.1
 	github.com/grafana/xk6-redis v0.2.0
 	github.com/grafana/xk6-webcrypto v0.3.0

diff --git a/go.sum b/go.sum
@@ -96,8 +96,8 @@ github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/
 github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/grafana/xk6-browser v1.5.1 h1:wexnBtx1raDniYcXkRQ9zfXvuJGjvixZag4kmiYG3tg=
 github.com/grafana/xk6-browser v1.5.1/go.mod h1:hD9H1zpe1Fvs6RCENKnaPqpObh6alz+hX00Xf5qvDE4=
-github.com/grafana/xk6-dashboard v0.7.2 h1:CLaWeRfPZ388IS6rBn0nI+lqtX50QoQ73z0Hz5BIrS4=
-github.com/grafana/xk6-dashboard v0.7.2/go.mod h1:7HLAY4udlWGXGDQL5gWIi+In3eZRljXi8AnHt1Z+lFM=
+github.com/grafana/xk6-dashboard v0.7.3 h1:47dxL87eMhpCIHSJTOnohTq3WIfCwvNriRTDvYNlsHY=
+github.com/grafana/xk6-dashboard v0.7.3/go.mod h1:7HLAY4udlWGXGDQL5gWIi+In3eZRljXi8AnHt1Z+lFM=
 github.com/grafana/xk6-output-prometheus-remote v0.3.1 h1:X23rQzlJD8dXWB31DkxR4uPnuRFo8L0Y0H22fSG9xl0=
 github.com/grafana/xk6-output-prometheus-remote v0.3.1/go.mod h1:0JLAm4ONsNUlNoxJXAwOCfA6GtDwTPs557OplAvE+3o=
 github.com/grafana/xk6-redis v0.2.0 h1:iXmAKVlAxafZ/h8ptuXTFhGu63IFsyDI8QjUgWm66BU=

diff --git a/vendor/github.com/grafana/xk6-dashboard/dashboard/aggregate.go b/vendor/github.com/grafana/xk6-dashboard/dashboard/aggregate.go
diff --git a/vendor/github.com/grafana/xk6-dashboard/dashboard/assets/packages/report/dist/index.html b/vendor/github.com/grafana/xk6-dashboard/dashboard/assets/packages/report/dist/index.html
diff --git a/...thub.com/grafana/xk6-dashboard/dashboard/assets/packages/ui/dist/assets/index-4796c824.js b/...thub.com/grafana/xk6-dashboard/dashboard/assets/packages/ui/dist/assets/index-4796c824.js
diff --git a/...hub.com/grafana/xk6-dashboard/dashboard/assets/packages/ui/dist/assets/index-8105e2d0.css b/...hub.com/grafana/xk6-dashboard/dashboard/assets/packages/ui/dist/assets/index-8105e2d0.css