Chore: Update oapi-codegen library (#62962)

* Update oapi library and thema * Use fork commit to fix elasticsearch and cloudwatch generators * Update thema * Fixes * Update thema with last fixes * Sync * Fix test * Update thema and schemas * Update thema
2 years ago · 7ace44c8b5
parent 5ca8ea40c1
commit 7ace44c8b5
22 changed files with 971 additions and 929 deletions
--- a/go.mod
+++ b/go.mod
@ -20,6 +20,9 @@ replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503
 // contains openapi encoder fixes. remove ASAP
 replace cuelang.org/go => github.com/sdboyer/cue v0.5.0-beta.2.0.20221218111347-341999f48bdb
 // contains go generation fixes
 replace github.com/deepmap/oapi-codegen => github.com/spinillos/oapi-codegen v1.12.5-0.20230206122001-6a05ca88e18e
 // For some insane reason, client-go seems to have a broken v12.0.0 tag on it that forces us to
 // hoist a replace statement.
 replace k8s.io/client-go => k8s.io/client-go v0.25.3
@ -112,11 +115,11 @@ require (
 	go.opentelemetry.io/otel/trace v1.11.2
 	golang.org/x/crypto v0.4.0
 	golang.org/x/exp v0.0.0-20221211140036-ad323defaf05
-	golang.org/x/net v0.4.0
+	golang.org/x/net v0.5.0
 	golang.org/x/oauth2 v0.3.0
 	golang.org/x/sync v0.1.0
 	golang.org/x/time v0.2.0
-	golang.org/x/tools v0.4.0
+	golang.org/x/tools v0.5.0
 	gonum.org/v1/gonum v0.11.0
 	google.golang.org/api v0.104.0
 	google.golang.org/grpc v1.51.0
@ -153,7 +156,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cheekybits/genny v1.0.0 // indirect
 	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
-	github.com/deepmap/oapi-codegen v1.10.1
+	github.com/deepmap/oapi-codegen v1.12.4
 	github.com/dennwc/varint v1.0.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/docker/go-units v0.5.0 // indirect
@ -226,8 +229,8 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.10.0
 	go.uber.org/goleak v1.2.0 // indirect
-	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/sys v0.4.0 // indirect
-	golang.org/x/text v0.5.0
+	golang.org/x/text v0.6.0
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef
@ -246,7 +249,7 @@ require (
 	github.com/bufbuild/connect-go v1.4.1
 	github.com/dlmiddlecote/sqlstats v1.0.2
 	github.com/drone/drone-cli v1.6.1
-	github.com/getkin/kin-openapi v0.107.0
+	github.com/getkin/kin-openapi v0.112.0
 	github.com/golang-migrate/migrate/v4 v4.7.0
 	github.com/google/go-github/v45 v45.2.0
 	github.com/grafana/codejen v0.0.3
@ -269,7 +272,7 @@ require (
 	buf.build/gen/go/parca-dev/parca/protocolbuffers/go v1.28.1-20221222094228-8b1d3d0f62e6.4
 	github.com/Masterminds/semver/v3 v3.1.1
 	github.com/dave/dst v0.27.2
-	github.com/grafana/thema v0.0.0-20230122235053-b4b6714dd1c9
+	github.com/grafana/thema v0.0.0-20230221105543-a6a177d234d7
 	github.com/hmarr/codeowners v1.1.1
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f
 )
@ -281,6 +284,7 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/bmatcuk/doublestar v1.1.1 // indirect
 	github.com/buildkite/yaml v2.1.0+incompatible // indirect
@ -377,7 +381,7 @@ require (
 	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
 	github.com/klauspost/compress v1.15.13 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
-	github.com/labstack/echo/v4 v4.9.1 // indirect
+	github.com/labstack/echo/v4 v4.10.0 // indirect
 	github.com/labstack/gommon v0.4.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
--- a/go.sum
+++ b/go.sum
@ -254,6 +254,7 @@ github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
 github.com/RoaringBitmap/gocroaring v0.4.0/go.mod h1:NieMwz7ZqwU2DD73/vvYwv7r4eWBKuPVSXZIpsaMwCI=
 github.com/RoaringBitmap/real-roaring-datasets v0.0.0-20190726190000-eb7c87156f76/go.mod h1:oM0MHmQ3nDsq609SS36p+oYbRi16+oVvU2Bw4Ipv0SE=
 github.com/RoaringBitmap/roaring v0.9.1/go.mod h1:h1B7iIUOmnAeb5ytYMvnHJwxMc6LUrwBnzXWRuqTQUc=
@ -300,6 +301,8 @@ github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40/go.mod h1:Q7
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.14.2/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
@ -611,7 +614,6 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3pglZ5oH4=
 github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v9FBN7gdVTpiD/+LZ7Po0UKvROyT87uLVxTHVky/dlQ=
 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=
 github.com/cznic/b v0.0.0-20180115125044-35e9bbe41f07/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
 github.com/cznic/fileutil v0.0.0-20180108211300-6a051e75936f/go.mod h1:8S58EK26zhXSxzv7NQFpnliaOQsmDUxvoQO3rt154Vg=
@ -641,10 +643,6 @@ github.com/dchest/uniuri v1.2.0/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4
 github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d/go.mod h1:tmAIfUFEirG/Y8jhZ9M+h36obRZAk/1fcSpXwAVlfqE=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
 github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M=
 github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw=
 github.com/deepmap/oapi-codegen v1.10.1 h1:xybuJUR6D8l7P+LAuxOm5SD7nTlFKHWvOPl31q+DDVs=
 github.com/deepmap/oapi-codegen v1.10.1/go.mod h1:TvVmDQlUkFli9gFij/gtW1o+tFBr4qCHyv2zG+R0YZY=
 github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE=
 github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA=
 github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
@ -781,12 +779,9 @@ github.com/gchaincl/sqlhooks v1.3.0 h1:yKPXxW9a5CjXaVf2HkQn6wn7TZARvbAOAelr3H8vK
 github.com/gchaincl/sqlhooks v1.3.0/go.mod h1:9BypXnereMT0+Ys8WGWHqzgkkOfHIhyeUCqXC24ra34=
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
 github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM=
 github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
 github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
 github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
-github.com/getkin/kin-openapi v0.94.0/go.mod h1:LWZfzOd7PRy8GJ1dJ6mCU6tNdSfOwRac1BUPam4aw6Q=
+github.com/getkin/kin-openapi v0.112.0 h1:lnLXx3bAG53EJVI4E/w0N8i1Y/vUZUEsnrXkgnfn7/Y=
-github.com/getkin/kin-openapi v0.107.0 h1:bxhL6QArW7BXQj8NjXfIJQy680NsMKd25nwhvpCXchg=
+github.com/getkin/kin-openapi v0.112.0/go.mod h1:QtwUNt0PAAgIIBEvFWYfB7dfngxtAaqCX1zYHMZDeK8=
 github.com/getkin/kin-openapi v0.107.0/go.mod h1:9Dhr+FasATJZjS4iOLvB0hkaxgYdulrNYm2e9epLWOo=
 github.com/getsentry/sentry-go v0.13.0 h1:20dgTiUSfxRB/EhMPtxcL9ZEbM1ZdR+W/7f7NWD+xWo=
 github.com/getsentry/sentry-go v0.13.0/go.mod h1:EOsfu5ZdvKPfeHYV6pTVQnsjfp30+XA7//UooKNumH0=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@ -797,7 +792,7 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm
 github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.7.3/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
-github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
+github.com/gin-gonic/gin v1.8.2/go.mod h1:qw5AYuDrzRTnhvusDsrov+fDIxp9Dleuu12h8nfB398=
 github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
@ -805,8 +800,7 @@ github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0
 github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
 github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24=
 github.com/go-chi/chi v4.1.0+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
-github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs=
+github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
 github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
@ -984,7 +978,7 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+
 github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-playground/validator/v10 v10.10.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
+github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 h1:JVrqSeQfdhYRFk24TvhTZWU0q8lfCojxZQFi3Ou7+uY=
@ -1034,7 +1028,8 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJA
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/goccy/go-json v0.9.6/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA=
 github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0=
 github.com/gocql/gocql v0.0.0-20200228163523-cd4b606dd2fb/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY=
@ -1277,8 +1272,8 @@ github.com/grafana/saml v0.4.13-0.20230203140620-5f476db5c00a h1:aWSTt/pTOI4uGY9
 github.com/grafana/saml v0.4.13-0.20230203140620-5f476db5c00a/go.mod h1:igEejV+fihTIlHXYP8zOec3V5A8y3lws5bQBFsTm4gA=
 github.com/grafana/sqlds/v2 v2.3.10 h1:HWKhE0vR6LoEiE+Is8CSZOgaB//D1yqb2ntkass9Fd4=
 github.com/grafana/sqlds/v2 v2.3.10/go.mod h1:c6ibxnxRVGxV/0YkEgvy7QpQH/lyifFyV7K/14xvdIs=
-github.com/grafana/thema v0.0.0-20230122235053-b4b6714dd1c9 h1:nAdsZkvPYNH6wDPkAi9JaDSIf5i2iVz4+Rqk4AOt6sE=
+github.com/grafana/thema v0.0.0-20230221105543-a6a177d234d7 h1:qTb0okVkF2FIpFd9WWjiKkH3+tnQBsee5fSt3d6Q6Ak=
-github.com/grafana/thema v0.0.0-20230122235053-b4b6714dd1c9/go.mod h1:5j2nf4xmWhKr+1vyGouML8eJ8xERS5Jw/lhjs0eyz78=
+github.com/grafana/thema v0.0.0-20230221105543-a6a177d234d7/go.mod h1:PnyQW9mxG+0JLU+sVuyWoVustAY0WtMJEM0fl/ms8IA=
 github.com/grafana/xorm v0.8.3-0.20220614223926-2fcda7565af6 h1:I9dh1MXGX0wGyxdV/Sl7+ugnki4Dfsy8lv2s5Yf887o=
 github.com/grafana/xorm v0.8.3-0.20220614223926-2fcda7565af6/go.mod h1:ZkJLEYLoVyg7amJK/5r779bHyzs2AU8f8VMiP6BM7uY=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
@ -1537,6 +1532,7 @@ github.com/jsternberg/zap-logfmt v1.2.0/go.mod h1:kz+1CUmCutPWABnNkOu9hOHKdT2q3T
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
@ -1591,12 +1587,8 @@ github.com/kshvakov/clickhouse v1.3.5/go.mod h1:DMzX7FxRymoNkVgizH0DWAL8Cur7wHLg
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
+github.com/labstack/echo/v4 v4.10.0 h1:5CiyngihEO4HXsz3vVsJn7f8xAlWwRr3aY6Ih280ZKA=
-github.com/labstack/echo/v4 v4.7.2/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks=
+github.com/labstack/echo/v4 v4.10.0/go.mod h1:S/T/5fy/GigaXnHTkh0ZGe4LpkkQysvRjFMSUTkDRNQ=
 github.com/labstack/echo/v4 v4.9.1 h1:GliPYSpzGKlyOhqIbG8nmHBo3i1saKWFOgh41AN3b+Y=
 github.com/labstack/echo/v4 v4.9.1/go.mod h1:Pop5HLc+xoc4qhTZ1ip6C0RtP7Z+4VzRLWZZFKqbbjo=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
 github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
 github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
 github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353 h1:X/79QL0b4YJVO5+OsPH9rF2u428CIrGL/jLmPsoOQQ4=
@ -1607,11 +1599,9 @@ github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ic
 github.com/leoluk/perflib_exporter v0.1.0/go.mod h1:rpV0lYj7lemdTm31t7zpCqYqPnw7xs86f+BaaNBVYFM=
 github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y=
 github.com/lestrrat-go/blackmagic v1.0.0/go.mod h1:TNgH//0vYSs8VXDCfkZLgIrVTTXQELZffUV0tz3MtdQ=
 github.com/lestrrat-go/blackmagic v1.0.1/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
 github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
 github.com/lestrrat-go/iter v1.0.1/go.mod h1:zIdgO1mRKhn8l9vrZJZz9TUMMFbQbLeTsbqPDrJ/OJc=
-github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4=
+github.com/lestrrat-go/jwx v1.2.25/go.mod h1:zoNuZymNl5lgdcu6P7K6ie2QRll5HVfF4xwxBBK1NxY=
 github.com/lestrrat-go/jwx v1.2.23/go.mod h1:sAXjRwzSvCN6soO4RLoWWm1bVPpb8iOuv0IYfH8OWd8=
 github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@ -1656,18 +1646,15 @@ github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHef
 github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
 github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
-github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
+github.com/matryer/moq v0.3.0/go.mod h1:RJ75ZZZD71hejp39j4crZLsEDszGk6iH4v4YsWFKH4s=
 github.com/matryer/moq v0.2.7/go.mod h1:kITsx543GOENm48TUAQyJ9+SAvFSr7iGQXPoth/VUBk=
 github.com/mattermost/xml-roundtrip-validator v0.1.0 h1:RXbVD2UAl7A7nOTR4u7E3ILa4IbtvKBHw64LDsmu9hU=
 github.com/mattermost/xml-roundtrip-validator v0.1.0/go.mod h1:qccnGMcpgwcNaBnxqpJpWWUiPNr5H3O8eDgGV9gT5To=
 github.com/mattetti/filebuffer v1.0.1 h1:gG7pyfnSIZCxdoKq+cPa8T0hhYtD9NxCdI4D7PTjRLM=
 github.com/mattetti/filebuffer v1.0.1/go.mod h1:YdMURNDOttIiruleeVr6f56OrMc+MydEnTcXwtkxNVs=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
@ -1908,6 +1895,7 @@ github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrap
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas=
 github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
 github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
@ -2155,6 +2143,9 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
 github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw=
 github.com/spinillos/oapi-codegen v1.12.5-0.20230206122001-6a05ca88e18e h1:u26eIR7m9RHWnWtmzBXwiFgmgNvbHCNdUnnS9tksUmc=
 github.com/spinillos/oapi-codegen v1.12.5-0.20230206122001-6a05ca88e18e/go.mod h1:rlTe8FCRfdpXt+2S5m4T281CO5fnzt1EhDDeW8ZvS1E=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
 github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
@ -2240,7 +2231,6 @@ github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
@ -2469,7 +2459,6 @@ golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200422194213-44a606286825/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@ -2482,21 +2471,21 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211115234514-b4de73f9ece8/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
 golang.org/x/crypto v0.2.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
 golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@ -2639,7 +2628,6 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su
 golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
@ -2647,9 +2635,11 @@ golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
 golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
 golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@ -2781,7 +2771,6 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@ -2862,15 +2851,19 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
 golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
+golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
 golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg=
 golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@ -2884,21 +2877,20 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
 golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20220411224347-583f2d630306/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.2.0 h1:52I/1L54xyEQAYdtcSuxtiT84KGYTBGXwayxmIpNJhE=
 golang.org/x/time v0.2.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@ -2993,8 +2985,10 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.4.0 h1:7mTAgkunk3fr4GAloyyCasadO6h9zSsQZbwvcaIciV4=
+golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
 golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
 golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
 golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- a/pkg/api/playlist_play.go
+++ b/pkg/api/playlist_play.go
@ -78,7 +78,7 @@ func (hs *HTTPServer) LoadPlaylistDashboards(ctx context.Context, orgID int64, s
 		return result, err
 	}
-	playlistItems := *dto.Items
+	playlistItems := dto.Items
 	dashboardByIDs := make([]int64, 0)
 	dashboardByTag := make([]string, 0)
--- a/pkg/codegen/coremodel.go
+++ b/pkg/codegen/coremodel.go
@ -183,13 +183,21 @@ func (cd *CoremodelDeclaration) GenerateGoCoremodel(path string) (WriteDiffer, e
 		return nil, fmt.Errorf("error executing imports template: %w", err)
 	}
-	gostr, err := codegen.Generate(oT, lin.Name(), codegen.Options{
+	gostr, err := codegen.Generate(oT, codegen.Configuration{
-		GenerateTypes: true,
+		PackageName: lin.Name(),
-		SkipPrune:     true,
+		Generate: codegen.GenerateOptions{
-		SkipFmt:       true,
+			Models: true,
-		UserTemplates: map[string]string{
+		},
-			"imports.tmpl": importbuf.String(),
+		Compatibility: codegen.CompatibilityOptions{
-			"typedef.tmpl": tmplTypedef,
+			AlwaysPrefixEnumValues: true,
 		},
 		OutputOptions: codegen.OutputOptions{
 			SkipFmt:   true,
 			SkipPrune: true,
 			UserTemplates: map[string]string{
 				"imports.tmpl": importbuf.String(),
 				"typedef.tmpl": tmplTypedef,
 			},
 		},
 	})
 	if err != nil {
--- a/pkg/kinds/dashboard/dashboard_types_gen.go
+++ b/pkg/kinds/dashboard/dashboard_types_gen.go
@ -12,47 +12,37 @@ package dashboard
 // Defines values for Style.
 const (
-	StyleDark Style = "dark"
+	StyleDark  Style = "dark"
 	StyleLight Style = "light"
 )
 // Defines values for CursorSync.
 const (
 	CursorSyncN0 CursorSync = 0
 	CursorSyncN1 CursorSync = 1
 	CursorSyncN2 CursorSync = 2
 )
 // Defines values for LinkType.
 const (
 	LinkTypeDashboards LinkType = "dashboards"
-
+	LinkTypeLink       LinkType = "link"
 	LinkTypeLink LinkType = "link"
 )
 // Defines values for FieldColorModeId.
 const (
 	FieldColorModeIdContinuousGrYlRd FieldColorModeId = "continuous-GrYlRd"
-
+	FieldColorModeIdFixed            FieldColorModeId = "fixed"
-	FieldColorModeIdFixed FieldColorModeId = "fixed"
+	FieldColorModeIdPaletteClassic   FieldColorModeId = "palette-classic"
 	FieldColorModeIdPaletteClassic FieldColorModeId = "palette-classic"
 	FieldColorModeIdPaletteSaturated FieldColorModeId = "palette-saturated"
-
+	FieldColorModeIdThresholds       FieldColorModeId = "thresholds"
 	FieldColorModeIdThresholds FieldColorModeId = "thresholds"
 )
 // Defines values for FieldColorSeriesByMode.
 const (
 	FieldColorSeriesByModeLast FieldColorSeriesByMode = "last"
-
+	FieldColorSeriesByModeMax  FieldColorSeriesByMode = "max"
-	FieldColorSeriesByModeMax FieldColorSeriesByMode = "max"
+	FieldColorSeriesByModeMin  FieldColorSeriesByMode = "min"
 	FieldColorSeriesByModeMin FieldColorSeriesByMode = "min"
 )
 // Defines values for GraphPanelType.
@ -67,35 +57,43 @@ const (
 // Defines values for LoadingState.
 const (
-	LoadingStateDone LoadingState = "Done"
+	LoadingStateDone       LoadingState = "Done"
-
+	LoadingStateError      LoadingState = "Error"
-	LoadingStateError LoadingState = "Error"
+	LoadingStateLoading    LoadingState = "Loading"
 	LoadingStateLoading LoadingState = "Loading"
 	LoadingStateNotStarted LoadingState = "NotStarted"
-
+	LoadingStateStreaming  LoadingState = "Streaming"
 	LoadingStateStreaming LoadingState = "Streaming"
 )
 // Defines values for MappingType.
 const (
-	MappingTypeRange MappingType = "range"
+	MappingTypeRange   MappingType = "range"
-
+	MappingTypeRegex   MappingType = "regex"
 	MappingTypeRegex MappingType = "regex"
 	MappingTypeSpecial MappingType = "special"
-
+	MappingTypeValue   MappingType = "value"
 	MappingTypeValue MappingType = "value"
 )
 // Defines values for PanelRepeatDirection.
 const (
 	PanelRepeatDirectionH PanelRepeatDirection = "h"
 	PanelRepeatDirectionV PanelRepeatDirection = "v"
 )
 // Defines values for RangeMapType.
 const (
 	RangeMapTypeRange   RangeMapType = "range"
 	RangeMapTypeRegex   RangeMapType = "regex"
 	RangeMapTypeSpecial RangeMapType = "special"
 	RangeMapTypeValue   RangeMapType = "value"
 )
 // Defines values for RegexMapType.
 const (
 	RegexMapTypeRange   RegexMapType = "range"
 	RegexMapTypeRegex   RegexMapType = "regex"
 	RegexMapTypeSpecial RegexMapType = "special"
 	RegexMapTypeValue   RegexMapType = "value"
 )
 // Defines values for RowPanelType.
 const (
 	RowPanelTypeRow RowPanelType = "row"
@ -104,58 +102,58 @@ const (
 // Defines values for SpecialValueMapOptionsMatch.
 const (
 	SpecialValueMapOptionsMatchFalse SpecialValueMapOptionsMatch = "false"
 	SpecialValueMapOptionsMatchTrue  SpecialValueMapOptionsMatch = "true"
 )
-	SpecialValueMapOptionsMatchTrue SpecialValueMapOptionsMatch = "true"
+// Defines values for SpecialValueMapType.
 const (
 	SpecialValueMapTypeRange   SpecialValueMapType = "range"
 	SpecialValueMapTypeRegex   SpecialValueMapType = "regex"
 	SpecialValueMapTypeSpecial SpecialValueMapType = "special"
 	SpecialValueMapTypeValue   SpecialValueMapType = "value"
 )
 // Defines values for SpecialValueMatch.
 const (
-	SpecialValueMatchEmpty SpecialValueMatch = "empty"
+	SpecialValueMatchEmpty   SpecialValueMatch = "empty"
-
+	SpecialValueMatchFalse   SpecialValueMatch = "false"
-	SpecialValueMatchFalse SpecialValueMatch = "false"
+	SpecialValueMatchNan     SpecialValueMatch = "nan"
-
+	SpecialValueMatchNull    SpecialValueMatch = "null"
 	SpecialValueMatchNan SpecialValueMatch = "nan"
 	SpecialValueMatchNull SpecialValueMatch = "null"
 	SpecialValueMatchNullNan SpecialValueMatch = "null+nan"
-
+	SpecialValueMatchTrue    SpecialValueMatch = "true"
 	SpecialValueMatchTrue SpecialValueMatch = "true"
 )
 // Defines values for ThresholdsMode.
 const (
-	ThresholdsModeAbsolute ThresholdsMode = "absolute"
+	ThresholdsModeAbsolute   ThresholdsMode = "absolute"
 	ThresholdsModePercentage ThresholdsMode = "percentage"
 )
 // Defines values for ValueMapType.
 const (
 	ValueMapTypeRange   ValueMapType = "range"
 	ValueMapTypeRegex   ValueMapType = "regex"
 	ValueMapTypeSpecial ValueMapType = "special"
 	ValueMapTypeValue   ValueMapType = "value"
 )
 // Defines values for VariableHide.
 const (
 	VariableHideN0 VariableHide = 0
 	VariableHideN1 VariableHide = 1
 	VariableHideN2 VariableHide = 2
 )
 // Defines values for VariableType.
 const (
-	VariableTypeAdhoc VariableType = "adhoc"
+	VariableTypeAdhoc      VariableType = "adhoc"
-
+	VariableTypeConstant   VariableType = "constant"
-	VariableTypeConstant VariableType = "constant"
+	VariableTypeCustom     VariableType = "custom"
 	VariableTypeCustom VariableType = "custom"
 	VariableTypeDatasource VariableType = "datasource"
-
+	VariableTypeInterval   VariableType = "interval"
-	VariableTypeInterval VariableType = "interval"
+	VariableTypeQuery      VariableType = "query"
-
+	VariableTypeSystem     VariableType = "system"
-	VariableTypeQuery VariableType = "query"
+	VariableTypeTextbox    VariableType = "textbox"
 	VariableTypeSystem VariableType = "system"
 	VariableTypeTextbox VariableType = "textbox"
 )
 // TODO docs
@ -202,7 +200,7 @@ type AnnotationTarget struct {
 type Dashboard struct {
 	// TODO docs
 	Annotations *struct {
-		List *[]AnnotationQuery `json:"list,omitempty"`
+		List []AnnotationQuery `json:"list,omitempty"`
 	} `json:"annotations,omitempty"`
 	// Description of dashboard.
@ -227,13 +225,13 @@ type Dashboard struct {
 	Id *int64 `json:"id,omitempty"`
 	// TODO docs
-	Links *[]Link `json:"links,omitempty"`
+	Links []Link `json:"links,omitempty"`
 	// When set to true, the dashboard will redraw panels at an interval matching the pixel width.
 	// This will keep data "moving left" regardless of the query refresh rate.  This setting helps
 	// avoid dashboards presenting stale live data
-	LiveNow *bool          `json:"liveNow,omitempty"`
+	LiveNow *bool         `json:"liveNow,omitempty"`
-	Panels  *[]interface{} `json:"panels,omitempty"`
+	Panels  []interface{} `json:"panels,omitempty"`
 	// Refresh rate of dashboard. Represented via interval string, e.g. "5s", "1m", "1h", "1d".
 	Refresh *interface{} `json:"refresh,omitempty"`
@ -255,11 +253,11 @@ type Dashboard struct {
 	Style Style `json:"style"`
 	// Tags associated with dashboard.
-	Tags *[]string `json:"tags,omitempty"`
+	Tags []string `json:"tags,omitempty"`
 	// TODO docs
 	Templating *struct {
-		List *[]VariableModel `json:"list,omitempty"`
+		List []VariableModel `json:"list,omitempty"`
 	} `json:"templating,omitempty"`
 	// Time range for dashboard, e.g. last 6 hours, last 7 days, etc
@ -366,7 +364,7 @@ type FieldColor struct {
 	FixedColor *string `json:"fixedColor,omitempty"`
 	// The main color scheme mode
-	Mode interface{} `json:"mode"`
+	Mode string `json:"mode"`
 	// TODO docs
 	SeriesBy *FieldColorSeriesByMode `json:"seriesBy,omitempty"`
@ -385,7 +383,7 @@ type FieldConfig struct {
 	// custom is specified by the PanelFieldConfig field
 	// in panel plugin schemas.
-	Custom *map[string]interface{} `json:"custom,omitempty"`
+	Custom map[string]interface{} `json:"custom,omitempty"`
 	// Significant digits (for display)
 	Decimals *float32 `json:"decimals,omitempty"`
@ -404,12 +402,12 @@ type FieldConfig struct {
 	Filterable *bool `json:"filterable,omitempty"`
 	// The behavior when clicking on a result
-	Links *[]interface{} `json:"links,omitempty"`
+	Links []interface{} `json:"links,omitempty"`
 	// Convert input values into a display string
-	Mappings *[]ValueMapping `json:"mappings,omitempty"`
+	Mappings []interface{} `json:"mappings,omitempty"`
-	Max      *float32        `json:"max,omitempty"`
+	Max      *float32      `json:"max,omitempty"`
-	Min      *float32        `json:"min,omitempty"`
+	Min      *float32      `json:"min,omitempty"`
 	// Alternative to empty string
 	NoValue *string `json:"noValue,omitempty"`
@ -454,13 +452,13 @@ type GraphPanelType string
 // GridPos defines model for GridPos.
 type GridPos struct {
-	// Panel
+	// H Panel
 	H int `json:"h"`
-	// true if fixed
+	// Static true if fixed
 	Static *bool `json:"static,omitempty"`
-	// Panel
+	// W Panel
 	W int `json:"w"`
 	// Panel x
@ -506,7 +504,7 @@ type Panel struct {
 		Uid  *string `json:"uid,omitempty"`
 	} `json:"datasource,omitempty"`
-	// Description.
+	// Description Description.
 	Description *string           `json:"description,omitempty"`
 	FieldConfig FieldConfigSource `json:"fieldConfig"`
 	GridPos     *GridPos          `json:"gridPos,omitempty"`
@ -521,7 +519,7 @@ type Panel struct {
 	// Panel links.
 	// TODO fill this out - seems there are a couple variants?
-	Links *[]Link `json:"links,omitempty"`
+	Links []Link `json:"links,omitempty"`
 	// TODO docs
 	MaxDataPoints *float32 `json:"maxDataPoints,omitempty"`
@ -545,20 +543,20 @@ type Panel struct {
 	RepeatPanelId *int64 `json:"repeatPanelId,omitempty"`
 	// TODO docs
-	Tags *[]string `json:"tags,omitempty"`
+	Tags []string `json:"tags,omitempty"`
 	// TODO docs
-	Targets *[]Target `json:"targets,omitempty"`
+	Targets []Target `json:"targets,omitempty"`
 	// TODO docs - seems to be an old field from old dashboard alerts?
-	Thresholds *[]interface{} `json:"thresholds,omitempty"`
+	Thresholds []interface{} `json:"thresholds,omitempty"`
 	// TODO docs
 	// TODO tighter constraint
 	TimeFrom *string `json:"timeFrom,omitempty"`
 	// TODO docs
-	TimeRegions *[]interface{} `json:"timeRegions,omitempty"`
+	TimeRegions []interface{} `json:"timeRegions,omitempty"`
 	// TODO docs
 	// TODO tighter constraint
@ -583,20 +581,19 @@ type PanelRepeatDirection string
 // TODO docs
 type RangeMap struct {
 	Options struct {
-		// to and from are `number | null` in current ts, really not sure what to do
+		// From to and from are `number | null` in current ts, really not sure what to do
 		From float64 `json:"from"`
 		// TODO docs
 		Result ValueMappingResult `json:"result"`
 		To     float64            `json:"to"`
 	} `json:"options"`
-	Type struct {
+	Type RangeMapType `json:"type"`
 		// Embedded struct due to allOf(#/components/schemas/MappingType)
 		MappingType `yaml:",inline"`
 		// Embedded fields due to inline allOf schema
 	} `json:"type"`
 }
 // RangeMapType defines model for RangeMap.Type.
 type RangeMapType string
 // TODO docs
 type RegexMap struct {
 	Options struct {
@ -605,13 +602,12 @@ type RegexMap struct {
 		// TODO docs
 		Result ValueMappingResult `json:"result"`
 	} `json:"options"`
-	Type struct {
+	Type RegexMapType `json:"type"`
 		// Embedded struct due to allOf(#/components/schemas/MappingType)
 		MappingType `yaml:",inline"`
 		// Embedded fields due to inline allOf schema
 	} `json:"type"`
 }
 // RegexMapType defines model for RegexMap.Type.
 type RegexMapType string
 // Row panel
 type RowPanel struct {
 	Collapsed bool `json:"collapsed"`
@ -679,16 +675,15 @@ type SpecialValueMap struct {
 		// TODO docs
 		Result ValueMappingResult `json:"result"`
 	} `json:"options"`
-	Type struct {
+	Type SpecialValueMapType `json:"type"`
 		// Embedded struct due to allOf(#/components/schemas/MappingType)
 		MappingType `yaml:",inline"`
 		// Embedded fields due to inline allOf schema
 	} `json:"type"`
 }
 // SpecialValueMapOptionsMatch defines model for SpecialValueMap.Options.Match.
 type SpecialValueMapOptionsMatch string
 // SpecialValueMapType defines model for SpecialValueMap.Type.
 type SpecialValueMapType string
 // TODO docs
 type SpecialValueMatch string
@ -699,7 +694,7 @@ type SpecialValueMatch string
 // with types derived from plugins in the Instance variant.
 // When working directly from CUE, importers can extend this
 // type directly to achieve the same effect.
-type Target map[string]interface{}
+type Target = map[string]interface{}
 // TODO docs
 type Threshold struct {
@ -730,15 +725,11 @@ type ThresholdsMode string
 // TODO docs
 type ValueMap struct {
 	Options map[string]ValueMappingResult `json:"options"`
-	Type    struct {
+	Type    ValueMapType                  `json:"type"`
 		// Embedded struct due to allOf(#/components/schemas/MappingType)
 		MappingType `yaml:",inline"`
 		// Embedded fields due to inline allOf schema
 	} `json:"type"`
 }
-// TODO docs
+// ValueMapType defines model for ValueMap.Type.
-type ValueMapping interface{}
+type ValueMapType string
 // TODO docs
 type ValueMappingResult struct {
@ -757,15 +748,15 @@ type VariableHide int
 // TODO there appear to be a lot of different kinds of [template] vars here? if so need a disjunction
 type VariableModel struct {
 	// Ref to a DataSource instance
-	Datasource  *DataSourceRef          `json:"datasource,omitempty"`
+	Datasource  *DataSourceRef         `json:"datasource,omitempty"`
-	Description *string                 `json:"description,omitempty"`
+	Description *string                `json:"description,omitempty"`
-	Error       *map[string]interface{} `json:"error,omitempty"`
+	Error       map[string]interface{} `json:"error,omitempty"`
-	Global      bool                    `json:"global"`
+	Global      bool                   `json:"global"`
-	Hide        VariableHide            `json:"hide"`
+	Hide        VariableHide           `json:"hide"`
-	Id          string                  `json:"id"`
+	Id          string                 `json:"id"`
-	Index       int                     `json:"index"`
+	Index       int                    `json:"index"`
-	Label       *string                 `json:"label,omitempty"`
+	Label       *string                `json:"label,omitempty"`
-	Name        string                  `json:"name"`
+	Name        string                 `json:"name"`
 	// TODO: Move this into a separated QueryVariableModel type
 	Query        *interface{} `json:"query,omitempty"`
--- a/pkg/kinds/librarypanel/librarypanel_types_gen.go
+++ b/pkg/kinds/librarypanel/librarypanel_types_gen.go
@ -53,6 +53,6 @@ type LibraryPanel struct {
 	// Library element UID
 	Uid string `json:"uid"`
-	// panel version, incremented each time the dashboard is updated.
+	// Version panel version, incremented each time the dashboard is updated.
 	Version int64 `json:"version"`
 }
--- a/pkg/kinds/playlist/playlist_types_gen.go
+++ b/pkg/kinds/playlist/playlist_types_gen.go
@ -12,10 +12,8 @@ package playlist
 // Defines values for ItemType.
 const (
-	ItemTypeDashboardById ItemType = "dashboard_by_id"
+	ItemTypeDashboardById  ItemType = "dashboard_by_id"
 	ItemTypeDashboardByTag ItemType = "dashboard_by_tag"
 	ItemTypeDashboardByUid ItemType = "dashboard_by_uid"
 )
@ -27,7 +25,7 @@ type Playlist struct {
 	// The ordered list of items that the playlist will iterate over.
 	// FIXME! This should not be optional, but changing it makes the godegen awkward
-	Items *[]Item `json:"items,omitempty"`
+	Items []Item `json:"items,omitempty"`
 	// Name of the playlist.
 	Name string `json:"name"`
--- a/pkg/kinds/preferences/preferences_types_gen.go
+++ b/pkg/kinds/preferences/preferences_types_gen.go
@ -19,19 +19,19 @@ type Preferences struct {
 	Language     *string                 `json:"language,omitempty"`
 	QueryHistory *QueryHistoryPreference `json:"queryHistory,omitempty"`
-	// light, dark, empty is default
+	// Theme light, dark, empty is default
 	Theme *string `json:"theme,omitempty"`
 	// The timezone selection
 	// TODO: this should use the timezone defined in common
 	Timezone *string `json:"timezone,omitempty"`
-	// day of the week (sunday, monday, etc)
+	// WeekStart day of the week (sunday, monday, etc)
 	WeekStart *string `json:"weekStart,omitempty"`
 }
 // QueryHistoryPreference defines model for QueryHistoryPreference.
 type QueryHistoryPreference struct {
-	// one of: '' | 'query' | 'starred';
+	// HomeTab one of: '' | 'query' | 'starred';
 	HomeTab *string `json:"homeTab,omitempty"`
 }
--- a/pkg/kinds/serviceaccount/serviceaccount_types_gen.go
+++ b/pkg/kinds/serviceaccount/serviceaccount_types_gen.go
@ -12,10 +12,8 @@ package serviceaccount
 // Defines values for OrgRole.
 const (
-	OrgRoleAdmin OrgRole = "Admin"
+	OrgRoleAdmin  OrgRole = "Admin"
 	OrgRoleEditor OrgRole = "Editor"
 	OrgRoleViewer OrgRole = "Viewer"
 )
@ -53,7 +51,7 @@ type ServiceAccount struct {
 	Role OrgRole `json:"role"`
 	// Teams is a list of teams the service account belongs to.
-	Teams *[]string `json:"teams,omitempty"`
+	Teams []string `json:"teams,omitempty"`
 	// Tokens is the number of active tokens for the service account.
 	// Tokens are used to authenticate the service account against Grafana.
--- a/pkg/kinds/team/team_types_gen.go
+++ b/pkg/kinds/team/team_types_gen.go
@ -13,11 +13,8 @@ package team
 // Defines values for Permission.
 const (
 	PermissionN0 Permission = 0
 	PermissionN1 Permission = 1
 	PermissionN2 Permission = 2
 	PermissionN4 Permission = 4
 )
--- a/pkg/plugins/plugindef/plugindef_types_gen.go
+++ b/pkg/plugins/plugindef/plugindef_types_gen.go
@ -11,22 +11,17 @@ package plugindef
 // Defines values for BasicRole.
 const (
-	BasicRoleAdmin BasicRole = "Admin"
+	BasicRoleAdmin        BasicRole = "Admin"
-
+	BasicRoleEditor       BasicRole = "Editor"
 	BasicRoleEditor BasicRole = "Editor"
 	BasicRoleGrafanaAdmin BasicRole = "Grafana Admin"
-
+	BasicRoleViewer       BasicRole = "Viewer"
 	BasicRoleViewer BasicRole = "Viewer"
 )
 // Defines values for DependencyType.
 const (
-	DependencyTypeApp DependencyType = "app"
+	DependencyTypeApp        DependencyType = "app"
 	DependencyTypeDatasource DependencyType = "datasource"
-
+	DependencyTypePanel      DependencyType = "panel"
 	DependencyTypePanel DependencyType = "panel"
 )
 // Defines values for ExtensionsLinkType.
@ -36,71 +31,49 @@ const (
 // Defines values for IncludeRole.
 const (
-	IncludeRoleAdmin IncludeRole = "Admin"
+	IncludeRoleAdmin  IncludeRole = "Admin"
 	IncludeRoleEditor IncludeRole = "Editor"
 	IncludeRoleViewer IncludeRole = "Viewer"
 )
 // Defines values for IncludeType.
 const (
-	IncludeTypeApp IncludeType = "app"
+	IncludeTypeApp            IncludeType = "app"
-
+	IncludeTypeDashboard      IncludeType = "dashboard"
-	IncludeTypeDashboard IncludeType = "dashboard"
+	IncludeTypeDatasource     IncludeType = "datasource"
-
+	IncludeTypePage           IncludeType = "page"
-	IncludeTypeDatasource IncludeType = "datasource"
+	IncludeTypePanel          IncludeType = "panel"
-
+	IncludeTypeRenderer       IncludeType = "renderer"
 	IncludeTypePage IncludeType = "page"
 	IncludeTypePanel IncludeType = "panel"
 	IncludeTypeRenderer IncludeType = "renderer"
 	IncludeTypeSecretsmanager IncludeType = "secretsmanager"
 )
 // Defines values for Category.
 const (
-	CategoryCloud Category = "cloud"
+	CategoryCloud      Category = "cloud"
 	CategoryEnterprise Category = "enterprise"
-
+	CategoryLogging    Category = "logging"
-	CategoryLogging Category = "logging"
+	CategoryOther      Category = "other"
-
+	CategoryProfiling  Category = "profiling"
-	CategoryOther Category = "other"
+	CategorySql        Category = "sql"
-
+	CategoryTracing    Category = "tracing"
-	CategoryProfiling Category = "profiling"
+	CategoryTsdb       Category = "tsdb"
 	CategorySql Category = "sql"
 	CategoryTracing Category = "tracing"
 	CategoryTsdb Category = "tsdb"
 )
 // Defines values for Type.
 const (
-	TypeApp Type = "app"
+	TypeApp            Type = "app"
-
+	TypeDatasource     Type = "datasource"
-	TypeDatasource Type = "datasource"
+	TypePanel          Type = "panel"
-
+	TypeRenderer       Type = "renderer"
 	TypePanel Type = "panel"
 	TypeRenderer Type = "renderer"
 	TypeSecretsmanager Type = "secretsmanager"
 )
 // Defines values for ReleaseState.
 const (
-	ReleaseStateAlpha ReleaseState = "alpha"
+	ReleaseStateAlpha      ReleaseState = "alpha"
-
+	ReleaseStateBeta       ReleaseState = "beta"
 	ReleaseStateBeta ReleaseState = "beta"
 	ReleaseStateDeprecated ReleaseState = "deprecated"
-
+	ReleaseStateStable     ReleaseState = "stable"
 	ReleaseStateStable ReleaseState = "stable"
 )
 // BasicRole is a Grafana basic role, which can be 'Viewer', 'Editor', 'Admin' or 'Grafana Admin'.
@ -137,7 +110,7 @@ type Dependencies struct {
 	GrafanaVersion *string `json:"grafanaVersion,omitempty"`
 	// An array of required plugins on which this plugin depends.
-	Plugins *[]Dependency `json:"plugins,omitempty"`
+	Plugins []Dependency `json:"plugins,omitempty"`
 }
 // Dependency describes another plugin on which a plugin depends.
@ -248,7 +221,7 @@ type Info struct {
 	// An array of link objects to be displayed on this plugin's
 	// project page in the form `{name: 'foo', url:
 	// 'http://example.com'}`
-	Links *[]struct {
+	Links []struct {
 		Name *string `json:"name,omitempty"`
 		Url  *string `json:"url,omitempty"`
 	} `json:"links,omitempty"`
@ -266,7 +239,7 @@ type Info struct {
 	// An array of screenshot objects in the form `{name: 'bar', path:
 	// 'img/screenshot.png'}`
-	Screenshots *[]struct {
+	Screenshots []struct {
 		Name *string `json:"name,omitempty"`
 		Path *string `json:"path,omitempty"`
 	} `json:"screenshots,omitempty"`
@ -341,7 +314,7 @@ type PluginDef struct {
 	Executable *string `json:"executable,omitempty"`
 	// Extensions made by the current plugin.
-	Extensions *[]ExtensionsLink `json:"extensions,omitempty"`
+	Extensions []ExtensionsLink `json:"extensions,omitempty"`
 	// For data source plugins, include hidden queries in the data
 	// request.
@ -357,7 +330,7 @@ type PluginDef struct {
 	Id string `json:"id"`
 	// Resources to include in plugin.
-	Includes *[]Include `json:"includes,omitempty"`
+	Includes []Include `json:"includes,omitempty"`
 	// Metadata about a Grafana plugin. Some fields are used on the plugins
 	// page in Grafana and others on grafana.com, if the plugin is published.
@ -407,10 +380,10 @@ type PluginDef struct {
 	// which characterizes what viewers, editors, admins, or grafana admins can do on the plugin.
 	// The Admin basic role inherits its default permissions from the Editor basic role which in turn
 	// inherits them from the Viewer basic role.
-	Roles *[]RoleRegistration `json:"roles,omitempty"`
+	Roles []RoleRegistration `json:"roles,omitempty"`
 	// Routes is a list of proxy routes, if any. For datasource plugins only.
-	Routes *[]Route `json:"routes,omitempty"`
+	Routes []Route `json:"routes,omitempty"`
 	// For panel plugins. Hides the query editor.
 	SkipDataQuery *bool `json:"skipDataQuery,omitempty"`
@ -435,7 +408,7 @@ type PluginDef struct {
 // Plugin category used on the Add data source page.
 type Category string
-// type indicates which type of Grafana plugin this is, of the defined
+// Type type indicates which type of Grafana plugin this is, of the defined
 // set of Grafana plugin types.
 type Type string
@ -475,11 +448,11 @@ type RoleRegistration struct {
 type Route struct {
 	// For data source plugins. Route headers set the body content and
 	// length to the proxied request.
-	Body *map[string]interface{} `json:"body,omitempty"`
+	Body map[string]interface{} `json:"body,omitempty"`
 	// For data source plugins. Route headers adds HTTP headers to the
 	// proxied request.
-	Headers *[]Header `json:"headers,omitempty"`
+	Headers []Header `json:"headers,omitempty"`
 	// TODO docs
 	// TODO should this really be separate from TokenAuth?
@ -501,8 +474,8 @@ type Route struct {
 	// For data source plugins. Route URL is where the request is
 	// proxied to.
-	Url       *string     `json:"url,omitempty"`
+	Url       *string    `json:"url,omitempty"`
-	UrlParams *[]URLParam `json:"urlParams,omitempty"`
+	UrlParams []URLParam `json:"urlParams,omitempty"`
 }
 // TODO docs
@ -512,7 +485,7 @@ type TokenAuth struct {
 	// The list of scopes that your application should be granted
 	// access to.
-	Scopes *[]string `json:"scopes,omitempty"`
+	Scopes []string `json:"scopes,omitempty"`
 	// URL to fetch the authentication token.
 	Url *string `json:"url,omitempty"`
--- a/pkg/services/playlist/playlistimpl/playlist.go
+++ b/pkg/services/playlist/playlistimpl/playlist.go
@ -83,7 +83,7 @@ func (s *Service) Get(ctx context.Context, q *playlist.GetPlaylistByUidQuery) (*
 		Uid:      v.UID,
 		Name:     v.Name,
 		Interval: v.Interval,
-		Items:    &items,
+		Items:    items,
 	}, nil
 }
--- a/pkg/services/store/kind/playlist/summary.go
+++ b/pkg/services/store/kind/playlist/summary.go
@ -31,17 +31,17 @@ func summaryBuilder(ctx context.Context, uid string, body []byte) (*entity.Entit
 	// TODO: fix model so this is not possible
 	if obj.Items == nil {
 		temp := make([]playlist.Item, 0)
-		obj.Items = &temp
+		obj.Items = temp
 	}
 	obj.Uid = uid // make sure they are consistent
 	summary := &entity.EntitySummary{
 		UID:         uid,
 		Name:        obj.Name,
-		Description: fmt.Sprintf("%d items, refreshed every %s", len(*obj.Items), obj.Interval),
+		Description: fmt.Sprintf("%d items, refreshed every %s", len(obj.Items), obj.Interval),
 	}
-	for _, item := range *obj.Items {
+	for _, item := range obj.Items {
 		switch item.Type {
 		case playlist.ItemTypeDashboardByUid:
 			summary.References = append(summary.References, &entity.EntityExternalReference{
--- a/pkg/services/store/kind/playlist/summary_test.go
+++ b/pkg/services/store/kind/playlist/summary_test.go
@ -20,7 +20,7 @@ func TestPlaylistSummary(t *testing.T) {
 	playlist := playlist.Playlist{
 		Interval: "30s",
 		Name:     "test",
-		Items: &[]playlist.Item{
+		Items: []playlist.Item{
 			{Type: playlist.ItemTypeDashboardByUid, Value: "D1"},
 			{Type: playlist.ItemTypeDashboardByTag, Value: "tagA"},
 			{Type: playlist.ItemTypeDashboardByUid, Value: "D3"},
--- a/pkg/tsdb/azuremonitor/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/azuremonitor/kinds/dataquery/types_dataquery_gen.go
@ -9,6 +9,10 @@
 package dataquery
 import (
 	"encoding/json"
 )
 // Defines values for AppInsightsGroupByQueryKind.
 const (
 	AppInsightsGroupByQueryKindAppInsightsGroupByQuery AppInsightsGroupByQueryKind = "AppInsightsGroupByQuery"
@ -21,62 +25,42 @@ const (
 // Defines values for AzureLogsQueryResultFormat.
 const (
-	AzureLogsQueryResultFormatTable AzureLogsQueryResultFormat = "table"
+	AzureLogsQueryResultFormatTable      AzureLogsQueryResultFormat = "table"
 	AzureLogsQueryResultFormatTimeSeries AzureLogsQueryResultFormat = "time_series"
 )
 // Defines values for AzureMonitorQueryAzureLogAnalyticsResultFormat.
 const (
-	AzureMonitorQueryAzureLogAnalyticsResultFormatTable AzureMonitorQueryAzureLogAnalyticsResultFormat = "table"
+	AzureMonitorQueryAzureLogAnalyticsResultFormatTable      AzureMonitorQueryAzureLogAnalyticsResultFormat = "table"
 	AzureMonitorQueryAzureLogAnalyticsResultFormatTimeSeries AzureMonitorQueryAzureLogAnalyticsResultFormat = "time_series"
 )
 // Defines values for AzureQueryType.
 const (
-	AzureQueryTypeAzureLogAnalytics AzureQueryType = "Azure Log Analytics"
+	AzureQueryTypeAzureLogAnalytics               AzureQueryType = "Azure Log Analytics"
-
+	AzureQueryTypeAzureMetricNames                AzureQueryType = "Azure Metric Names"
-	AzureQueryTypeAzureMetricNames AzureQueryType = "Azure Metric Names"
+	AzureQueryTypeAzureMonitor                    AzureQueryType = "Azure Monitor"
-
+	AzureQueryTypeAzureNamespaces                 AzureQueryType = "Azure Namespaces"
-	AzureQueryTypeAzureMonitor AzureQueryType = "Azure Monitor"
+	AzureQueryTypeAzureRegions                    AzureQueryType = "Azure Regions"
-
+	AzureQueryTypeAzureResourceGraph              AzureQueryType = "Azure Resource Graph"
-	AzureQueryTypeAzureNamespaces AzureQueryType = "Azure Namespaces"
+	AzureQueryTypeAzureResourceGroups             AzureQueryType = "Azure Resource Groups"
-
+	AzureQueryTypeAzureResourceNames              AzureQueryType = "Azure Resource Names"
-	AzureQueryTypeAzureRegions AzureQueryType = "Azure Regions"
+	AzureQueryTypeAzureSubscriptions              AzureQueryType = "Azure Subscriptions"
-
+	AzureQueryTypeAzureWorkspaces                 AzureQueryType = "Azure Workspaces"
 	AzureQueryTypeAzureResourceGraph AzureQueryType = "Azure Resource Graph"
 	AzureQueryTypeAzureResourceGroups AzureQueryType = "Azure Resource Groups"
 	AzureQueryTypeAzureResourceNames AzureQueryType = "Azure Resource Names"
 	AzureQueryTypeAzureSubscriptions AzureQueryType = "Azure Subscriptions"
 	AzureQueryTypeAzureWorkspaces AzureQueryType = "Azure Workspaces"
 	AzureQueryTypeGrafanaTemplateVariableFunction AzureQueryType = "Grafana Template Variable Function"
 )
 // Defines values for GrafanaTemplateVariableQueryType.
 const (
-	GrafanaTemplateVariableQueryTypeAppInsightsGroupByQuery GrafanaTemplateVariableQueryType = "AppInsightsGroupByQuery"
+	GrafanaTemplateVariableQueryTypeAppInsightsGroupByQuery    GrafanaTemplateVariableQueryType = "AppInsightsGroupByQuery"
 	GrafanaTemplateVariableQueryTypeAppInsightsMetricNameQuery GrafanaTemplateVariableQueryType = "AppInsightsMetricNameQuery"
-
+	GrafanaTemplateVariableQueryTypeMetricNamesQuery           GrafanaTemplateVariableQueryType = "MetricNamesQuery"
-	GrafanaTemplateVariableQueryTypeMetricNamesQuery GrafanaTemplateVariableQueryType = "MetricNamesQuery"
+	GrafanaTemplateVariableQueryTypeMetricNamespaceQuery       GrafanaTemplateVariableQueryType = "MetricNamespaceQuery"
-
+	GrafanaTemplateVariableQueryTypeResourceGroupsQuery        GrafanaTemplateVariableQueryType = "ResourceGroupsQuery"
-	GrafanaTemplateVariableQueryTypeMetricNamespaceQuery GrafanaTemplateVariableQueryType = "MetricNamespaceQuery"
+	GrafanaTemplateVariableQueryTypeResourceNamesQuery         GrafanaTemplateVariableQueryType = "ResourceNamesQuery"
-
+	GrafanaTemplateVariableQueryTypeSubscriptionsQuery         GrafanaTemplateVariableQueryType = "SubscriptionsQuery"
-	GrafanaTemplateVariableQueryTypeResourceGroupsQuery GrafanaTemplateVariableQueryType = "ResourceGroupsQuery"
+	GrafanaTemplateVariableQueryTypeUnknownQuery               GrafanaTemplateVariableQueryType = "UnknownQuery"
-
+	GrafanaTemplateVariableQueryTypeWorkspacesQuery            GrafanaTemplateVariableQueryType = "WorkspacesQuery"
 	GrafanaTemplateVariableQueryTypeResourceNamesQuery GrafanaTemplateVariableQueryType = "ResourceNamesQuery"
 	GrafanaTemplateVariableQueryTypeSubscriptionsQuery GrafanaTemplateVariableQueryType = "SubscriptionsQuery"
 	GrafanaTemplateVariableQueryTypeUnknownQuery GrafanaTemplateVariableQueryType = "UnknownQuery"
 	GrafanaTemplateVariableQueryTypeWorkspacesQuery GrafanaTemplateVariableQueryType = "WorkspacesQuery"
 )
 // Defines values for MetricDefinitionsQueryKind.
@ -106,8 +90,7 @@ const (
 // Defines values for ResultFormat.
 const (
-	ResultFormatTable ResultFormat = "table"
+	ResultFormatTable      ResultFormat = "table"
 	ResultFormatTimeSeries ResultFormat = "time_series"
 )
@ -126,9 +109,24 @@ const (
 	WorkspacesQueryKindWorkspacesQuery WorkspacesQueryKind = "WorkspacesQuery"
 )
 // AppInsightsGroupByQuery defines model for AppInsightsGroupByQuery.
 type AppInsightsGroupByQuery struct {
 	Kind                 AppInsightsGroupByQueryKind `json:"kind"`
 	MetricName           string                      `json:"metricName"`
 	RawQuery             *string                     `json:"rawQuery,omitempty"`
 	AdditionalProperties map[string]interface{}      `json:"-"`
 }
 // AppInsightsGroupByQueryKind defines model for AppInsightsGroupByQuery.Kind.
 type AppInsightsGroupByQueryKind string
 // AppInsightsMetricNameQuery defines model for AppInsightsMetricNameQuery.
 type AppInsightsMetricNameQuery struct {
 	Kind                 AppInsightsMetricNameQueryKind `json:"kind"`
 	RawQuery             *string                        `json:"rawQuery,omitempty"`
 	AdditionalProperties map[string]interface{}         `json:"-"`
 }
 // AppInsightsMetricNameQueryKind defines model for AppInsightsMetricNameQuery.Kind.
 type AppInsightsMetricNameQueryKind string
@ -141,7 +139,7 @@ type AzureLogsQuery struct {
 	Resource *string `json:"resource,omitempty"`
 	// Array of resource URIs to be queried.
-	Resources *[]string `json:"resources,omitempty"`
+	Resources []string `json:"resources,omitempty"`
 	// Specifies the format results should be returned as.
 	ResultFormat *AzureLogsQueryResultFormat `json:"resultFormat,omitempty"`
@ -162,7 +160,7 @@ type AzureMetricDimension struct {
 	Filter *string `json:"filter,omitempty"`
 	// Values to match with the filter.
-	Filters *[]string `json:"filters,omitempty"`
+	Filters []string `json:"filters,omitempty"`
 	// String denoting the filter operation. Supports 'eq' - equals,'ne' - not equals, 'sw' - starts with. Note that some dimensions may not support all operators.
 	Operator *string `json:"operator,omitempty"`
@ -177,7 +175,7 @@ type AzureMetricQuery struct {
 	Alias *string `json:"alias,omitempty"`
 	// Time grains that are supported by the metric.
-	AllowedTimeGrainsMs *[]int64 `json:"allowedTimeGrainsMs,omitempty"`
+	AllowedTimeGrainsMs []int64 `json:"allowedTimeGrainsMs,omitempty"`
 	// Used as the value for the metricNamespace property when it's different from the resource namespace.
 	CustomNamespace *string `json:"customNamespace,omitempty"`
@ -189,7 +187,7 @@ type AzureMetricQuery struct {
 	DimensionFilter *string `json:"dimensionFilter,omitempty"`
 	// Filters to reduce the set of data returned. Dimensions that can be filtered on are defined by the metric.
-	DimensionFilters *[]struct {
+	DimensionFilters []struct {
 		// Name of Dimension to be filtered on.
 		Dimension *string `json:"dimension,omitempty"`
@ -197,7 +195,7 @@ type AzureMetricQuery struct {
 		Filter *string `json:"filter,omitempty"`
 		// Values to match with the filter.
-		Filters *[]string `json:"filters,omitempty"`
+		Filters []string `json:"filters,omitempty"`
 		// String denoting the filter operation. Supports 'eq' - equals,'ne' - not equals, 'sw' - starts with. Note that some dimensions may not support all operators.
 		Operator *string `json:"operator,omitempty"`
@ -227,7 +225,7 @@ type AzureMetricQuery struct {
 	ResourceUri *string `json:"resourceUri,omitempty"`
 	// Array of resource URIs to be queried.
-	Resources *[]struct {
+	Resources []struct {
 		MetricNamespace *string `json:"metricNamespace,omitempty"`
 		Region          *string `json:"region,omitempty"`
 		ResourceGroup   *string `json:"resourceGroup,omitempty"`
@ -238,7 +236,7 @@ type AzureMetricQuery struct {
 	// The granularity of data points to be queried. Defaults to auto.
 	TimeGrain *string `json:"timeGrain,omitempty"`
-	// @deprecated
+	// TimeGrainUnit @deprecated
 	TimeGrainUnit *string `json:"timeGrainUnit,omitempty"`
 	// Maximum number of records to return. Defaults to 10.
@ -246,7 +244,7 @@ type AzureMetricQuery struct {
 }
 // AzureMonitorDataQuery defines model for AzureMonitorDataQuery.
-type AzureMonitorDataQuery map[string]interface{}
+type AzureMonitorDataQuery = map[string]interface{}
 // AzureMonitorQuery defines model for AzureMonitorQuery.
 type AzureMonitorQuery struct {
@ -259,7 +257,7 @@ type AzureMonitorQuery struct {
 		Resource *string `json:"resource,omitempty"`
 		// Array of resource URIs to be queried.
-		Resources *[]string `json:"resources,omitempty"`
+		Resources []string `json:"resources,omitempty"`
 		// Specifies the format results should be returned as.
 		ResultFormat *AzureMonitorQueryAzureLogAnalyticsResultFormat `json:"resultFormat,omitempty"`
@ -277,7 +275,7 @@ type AzureMonitorQuery struct {
 		Alias *string `json:"alias,omitempty"`
 		// Time grains that are supported by the metric.
-		AllowedTimeGrainsMs *[]int64 `json:"allowedTimeGrainsMs,omitempty"`
+		AllowedTimeGrainsMs []int64 `json:"allowedTimeGrainsMs,omitempty"`
 		// Used as the value for the metricNamespace property when it's different from the resource namespace.
 		CustomNamespace *string `json:"customNamespace,omitempty"`
@ -289,7 +287,7 @@ type AzureMonitorQuery struct {
 		DimensionFilter *string `json:"dimensionFilter,omitempty"`
 		// Filters to reduce the set of data returned. Dimensions that can be filtered on are defined by the metric.
-		DimensionFilters *[]struct {
+		DimensionFilters []struct {
 			// Name of Dimension to be filtered on.
 			Dimension *string `json:"dimension,omitempty"`
@ -297,7 +295,7 @@ type AzureMonitorQuery struct {
 			Filter *string `json:"filter,omitempty"`
 			// Values to match with the filter.
-			Filters *[]string `json:"filters,omitempty"`
+			Filters []string `json:"filters,omitempty"`
 			// String denoting the filter operation. Supports 'eq' - equals,'ne' - not equals, 'sw' - starts with. Note that some dimensions may not support all operators.
 			Operator *string `json:"operator,omitempty"`
@ -327,7 +325,7 @@ type AzureMonitorQuery struct {
 		ResourceUri *string `json:"resourceUri,omitempty"`
 		// Array of resource URIs to be queried.
-		Resources *[]struct {
+		Resources []struct {
 			MetricNamespace *string `json:"metricNamespace,omitempty"`
 			Region          *string `json:"region,omitempty"`
 			ResourceGroup   *string `json:"resourceGroup,omitempty"`
@ -338,7 +336,7 @@ type AzureMonitorQuery struct {
 		// The granularity of data points to be queried. Defaults to auto.
 		TimeGrain *string `json:"timeGrain,omitempty"`
-		// @deprecated
+		// TimeGrainUnit @deprecated
 		TimeGrainUnit *string `json:"timeGrainUnit,omitempty"`
 		// Maximum number of records to return. Defaults to 10.
@ -361,9 +359,9 @@ type AzureMonitorQuery struct {
 	Datasource *interface{} `json:"datasource,omitempty"`
 	// @deprecated Legacy template variable support.
-	GrafanaTemplateVariableFn *interface{} `json:"grafanaTemplateVariableFn,omitempty"`
+	GrafanaTemplateVariableFn *AzureMonitorQuery_GrafanaTemplateVariableFn `json:"grafanaTemplateVariableFn,omitempty"`
-	// true if query is disabled (ie should not be returned to the dashboard)
+	// Hide true if query is disabled (ie should not be returned to the dashboard)
 	Hide *bool `json:"hide,omitempty"`
 	// Unique, guid like, string used in explore mode
@ -389,12 +387,25 @@ type AzureMonitorQuery struct {
 	Subscription *string `json:"subscription,omitempty"`
 	// Subscriptions to be queried via Azure Resource Graph.
-	Subscriptions *[]string `json:"subscriptions,omitempty"`
+	Subscriptions []string `json:"subscriptions,omitempty"`
 }
 // Specifies the format results should be returned as.
 type AzureMonitorQueryAzureLogAnalyticsResultFormat string
 // @deprecated Legacy template variable support.
 type AzureMonitorQuery_GrafanaTemplateVariableFn struct {
 	Kind                 *interface{}           `json:"kind,omitempty"`
 	MetricName           *string                `json:"metricName,omitempty"`
 	MetricNamespace      *string                `json:"metricNamespace,omitempty"`
 	RawQuery             *string                `json:"rawQuery,omitempty"`
 	ResourceGroup        *string                `json:"resourceGroup,omitempty"`
 	ResourceName         *string                `json:"resourceName,omitempty"`
 	Subscription         *string                `json:"subscription,omitempty"`
 	AdditionalProperties map[string]interface{} `json:"-"`
 	union                json.RawMessage
 }
 // AzureMonitorResource defines model for AzureMonitorResource.
 type AzureMonitorResource struct {
 	MetricNamespace *string `json:"metricNamespace,omitempty"`
@ -416,35 +427,124 @@ type AzureResourceGraphQuery struct {
 	ResultFormat *string `json:"resultFormat,omitempty"`
 }
 // BaseGrafanaTemplateVariableQuery defines model for BaseGrafanaTemplateVariableQuery.
 type BaseGrafanaTemplateVariableQuery struct {
 	RawQuery             *string                `json:"rawQuery,omitempty"`
 	AdditionalProperties map[string]interface{} `json:"-"`
 }
 // GrafanaTemplateVariableQuery defines model for GrafanaTemplateVariableQuery.
-type GrafanaTemplateVariableQuery interface{}
+type GrafanaTemplateVariableQuery struct {
 	Kind                 *interface{}           `json:"kind,omitempty"`
 	MetricName           *string                `json:"metricName,omitempty"`
 	MetricNamespace      *string                `json:"metricNamespace,omitempty"`
 	RawQuery             *string                `json:"rawQuery,omitempty"`
 	ResourceGroup        *string                `json:"resourceGroup,omitempty"`
 	ResourceName         *string                `json:"resourceName,omitempty"`
 	Subscription         *string                `json:"subscription,omitempty"`
 	AdditionalProperties map[string]interface{} `json:"-"`
 	union                json.RawMessage
 }
 // GrafanaTemplateVariableQueryType defines model for GrafanaTemplateVariableQueryType.
 type GrafanaTemplateVariableQueryType string
 // @deprecated Use MetricNamespaceQuery instead
 type MetricDefinitionsQuery struct {
 	Kind                 MetricDefinitionsQueryKind `json:"kind"`
 	MetricNamespace      *string                    `json:"metricNamespace,omitempty"`
 	RawQuery             *string                    `json:"rawQuery,omitempty"`
 	ResourceGroup        string                     `json:"resourceGroup"`
 	ResourceName         *string                    `json:"resourceName,omitempty"`
 	Subscription         string                     `json:"subscription"`
 	AdditionalProperties map[string]interface{}     `json:"-"`
 }
 // MetricDefinitionsQueryKind defines model for MetricDefinitionsQuery.Kind.
 type MetricDefinitionsQueryKind string
 // MetricNamesQuery defines model for MetricNamesQuery.
 type MetricNamesQuery struct {
 	Kind                 MetricNamesQueryKind   `json:"kind"`
 	MetricNamespace      string                 `json:"metricNamespace"`
 	RawQuery             *string                `json:"rawQuery,omitempty"`
 	ResourceGroup        string                 `json:"resourceGroup"`
 	ResourceName         string                 `json:"resourceName"`
 	Subscription         string                 `json:"subscription"`
 	AdditionalProperties map[string]interface{} `json:"-"`
 }
 // MetricNamesQueryKind defines model for MetricNamesQuery.Kind.
 type MetricNamesQueryKind string
 // MetricNamespaceQuery defines model for MetricNamespaceQuery.
 type MetricNamespaceQuery struct {
 	Kind                 MetricNamespaceQueryKind `json:"kind"`
 	MetricNamespace      *string                  `json:"metricNamespace,omitempty"`
 	RawQuery             *string                  `json:"rawQuery,omitempty"`
 	ResourceGroup        string                   `json:"resourceGroup"`
 	ResourceName         *string                  `json:"resourceName,omitempty"`
 	Subscription         string                   `json:"subscription"`
 	AdditionalProperties map[string]interface{}   `json:"-"`
 }
 // MetricNamespaceQueryKind defines model for MetricNamespaceQuery.Kind.
 type MetricNamespaceQueryKind string
 // ResourceGroupsQuery defines model for ResourceGroupsQuery.
 type ResourceGroupsQuery struct {
 	Kind                 ResourceGroupsQueryKind `json:"kind"`
 	RawQuery             *string                 `json:"rawQuery,omitempty"`
 	Subscription         string                  `json:"subscription"`
 	AdditionalProperties map[string]interface{}  `json:"-"`
 }
 // ResourceGroupsQueryKind defines model for ResourceGroupsQuery.Kind.
 type ResourceGroupsQueryKind string
 // ResourceNamesQuery defines model for ResourceNamesQuery.
 type ResourceNamesQuery struct {
 	Kind                 ResourceNamesQueryKind `json:"kind"`
 	MetricNamespace      string                 `json:"metricNamespace"`
 	RawQuery             *string                `json:"rawQuery,omitempty"`
 	ResourceGroup        string                 `json:"resourceGroup"`
 	Subscription         string                 `json:"subscription"`
 	AdditionalProperties map[string]interface{} `json:"-"`
 }
 // ResourceNamesQueryKind defines model for ResourceNamesQuery.Kind.
 type ResourceNamesQueryKind string
 // ResultFormat defines model for ResultFormat.
 type ResultFormat string
 // SubscriptionsQuery defines model for SubscriptionsQuery.
 type SubscriptionsQuery struct {
 	Kind                 SubscriptionsQueryKind `json:"kind"`
 	RawQuery             *string                `json:"rawQuery,omitempty"`
 	AdditionalProperties map[string]interface{} `json:"-"`
 }
 // SubscriptionsQueryKind defines model for SubscriptionsQuery.Kind.
 type SubscriptionsQueryKind string
 // UnknownQuery defines model for UnknownQuery.
 type UnknownQuery struct {
 	Kind                 UnknownQueryKind       `json:"kind"`
 	RawQuery             *string                `json:"rawQuery,omitempty"`
 	AdditionalProperties map[string]interface{} `json:"-"`
 }
 // UnknownQueryKind defines model for UnknownQuery.Kind.
 type UnknownQueryKind string
 // WorkspacesQuery defines model for WorkspacesQuery.
 type WorkspacesQuery struct {
 	Kind                 WorkspacesQueryKind    `json:"kind"`
 	RawQuery             *string                `json:"rawQuery,omitempty"`
 	Subscription         string                 `json:"subscription"`
 	AdditionalProperties map[string]interface{} `json:"-"`
 }
 // WorkspacesQueryKind defines model for WorkspacesQuery.Kind.
 type WorkspacesQueryKind string
--- a/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
@ -9,52 +9,58 @@
 package dataquery
 import (
 	"encoding/json"
 )
 // Defines values for CloudWatchAnnotationQueryQueryMode.
 const (
 	CloudWatchAnnotationQueryQueryModeAnnotations CloudWatchAnnotationQueryQueryMode = "Annotations"
-
+	CloudWatchAnnotationQueryQueryModeLogs        CloudWatchAnnotationQueryQueryMode = "Logs"
-	CloudWatchAnnotationQueryQueryModeLogs CloudWatchAnnotationQueryQueryMode = "Logs"
+	CloudWatchAnnotationQueryQueryModeMetrics     CloudWatchAnnotationQueryQueryMode = "Metrics"
 	CloudWatchAnnotationQueryQueryModeMetrics CloudWatchAnnotationQueryQueryMode = "Metrics"
 )
 // Defines values for CloudWatchLogsQueryQueryMode.
 const (
 	CloudWatchLogsQueryQueryModeAnnotations CloudWatchLogsQueryQueryMode = "Annotations"
-
+	CloudWatchLogsQueryQueryModeLogs        CloudWatchLogsQueryQueryMode = "Logs"
-	CloudWatchLogsQueryQueryModeLogs CloudWatchLogsQueryQueryMode = "Logs"
+	CloudWatchLogsQueryQueryModeMetrics     CloudWatchLogsQueryQueryMode = "Metrics"
 	CloudWatchLogsQueryQueryModeMetrics CloudWatchLogsQueryQueryMode = "Metrics"
 )
 // Defines values for CloudWatchMetricsQueryMetricEditorMode.
 const (
 	CloudWatchMetricsQueryMetricEditorModeN0 CloudWatchMetricsQueryMetricEditorMode = 0
 	CloudWatchMetricsQueryMetricEditorModeN1 CloudWatchMetricsQueryMetricEditorMode = 1
 )
 // Defines values for CloudWatchMetricsQueryMetricQueryType.
 const (
 	CloudWatchMetricsQueryMetricQueryTypeN0 CloudWatchMetricsQueryMetricQueryType = 0
 	CloudWatchMetricsQueryMetricQueryTypeN1 CloudWatchMetricsQueryMetricQueryType = 1
 )
 // Defines values for CloudWatchMetricsQueryQueryMode.
 const (
 	CloudWatchMetricsQueryQueryModeAnnotations CloudWatchMetricsQueryQueryMode = "Annotations"
 	CloudWatchMetricsQueryQueryModeLogs        CloudWatchMetricsQueryQueryMode = "Logs"
 	CloudWatchMetricsQueryQueryModeMetrics     CloudWatchMetricsQueryQueryMode = "Metrics"
 )
-	CloudWatchMetricsQueryQueryModeLogs CloudWatchMetricsQueryQueryMode = "Logs"
+// Defines values for CloudWatchMetricsQuerySqlFromParametersType.
 const (
 	CloudWatchMetricsQuerySqlFromParametersTypeFunctionParameter CloudWatchMetricsQuerySqlFromParametersType = "functionParameter"
 )
-	CloudWatchMetricsQueryQueryModeMetrics CloudWatchMetricsQueryQueryMode = "Metrics"
+// Defines values for CloudWatchMetricsQuerySqlFromPropertyType.
 const (
 	CloudWatchMetricsQuerySqlFromPropertyTypeString CloudWatchMetricsQuerySqlFromPropertyType = "string"
 	CloudWatchMetricsQuerySqlFromPropertyTypeTest   CloudWatchMetricsQuerySqlFromPropertyType = "test"
 )
 // Defines values for CloudWatchMetricsQuerySqlGroupByType.
 const (
 	CloudWatchMetricsQuerySqlGroupByTypeAnd CloudWatchMetricsQuerySqlGroupByType = "and"
-
+	CloudWatchMetricsQuerySqlGroupByTypeOr  CloudWatchMetricsQuerySqlGroupByType = "or"
 	CloudWatchMetricsQuerySqlGroupByTypeOr CloudWatchMetricsQuerySqlGroupByType = "or"
 )
 // Defines values for CloudWatchMetricsQuerySqlOrderByParametersType.
@ -80,55 +86,43 @@ const (
 // Defines values for CloudWatchMetricsQuerySqlWhereType.
 const (
 	CloudWatchMetricsQuerySqlWhereTypeAnd CloudWatchMetricsQuerySqlWhereType = "and"
-
+	CloudWatchMetricsQuerySqlWhereTypeOr  CloudWatchMetricsQuerySqlWhereType = "or"
 	CloudWatchMetricsQuerySqlWhereTypeOr CloudWatchMetricsQuerySqlWhereType = "or"
 )
 // Defines values for CloudWatchQueryMode.
 const (
 	CloudWatchQueryModeAnnotations CloudWatchQueryMode = "Annotations"
-
+	CloudWatchQueryModeLogs        CloudWatchQueryMode = "Logs"
-	CloudWatchQueryModeLogs CloudWatchQueryMode = "Logs"
+	CloudWatchQueryModeMetrics     CloudWatchQueryMode = "Metrics"
 	CloudWatchQueryModeMetrics CloudWatchQueryMode = "Metrics"
 )
 // Defines values for MetricEditorMode.
 const (
 	MetricEditorModeN0 MetricEditorMode = 0
 	MetricEditorModeN1 MetricEditorMode = 1
 )
 // Defines values for MetricQueryType.
 const (
 	MetricQueryTypeN0 MetricQueryType = 0
 	MetricQueryTypeN1 MetricQueryType = 1
 )
 // Defines values for QueryEditorArrayExpressionType.
 const (
 	QueryEditorArrayExpressionTypeAnd QueryEditorArrayExpressionType = "and"
-
+	QueryEditorArrayExpressionTypeOr  QueryEditorArrayExpressionType = "or"
 	QueryEditorArrayExpressionTypeOr QueryEditorArrayExpressionType = "or"
 )
 // Defines values for QueryEditorExpressionType.
 const (
-	QueryEditorExpressionTypeAnd QueryEditorExpressionType = "and"
+	QueryEditorExpressionTypeAnd               QueryEditorExpressionType = "and"
-
+	QueryEditorExpressionTypeFunction          QueryEditorExpressionType = "function"
 	QueryEditorExpressionTypeFunction QueryEditorExpressionType = "function"
 	QueryEditorExpressionTypeFunctionParameter QueryEditorExpressionType = "functionParameter"
-
+	QueryEditorExpressionTypeGroupBy           QueryEditorExpressionType = "groupBy"
-	QueryEditorExpressionTypeGroupBy QueryEditorExpressionType = "groupBy"
+	QueryEditorExpressionTypeOperator          QueryEditorExpressionType = "operator"
-
+	QueryEditorExpressionTypeOr                QueryEditorExpressionType = "or"
-	QueryEditorExpressionTypeOperator QueryEditorExpressionType = "operator"
+	QueryEditorExpressionTypeProperty          QueryEditorExpressionType = "property"
 	QueryEditorExpressionTypeOr QueryEditorExpressionType = "or"
 	QueryEditorExpressionTypeProperty QueryEditorExpressionType = "property"
 )
 // Defines values for QueryEditorFunctionExpressionParametersType.
@ -149,8 +143,7 @@ const (
 // Defines values for QueryEditorGroupByExpressionPropertyType.
 const (
 	QueryEditorGroupByExpressionPropertyTypeString QueryEditorGroupByExpressionPropertyType = "string"
-
+	QueryEditorGroupByExpressionPropertyTypeTest   QueryEditorGroupByExpressionPropertyType = "test"
 	QueryEditorGroupByExpressionPropertyTypeTest QueryEditorGroupByExpressionPropertyType = "test"
 )
 // Defines values for QueryEditorGroupByExpressionType.
@ -161,8 +154,7 @@ const (
 // Defines values for QueryEditorOperatorExpressionPropertyType.
 const (
 	QueryEditorOperatorExpressionPropertyTypeString QueryEditorOperatorExpressionPropertyType = "string"
-
+	QueryEditorOperatorExpressionPropertyTypeTest   QueryEditorOperatorExpressionPropertyType = "test"
 	QueryEditorOperatorExpressionPropertyTypeTest QueryEditorOperatorExpressionPropertyType = "test"
 )
 // Defines values for QueryEditorOperatorExpressionType.
@ -173,15 +165,13 @@ const (
 // Defines values for QueryEditorPropertyType.
 const (
 	QueryEditorPropertyTypeString QueryEditorPropertyType = "string"
-
+	QueryEditorPropertyTypeTest   QueryEditorPropertyType = "test"
 	QueryEditorPropertyTypeTest QueryEditorPropertyType = "test"
 )
 // Defines values for QueryEditorPropertyExpressionPropertyType.
 const (
 	QueryEditorPropertyExpressionPropertyTypeString QueryEditorPropertyExpressionPropertyType = "string"
-
+	QueryEditorPropertyExpressionPropertyTypeTest   QueryEditorPropertyExpressionPropertyType = "test"
 	QueryEditorPropertyExpressionPropertyTypeTest QueryEditorPropertyExpressionPropertyType = "test"
 )
 // Defines values for QueryEditorPropertyExpressionType.
@ -189,11 +179,21 @@ const (
 	QueryEditorPropertyExpressionTypeProperty QueryEditorPropertyExpressionType = "property"
 )
 // Defines values for SQLExpressionFromParametersType.
 const (
 	SQLExpressionFromParametersTypeFunctionParameter SQLExpressionFromParametersType = "functionParameter"
 )
 // Defines values for SQLExpressionFromPropertyType.
 const (
 	SQLExpressionFromPropertyTypeString SQLExpressionFromPropertyType = "string"
 	SQLExpressionFromPropertyTypeTest   SQLExpressionFromPropertyType = "test"
 )
 // Defines values for SQLExpressionGroupByType.
 const (
 	SQLExpressionGroupByTypeAnd SQLExpressionGroupByType = "and"
-
+	SQLExpressionGroupByTypeOr  SQLExpressionGroupByType = "or"
 	SQLExpressionGroupByTypeOr SQLExpressionGroupByType = "or"
 )
 // Defines values for SQLExpressionOrderByParametersType.
@ -219,8 +219,7 @@ const (
 // Defines values for SQLExpressionWhereType.
 const (
 	SQLExpressionWhereTypeAnd SQLExpressionWhereType = "and"
-
+	SQLExpressionWhereTypeOr  SQLExpressionWhereType = "or"
 	SQLExpressionWhereTypeOr SQLExpressionWhereType = "or"
 )
 // CloudWatchAnnotationQuery defines model for CloudWatchAnnotationQuery.
@ -239,14 +238,14 @@ type CloudWatchAnnotationQuery struct {
 	Statistic       *string                            `json:"statistic,omitempty"`
 	// @deprecated use statistic
-	Statistics *[]string `json:"statistics,omitempty"`
+	Statistics []string `json:"statistics,omitempty"`
 }
 // CloudWatchAnnotationQueryQueryMode defines model for CloudWatchAnnotationQuery.QueryMode.
 type CloudWatchAnnotationQueryQueryMode string
 // CloudWatchDataQuery defines model for CloudWatchDataQuery.
-type CloudWatchDataQuery map[string]interface{}
+type CloudWatchDataQuery = map[string]interface{}
 // CloudWatchLogsQuery defines model for CloudWatchLogsQuery.
 type CloudWatchLogsQuery struct {
@ -257,16 +256,16 @@ type CloudWatchLogsQuery struct {
 	Datasource *interface{} `json:"datasource,omitempty"`
 	Expression *string      `json:"expression,omitempty"`
-	// true if query is disabled (ie should not be returned to the dashboard)
+	// Hide true if query is disabled (ie should not be returned to the dashboard)
 	Hide *bool  `json:"hide,omitempty"`
 	Id   string `json:"id"`
 	// Unique, guid like, string used in explore mode
 	Key *string `json:"key,omitempty"`
-	// deprecated, use logGroups instead
+	// LogGroupNames deprecated, use logGroups instead
-	LogGroupNames *[]string `json:"logGroupNames,omitempty"`
+	LogGroupNames []string `json:"logGroupNames,omitempty"`
-	LogGroups     *[]struct {
+	LogGroups     []struct {
 		AccountId    *string `json:"accountId,omitempty"`
 		AccountLabel *string `json:"accountLabel,omitempty"`
 		Arn          string  `json:"arn"`
@ -279,9 +278,9 @@ type CloudWatchLogsQuery struct {
 	QueryType *string `json:"queryType,omitempty"`
 	// A - Z
-	RefId       string    `json:"refId"`
+	RefId       string   `json:"refId"`
-	Region      string    `json:"region"`
+	Region      string   `json:"region"`
-	StatsGroups *[]string `json:"statsGroups,omitempty"`
+	StatsGroups []string `json:"statsGroups,omitempty"`
 }
 // CloudWatchLogsQueryQueryMode defines model for CloudWatchLogsQuery.QueryMode.
@ -296,7 +295,7 @@ type CloudWatchMetricsQuery struct {
 	// Math expression query
 	Expression *string `json:"expression,omitempty"`
-	// common props
+	// Id common props
 	Id               string                                  `json:"id"`
 	Label            *string                                 `json:"label,omitempty"`
 	MatchExact       *bool                                   `json:"matchExact,omitempty"`
@ -308,7 +307,7 @@ type CloudWatchMetricsQuery struct {
 	QueryMode        *CloudWatchMetricsQueryQueryMode        `json:"queryMode,omitempty"`
 	Region           string                                  `json:"region"`
 	Sql              *struct {
-		From    *interface{} `json:"from,omitempty"`
+		From    *CloudWatchMetricsQuery_Sql_From `json:"from,omitempty"`
 		GroupBy *struct {
 			// TODO should be QueryEditorExpression[] | QueryEditorArrayExpression[], extend in veneer
 			Expressions interface{} `json:"expressions"`
@ -319,7 +318,7 @@ type CloudWatchMetricsQuery struct {
 		Limit   *int64 `json:"limit,omitempty"`
 		OrderBy *struct {
 			Name       *string `json:"name,omitempty"`
-			Parameters *[]struct {
+			Parameters []struct {
 				Name *string                                        `json:"name,omitempty"`
 				Type CloudWatchMetricsQuerySqlOrderByParametersType `json:"type"`
 			} `json:"parameters,omitempty"`
@ -328,7 +327,7 @@ type CloudWatchMetricsQuery struct {
 		OrderByDirection *string `json:"orderByDirection,omitempty"`
 		Select           *struct {
 			Name       *string `json:"name,omitempty"`
-			Parameters *[]struct {
+			Parameters []struct {
 				Name *string                                       `json:"name,omitempty"`
 				Type CloudWatchMetricsQuerySqlSelectParametersType `json:"type"`
 			} `json:"parameters,omitempty"`
@ -346,7 +345,7 @@ type CloudWatchMetricsQuery struct {
 	Statistic     *string `json:"statistic,omitempty"`
 	// @deprecated use statistic
-	Statistics *[]string `json:"statistics,omitempty"`
+	Statistics []string `json:"statistics,omitempty"`
 }
 // CloudWatchMetricsQueryMetricEditorMode defines model for CloudWatchMetricsQuery.MetricEditorMode.
@ -358,6 +357,27 @@ type CloudWatchMetricsQueryMetricQueryType int
 // CloudWatchMetricsQueryQueryMode defines model for CloudWatchMetricsQuery.QueryMode.
 type CloudWatchMetricsQueryQueryMode string
 // CloudWatchMetricsQuerySqlFromParametersType defines model for CloudWatchMetricsQuery.Sql.From.Parameters.Type.
 type CloudWatchMetricsQuerySqlFromParametersType string
 // CloudWatchMetricsQuerySqlFromPropertyType defines model for CloudWatchMetricsQuery.Sql.From.Property.Type.
 type CloudWatchMetricsQuerySqlFromPropertyType string
 // CloudWatchMetricsQuery_Sql_From defines model for CloudWatchMetricsQuery.Sql.From.
 type CloudWatchMetricsQuery_Sql_From struct {
 	Name       *string `json:"name,omitempty"`
 	Parameters []struct {
 		Name *string                                     `json:"name,omitempty"`
 		Type CloudWatchMetricsQuerySqlFromParametersType `json:"type"`
 	} `json:"parameters,omitempty"`
 	Property *struct {
 		Name *string                                   `json:"name,omitempty"`
 		Type CloudWatchMetricsQuerySqlFromPropertyType `json:"type"`
 	} `json:"property,omitempty"`
 	Type  *interface{} `json:"type,omitempty"`
 	union json.RawMessage
 }
 // TODO this doesn't work
 type CloudWatchMetricsQuerySqlGroupByType string
@ -379,6 +399,9 @@ type CloudWatchMetricsQuerySqlWhereType string
 // CloudWatchQueryMode defines model for CloudWatchQueryMode.
 type CloudWatchQueryMode string
 // Dimensions defines model for Dimensions.
 type Dimensions map[string]interface{}
 // LogGroup defines model for LogGroup.
 type LogGroup struct {
 	AccountId    *string `json:"accountId,omitempty"`
@ -405,7 +428,7 @@ type MetricStat struct {
 	Statistic  *string                `json:"statistic,omitempty"`
 	// @deprecated use statistic
-	Statistics *[]string `json:"statistics,omitempty"`
+	Statistics []string `json:"statistics,omitempty"`
 }
 // QueryEditorArrayExpression defines model for QueryEditorArrayExpression.
@ -426,7 +449,7 @@ type QueryEditorExpressionType string
 // QueryEditorFunctionExpression defines model for QueryEditorFunctionExpression.
 type QueryEditorFunctionExpression struct {
 	Name       *string `json:"name,omitempty"`
-	Parameters *[]struct {
+	Parameters []struct {
 		Name *string                                     `json:"name,omitempty"`
 		Type QueryEditorFunctionExpressionParametersType `json:"type"`
 	} `json:"parameters,omitempty"`
@ -489,12 +512,6 @@ type QueryEditorOperatorExpressionPropertyType string
 // QueryEditorOperatorExpressionType defines model for QueryEditorOperatorExpression.Type.
 type QueryEditorOperatorExpressionType string
 // QueryEditorOperatorType defines model for QueryEditorOperatorType.
 type QueryEditorOperatorType interface{}
 // QueryEditorOperatorValueType defines model for QueryEditorOperatorValueType.
 type QueryEditorOperatorValueType interface{}
 // QueryEditorProperty defines model for QueryEditorProperty.
 type QueryEditorProperty struct {
 	Name *string                 `json:"name,omitempty"`
@ -521,7 +538,7 @@ type QueryEditorPropertyExpressionType string
 // SQLExpression defines model for SQLExpression.
 type SQLExpression struct {
-	From    *interface{} `json:"from,omitempty"`
+	From    *SQLExpression_From `json:"from,omitempty"`
 	GroupBy *struct {
 		// TODO should be QueryEditorExpression[] | QueryEditorArrayExpression[], extend in veneer
 		Expressions interface{} `json:"expressions"`
@ -532,7 +549,7 @@ type SQLExpression struct {
 	Limit   *int64 `json:"limit,omitempty"`
 	OrderBy *struct {
 		Name       *string `json:"name,omitempty"`
-		Parameters *[]struct {
+		Parameters []struct {
 			Name *string                            `json:"name,omitempty"`
 			Type SQLExpressionOrderByParametersType `json:"type"`
 		} `json:"parameters,omitempty"`
@ -541,7 +558,7 @@ type SQLExpression struct {
 	OrderByDirection *string `json:"orderByDirection,omitempty"`
 	Select           *struct {
 		Name       *string `json:"name,omitempty"`
-		Parameters *[]struct {
+		Parameters []struct {
 			Name *string                           `json:"name,omitempty"`
 			Type SQLExpressionSelectParametersType `json:"type"`
 		} `json:"parameters,omitempty"`
@ -556,6 +573,27 @@ type SQLExpression struct {
 	} `json:"where,omitempty"`
 }
 // SQLExpressionFromParametersType defines model for SQLExpression.From.Parameters.Type.
 type SQLExpressionFromParametersType string
 // SQLExpressionFromPropertyType defines model for SQLExpression.From.Property.Type.
 type SQLExpressionFromPropertyType string
 // SQLExpression_From defines model for SQLExpression.From.
 type SQLExpression_From struct {
 	Name       *string `json:"name,omitempty"`
 	Parameters []struct {
 		Name *string                         `json:"name,omitempty"`
 		Type SQLExpressionFromParametersType `json:"type"`
 	} `json:"parameters,omitempty"`
 	Property *struct {
 		Name *string                       `json:"name,omitempty"`
 		Type SQLExpressionFromPropertyType `json:"type"`
 	} `json:"property,omitempty"`
 	Type  *interface{} `json:"type,omitempty"`
 	union json.RawMessage
 }
 // TODO this doesn't work
 type SQLExpressionGroupByType string
--- a/pkg/tsdb/elasticsearch/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/elasticsearch/kinds/dataquery/types_dataquery_gen.go
@ -9,6 +9,10 @@
 package dataquery
 import (
 	"encoding/json"
 )
 // Defines values for AverageType.
 const (
 	AverageTypeAvg AverageType = "avg"
@ -17,141 +21,92 @@ const (
 // Defines values for BaseBucketAggregationType.
 const (
 	BaseBucketAggregationTypeDateHistogram BaseBucketAggregationType = "date_histogram"
-
+	BaseBucketAggregationTypeFilters       BaseBucketAggregationType = "filters"
-	BaseBucketAggregationTypeFilters BaseBucketAggregationType = "filters"
+	BaseBucketAggregationTypeGeohashGrid   BaseBucketAggregationType = "geohash_grid"
-
+	BaseBucketAggregationTypeHistogram     BaseBucketAggregationType = "histogram"
-	BaseBucketAggregationTypeGeohashGrid BaseBucketAggregationType = "geohash_grid"
+	BaseBucketAggregationTypeNested        BaseBucketAggregationType = "nested"
-
+	BaseBucketAggregationTypeTerms         BaseBucketAggregationType = "terms"
 	BaseBucketAggregationTypeHistogram BaseBucketAggregationType = "histogram"
 	BaseBucketAggregationTypeNested BaseBucketAggregationType = "nested"
 	BaseBucketAggregationTypeTerms BaseBucketAggregationType = "terms"
 )
 // Defines values for BaseMetricAggregationType.
 const (
-	BaseMetricAggregationTypeAvg BaseMetricAggregationType = "avg"
+	BaseMetricAggregationTypeAvg           BaseMetricAggregationType = "avg"
-
+	BaseMetricAggregationTypeBucketScript  BaseMetricAggregationType = "bucket_script"
-	BaseMetricAggregationTypeBucketScript BaseMetricAggregationType = "bucket_script"
+	BaseMetricAggregationTypeCardinality   BaseMetricAggregationType = "cardinality"
-
+	BaseMetricAggregationTypeCount         BaseMetricAggregationType = "count"
 	BaseMetricAggregationTypeCardinality BaseMetricAggregationType = "cardinality"
 	BaseMetricAggregationTypeCount BaseMetricAggregationType = "count"
 	BaseMetricAggregationTypeCumulativeSum BaseMetricAggregationType = "cumulative_sum"
-
+	BaseMetricAggregationTypeDerivative    BaseMetricAggregationType = "derivative"
 	BaseMetricAggregationTypeDerivative BaseMetricAggregationType = "derivative"
 	BaseMetricAggregationTypeExtendedStats BaseMetricAggregationType = "extended_stats"
-
+	BaseMetricAggregationTypeLogs          BaseMetricAggregationType = "logs"
-	BaseMetricAggregationTypeLogs BaseMetricAggregationType = "logs"
+	BaseMetricAggregationTypeMax           BaseMetricAggregationType = "max"
-
+	BaseMetricAggregationTypeMin           BaseMetricAggregationType = "min"
-	BaseMetricAggregationTypeMax BaseMetricAggregationType = "max"
+	BaseMetricAggregationTypeMovingAvg     BaseMetricAggregationType = "moving_avg"
-
+	BaseMetricAggregationTypeMovingFn      BaseMetricAggregationType = "moving_fn"
-	BaseMetricAggregationTypeMin BaseMetricAggregationType = "min"
+	BaseMetricAggregationTypePercentiles   BaseMetricAggregationType = "percentiles"
-
+	BaseMetricAggregationTypeRate          BaseMetricAggregationType = "rate"
-	BaseMetricAggregationTypeMovingAvg BaseMetricAggregationType = "moving_avg"
+	BaseMetricAggregationTypeRawData       BaseMetricAggregationType = "raw_data"
-
+	BaseMetricAggregationTypeRawDocument   BaseMetricAggregationType = "raw_document"
-	BaseMetricAggregationTypeMovingFn BaseMetricAggregationType = "moving_fn"
+	BaseMetricAggregationTypeSerialDiff    BaseMetricAggregationType = "serial_diff"
-
+	BaseMetricAggregationTypeSum           BaseMetricAggregationType = "sum"
-	BaseMetricAggregationTypePercentiles BaseMetricAggregationType = "percentiles"
+	BaseMetricAggregationTypeTopMetrics    BaseMetricAggregationType = "top_metrics"
 	BaseMetricAggregationTypeRate BaseMetricAggregationType = "rate"
 	BaseMetricAggregationTypeRawData BaseMetricAggregationType = "raw_data"
 	BaseMetricAggregationTypeRawDocument BaseMetricAggregationType = "raw_document"
 	BaseMetricAggregationTypeSerialDiff BaseMetricAggregationType = "serial_diff"
 	BaseMetricAggregationTypeSum BaseMetricAggregationType = "sum"
 	BaseMetricAggregationTypeTopMetrics BaseMetricAggregationType = "top_metrics"
 )
 // Defines values for BaseMovingAverageModelSettingsModel.
 const (
-	BaseMovingAverageModelSettingsModelEwma BaseMovingAverageModelSettingsModel = "ewma"
+	BaseMovingAverageModelSettingsModelEwma        BaseMovingAverageModelSettingsModel = "ewma"
-
+	BaseMovingAverageModelSettingsModelHolt        BaseMovingAverageModelSettingsModel = "holt"
 	BaseMovingAverageModelSettingsModelHolt BaseMovingAverageModelSettingsModel = "holt"
 	BaseMovingAverageModelSettingsModelHoltWinters BaseMovingAverageModelSettingsModel = "holt_winters"
-
+	BaseMovingAverageModelSettingsModelLinear      BaseMovingAverageModelSettingsModel = "linear"
-	BaseMovingAverageModelSettingsModelLinear BaseMovingAverageModelSettingsModel = "linear"
+	BaseMovingAverageModelSettingsModelSimple      BaseMovingAverageModelSettingsModel = "simple"
 	BaseMovingAverageModelSettingsModelSimple BaseMovingAverageModelSettingsModel = "simple"
 )
 // Defines values for BasePipelineMetricAggregationType.
 const (
-	BasePipelineMetricAggregationTypeAvg BasePipelineMetricAggregationType = "avg"
+	BasePipelineMetricAggregationTypeAvg           BasePipelineMetricAggregationType = "avg"
-
+	BasePipelineMetricAggregationTypeBucketScript  BasePipelineMetricAggregationType = "bucket_script"
-	BasePipelineMetricAggregationTypeBucketScript BasePipelineMetricAggregationType = "bucket_script"
+	BasePipelineMetricAggregationTypeCardinality   BasePipelineMetricAggregationType = "cardinality"
-
+	BasePipelineMetricAggregationTypeCount         BasePipelineMetricAggregationType = "count"
 	BasePipelineMetricAggregationTypeCardinality BasePipelineMetricAggregationType = "cardinality"
 	BasePipelineMetricAggregationTypeCount BasePipelineMetricAggregationType = "count"
 	BasePipelineMetricAggregationTypeCumulativeSum BasePipelineMetricAggregationType = "cumulative_sum"
-
+	BasePipelineMetricAggregationTypeDerivative    BasePipelineMetricAggregationType = "derivative"
 	BasePipelineMetricAggregationTypeDerivative BasePipelineMetricAggregationType = "derivative"
 	BasePipelineMetricAggregationTypeExtendedStats BasePipelineMetricAggregationType = "extended_stats"
 	BasePipelineMetricAggregationTypeLogs          BasePipelineMetricAggregationType = "logs"
 	BasePipelineMetricAggregationTypeMax           BasePipelineMetricAggregationType = "max"
 	BasePipelineMetricAggregationTypeMin           BasePipelineMetricAggregationType = "min"
 	BasePipelineMetricAggregationTypeMovingAvg     BasePipelineMetricAggregationType = "moving_avg"
 	BasePipelineMetricAggregationTypeMovingFn      BasePipelineMetricAggregationType = "moving_fn"
 	BasePipelineMetricAggregationTypePercentiles   BasePipelineMetricAggregationType = "percentiles"
 	BasePipelineMetricAggregationTypeRate          BasePipelineMetricAggregationType = "rate"
 	BasePipelineMetricAggregationTypeRawData       BasePipelineMetricAggregationType = "raw_data"
 	BasePipelineMetricAggregationTypeRawDocument   BasePipelineMetricAggregationType = "raw_document"
 	BasePipelineMetricAggregationTypeSerialDiff    BasePipelineMetricAggregationType = "serial_diff"
 	BasePipelineMetricAggregationTypeSum           BasePipelineMetricAggregationType = "sum"
 	BasePipelineMetricAggregationTypeTopMetrics    BasePipelineMetricAggregationType = "top_metrics"
 )
-	BasePipelineMetricAggregationTypeLogs BasePipelineMetricAggregationType = "logs"
+// Defines values for BucketAggregationSettingsOrder.
-
+const (
-	BasePipelineMetricAggregationTypeMax BasePipelineMetricAggregationType = "max"
+	BucketAggregationSettingsOrderAsc  BucketAggregationSettingsOrder = "asc"
-
+	BucketAggregationSettingsOrderDesc BucketAggregationSettingsOrder = "desc"
 	BasePipelineMetricAggregationTypeMin BasePipelineMetricAggregationType = "min"
 	BasePipelineMetricAggregationTypeMovingAvg BasePipelineMetricAggregationType = "moving_avg"
 	BasePipelineMetricAggregationTypeMovingFn BasePipelineMetricAggregationType = "moving_fn"
 	BasePipelineMetricAggregationTypePercentiles BasePipelineMetricAggregationType = "percentiles"
 	BasePipelineMetricAggregationTypeRate BasePipelineMetricAggregationType = "rate"
 	BasePipelineMetricAggregationTypeRawData BasePipelineMetricAggregationType = "raw_data"
 	BasePipelineMetricAggregationTypeRawDocument BasePipelineMetricAggregationType = "raw_document"
 	BasePipelineMetricAggregationTypeSerialDiff BasePipelineMetricAggregationType = "serial_diff"
 	BasePipelineMetricAggregationTypeSum BasePipelineMetricAggregationType = "sum"
 	BasePipelineMetricAggregationTypeTopMetrics BasePipelineMetricAggregationType = "top_metrics"
 )
 // Defines values for BucketAggregationType.
 const (
 	BucketAggregationTypeDateHistogram BucketAggregationType = "date_histogram"
-
+	BucketAggregationTypeFilters       BucketAggregationType = "filters"
-	BucketAggregationTypeFilters BucketAggregationType = "filters"
+	BucketAggregationTypeGeohashGrid   BucketAggregationType = "geohash_grid"
-
+	BucketAggregationTypeHistogram     BucketAggregationType = "histogram"
-	BucketAggregationTypeGeohashGrid BucketAggregationType = "geohash_grid"
+	BucketAggregationTypeNested        BucketAggregationType = "nested"
-
+	BucketAggregationTypeTerms         BucketAggregationType = "terms"
 	BucketAggregationTypeHistogram BucketAggregationType = "histogram"
 	BucketAggregationTypeNested BucketAggregationType = "nested"
 	BucketAggregationTypeTerms BucketAggregationType = "terms"
 )
 // Defines values for BucketAggregationWithFieldType.
 const (
 	BucketAggregationWithFieldTypeDateHistogram BucketAggregationWithFieldType = "date_histogram"
-
+	BucketAggregationWithFieldTypeFilters       BucketAggregationWithFieldType = "filters"
-	BucketAggregationWithFieldTypeFilters BucketAggregationWithFieldType = "filters"
+	BucketAggregationWithFieldTypeGeohashGrid   BucketAggregationWithFieldType = "geohash_grid"
-
+	BucketAggregationWithFieldTypeHistogram     BucketAggregationWithFieldType = "histogram"
-	BucketAggregationWithFieldTypeGeohashGrid BucketAggregationWithFieldType = "geohash_grid"
+	BucketAggregationWithFieldTypeNested        BucketAggregationWithFieldType = "nested"
-
+	BucketAggregationWithFieldTypeTerms         BucketAggregationWithFieldType = "terms"
 	BucketAggregationWithFieldTypeHistogram BucketAggregationWithFieldType = "histogram"
 	BucketAggregationWithFieldTypeNested BucketAggregationWithFieldType = "nested"
 	BucketAggregationWithFieldTypeTerms BucketAggregationWithFieldType = "terms"
 )
 // Defines values for BucketScriptType.
@ -179,42 +134,34 @@ const (
 	DerivativeTypeDerivative DerivativeType = "derivative"
 )
-// Defines values for ExtendedStatValue.
+// Defines values for BucketAggsSettingsOrder.
 const (
-	ExtendedStatValueAvg ExtendedStatValue = "avg"
+	BucketAggsSettingsOrderAsc  BucketAggsSettingsOrder = "asc"
-
+	BucketAggsSettingsOrderDesc BucketAggsSettingsOrder = "desc"
-	ExtendedStatValueCount ExtendedStatValue = "count"
+)
 	ExtendedStatValueMax ExtendedStatValue = "max"
 	ExtendedStatValueMin ExtendedStatValue = "min"
 	ExtendedStatValueStdDeviation ExtendedStatValue = "std_deviation"
 // Defines values for ExtendedStatValue.
 const (
 	ExtendedStatValueAvg                     ExtendedStatValue = "avg"
 	ExtendedStatValueCount                   ExtendedStatValue = "count"
 	ExtendedStatValueMax                     ExtendedStatValue = "max"
 	ExtendedStatValueMin                     ExtendedStatValue = "min"
 	ExtendedStatValueStdDeviation            ExtendedStatValue = "std_deviation"
 	ExtendedStatValueStdDeviationBoundsLower ExtendedStatValue = "std_deviation_bounds_lower"
 	ExtendedStatValueStdDeviationBoundsUpper ExtendedStatValue = "std_deviation_bounds_upper"
-
+	ExtendedStatValueSum                     ExtendedStatValue = "sum"
 	ExtendedStatValueSum ExtendedStatValue = "sum"
 )
 // Defines values for ExtendedStatMetaType.
 const (
-	ExtendedStatMetaTypeAvg ExtendedStatMetaType = "avg"
+	ExtendedStatMetaTypeAvg                     ExtendedStatMetaType = "avg"
-
+	ExtendedStatMetaTypeCount                   ExtendedStatMetaType = "count"
-	ExtendedStatMetaTypeCount ExtendedStatMetaType = "count"
+	ExtendedStatMetaTypeMax                     ExtendedStatMetaType = "max"
-
+	ExtendedStatMetaTypeMin                     ExtendedStatMetaType = "min"
-	ExtendedStatMetaTypeMax ExtendedStatMetaType = "max"
+	ExtendedStatMetaTypeStdDeviation            ExtendedStatMetaType = "std_deviation"
 	ExtendedStatMetaTypeMin ExtendedStatMetaType = "min"
 	ExtendedStatMetaTypeStdDeviation ExtendedStatMetaType = "std_deviation"
 	ExtendedStatMetaTypeStdDeviationBoundsLower ExtendedStatMetaType = "std_deviation_bounds_lower"
 	ExtendedStatMetaTypeStdDeviationBoundsUpper ExtendedStatMetaType = "std_deviation_bounds_upper"
-
+	ExtendedStatMetaTypeSum                     ExtendedStatMetaType = "sum"
 	ExtendedStatMetaTypeSum ExtendedStatMetaType = "sum"
 )
 // Defines values for ExtendedStatsType.
@ -249,166 +196,94 @@ const (
 // Defines values for MetricAggregationType.
 const (
-	MetricAggregationTypeAvg MetricAggregationType = "avg"
+	MetricAggregationTypeAvg           MetricAggregationType = "avg"
-
+	MetricAggregationTypeBucketScript  MetricAggregationType = "bucket_script"
-	MetricAggregationTypeBucketScript MetricAggregationType = "bucket_script"
+	MetricAggregationTypeCardinality   MetricAggregationType = "cardinality"
-
+	MetricAggregationTypeCount         MetricAggregationType = "count"
 	MetricAggregationTypeCardinality MetricAggregationType = "cardinality"
 	MetricAggregationTypeCount MetricAggregationType = "count"
 	MetricAggregationTypeCumulativeSum MetricAggregationType = "cumulative_sum"
-
+	MetricAggregationTypeDerivative    MetricAggregationType = "derivative"
 	MetricAggregationTypeDerivative MetricAggregationType = "derivative"
 	MetricAggregationTypeExtendedStats MetricAggregationType = "extended_stats"
-
+	MetricAggregationTypeLogs          MetricAggregationType = "logs"
-	MetricAggregationTypeLogs MetricAggregationType = "logs"
+	MetricAggregationTypeMax           MetricAggregationType = "max"
-
+	MetricAggregationTypeMin           MetricAggregationType = "min"
-	MetricAggregationTypeMax MetricAggregationType = "max"
+	MetricAggregationTypeMovingAvg     MetricAggregationType = "moving_avg"
-
+	MetricAggregationTypeMovingFn      MetricAggregationType = "moving_fn"
-	MetricAggregationTypeMin MetricAggregationType = "min"
+	MetricAggregationTypePercentiles   MetricAggregationType = "percentiles"
-
+	MetricAggregationTypeRate          MetricAggregationType = "rate"
-	MetricAggregationTypeMovingAvg MetricAggregationType = "moving_avg"
+	MetricAggregationTypeRawData       MetricAggregationType = "raw_data"
-
+	MetricAggregationTypeRawDocument   MetricAggregationType = "raw_document"
-	MetricAggregationTypeMovingFn MetricAggregationType = "moving_fn"
+	MetricAggregationTypeSerialDiff    MetricAggregationType = "serial_diff"
-
+	MetricAggregationTypeSum           MetricAggregationType = "sum"
-	MetricAggregationTypePercentiles MetricAggregationType = "percentiles"
+	MetricAggregationTypeTopMetrics    MetricAggregationType = "top_metrics"
 	MetricAggregationTypeRate MetricAggregationType = "rate"
 	MetricAggregationTypeRawData MetricAggregationType = "raw_data"
 	MetricAggregationTypeRawDocument MetricAggregationType = "raw_document"
 	MetricAggregationTypeSerialDiff MetricAggregationType = "serial_diff"
 	MetricAggregationTypeSum MetricAggregationType = "sum"
 	MetricAggregationTypeTopMetrics MetricAggregationType = "top_metrics"
 )
 // Defines values for MetricAggregationWithFieldType.
 const (
-	MetricAggregationWithFieldTypeAvg MetricAggregationWithFieldType = "avg"
+	MetricAggregationWithFieldTypeAvg           MetricAggregationWithFieldType = "avg"
-
+	MetricAggregationWithFieldTypeBucketScript  MetricAggregationWithFieldType = "bucket_script"
-	MetricAggregationWithFieldTypeBucketScript MetricAggregationWithFieldType = "bucket_script"
+	MetricAggregationWithFieldTypeCardinality   MetricAggregationWithFieldType = "cardinality"
-
+	MetricAggregationWithFieldTypeCount         MetricAggregationWithFieldType = "count"
 	MetricAggregationWithFieldTypeCardinality MetricAggregationWithFieldType = "cardinality"
 	MetricAggregationWithFieldTypeCount MetricAggregationWithFieldType = "count"
 	MetricAggregationWithFieldTypeCumulativeSum MetricAggregationWithFieldType = "cumulative_sum"
-
+	MetricAggregationWithFieldTypeDerivative    MetricAggregationWithFieldType = "derivative"
 	MetricAggregationWithFieldTypeDerivative MetricAggregationWithFieldType = "derivative"
 	MetricAggregationWithFieldTypeExtendedStats MetricAggregationWithFieldType = "extended_stats"
-
+	MetricAggregationWithFieldTypeLogs          MetricAggregationWithFieldType = "logs"
-	MetricAggregationWithFieldTypeLogs MetricAggregationWithFieldType = "logs"
+	MetricAggregationWithFieldTypeMax           MetricAggregationWithFieldType = "max"
-
+	MetricAggregationWithFieldTypeMin           MetricAggregationWithFieldType = "min"
-	MetricAggregationWithFieldTypeMax MetricAggregationWithFieldType = "max"
+	MetricAggregationWithFieldTypeMovingAvg     MetricAggregationWithFieldType = "moving_avg"
-
+	MetricAggregationWithFieldTypeMovingFn      MetricAggregationWithFieldType = "moving_fn"
-	MetricAggregationWithFieldTypeMin MetricAggregationWithFieldType = "min"
+	MetricAggregationWithFieldTypePercentiles   MetricAggregationWithFieldType = "percentiles"
-
+	MetricAggregationWithFieldTypeRate          MetricAggregationWithFieldType = "rate"
-	MetricAggregationWithFieldTypeMovingAvg MetricAggregationWithFieldType = "moving_avg"
+	MetricAggregationWithFieldTypeRawData       MetricAggregationWithFieldType = "raw_data"
-
+	MetricAggregationWithFieldTypeRawDocument   MetricAggregationWithFieldType = "raw_document"
-	MetricAggregationWithFieldTypeMovingFn MetricAggregationWithFieldType = "moving_fn"
+	MetricAggregationWithFieldTypeSerialDiff    MetricAggregationWithFieldType = "serial_diff"
-
+	MetricAggregationWithFieldTypeSum           MetricAggregationWithFieldType = "sum"
-	MetricAggregationWithFieldTypePercentiles MetricAggregationWithFieldType = "percentiles"
+	MetricAggregationWithFieldTypeTopMetrics    MetricAggregationWithFieldType = "top_metrics"
 	MetricAggregationWithFieldTypeRate MetricAggregationWithFieldType = "rate"
 	MetricAggregationWithFieldTypeRawData MetricAggregationWithFieldType = "raw_data"
 	MetricAggregationWithFieldTypeRawDocument MetricAggregationWithFieldType = "raw_document"
 	MetricAggregationWithFieldTypeSerialDiff MetricAggregationWithFieldType = "serial_diff"
 	MetricAggregationWithFieldTypeSum MetricAggregationWithFieldType = "sum"
 	MetricAggregationWithFieldTypeTopMetrics MetricAggregationWithFieldType = "top_metrics"
 )
 // Defines values for MetricAggregationWithInlineScriptType.
 const (
-	MetricAggregationWithInlineScriptTypeAvg MetricAggregationWithInlineScriptType = "avg"
+	MetricAggregationWithInlineScriptTypeAvg           MetricAggregationWithInlineScriptType = "avg"
-
+	MetricAggregationWithInlineScriptTypeBucketScript  MetricAggregationWithInlineScriptType = "bucket_script"
-	MetricAggregationWithInlineScriptTypeBucketScript MetricAggregationWithInlineScriptType = "bucket_script"
+	MetricAggregationWithInlineScriptTypeCardinality   MetricAggregationWithInlineScriptType = "cardinality"
-
+	MetricAggregationWithInlineScriptTypeCount         MetricAggregationWithInlineScriptType = "count"
 	MetricAggregationWithInlineScriptTypeCardinality MetricAggregationWithInlineScriptType = "cardinality"
 	MetricAggregationWithInlineScriptTypeCount MetricAggregationWithInlineScriptType = "count"
 	MetricAggregationWithInlineScriptTypeCumulativeSum MetricAggregationWithInlineScriptType = "cumulative_sum"
-
+	MetricAggregationWithInlineScriptTypeDerivative    MetricAggregationWithInlineScriptType = "derivative"
 	MetricAggregationWithInlineScriptTypeDerivative MetricAggregationWithInlineScriptType = "derivative"
 	MetricAggregationWithInlineScriptTypeExtendedStats MetricAggregationWithInlineScriptType = "extended_stats"
-
+	MetricAggregationWithInlineScriptTypeLogs          MetricAggregationWithInlineScriptType = "logs"
-	MetricAggregationWithInlineScriptTypeLogs MetricAggregationWithInlineScriptType = "logs"
+	MetricAggregationWithInlineScriptTypeMax           MetricAggregationWithInlineScriptType = "max"
-
+	MetricAggregationWithInlineScriptTypeMin           MetricAggregationWithInlineScriptType = "min"
-	MetricAggregationWithInlineScriptTypeMax MetricAggregationWithInlineScriptType = "max"
+	MetricAggregationWithInlineScriptTypeMovingAvg     MetricAggregationWithInlineScriptType = "moving_avg"
-
+	MetricAggregationWithInlineScriptTypeMovingFn      MetricAggregationWithInlineScriptType = "moving_fn"
-	MetricAggregationWithInlineScriptTypeMin MetricAggregationWithInlineScriptType = "min"
+	MetricAggregationWithInlineScriptTypePercentiles   MetricAggregationWithInlineScriptType = "percentiles"
-
+	MetricAggregationWithInlineScriptTypeRate          MetricAggregationWithInlineScriptType = "rate"
-	MetricAggregationWithInlineScriptTypeMovingAvg MetricAggregationWithInlineScriptType = "moving_avg"
+	MetricAggregationWithInlineScriptTypeRawData       MetricAggregationWithInlineScriptType = "raw_data"
-
+	MetricAggregationWithInlineScriptTypeRawDocument   MetricAggregationWithInlineScriptType = "raw_document"
-	MetricAggregationWithInlineScriptTypeMovingFn MetricAggregationWithInlineScriptType = "moving_fn"
+	MetricAggregationWithInlineScriptTypeSerialDiff    MetricAggregationWithInlineScriptType = "serial_diff"
-
+	MetricAggregationWithInlineScriptTypeSum           MetricAggregationWithInlineScriptType = "sum"
-	MetricAggregationWithInlineScriptTypePercentiles MetricAggregationWithInlineScriptType = "percentiles"
+	MetricAggregationWithInlineScriptTypeTopMetrics    MetricAggregationWithInlineScriptType = "top_metrics"
 	MetricAggregationWithInlineScriptTypeRate MetricAggregationWithInlineScriptType = "rate"
 	MetricAggregationWithInlineScriptTypeRawData MetricAggregationWithInlineScriptType = "raw_data"
 	MetricAggregationWithInlineScriptTypeRawDocument MetricAggregationWithInlineScriptType = "raw_document"
 	MetricAggregationWithInlineScriptTypeSerialDiff MetricAggregationWithInlineScriptType = "serial_diff"
 	MetricAggregationWithInlineScriptTypeSum MetricAggregationWithInlineScriptType = "sum"
 	MetricAggregationWithInlineScriptTypeTopMetrics MetricAggregationWithInlineScriptType = "top_metrics"
 )
 // Defines values for MetricAggregationWithMissingSupportType.
 const (
-	MetricAggregationWithMissingSupportTypeAvg MetricAggregationWithMissingSupportType = "avg"
+	MetricAggregationWithMissingSupportTypeAvg           MetricAggregationWithMissingSupportType = "avg"
-
+	MetricAggregationWithMissingSupportTypeBucketScript  MetricAggregationWithMissingSupportType = "bucket_script"
-	MetricAggregationWithMissingSupportTypeBucketScript MetricAggregationWithMissingSupportType = "bucket_script"
+	MetricAggregationWithMissingSupportTypeCardinality   MetricAggregationWithMissingSupportType = "cardinality"
-
+	MetricAggregationWithMissingSupportTypeCount         MetricAggregationWithMissingSupportType = "count"
 	MetricAggregationWithMissingSupportTypeCardinality MetricAggregationWithMissingSupportType = "cardinality"
 	MetricAggregationWithMissingSupportTypeCount MetricAggregationWithMissingSupportType = "count"
 	MetricAggregationWithMissingSupportTypeCumulativeSum MetricAggregationWithMissingSupportType = "cumulative_sum"
-
+	MetricAggregationWithMissingSupportTypeDerivative    MetricAggregationWithMissingSupportType = "derivative"
 	MetricAggregationWithMissingSupportTypeDerivative MetricAggregationWithMissingSupportType = "derivative"
 	MetricAggregationWithMissingSupportTypeExtendedStats MetricAggregationWithMissingSupportType = "extended_stats"
-
+	MetricAggregationWithMissingSupportTypeLogs          MetricAggregationWithMissingSupportType = "logs"
-	MetricAggregationWithMissingSupportTypeLogs MetricAggregationWithMissingSupportType = "logs"
+	MetricAggregationWithMissingSupportTypeMax           MetricAggregationWithMissingSupportType = "max"
-
+	MetricAggregationWithMissingSupportTypeMin           MetricAggregationWithMissingSupportType = "min"
-	MetricAggregationWithMissingSupportTypeMax MetricAggregationWithMissingSupportType = "max"
+	MetricAggregationWithMissingSupportTypeMovingAvg     MetricAggregationWithMissingSupportType = "moving_avg"
-
+	MetricAggregationWithMissingSupportTypeMovingFn      MetricAggregationWithMissingSupportType = "moving_fn"
-	MetricAggregationWithMissingSupportTypeMin MetricAggregationWithMissingSupportType = "min"
+	MetricAggregationWithMissingSupportTypePercentiles   MetricAggregationWithMissingSupportType = "percentiles"
-
+	MetricAggregationWithMissingSupportTypeRate          MetricAggregationWithMissingSupportType = "rate"
-	MetricAggregationWithMissingSupportTypeMovingAvg MetricAggregationWithMissingSupportType = "moving_avg"
+	MetricAggregationWithMissingSupportTypeRawData       MetricAggregationWithMissingSupportType = "raw_data"
-
+	MetricAggregationWithMissingSupportTypeRawDocument   MetricAggregationWithMissingSupportType = "raw_document"
-	MetricAggregationWithMissingSupportTypeMovingFn MetricAggregationWithMissingSupportType = "moving_fn"
+	MetricAggregationWithMissingSupportTypeSerialDiff    MetricAggregationWithMissingSupportType = "serial_diff"
-
+	MetricAggregationWithMissingSupportTypeSum           MetricAggregationWithMissingSupportType = "sum"
-	MetricAggregationWithMissingSupportTypePercentiles MetricAggregationWithMissingSupportType = "percentiles"
+	MetricAggregationWithMissingSupportTypeTopMetrics    MetricAggregationWithMissingSupportType = "top_metrics"
 	MetricAggregationWithMissingSupportTypeRate MetricAggregationWithMissingSupportType = "rate"
 	MetricAggregationWithMissingSupportTypeRawData MetricAggregationWithMissingSupportType = "raw_data"
 	MetricAggregationWithMissingSupportTypeRawDocument MetricAggregationWithMissingSupportType = "raw_document"
 	MetricAggregationWithMissingSupportTypeSerialDiff MetricAggregationWithMissingSupportType = "serial_diff"
 	MetricAggregationWithMissingSupportTypeSum MetricAggregationWithMissingSupportType = "sum"
 	MetricAggregationWithMissingSupportTypeTopMetrics MetricAggregationWithMissingSupportType = "top_metrics"
 )
 // Defines values for MinType.
@ -443,28 +318,20 @@ const (
 // Defines values for MovingAverageModel.
 const (
-	MovingAverageModelEwma MovingAverageModel = "ewma"
+	MovingAverageModelEwma        MovingAverageModel = "ewma"
-
+	MovingAverageModelHolt        MovingAverageModel = "holt"
 	MovingAverageModelHolt MovingAverageModel = "holt"
 	MovingAverageModelHoltWinters MovingAverageModel = "holt_winters"
-
+	MovingAverageModelLinear      MovingAverageModel = "linear"
-	MovingAverageModelLinear MovingAverageModel = "linear"
+	MovingAverageModelSimple      MovingAverageModel = "simple"
 	MovingAverageModelSimple MovingAverageModel = "simple"
 )
 // Defines values for MovingAverageModelOptionValue.
 const (
-	MovingAverageModelOptionValueEwma MovingAverageModelOptionValue = "ewma"
+	MovingAverageModelOptionValueEwma        MovingAverageModelOptionValue = "ewma"
-
+	MovingAverageModelOptionValueHolt        MovingAverageModelOptionValue = "holt"
 	MovingAverageModelOptionValueHolt MovingAverageModelOptionValue = "holt"
 	MovingAverageModelOptionValueHoltWinters MovingAverageModelOptionValue = "holt_winters"
-
+	MovingAverageModelOptionValueLinear      MovingAverageModelOptionValue = "linear"
-	MovingAverageModelOptionValueLinear MovingAverageModelOptionValue = "linear"
+	MovingAverageModelOptionValueSimple      MovingAverageModelOptionValue = "simple"
 	MovingAverageModelOptionValueSimple MovingAverageModelOptionValue = "simple"
 )
 // Defines values for MovingAverageSimpleModelSettingsModel.
@ -489,58 +356,35 @@ const (
 // Defines values for PipelineMetricAggregationType.
 const (
-	PipelineMetricAggregationTypeBucketScript PipelineMetricAggregationType = "bucket_script"
+	PipelineMetricAggregationTypeBucketScript  PipelineMetricAggregationType = "bucket_script"
 	PipelineMetricAggregationTypeCumulativeSum PipelineMetricAggregationType = "cumulative_sum"
-
+	PipelineMetricAggregationTypeDerivative    PipelineMetricAggregationType = "derivative"
-	PipelineMetricAggregationTypeDerivative PipelineMetricAggregationType = "derivative"
+	PipelineMetricAggregationTypeMovingAvg     PipelineMetricAggregationType = "moving_avg"
-
+	PipelineMetricAggregationTypeMovingFn      PipelineMetricAggregationType = "moving_fn"
-	PipelineMetricAggregationTypeMovingAvg PipelineMetricAggregationType = "moving_avg"
+	PipelineMetricAggregationTypeSerialDiff    PipelineMetricAggregationType = "serial_diff"
 	PipelineMetricAggregationTypeMovingFn PipelineMetricAggregationType = "moving_fn"
 	PipelineMetricAggregationTypeSerialDiff PipelineMetricAggregationType = "serial_diff"
 )
 // Defines values for PipelineMetricAggregationWithMultipleBucketPathsType.
 const (
-	PipelineMetricAggregationWithMultipleBucketPathsTypeAvg PipelineMetricAggregationWithMultipleBucketPathsType = "avg"
+	PipelineMetricAggregationWithMultipleBucketPathsTypeAvg           PipelineMetricAggregationWithMultipleBucketPathsType = "avg"
-
+	PipelineMetricAggregationWithMultipleBucketPathsTypeBucketScript  PipelineMetricAggregationWithMultipleBucketPathsType = "bucket_script"
-	PipelineMetricAggregationWithMultipleBucketPathsTypeBucketScript PipelineMetricAggregationWithMultipleBucketPathsType = "bucket_script"
+	PipelineMetricAggregationWithMultipleBucketPathsTypeCardinality   PipelineMetricAggregationWithMultipleBucketPathsType = "cardinality"
-
+	PipelineMetricAggregationWithMultipleBucketPathsTypeCount         PipelineMetricAggregationWithMultipleBucketPathsType = "count"
 	PipelineMetricAggregationWithMultipleBucketPathsTypeCardinality PipelineMetricAggregationWithMultipleBucketPathsType = "cardinality"
 	PipelineMetricAggregationWithMultipleBucketPathsTypeCount PipelineMetricAggregationWithMultipleBucketPathsType = "count"
 	PipelineMetricAggregationWithMultipleBucketPathsTypeCumulativeSum PipelineMetricAggregationWithMultipleBucketPathsType = "cumulative_sum"
-
+	PipelineMetricAggregationWithMultipleBucketPathsTypeDerivative    PipelineMetricAggregationWithMultipleBucketPathsType = "derivative"
 	PipelineMetricAggregationWithMultipleBucketPathsTypeDerivative PipelineMetricAggregationWithMultipleBucketPathsType = "derivative"
 	PipelineMetricAggregationWithMultipleBucketPathsTypeExtendedStats PipelineMetricAggregationWithMultipleBucketPathsType = "extended_stats"
-
+	PipelineMetricAggregationWithMultipleBucketPathsTypeLogs          PipelineMetricAggregationWithMultipleBucketPathsType = "logs"
-	PipelineMetricAggregationWithMultipleBucketPathsTypeLogs PipelineMetricAggregationWithMultipleBucketPathsType = "logs"
+	PipelineMetricAggregationWithMultipleBucketPathsTypeMax           PipelineMetricAggregationWithMultipleBucketPathsType = "max"
-
+	PipelineMetricAggregationWithMultipleBucketPathsTypeMin           PipelineMetricAggregationWithMultipleBucketPathsType = "min"
-	PipelineMetricAggregationWithMultipleBucketPathsTypeMax PipelineMetricAggregationWithMultipleBucketPathsType = "max"
+	PipelineMetricAggregationWithMultipleBucketPathsTypeMovingAvg     PipelineMetricAggregationWithMultipleBucketPathsType = "moving_avg"
-
+	PipelineMetricAggregationWithMultipleBucketPathsTypeMovingFn      PipelineMetricAggregationWithMultipleBucketPathsType = "moving_fn"
-	PipelineMetricAggregationWithMultipleBucketPathsTypeMin PipelineMetricAggregationWithMultipleBucketPathsType = "min"
+	PipelineMetricAggregationWithMultipleBucketPathsTypePercentiles   PipelineMetricAggregationWithMultipleBucketPathsType = "percentiles"
-
+	PipelineMetricAggregationWithMultipleBucketPathsTypeRate          PipelineMetricAggregationWithMultipleBucketPathsType = "rate"
-	PipelineMetricAggregationWithMultipleBucketPathsTypeMovingAvg PipelineMetricAggregationWithMultipleBucketPathsType = "moving_avg"
+	PipelineMetricAggregationWithMultipleBucketPathsTypeRawData       PipelineMetricAggregationWithMultipleBucketPathsType = "raw_data"
-
+	PipelineMetricAggregationWithMultipleBucketPathsTypeRawDocument   PipelineMetricAggregationWithMultipleBucketPathsType = "raw_document"
-	PipelineMetricAggregationWithMultipleBucketPathsTypeMovingFn PipelineMetricAggregationWithMultipleBucketPathsType = "moving_fn"
+	PipelineMetricAggregationWithMultipleBucketPathsTypeSerialDiff    PipelineMetricAggregationWithMultipleBucketPathsType = "serial_diff"
-
+	PipelineMetricAggregationWithMultipleBucketPathsTypeSum           PipelineMetricAggregationWithMultipleBucketPathsType = "sum"
-	PipelineMetricAggregationWithMultipleBucketPathsTypePercentiles PipelineMetricAggregationWithMultipleBucketPathsType = "percentiles"
+	PipelineMetricAggregationWithMultipleBucketPathsTypeTopMetrics    PipelineMetricAggregationWithMultipleBucketPathsType = "top_metrics"
 	PipelineMetricAggregationWithMultipleBucketPathsTypeRate PipelineMetricAggregationWithMultipleBucketPathsType = "rate"
 	PipelineMetricAggregationWithMultipleBucketPathsTypeRawData PipelineMetricAggregationWithMultipleBucketPathsType = "raw_data"
 	PipelineMetricAggregationWithMultipleBucketPathsTypeRawDocument PipelineMetricAggregationWithMultipleBucketPathsType = "raw_document"
 	PipelineMetricAggregationWithMultipleBucketPathsTypeSerialDiff PipelineMetricAggregationWithMultipleBucketPathsType = "serial_diff"
 	PipelineMetricAggregationWithMultipleBucketPathsTypeSum PipelineMetricAggregationWithMultipleBucketPathsType = "sum"
 	PipelineMetricAggregationWithMultipleBucketPathsTypeTopMetrics PipelineMetricAggregationWithMultipleBucketPathsType = "top_metrics"
 )
 // Defines values for RateType.
@ -570,8 +414,7 @@ const (
 // Defines values for TermsSettingsOrder.
 const (
-	TermsSettingsOrderAsc TermsSettingsOrder = "asc"
+	TermsSettingsOrderAsc  TermsSettingsOrder = "asc"
 	TermsSettingsOrderDesc TermsSettingsOrder = "desc"
 )
@ -582,8 +425,7 @@ const (
 // Defines values for TermsOrder.
 const (
-	TermsOrderAsc TermsOrder = "asc"
+	TermsOrderAsc  TermsOrder = "asc"
 	TermsOrderDesc TermsOrder = "desc"
 )
@ -655,7 +497,35 @@ type BasePipelineMetricAggregation struct {
 type BasePipelineMetricAggregationType string
 // BucketAggregation defines model for BucketAggregation.
-type BucketAggregation interface{}
+type BucketAggregation struct {
 	Field    *string                     `json:"field,omitempty"`
 	Id       *string                     `json:"id,omitempty"`
 	Settings *BucketAggregation_Settings `json:"settings,omitempty"`
 	Type     *interface{}                `json:"type,omitempty"`
 	union    json.RawMessage
 }
 // BucketAggregationSettingsOrder defines model for BucketAggregation.Settings.Order.
 type BucketAggregationSettingsOrder string
 // BucketAggregation_Settings defines model for BucketAggregation.Settings.
 type BucketAggregation_Settings struct {
 	Filters []struct {
 		Label string `json:"label"`
 		Query string `json:"query"`
 	} `json:"filters,omitempty"`
 	Interval             *string                         `json:"interval,omitempty"`
 	MinDocCount          *string                         `json:"min_doc_count,omitempty"`
 	Missing              *string                         `json:"missing,omitempty"`
 	Offset               *string                         `json:"offset,omitempty"`
 	Order                *BucketAggregationSettingsOrder `json:"order,omitempty"`
 	OrderBy              *string                         `json:"orderBy,omitempty"`
 	Precision            *string                         `json:"precision,omitempty"`
 	Size                 *string                         `json:"size,omitempty"`
 	TimeZone             *string                         `json:"timeZone,omitempty"`
 	TrimEdges            *string                         `json:"trimEdges,omitempty"`
 	AdditionalProperties map[string]interface{}          `json:"-"`
 }
 // BucketAggregationType defines model for BucketAggregationType.
 type BucketAggregationType string
@ -675,7 +545,7 @@ type BucketAggregationWithFieldType string
 type BucketScript struct {
 	Hide              *bool  `json:"hide,omitempty"`
 	Id                string `json:"id"`
-	PipelineVariables *[]struct {
+	PipelineVariables []struct {
 		Name        string `json:"name"`
 		PipelineAgg string `json:"pipelineAgg"`
 	} `json:"pipelineVariables,omitempty"`
@ -760,7 +630,7 @@ type ElasticsearchDataQuery struct {
 	Alias *string `json:"alias,omitempty"`
 	// List of bucket aggregations
-	BucketAggs *[]interface{} `json:"bucketAggs,omitempty"`
+	BucketAggs []_BucketAggs_Item `json:"bucketAggs,omitempty"`
 	// For mixed data sources the selected datasource is on the query level.
 	// For non mixed scenarios this is undefined.
@ -768,14 +638,14 @@ type ElasticsearchDataQuery struct {
 	// TODO this shouldn't be unknown but DataSourceRef | null
 	Datasource *interface{} `json:"datasource,omitempty"`
-	// true if query is disabled (ie should not be returned to the dashboard)
+	// Hide true if query is disabled (ie should not be returned to the dashboard)
 	Hide *bool `json:"hide,omitempty"`
 	// Unique, guid like, string used in explore mode
 	Key *string `json:"key,omitempty"`
 	// List of metric aggregations
-	Metrics *[]interface{} `json:"metrics,omitempty"`
+	Metrics []_Metrics_Item `json:"metrics,omitempty"`
 	// Lucene query
 	Query *string `json:"query,omitempty"`
@ -791,6 +661,74 @@ type ElasticsearchDataQuery struct {
 	TimeField *string `json:"timeField,omitempty"`
 }
 // BucketAggsSettingsOrder defines model for ElasticsearchDataQuery.BucketAggs.Settings.Order.
 type BucketAggsSettingsOrder string
 // _BucketAggs_Settings defines model for ElasticsearchDataQuery.BucketAggs.Settings.
 type _BucketAggs_Settings struct {
 	Filters []struct {
 		Label string `json:"label"`
 		Query string `json:"query"`
 	} `json:"filters,omitempty"`
 	Interval             *string                  `json:"interval,omitempty"`
 	MinDocCount          *string                  `json:"min_doc_count,omitempty"`
 	Missing              *string                  `json:"missing,omitempty"`
 	Offset               *string                  `json:"offset,omitempty"`
 	Order                *BucketAggsSettingsOrder `json:"order,omitempty"`
 	OrderBy              *string                  `json:"orderBy,omitempty"`
 	Precision            *string                  `json:"precision,omitempty"`
 	Size                 *string                  `json:"size,omitempty"`
 	TimeZone             *string                  `json:"timeZone,omitempty"`
 	TrimEdges            *string                  `json:"trimEdges,omitempty"`
 	AdditionalProperties map[string]interface{}   `json:"-"`
 }
 // _BucketAggs_Item defines model for ElasticsearchDataQuery.bucketAggs.Item.
 type _BucketAggs_Item struct {
 	Field    *string               `json:"field,omitempty"`
 	Id       *string               `json:"id,omitempty"`
 	Settings *_BucketAggs_Settings `json:"settings,omitempty"`
 	Type     *interface{}          `json:"type,omitempty"`
 	union    json.RawMessage
 }
 // _Metrics_Settings defines model for ElasticsearchDataQuery.Metrics.Settings.
 type _Metrics_Settings struct {
 	Format               *string                `json:"format,omitempty"`
 	Lag                  *string                `json:"lag,omitempty"`
 	Limit                *string                `json:"limit,omitempty"`
 	Metrics              []string               `json:"metrics,omitempty"`
 	Missing              *string                `json:"missing,omitempty"`
 	Mode                 *string                `json:"mode,omitempty"`
 	Order                *string                `json:"order,omitempty"`
 	OrderBy              *string                `json:"orderBy,omitempty"`
 	Percents             []string               `json:"percents,omitempty"`
 	PrecisionThreshold   *string                `json:"precision_threshold,omitempty"`
 	Script               *interface{}           `json:"script,omitempty"`
 	Shift                *string                `json:"shift,omitempty"`
 	Sigma                *string                `json:"sigma,omitempty"`
 	Size                 *string                `json:"size,omitempty"`
 	Unit                 *string                `json:"unit,omitempty"`
 	Window               *string                `json:"window,omitempty"`
 	AdditionalProperties map[string]interface{} `json:"-"`
 }
 // _Metrics_Item defines model for ElasticsearchDataQuery.metrics.Item.
 type _Metrics_Item struct {
 	Field             *string                `json:"field,omitempty"`
 	Hide              *bool                  `json:"hide,omitempty"`
 	Id                *string                `json:"id,omitempty"`
 	Meta              map[string]interface{} `json:"meta,omitempty"`
 	PipelineAgg       *string                `json:"pipelineAgg,omitempty"`
 	PipelineVariables []struct {
 		Name        string `json:"name"`
 		PipelineAgg string `json:"pipelineAgg"`
 	} `json:"pipelineVariables,omitempty"`
 	Settings *_Metrics_Settings `json:"settings,omitempty"`
 	Type     *interface{}       `json:"type,omitempty"`
 	union    json.RawMessage
 }
 // ExtendedStat defines model for ExtendedStat.
 type ExtendedStat struct {
 	Label string            `json:"label"`
@ -805,10 +743,10 @@ type ExtendedStatMetaType string
 // ExtendedStats defines model for ExtendedStats.
 type ExtendedStats struct {
-	Field    *string                 `json:"field,omitempty"`
+	Field    *string                `json:"field,omitempty"`
-	Hide     *bool                   `json:"hide,omitempty"`
+	Hide     *bool                  `json:"hide,omitempty"`
-	Id       string                  `json:"id"`
+	Id       string                 `json:"id"`
-	Meta     *map[string]interface{} `json:"meta,omitempty"`
+	Meta     map[string]interface{} `json:"meta,omitempty"`
 	Settings *struct {
 		Missing *string      `json:"missing,omitempty"`
 		Script  *interface{} `json:"script,omitempty"`
@ -830,7 +768,7 @@ type Filter struct {
 type Filters struct {
 	Id       string `json:"id"`
 	Settings *struct {
-		Filters *[]struct {
+		Filters []struct {
 			Label string `json:"label"`
 			Query string `json:"query"`
 		} `json:"filters,omitempty"`
@ -843,7 +781,7 @@ type FiltersType string
 // FiltersSettings defines model for FiltersSettings.
 type FiltersSettings struct {
-	Filters *[]struct {
+	Filters []struct {
 		Label string `json:"label"`
 		Query string `json:"query"`
 	} `json:"filters,omitempty"`
@ -887,9 +825,6 @@ type HistogramSettings struct {
 	MinDocCount *string `json:"min_doc_count,omitempty"`
 }
 // InlineScript defines model for InlineScript.
 type InlineScript interface{}
 // Logs defines model for Logs.
 type Logs struct {
 	Hide     *bool  `json:"hide,omitempty"`
@ -919,7 +854,41 @@ type Max struct {
 type MaxType string
 // MetricAggregation defines model for MetricAggregation.
-type MetricAggregation interface{}
+type MetricAggregation struct {
 	Field             *string                `json:"field,omitempty"`
 	Hide              *bool                  `json:"hide,omitempty"`
 	Id                *string                `json:"id,omitempty"`
 	Meta              map[string]interface{} `json:"meta,omitempty"`
 	PipelineAgg       *string                `json:"pipelineAgg,omitempty"`
 	PipelineVariables []struct {
 		Name        string `json:"name"`
 		PipelineAgg string `json:"pipelineAgg"`
 	} `json:"pipelineVariables,omitempty"`
 	Settings *MetricAggregation_Settings `json:"settings,omitempty"`
 	Type     *interface{}                `json:"type,omitempty"`
 	union    json.RawMessage
 }
 // MetricAggregation_Settings defines model for MetricAggregation.Settings.
 type MetricAggregation_Settings struct {
 	Format               *string                `json:"format,omitempty"`
 	Lag                  *string                `json:"lag,omitempty"`
 	Limit                *string                `json:"limit,omitempty"`
 	Metrics              []string               `json:"metrics,omitempty"`
 	Missing              *string                `json:"missing,omitempty"`
 	Mode                 *string                `json:"mode,omitempty"`
 	Order                *string                `json:"order,omitempty"`
 	OrderBy              *string                `json:"orderBy,omitempty"`
 	Percents             []string               `json:"percents,omitempty"`
 	PrecisionThreshold   *string                `json:"precision_threshold,omitempty"`
 	Script               *interface{}           `json:"script,omitempty"`
 	Shift                *string                `json:"shift,omitempty"`
 	Sigma                *string                `json:"sigma,omitempty"`
 	Size                 *string                `json:"size,omitempty"`
 	Unit                 *string                `json:"unit,omitempty"`
 	Window               *string                `json:"window,omitempty"`
 	AdditionalProperties map[string]interface{} `json:"-"`
 }
 // MetricAggregationType defines model for MetricAggregationType.
 type MetricAggregationType string
@ -962,7 +931,41 @@ type MetricAggregationWithMissingSupport struct {
 type MetricAggregationWithMissingSupportType string
 // MetricAggregationWithSettings defines model for MetricAggregationWithSettings.
-type MetricAggregationWithSettings interface{}
+type MetricAggregationWithSettings struct {
 	Field             *string                `json:"field,omitempty"`
 	Hide              *bool                  `json:"hide,omitempty"`
 	Id                *string                `json:"id,omitempty"`
 	Meta              map[string]interface{} `json:"meta,omitempty"`
 	PipelineAgg       *string                `json:"pipelineAgg,omitempty"`
 	PipelineVariables []struct {
 		Name        string `json:"name"`
 		PipelineAgg string `json:"pipelineAgg"`
 	} `json:"pipelineVariables,omitempty"`
 	Settings *MetricAggregationWithSettings_Settings `json:"settings,omitempty"`
 	Type     *interface{}                            `json:"type,omitempty"`
 	union    json.RawMessage
 }
 // MetricAggregationWithSettings_Settings defines model for MetricAggregationWithSettings.Settings.
 type MetricAggregationWithSettings_Settings struct {
 	Format               *string                `json:"format,omitempty"`
 	Lag                  *string                `json:"lag,omitempty"`
 	Limit                *string                `json:"limit,omitempty"`
 	Metrics              []string               `json:"metrics,omitempty"`
 	Missing              *string                `json:"missing,omitempty"`
 	Mode                 *string                `json:"mode,omitempty"`
 	Order                *string                `json:"order,omitempty"`
 	OrderBy              *string                `json:"orderBy,omitempty"`
 	Percents             []string               `json:"percents,omitempty"`
 	PrecisionThreshold   *string                `json:"precision_threshold,omitempty"`
 	Script               *interface{}           `json:"script,omitempty"`
 	Shift                *string                `json:"shift,omitempty"`
 	Sigma                *string                `json:"sigma,omitempty"`
 	Size                 *string                `json:"size,omitempty"`
 	Unit                 *string                `json:"unit,omitempty"`
 	Window               *string                `json:"window,omitempty"`
 	AdditionalProperties map[string]interface{} `json:"-"`
 }
 // Min defines model for Min.
 type Min struct {
@ -1106,7 +1109,7 @@ type Percentiles struct {
 	Id       string  `json:"id"`
 	Settings *struct {
 		Missing  *string      `json:"missing,omitempty"`
-		Percents *[]string    `json:"percents,omitempty"`
+		Percents []string     `json:"percents,omitempty"`
 		Script   *interface{} `json:"script,omitempty"`
 	} `json:"settings,omitempty"`
 	Type PercentilesType `json:"type"`
@ -1116,7 +1119,27 @@ type Percentiles struct {
 type PercentilesType string
 // PipelineMetricAggregation defines model for PipelineMetricAggregation.
-type PipelineMetricAggregation interface{}
+type PipelineMetricAggregation struct {
 	Field             *string `json:"field,omitempty"`
 	Hide              *bool   `json:"hide,omitempty"`
 	Id                *string `json:"id,omitempty"`
 	PipelineAgg       *string `json:"pipelineAgg,omitempty"`
 	PipelineVariables []struct {
 		Name        string `json:"name"`
 		PipelineAgg string `json:"pipelineAgg"`
 	} `json:"pipelineVariables,omitempty"`
 	Settings *PipelineMetricAggregation_Settings `json:"settings,omitempty"`
 	Type     *interface{}                        `json:"type,omitempty"`
 	union    json.RawMessage
 }
 // PipelineMetricAggregation_Settings defines model for PipelineMetricAggregation.Settings.
 type PipelineMetricAggregation_Settings struct {
 	Format               *string                `json:"format,omitempty"`
 	Script               *interface{}           `json:"script,omitempty"`
 	Unit                 *string                `json:"unit,omitempty"`
 	AdditionalProperties map[string]interface{} `json:"-"`
 }
 // PipelineMetricAggregationType defines model for PipelineMetricAggregationType.
 type PipelineMetricAggregationType string
@ -1125,7 +1148,7 @@ type PipelineMetricAggregationType string
 type PipelineMetricAggregationWithMultipleBucketPaths struct {
 	Hide              *bool  `json:"hide,omitempty"`
 	Id                string `json:"id"`
-	PipelineVariables *[]struct {
+	PipelineVariables []struct {
 		Name        string `json:"name"`
 		PipelineAgg string `json:"pipelineAgg"`
 	} `json:"pipelineVariables,omitempty"`
@ -1249,9 +1272,9 @@ type TopMetrics struct {
 	Hide     *bool  `json:"hide,omitempty"`
 	Id       string `json:"id"`
 	Settings *struct {
-		Metrics *[]string `json:"metrics,omitempty"`
+		Metrics []string `json:"metrics,omitempty"`
-		Order   *string   `json:"order,omitempty"`
+		Order   *string  `json:"order,omitempty"`
-		OrderBy *string   `json:"orderBy,omitempty"`
+		OrderBy *string  `json:"orderBy,omitempty"`
 	} `json:"settings,omitempty"`
 	Type TopMetricsType `json:"type"`
 }
--- a/pkg/tsdb/loki/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/loki/kinds/dataquery/types_dataquery_gen.go
@ -12,39 +12,32 @@ package dataquery
 // Defines values for EditorMode.
 const (
 	EditorModeBuilder EditorMode = "builder"
-
+	EditorModeCode    EditorMode = "code"
 	EditorModeCode EditorMode = "code"
 )
 // Defines values for LokiQueryDirection.
 const (
 	LokiQueryDirectionBackward LokiQueryDirection = "backward"
-
+	LokiQueryDirectionForward  LokiQueryDirection = "forward"
 	LokiQueryDirectionForward LokiQueryDirection = "forward"
 )
 // Defines values for LokiQueryType.
 const (
 	LokiQueryTypeInstant LokiQueryType = "instant"
-
+	LokiQueryTypeRange   LokiQueryType = "range"
-	LokiQueryTypeRange LokiQueryType = "range"
+	LokiQueryTypeStream  LokiQueryType = "stream"
 	LokiQueryTypeStream LokiQueryType = "stream"
 )
 // Defines values for QueryEditorMode.
 const (
 	QueryEditorModeBuilder QueryEditorMode = "builder"
-
+	QueryEditorModeCode    QueryEditorMode = "code"
 	QueryEditorModeCode QueryEditorMode = "code"
 )
 // Defines values for SupportingQueryType.
 const (
 	SupportingQueryTypeDataSample SupportingQueryType = "dataSample"
 	SupportingQueryTypeLogsSample SupportingQueryType = "logsSample"
 	SupportingQueryTypeLogsVolume SupportingQueryType = "logsVolume"
 )
@ -60,7 +53,7 @@ type LokiDataQuery struct {
 	// The LogQL query.
 	Expr string `json:"expr"`
-	// true if query is disabled (ie should not be returned to the dashboard)
+	// Hide true if query is disabled (ie should not be returned to the dashboard)
 	Hide *bool `json:"hide,omitempty"`
 	// @deprecated, now use queryType.
--- a/pkg/tsdb/parca/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/parca/kinds/dataquery/types_dataquery_gen.go
@ -11,10 +11,8 @@ package dataquery
 // Defines values for ParcaQueryType.
 const (
-	ParcaQueryTypeBoth ParcaQueryType = "both"
+	ParcaQueryTypeBoth    ParcaQueryType = "both"
 	ParcaQueryTypeMetrics ParcaQueryType = "metrics"
 	ParcaQueryTypeProfile ParcaQueryType = "profile"
 )
@ -26,7 +24,7 @@ type ParcaDataQuery struct {
 	// TODO this shouldn't be unknown but DataSourceRef | null
 	Datasource *interface{} `json:"datasource,omitempty"`
-	// true if query is disabled (ie should not be returned to the dashboard)
+	// Hide true if query is disabled (ie should not be returned to the dashboard)
 	Hide *bool `json:"hide,omitempty"`
 	// Unique, guid like, string used in explore mode
--- a/pkg/tsdb/phlare/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/phlare/kinds/dataquery/types_dataquery_gen.go
@ -11,10 +11,8 @@ package dataquery
 // Defines values for PhlareQueryType.
 const (
-	PhlareQueryTypeBoth PhlareQueryType = "both"
+	PhlareQueryTypeBoth    PhlareQueryType = "both"
 	PhlareQueryTypeMetrics PhlareQueryType = "metrics"
 	PhlareQueryTypeProfile PhlareQueryType = "profile"
 )
@ -29,7 +27,7 @@ type PhlareDataQuery struct {
 	// Allows to group the results.
 	GroupBy []string `json:"groupBy"`
-	// true if query is disabled (ie should not be returned to the dashboard)
+	// Hide true if query is disabled (ie should not be returned to the dashboard)
 	Hide *bool `json:"hide,omitempty"`
 	// Unique, guid like, string used in explore mode
--- a/pkg/tsdb/tempo/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/tempo/kinds/dataquery/types_dataquery_gen.go
@ -11,17 +11,12 @@ package dataquery
 // Defines values for TempoQueryType.
 const (
-	TempoQueryTypeClear TempoQueryType = "clear"
+	TempoQueryTypeClear        TempoQueryType = "clear"
 	TempoQueryTypeNativeSearch TempoQueryType = "nativeSearch"
-
+	TempoQueryTypeSearch       TempoQueryType = "search"
-	TempoQueryTypeSearch TempoQueryType = "search"
+	TempoQueryTypeServiceMap   TempoQueryType = "serviceMap"
-
+	TempoQueryTypeTraceql      TempoQueryType = "traceql"
-	TempoQueryTypeServiceMap TempoQueryType = "serviceMap"
+	TempoQueryTypeUpload       TempoQueryType = "upload"
 	TempoQueryTypeTraceql TempoQueryType = "traceql"
 	TempoQueryTypeUpload TempoQueryType = "upload"
 )
 // TempoDataQuery defines model for TempoDataQuery.
@ -32,7 +27,7 @@ type TempoDataQuery struct {
 	// TODO this shouldn't be unknown but DataSourceRef | null
 	Datasource *interface{} `json:"datasource,omitempty"`
-	// true if query is disabled (ie should not be returned to the dashboard)
+	// Hide true if query is disabled (ie should not be returned to the dashboard)
 	Hide *bool `json:"hide,omitempty"`
 	// Unique, guid like, string used in explore mode
@ -70,5 +65,5 @@ type TempoDataQuery struct {
 	SpanName *string `json:"spanName,omitempty"`
 }
-// search = Loki search, nativeSearch = Tempo search for backwards compatibility
+// TempoQueryType search = Loki search, nativeSearch = Tempo search for backwards compatibility
 type TempoQueryType string
--- a/pkg/tsdb/testdatasource/kinds/dataquery/types_dataquery_gen.go
+++ b/pkg/tsdb/testdatasource/kinds/dataquery/types_dataquery_gen.go
@ -11,169 +11,103 @@ package dataquery
 // Defines values for NodesQueryType.
 const (
-	NodesQueryTypeRandom NodesQueryType = "random"
+	NodesQueryTypeRandom      NodesQueryType = "random"
 	NodesQueryTypeRandomEdges NodesQueryType = "random edges"
-
+	NodesQueryTypeResponse    NodesQueryType = "response"
 	NodesQueryTypeResponse NodesQueryType = "response"
 )
 // Defines values for StreamingQueryType.
 const (
-	StreamingQueryTypeFetch StreamingQueryType = "fetch"
+	StreamingQueryTypeFetch  StreamingQueryType = "fetch"
-
+	StreamingQueryTypeLogs   StreamingQueryType = "logs"
 	StreamingQueryTypeLogs StreamingQueryType = "logs"
 	StreamingQueryTypeSignal StreamingQueryType = "signal"
 )
 // Defines values for ErrorType.
 const (
-	ErrorTypeFrontendException ErrorType = "frontend_exception"
+	ErrorTypeFrontendException  ErrorType = "frontend_exception"
 	ErrorTypeFrontendObservable ErrorType = "frontend_observable"
-
+	ErrorTypeServerPanic        ErrorType = "server_panic"
 	ErrorTypeServerPanic ErrorType = "server_panic"
 )
 // Defines values for NodesType.
 const (
-	NodesTypeRandom NodesType = "random"
+	NodesTypeRandom      NodesType = "random"
 	NodesTypeRandomEdges NodesType = "random edges"
-
+	NodesTypeResponse    NodesType = "response"
 	NodesTypeResponse NodesType = "response"
 )
 // Defines values for ScenarioId.
 const (
-	ScenarioIdAnnotations ScenarioId = "annotations"
+	ScenarioIdAnnotations                  ScenarioId = "annotations"
-
+	ScenarioIdArrow                        ScenarioId = "arrow"
-	ScenarioIdArrow ScenarioId = "arrow"
+	ScenarioIdCsvContent                   ScenarioId = "csv_content"
-
+	ScenarioIdCsvFile                      ScenarioId = "csv_file"
-	ScenarioIdCsvContent ScenarioId = "csv_content"
+	ScenarioIdCsvMetricValues              ScenarioId = "csv_metric_values"
-
+	ScenarioIdDatapointsOutsideRange       ScenarioId = "datapoints_outside_range"
 	ScenarioIdCsvFile ScenarioId = "csv_file"
 	ScenarioIdCsvMetricValues ScenarioId = "csv_metric_values"
 	ScenarioIdDatapointsOutsideRange ScenarioId = "datapoints_outside_range"
 	ScenarioIdExponentialHeatmapBucketData ScenarioId = "exponential_heatmap_bucket_data"
-
+	ScenarioIdFlameGraph                   ScenarioId = "flame_graph"
-	ScenarioIdFlameGraph ScenarioId = "flame_graph"
+	ScenarioIdGrafanaApi                   ScenarioId = "grafana_api"
-
+	ScenarioIdLinearHeatmapBucketData      ScenarioId = "linear_heatmap_bucket_data"
-	ScenarioIdGrafanaApi ScenarioId = "grafana_api"
+	ScenarioIdLive                         ScenarioId = "live"
-
+	ScenarioIdLogs                         ScenarioId = "logs"
-	ScenarioIdLinearHeatmapBucketData ScenarioId = "linear_heatmap_bucket_data"
+	ScenarioIdManualEntry                  ScenarioId = "manual_entry"
-
+	ScenarioIdNoDataPoints                 ScenarioId = "no_data_points"
-	ScenarioIdLive ScenarioId = "live"
+	ScenarioIdNodeGraph                    ScenarioId = "node_graph"
-
+	ScenarioIdPredictableCsvWave           ScenarioId = "predictable_csv_wave"
-	ScenarioIdLogs ScenarioId = "logs"
+	ScenarioIdPredictablePulse             ScenarioId = "predictable_pulse"
-
+	ScenarioIdRandomWalk                   ScenarioId = "random_walk"
-	ScenarioIdManualEntry ScenarioId = "manual_entry"
+	ScenarioIdRandomWalkTable              ScenarioId = "random_walk_table"
-
+	ScenarioIdRandomWalkWithError          ScenarioId = "random_walk_with_error"
-	ScenarioIdNoDataPoints ScenarioId = "no_data_points"
+	ScenarioIdRawFrame                     ScenarioId = "raw_frame"
-
+	ScenarioIdServerError500               ScenarioId = "server_error_500"
-	ScenarioIdNodeGraph ScenarioId = "node_graph"
+	ScenarioIdSimulation                   ScenarioId = "simulation"
-
+	ScenarioIdSlowQuery                    ScenarioId = "slow_query"
-	ScenarioIdPredictableCsvWave ScenarioId = "predictable_csv_wave"
+	ScenarioIdStreamingClient              ScenarioId = "streaming_client"
-
+	ScenarioIdTableStatic                  ScenarioId = "table_static"
-	ScenarioIdPredictablePulse ScenarioId = "predictable_pulse"
+	ScenarioIdTrace                        ScenarioId = "trace"
-
+	ScenarioIdUsa                          ScenarioId = "usa"
-	ScenarioIdRandomWalk ScenarioId = "random_walk"
+	ScenarioIdVariablesQuery               ScenarioId = "variables-query"
 	ScenarioIdRandomWalkTable ScenarioId = "random_walk_table"
 	ScenarioIdRandomWalkWithError ScenarioId = "random_walk_with_error"
 	ScenarioIdRawFrame ScenarioId = "raw_frame"
 	ScenarioIdServerError500 ScenarioId = "server_error_500"
 	ScenarioIdSimulation ScenarioId = "simulation"
 	ScenarioIdSlowQuery ScenarioId = "slow_query"
 	ScenarioIdStreamingClient ScenarioId = "streaming_client"
 	ScenarioIdTableStatic ScenarioId = "table_static"
 	ScenarioIdTrace ScenarioId = "trace"
 	ScenarioIdUsa ScenarioId = "usa"
 	ScenarioIdVariablesQuery ScenarioId = "variables-query"
 )
 // Defines values for StreamType.
 const (
-	StreamTypeFetch StreamType = "fetch"
+	StreamTypeFetch  StreamType = "fetch"
-
+	StreamTypeLogs   StreamType = "logs"
 	StreamTypeLogs StreamType = "logs"
 	StreamTypeSignal StreamType = "signal"
 )
 // Defines values for TestDataQueryType.
 const (
-	TestDataQueryTypeAnnotations TestDataQueryType = "annotations"
+	TestDataQueryTypeAnnotations                  TestDataQueryType = "annotations"
-
+	TestDataQueryTypeArrow                        TestDataQueryType = "arrow"
-	TestDataQueryTypeArrow TestDataQueryType = "arrow"
+	TestDataQueryTypeCsvContent                   TestDataQueryType = "csv_content"
-
+	TestDataQueryTypeCsvFile                      TestDataQueryType = "csv_file"
-	TestDataQueryTypeCsvContent TestDataQueryType = "csv_content"
+	TestDataQueryTypeCsvMetricValues              TestDataQueryType = "csv_metric_values"
-
+	TestDataQueryTypeDatapointsOutsideRange       TestDataQueryType = "datapoints_outside_range"
 	TestDataQueryTypeCsvFile TestDataQueryType = "csv_file"
 	TestDataQueryTypeCsvMetricValues TestDataQueryType = "csv_metric_values"
 	TestDataQueryTypeDatapointsOutsideRange TestDataQueryType = "datapoints_outside_range"
 	TestDataQueryTypeExponentialHeatmapBucketData TestDataQueryType = "exponential_heatmap_bucket_data"
-
+	TestDataQueryTypeFlameGraph                   TestDataQueryType = "flame_graph"
-	TestDataQueryTypeFlameGraph TestDataQueryType = "flame_graph"
+	TestDataQueryTypeGrafanaApi                   TestDataQueryType = "grafana_api"
-
+	TestDataQueryTypeLinearHeatmapBucketData      TestDataQueryType = "linear_heatmap_bucket_data"
-	TestDataQueryTypeGrafanaApi TestDataQueryType = "grafana_api"
+	TestDataQueryTypeLive                         TestDataQueryType = "live"
-
+	TestDataQueryTypeLogs                         TestDataQueryType = "logs"
-	TestDataQueryTypeLinearHeatmapBucketData TestDataQueryType = "linear_heatmap_bucket_data"
+	TestDataQueryTypeManualEntry                  TestDataQueryType = "manual_entry"
-
+	TestDataQueryTypeNoDataPoints                 TestDataQueryType = "no_data_points"
-	TestDataQueryTypeLive TestDataQueryType = "live"
+	TestDataQueryTypeNodeGraph                    TestDataQueryType = "node_graph"
-
+	TestDataQueryTypePredictableCsvWave           TestDataQueryType = "predictable_csv_wave"
-	TestDataQueryTypeLogs TestDataQueryType = "logs"
+	TestDataQueryTypePredictablePulse             TestDataQueryType = "predictable_pulse"
-
+	TestDataQueryTypeRandomWalk                   TestDataQueryType = "random_walk"
-	TestDataQueryTypeManualEntry TestDataQueryType = "manual_entry"
+	TestDataQueryTypeRandomWalkTable              TestDataQueryType = "random_walk_table"
-
+	TestDataQueryTypeRandomWalkWithError          TestDataQueryType = "random_walk_with_error"
-	TestDataQueryTypeNoDataPoints TestDataQueryType = "no_data_points"
+	TestDataQueryTypeRawFrame                     TestDataQueryType = "raw_frame"
-
+	TestDataQueryTypeServerError500               TestDataQueryType = "server_error_500"
-	TestDataQueryTypeNodeGraph TestDataQueryType = "node_graph"
+	TestDataQueryTypeSimulation                   TestDataQueryType = "simulation"
-
+	TestDataQueryTypeSlowQuery                    TestDataQueryType = "slow_query"
-	TestDataQueryTypePredictableCsvWave TestDataQueryType = "predictable_csv_wave"
+	TestDataQueryTypeStreamingClient              TestDataQueryType = "streaming_client"
-
+	TestDataQueryTypeTableStatic                  TestDataQueryType = "table_static"
-	TestDataQueryTypePredictablePulse TestDataQueryType = "predictable_pulse"
+	TestDataQueryTypeTrace                        TestDataQueryType = "trace"
-
+	TestDataQueryTypeUsa                          TestDataQueryType = "usa"
-	TestDataQueryTypeRandomWalk TestDataQueryType = "random_walk"
+	TestDataQueryTypeVariablesQuery               TestDataQueryType = "variables-query"
 	TestDataQueryTypeRandomWalkTable TestDataQueryType = "random_walk_table"
 	TestDataQueryTypeRandomWalkWithError TestDataQueryType = "random_walk_with_error"
 	TestDataQueryTypeRawFrame TestDataQueryType = "raw_frame"
 	TestDataQueryTypeServerError500 TestDataQueryType = "server_error_500"
 	TestDataQueryTypeSimulation TestDataQueryType = "simulation"
 	TestDataQueryTypeSlowQuery TestDataQueryType = "slow_query"
 	TestDataQueryTypeStreamingClient TestDataQueryType = "streaming_client"
 	TestDataQueryTypeTableStatic TestDataQueryType = "table_static"
 	TestDataQueryTypeTrace TestDataQueryType = "trace"
 	TestDataQueryTypeUsa TestDataQueryType = "usa"
 	TestDataQueryTypeVariablesQuery TestDataQueryType = "variables-query"
 )
 // CSVWave defines model for CSVWave.
@ -242,7 +176,7 @@ type TestDataDataQuery struct {
 	Channel     *string `json:"channel,omitempty"`
 	CsvContent  *string `json:"csvContent,omitempty"`
 	CsvFileName *string `json:"csvFileName,omitempty"`
-	CsvWave     *[]struct {
+	CsvWave     []struct {
 		Labels    *string `json:"labels,omitempty"`
 		Name      *string `json:"name,omitempty"`
 		TimeStep  *int64  `json:"timeStep,omitempty"`
@ -256,7 +190,7 @@ type TestDataDataQuery struct {
 	Datasource *interface{} `json:"datasource,omitempty"`
 	ErrorType  *ErrorType   `json:"errorType,omitempty"`
-	// true if query is disabled (ie should not be returned to the dashboard)
+	// Hide true if query is disabled (ie should not be returned to the dashboard)
 	Hide *bool `json:"hide,omitempty"`
 	// Unique, guid like, string used in explore mode
@ -268,7 +202,7 @@ type TestDataDataQuery struct {
 		Count *int64     `json:"count,omitempty"`
 		Type  *NodesType `json:"type,omitempty"`
 	} `json:"nodes,omitempty"`
-	Points    *[][]interface{} `json:"points,omitempty"`
+	Points    [][]interface{} `json:"points,omitempty"`
 	PulseWave *struct {
 		OffCount *int64   `json:"offCount,omitempty"`
 		OffValue *float64 `json:"offValue,omitempty"`
@ -307,10 +241,10 @@ type TestDataDataQuery struct {
 	} `json:"stream,omitempty"`
 	StringInput *string `json:"stringInput,omitempty"`
 	Usa         *struct {
-		Fields *[]string `json:"fields,omitempty"`
+		Fields []string `json:"fields,omitempty"`
-		Mode   *string   `json:"mode,omitempty"`
+		Mode   *string  `json:"mode,omitempty"`
-		Period *string   `json:"period,omitempty"`
+		Period *string  `json:"period,omitempty"`
-		States *[]string `json:"states,omitempty"`
+		States []string `json:"states,omitempty"`
 	} `json:"usa,omitempty"`
 }
@ -331,8 +265,8 @@ type TestDataQueryType string
 // USAQuery defines model for USAQuery.
 type USAQuery struct {
-	Fields *[]string `json:"fields,omitempty"`
+	Fields []string `json:"fields,omitempty"`
-	Mode   *string   `json:"mode,omitempty"`
+	Mode   *string  `json:"mode,omitempty"`
-	Period *string   `json:"period,omitempty"`
+	Period *string  `json:"period,omitempty"`
-	States *[]string `json:"states,omitempty"`
+	States []string `json:"states,omitempty"`
 }