test: use testify package

go.mod

@@ -1,6 +1,6 @@
 module github.com/SigNoz/signoz
 
-go 1.25.0
+go 1.25.7
 
 require (
 	dario.cat/mergo v1.0.2
@@ -19,6 +19,7 @@ require (
 	github.com/go-co-op/gocron v1.30.1
 	github.com/go-openapi/runtime v0.29.2
 	github.com/go-openapi/strfmt v0.25.0
+	github.com/go-playground/validator/v10 v10.27.0
 	github.com/go-redis/redismock/v9 v9.2.0
 	github.com/go-viper/mapstructure/v2 v2.5.0
 	github.com/gojek/heimdall/v7 v7.0.3
@@ -27,8 +28,8 @@ require (
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.1
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
-	github.com/huandu/go-sqlbuilder v1.35.0
-	github.com/jackc/pgx/v5 v5.7.6
+	github.com/huandu/go-sqlbuilder v1.39.1
+	github.com/jackc/pgx/v5 v5.8.0
 	github.com/json-iterator/go v1.1.13-0.20220915233716-71ac16282d12
 	github.com/knadh/koanf v1.5.0
 	github.com/knadh/koanf/v2 v2.3.2
@@ -38,6 +39,7 @@ require (
 	github.com/openfga/api/proto v0.0.0-20250909172242-b4b2a12f5c67
 	github.com/openfga/language/pkg/go v0.2.0-beta.2.0.20251027165255-0f8f255e5f6c
 	github.com/opentracing/opentracing-go v1.2.0
+	github.com/perses/perses v0.53.1
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/alertmanager v0.31.0
 	github.com/prometheus/client_golang v1.23.2
@@ -86,7 +88,7 @@ require (
 	google.golang.org/protobuf v1.36.11
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/apimachinery v0.35.0
+	k8s.io/apimachinery v0.35.2
 	modernc.org/sqlite v1.40.1
 )
 
@@ -125,12 +127,14 @@ require (
 	github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.27.0 // indirect
 	github.com/goccy/go-yaml v1.19.2 // indirect
 	github.com/hashicorp/go-metrics v0.5.4 // indirect
+	github.com/huandu/go-clone v1.7.3 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/muhlemmer/gu v0.3.1 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
+	github.com/perses/common v0.30.2 // indirect
 	github.com/prometheus/client_golang/exp v0.0.0-20260108101519-fb0838f53562 // indirect
 	github.com/redis/go-redis/extra/rediscmd/v9 v9.15.1 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
@@ -139,6 +143,8 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.3.0 // indirect
 	github.com/uptrace/opentelemetry-go-extra/otelsql v0.3.2 // indirect
+	github.com/zitadel/oidc/v3 v3.45.4 // indirect
+	github.com/zitadel/schema v1.3.2 // indirect
 	go.opentelemetry.io/collector/client v1.50.0 // indirect
 	go.opentelemetry.io/collector/config/configoptional v1.50.0 // indirect
 	go.opentelemetry.io/collector/config/configretry v1.50.0 // indirect
@@ -208,7 +214,7 @@ require (
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v1.0.0 // indirect
 	github.com/google/btree v1.1.3 // indirect
-	github.com/google/cel-go v0.26.1 // indirect
+	github.com/google/cel-go v0.27.0 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.11 // indirect
 	github.com/googleapis/gax-go/v2 v2.16.0 // indirect
@@ -226,7 +232,7 @@ require (
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/memberlist v0.5.4 // indirect
-	github.com/huandu/xstrings v1.4.0 // indirect
+	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
@@ -298,7 +304,6 @@ require (
 	github.com/spf13/cast v1.10.0 // indirect
 	github.com/spf13/pflag v1.0.10 // indirect
 	github.com/spf13/viper v1.20.1 // indirect
-	github.com/stoewer/go-strcase v1.3.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/swaggest/openapi-go v0.2.60
@@ -384,7 +389,7 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9
 	google.golang.org/grpc v1.80.0 // indirect
 	gopkg.in/telebot.v3 v3.3.8 // indirect
-	k8s.io/client-go v0.35.0 // indirect
+	k8s.io/client-go v0.35.2 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
 )

go.sum

@@ -489,8 +489,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
 github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
-github.com/google/cel-go v0.26.1 h1:iPbVVEdkhTX++hpe3lzSk7D3G3QSYqLGoHOcEio+UXQ=
-github.com/google/cel-go v0.26.1/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM=
+github.com/google/cel-go v0.27.0 h1:e7ih85+4qVrBuqQWTW4FKSqZYokVuc3HnhH5keboFTo=
+github.com/google/cel-go v0.27.0/go.mod h1:tTJ11FWqnhw5KKpnWpvW9CJC3Y9GK4EIS0WXnBbebzw=
 github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
 github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -654,12 +654,15 @@ github.com/hetznercloud/hcloud-go/v2 v2.36.0 h1:HlLL/aaVXUulqe+rsjoJmrxKhPi1MflL
 github.com/hetznercloud/hcloud-go/v2 v2.36.0/go.mod h1:MnN/QJEa/RYNQiiVoJjNHPntM7Z1wlYPgJ2HA40/cDE=
 github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2cs=
 github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E=
+github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U=
 github.com/huandu/go-assert v1.1.6 h1:oaAfYxq9KNDi9qswn/6aE0EydfxSa+tWZC1KabNitYs=
 github.com/huandu/go-assert v1.1.6/go.mod h1:JuIfbmYG9ykwvuxoJ3V8TB5QP+3+ajIA54Y44TmkMxs=
-github.com/huandu/go-sqlbuilder v1.35.0 h1:ESvxFHN8vxCTudY1Vq63zYpU5yJBESn19sf6k4v2T5Q=
-github.com/huandu/go-sqlbuilder v1.35.0/go.mod h1:mS0GAtrtW+XL6nM2/gXHRJax2RwSW1TraavWDFAc1JA=
-github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU=
-github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
+github.com/huandu/go-clone v1.7.3 h1:rtQODA+ABThEn6J5LBTppJfKmZy/FwfpMUWa8d01TTQ=
+github.com/huandu/go-clone v1.7.3/go.mod h1:ReGivhG6op3GYr+UY3lS6mxjKp7MIGTknuU5TbTVaXE=
+github.com/huandu/go-sqlbuilder v1.39.1 h1:uUaj41yLNTQBe7ojNF6Im1RPbHCN4zCjMRySTEC2ooI=
+github.com/huandu/go-sqlbuilder v1.39.1/go.mod h1:zdONH67liL+/TvoUMwnZP/sUYGSSvHh9psLe/HpXn8E=
+github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
+github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc=
 github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -672,8 +675,8 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.7.6 h1:rWQc5FwZSPX58r1OQmkuaNicxdmExaEz5A2DO2hUuTk=
-github.com/jackc/pgx/v5 v5.7.6/go.mod h1:aruU7o91Tc2q2cFp5h4uP3f6ztExVpyVv88Xl/8Vl8M=
+github.com/jackc/pgx/v5 v5.8.0 h1:TYPDoleBBme0xGSAX3/+NujXXtpZn9HBONkQC7IEZSo=
+github.com/jackc/pgx/v5 v5.8.0/go.mod h1:QVeDInX2m9VyzvNeiCJVjCkNFqzsNb43204HshNSZKw=
 github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jessevdk/go-flags v1.6.1 h1:Cvu5U8UGrLay1rZfv/zP7iLpSHGUZ/Ou68T0iX1bBK4=
@@ -818,6 +821,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
 github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
 github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
+github.com/muhlemmer/gu v0.3.1 h1:7EAqmFrW7n3hETvuAdmFmn4hS8W+z3LgKtrnow+YzNM=
+github.com/muhlemmer/gu v0.3.1/go.mod h1:YHtHR+gxM+bKEIIs7Hmi9sPT3ZDUvTN/i88wQpZkrdM=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -827,9 +832,11 @@ github.com/natefinch/wrap v0.2.0 h1:IXzc/pw5KqxJv55gV0lSOcKHYuEZPGbQrOOXr/bamRk=
 github.com/natefinch/wrap v0.2.0/go.mod h1:6gMHlAl12DwYEfKP3TkuykYUfLSEAvHw67itm4/KAS8=
 github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
+github.com/nexucis/lamenv v0.5.2 h1:tK/u3XGhCq9qIoVNcXsK9LZb8fKopm0A5weqSRvHd7M=
+github.com/nexucis/lamenv v0.5.2/go.mod h1:HusJm6ltmmT7FMG8A750mOLuME6SHCsr2iFYxp5fFi0=
 github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk=
-github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
+github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/oklog/run v1.2.0 h1:O8x3yXwah4A73hJdlrwo/2X6J62gE5qTMusH0dvz60E=
 github.com/oklog/run v1.2.0/go.mod h1:mgDbKRSwPhJfesJ4PntqFUbKQRZ50NgmZTSPlFA0YFk=
@@ -891,6 +898,10 @@ github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCko
 github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas=
 github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
 github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
+github.com/perses/common v0.30.2 h1:RAiVxUpX76lTCb4X7pfcXSvYdXQmZwKi4oDKAEO//u0=
+github.com/perses/common v0.30.2/go.mod h1:DFtur1QPah2/ChXbKKhw7djYdwNgz27s5fPKpiK0Xao=
+github.com/perses/perses v0.53.1 h1:9VY/6p9QWrZwPSV7qiwTMSOsgcB37Lb1AXKT0ORXc6I=
+github.com/perses/perses v0.53.1/go.mod h1:ro8fsgBkHYOdrL/MV+fdP9mflKzYCy/+gcbxiaReI/A=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4/v4 v4.1.23 h1:oJE7T90aYBGtFNrI8+KbETnPymobAhzRrR8Mu8n1yfU=
 github.com/pierrec/lz4/v4 v4.1.23/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
@@ -1049,8 +1060,6 @@ github.com/srikanthccv/ClickHouse-go-mock v0.13.0 h1:/b7DQphGkh29ocNtLh4DGmQxQYA
 github.com/srikanthccv/ClickHouse-go-mock v0.13.0/go.mod h1:LiiyBUdXNwB/1DE9rgK/8q9qjVYsTzg6WXQ/3mU3TeY=
 github.com/stackitcloud/stackit-sdk-go/core v0.21.1 h1:Y/PcAgM7DPYMNqum0MLv4n1mF9ieuevzcCIZYQfm3Ts=
 github.com/stackitcloud/stackit-sdk-go/core v0.21.1/go.mod h1:osMglDby4csGZ5sIfhNyYq1bS1TxIdPY88+skE/kkmI=
-github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
-github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
@@ -1150,6 +1159,10 @@ github.com/zeebo/assert v1.3.1 h1:vukIABvugfNMZMQO1ABsyQDJDTVQbn+LWSMy1ol1h6A=
 github.com/zeebo/assert v1.3.1/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
 github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
+github.com/zitadel/oidc/v3 v3.45.4 h1:GKyWaPRVQ8sCu9XgJ3NgNGtG52FzwVJpzXjIUG2+YrI=
+github.com/zitadel/oidc/v3 v3.45.4/go.mod h1:XALmFXS9/kSom9B6uWin1yJ2WTI/E4Ti5aXJdewAVEs=
+github.com/zitadel/schema v1.3.2 h1:gfJvt7dOMfTmxzhscZ9KkapKo3Nei3B6cAxjav+lyjI=
+github.com/zitadel/schema v1.3.2/go.mod h1:IZmdfF9Wu62Zu6tJJTH3UsArevs3Y4smfJIj3L8fzxw=
 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
 go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU=
@@ -1915,12 +1928,12 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.35.0 h1:iBAU5LTyBI9vw3L5glmat1njFK34srdLmktWwLTprlY=
-k8s.io/api v0.35.0/go.mod h1:AQ0SNTzm4ZAczM03QH42c7l3bih1TbAXYo0DkF8ktnA=
-k8s.io/apimachinery v0.35.0 h1:Z2L3IHvPVv/MJ7xRxHEtk6GoJElaAqDCCU0S6ncYok8=
-k8s.io/apimachinery v0.35.0/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
-k8s.io/client-go v0.35.0 h1:IAW0ifFbfQQwQmga0UdoH0yvdqrbwMdq9vIFEhRpxBE=
-k8s.io/client-go v0.35.0/go.mod h1:q2E5AAyqcbeLGPdoRB+Nxe3KYTfPce1Dnu1myQdqz9o=
+k8s.io/api v0.35.2 h1:tW7mWc2RpxW7HS4CoRXhtYHSzme1PN1UjGHJ1bdrtdw=
+k8s.io/api v0.35.2/go.mod h1:7AJfqGoAZcwSFhOjcGM7WV05QxMMgUaChNfLTXDRE60=
+k8s.io/apimachinery v0.35.2 h1:NqsM/mmZA7sHW02JZ9RTtk3wInRgbVxL8MPfzSANAK8=
+k8s.io/apimachinery v0.35.2/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
+k8s.io/client-go v0.35.2 h1:YUfPefdGJA4aljDdayAXkc98DnPkIetMl4PrKX97W9o=
+k8s.io/client-go v0.35.2/go.mod h1:4QqEwh4oQpeK8AaefZ0jwTFJw/9kIjdQi0jpKeYvz7g=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE=

pkg/modules/metricsexplorer/implmetricsexplorer/module.go

@@ -1122,7 +1122,7 @@ func (m *module) computeTimeseriesTreemap(ctx context.Context, req *metricsexplo
 	)
 	finalSB.From("__metric_totals mt")
 	finalSB.Join("__total_time_series tts", "1=1")
-	finalSB.OrderBy("percentage").Desc()
+	finalSB.OrderByDesc("percentage")
 	finalSB.Limit(req.Limit)
 
 	query, args := finalSB.BuildWithFlavor(sqlbuilder.ClickHouse)

pkg/types/dashboardtypes/dashboard_v2.go

@@ -0,0 +1,262 @@
+package dashboardtypes
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"slices"
+	"strings"
+
+	"github.com/SigNoz/signoz/pkg/errors"
+	qb "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
+	"github.com/go-playground/validator/v10"
+	v1 "github.com/perses/perses/pkg/model/api/v1"
+	"github.com/perses/perses/pkg/model/api/v1/common"
+	"github.com/perses/perses/pkg/model/api/v1/dashboard"
+)
+
+// StorableDashboardDataV2 wraps v1.DashboardSpec (Perses) with additional SigNoz-specific fields.
+//
+// We embed DashboardSpec (not v1.Dashboard) to avoid carrying Perses's Metadata
+// (Name, Project, CreatedAt, UpdatedAt, Tags, Version) and Kind field. SigNoz
+// manages identity (ID), timestamps (TimeAuditable), and multi-tenancy (OrgID)
+// separately on StorableDashboardV2/DashboardV2.
+//
+// The following v1 request fields map to locations inside v1.DashboardSpec:
+//   - title       → Display.Name          (common.Display)
+//   - description → Display.Description   (common.Display)
+//
+// Fields that have no Perses equivalent will be added in this wrapper (like image, uploadGrafana, etc.)
+type StorableDashboardDataV2 = v1.DashboardSpec
+
+// UnmarshalAndValidateDashboardV2JSON unmarshals the JSON into a StorableDashboardDataV2
+// (= PostableDashboardV2 = UpdatableDashboardV2) and validates plugin kinds and specs.
+func UnmarshalAndValidateDashboardV2JSON(data []byte) (*StorableDashboardDataV2, error) {
+	var d StorableDashboardDataV2
+	// Note: DashboardSpec has a custom UnmarshalJSON which prevents
+	// DisallowUnknownFields from working at the top level. Unknown
+	// fields in plugin specs are still rejected by validateAndNormalizePluginSpec.
+	if err := json.Unmarshal(data, &d); err != nil {
+		return nil, err
+	}
+	if err := validateDashboardV2(d); err != nil {
+		return nil, err
+	}
+	return &d, nil
+}
+
+// Plugin kind → spec type factory. Each value is a pointer to the zero value of the
+// expected spec struct. validatePluginSpec marshals plugin.Spec back to JSON and
+// unmarshals into the typed struct to catch field-level errors.
+var (
+	panelPluginSpecs = map[PanelPluginKind]func() any{
+		PanelKindTimeSeries: func() any { return new(TimeSeriesPanelSpec) },
+		PanelKindBarChart:   func() any { return new(BarChartPanelSpec) },
+		PanelKindNumber:     func() any { return new(NumberPanelSpec) },
+		PanelKindPieChart:   func() any { return new(PieChartPanelSpec) },
+		PanelKindTable:      func() any { return new(TablePanelSpec) },
+		PanelKindHistogram:  func() any { return new(HistogramPanelSpec) },
+		PanelKindList:       func() any { return new(ListPanelSpec) },
+	}
+	queryPluginSpecs = map[QueryPluginKind]func() any{
+		QueryKindBuilder:       func() any { return new(BuilderQuerySpec) },
+		QueryKindComposite:     func() any { return new(CompositeQuerySpec) },
+		QueryKindFormula:       func() any { return new(FormulaSpec) },
+		QueryKindPromQL:        func() any { return new(PromQLQuerySpec) },
+		QueryKindClickHouseSQL: func() any { return new(ClickHouseSQLQuerySpec) },
+		QueryKindTraceOperator: func() any { return new(TraceOperatorSpec) },
+	}
+	variablePluginSpecs = map[VariablePluginKind]func() any{
+		VariableKindDynamic: func() any { return new(DynamicVariableSpec) },
+		VariableKindQuery:   func() any { return new(QueryVariableSpec) },
+		VariableKindCustom:  func() any { return new(CustomVariableSpec) },
+		VariableKindTextbox: func() any { return new(TextboxVariableSpec) },
+	}
+	datasourcePluginSpecs = map[DatasourcePluginKind]func() any{
+		DatasourceKindSigNoz: func() any { return new(struct{}) },
+	}
+
+	// allowedQueryKinds maps each panel plugin kind to the query plugin
+	// kinds it supports. Composite sub-query types are mapped to these
+	// same kind strings via compositeSubQueryTypeToPluginKind.
+	allowedQueryKinds = map[PanelPluginKind][]QueryPluginKind{
+		PanelKindTimeSeries: {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindBarChart:   {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindNumber:     {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindHistogram:  {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindPieChart:   {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindClickHouseSQL},
+		PanelKindTable:      {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindClickHouseSQL},
+		PanelKindList:       {QueryKindBuilder},
+	}
+
+	// compositeSubQueryTypeToPluginKind maps CompositeQuery sub-query type
+	// strings to the equivalent top-level query plugin kind for validation.
+	compositeSubQueryTypeToPluginKind = map[qb.QueryType]QueryPluginKind{
+		qb.QueryTypeBuilder:       QueryKindBuilder,
+		qb.QueryTypeFormula:       QueryKindFormula,
+		qb.QueryTypeTraceOperator: QueryKindTraceOperator,
+		qb.QueryTypePromQL:        QueryKindPromQL,
+		qb.QueryTypeClickHouseSQL: QueryKindClickHouseSQL,
+	}
+)
+
+func validateDashboardV2(d StorableDashboardDataV2) error {
+	for name, ds := range d.Datasources {
+		if err := validateDatasourcePlugin(&ds.Plugin, fmt.Sprintf("spec.datasources.%s.plugin", name)); err != nil {
+			return err
+		}
+	}
+
+	for i, v := range d.Variables {
+		if err := validateVariablePlugin(v, fmt.Sprintf("spec.variables[%d]", i)); err != nil {
+			return err
+		}
+	}
+
+	for key, panel := range d.Panels {
+		if panel == nil {
+			return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "spec.panels.%s: panel must not be null", key)
+		}
+		path := fmt.Sprintf("spec.panels.%s", key)
+		if err := validatePanelPlugin(&panel.Spec.Plugin, path+".spec.plugin"); err != nil {
+			return err
+		}
+		panelKind := PanelPluginKind(panel.Spec.Plugin.Kind)
+		allowed := allowedQueryKinds[panelKind]
+		for qi := range panel.Spec.Queries {
+			queryPath := fmt.Sprintf("%s.spec.queries[%d].spec.plugin", path, qi)
+			if err := validateQueryPlugin(&panel.Spec.Queries[qi].Spec.Plugin, queryPath); err != nil {
+				return err
+			}
+			if err := validateQueryAllowedForPanel(panel.Spec.Queries[qi].Spec.Plugin, allowed, panelKind, queryPath); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func validateDatasourcePlugin(plugin *common.Plugin, path string) error {
+	kind := DatasourcePluginKind(plugin.Kind)
+	factory, ok := datasourcePluginSpecs[kind]
+	if !ok {
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput,
+			"%s: unknown datasource plugin kind %q; allowed values: %s", path, kind, formatEnum(kind.Enum()))
+	}
+	return validateAndNormalizePluginSpec(plugin, factory, path)
+}
+
+func validateVariablePlugin(v dashboard.Variable, path string) error {
+	switch spec := v.Spec.(type) {
+	case *dashboard.ListVariableSpec:
+		pluginPath := path + ".spec.plugin"
+		kind := VariablePluginKind(spec.Plugin.Kind)
+		factory, ok := variablePluginSpecs[kind]
+		if !ok {
+			return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput,
+				"%s: unknown variable plugin kind %q; allowed values: %s", pluginPath, kind, formatEnum(kind.Enum()))
+		}
+		return validateAndNormalizePluginSpec(&spec.Plugin, factory, pluginPath)
+	case *dashboard.TextVariableSpec:
+		// TextVariables have no plugin, nothing to validate.
+		return nil
+	default:
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "%s: unsupported variable kind %q", path, v.Kind)
+	}
+}
+
+func validatePanelPlugin(plugin *common.Plugin, path string) error {
+	kind := PanelPluginKind(plugin.Kind)
+	factory, ok := panelPluginSpecs[kind]
+	if !ok {
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput,
+			"%s: unknown panel plugin kind %q; allowed values: %s", path, kind, formatEnum(kind.Enum()))
+	}
+	return validateAndNormalizePluginSpec(plugin, factory, path)
+}
+
+func validateQueryPlugin(plugin *common.Plugin, path string) error {
+	kind := QueryPluginKind(plugin.Kind)
+	factory, ok := queryPluginSpecs[kind]
+	if !ok {
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput,
+			"%s: unknown query plugin kind %q; allowed values: %s", path, kind, formatEnum(kind.Enum()))
+	}
+	return validateAndNormalizePluginSpec(plugin, factory, path)
+}
+
+func formatEnum(values []any) string {
+	parts := make([]string, len(values))
+	for i, v := range values {
+		parts[i] = fmt.Sprintf("`%v`", v)
+	}
+	return strings.Join(parts, ", ")
+}
+
+// validateAndNormalizePluginSpec validates the plugin spec and writes the typed
+// struct (with defaults) back into plugin.Spec so that DB storage and API
+// responses contain normalized values.
+func validateAndNormalizePluginSpec(plugin *common.Plugin, factory func() any, path string) error {
+	if plugin.Kind == "" {
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "%s: plugin kind is required", path)
+	}
+	if plugin.Spec == nil {
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "%s: plugin spec is required", path)
+	}
+	// Re-marshal the spec and unmarshal into the typed struct.
+	specJSON, err := json.Marshal(plugin.Spec)
+	if err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "%s.spec", path)
+	}
+	target := factory()
+	decoder := json.NewDecoder(bytes.NewReader(specJSON))
+	decoder.DisallowUnknownFields()
+	if err := decoder.Decode(target); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "%s.spec", path)
+	}
+	if err := validator.New().Struct(target); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "%s.spec", path)
+	}
+	// Write the typed struct back so defaults are included.
+	plugin.Spec = target
+	return nil
+}
+
+// validateQueryAllowedForPanel checks that the query plugin kind is permitted
+// for the given panel. For composite queries it recurses into sub-queries.
+func validateQueryAllowedForPanel(plugin common.Plugin, allowed []QueryPluginKind, panelKind PanelPluginKind, path string) error {
+	queryKind := QueryPluginKind(plugin.Kind)
+	if !slices.Contains(allowed, queryKind) {
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput,
+			"%s: query kind %q is not supported by panel kind %q", path, queryKind, panelKind)
+	}
+
+	// For composite queries, validate each sub-query type.
+	if queryKind == QueryKindComposite && plugin.Spec != nil {
+		specJSON, err := json.Marshal(plugin.Spec)
+		if err != nil {
+			return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "%s.spec", path)
+		}
+		var composite struct {
+			Queries []struct {
+				Type qb.QueryType `json:"type"`
+			} `json:"queries"`
+		}
+		if err := json.Unmarshal(specJSON, &composite); err != nil {
+			return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "%s.spec", path)
+		}
+		for si, sub := range composite.Queries {
+			pluginKind, ok := compositeSubQueryTypeToPluginKind[sub.Type]
+			if !ok {
+				continue
+			}
+			if !slices.Contains(allowed, pluginKind) {
+				return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput,
+					"%s.spec.queries[%d]: sub-query type %q is not supported by panel kind %q",
+					path, si, sub.Type, panelKind)
+			}
+		}
+	}
+	return nil
+}

pkg/types/dashboardtypes/dashboard_v2_test.go

@@ -0,0 +1,889 @@
+package dashboardtypes
+
+import (
+	"encoding/json"
+	"os"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestValidateBigExample(t *testing.T) {
+	data, err := os.ReadFile("testdata/perses.json")
+	require.NoError(t, err, "reading example file")
+	_, err = UnmarshalAndValidateDashboardV2JSON(data)
+	require.NoError(t, err, "expected valid dashboard")
+}
+
+func TestValidateDashboardWithSections(t *testing.T) {
+	data, err := os.ReadFile("testdata/perses_with_sections.json")
+	require.NoError(t, err, "reading example file")
+	_, err = UnmarshalAndValidateDashboardV2JSON(data)
+	require.NoError(t, err, "expected valid dashboard")
+}
+
+func TestInvalidateNotAJSON(t *testing.T) {
+	_, err := UnmarshalAndValidateDashboardV2JSON([]byte("not json"))
+	require.Error(t, err, "expected error for invalid JSON")
+}
+
+func TestValidateEmptySpec(t *testing.T) {
+	// no variables no panels
+	data := []byte(`{}`)
+	_, err := UnmarshalAndValidateDashboardV2JSON(data)
+	require.NoError(t, err, "expected valid")
+}
+
+func TestValidateOnlyVariables(t *testing.T) {
+	data := []byte(`{
+		"variables": [
+			{
+				"kind": "ListVariable",
+				"spec": {
+					"name": "service",
+					"allowAllValue": true,
+					"allowMultiple": false,
+					"plugin": {
+						"kind": "signoz/DynamicVariable",
+						"spec": {
+							"name": "service.name",
+							"signal": "metrics"
+						}
+					}
+				}
+			},
+			{
+				"kind": "TextVariable",
+				"spec": {
+					"name": "mytext",
+					"value": "default",
+					"plugin": {
+						"kind": "signoz/TextboxVariable",
+						"spec": {}
+					}
+				}
+			}
+		],
+		"layouts": []
+	}`)
+	_, err := UnmarshalAndValidateDashboardV2JSON(data)
+	require.NoError(t, err, "expected valid")
+}
+
+func TestInvalidateUnknownPluginKind(t *testing.T) {
+	tests := []struct {
+		name        string
+		data        string
+		wantContain string
+	}{
+		{
+			name: "unknown panel plugin",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {"kind": "NonExistentPanel", "spec": {}}
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "NonExistentPanel",
+		},
+		{
+			name: "unknown query plugin",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {"kind": "signoz/TimeSeriesPanel", "spec": {}},
+							"queries": [{
+								"kind": "TimeSeriesQuery",
+								"spec": {
+									"plugin": {"kind": "FakeQueryPlugin", "spec": {}}
+								}
+							}]
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "FakeQueryPlugin",
+		},
+		{
+			name: "unknown variable plugin",
+			data: `{
+				"variables": [{
+					"kind": "ListVariable",
+					"spec": {
+						"name": "v1",
+						"allowAllValue": false,
+						"allowMultiple": false,
+						"plugin": {"kind": "FakeVariable", "spec": {}}
+					}
+				}],
+				"layouts": []
+			}`,
+			wantContain: "FakeVariable",
+		},
+		{
+			name: "unknown datasource plugin",
+			data: `{
+				"datasources": {
+					"ds1": {
+						"default": true,
+						"plugin": {"kind": "FakeDatasource", "spec": {}}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "FakeDatasource",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			_, err := UnmarshalAndValidateDashboardV2JSON([]byte(tt.data))
+			require.Error(t, err, "expected error containing %q, got nil", tt.wantContain)
+			require.Contains(t, err.Error(), tt.wantContain, "error should mention %q", tt.wantContain)
+		})
+	}
+}
+
+func TestInvalidateOneInvalidPanel(t *testing.T) {
+	data := []byte(`{
+		"panels": {
+			"good": {
+				"kind": "Panel",
+				"spec": {"plugin": {"kind": "signoz/NumberPanel", "spec": {}}}
+			},
+			"bad": {
+				"kind": "Panel",
+				"spec": {"plugin": {"kind": "FakePanel", "spec": {}}}
+			}
+		},
+		"layouts": []
+	}`)
+	_, err := UnmarshalAndValidateDashboardV2JSON(data)
+	require.Error(t, err, "expected error for invalid panel plugin kind")
+	require.Contains(t, err.Error(), "FakePanel", "error should mention FakePanel")
+}
+
+func TestRejectUnknownFieldsInPluginSpec(t *testing.T) {
+	tests := []struct {
+		name        string
+		data        string
+		wantContain string
+	}{
+		{
+			name: "unknown field in panel spec",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {
+								"kind": "signoz/TimeSeriesPanel",
+								"spec": {"bogusField": true}
+							}
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "bogusField",
+		},
+		{
+			name: "unknown field in query spec",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {"kind": "signoz/TimeSeriesPanel", "spec": {}},
+							"queries": [{
+								"kind": "TimeSeriesQuery",
+								"spec": {
+									"plugin": {
+										"kind": "signoz/PromQLQuery",
+										"spec": {"name": "A", "query": "up", "unknownThing": 42}
+									}
+								}
+							}]
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "unknownThing",
+		},
+		{
+			name: "unknown field in variable spec",
+			data: `{
+				"variables": [{
+					"kind": "ListVariable",
+					"spec": {
+						"name": "v",
+						"allowAllValue": false,
+						"allowMultiple": false,
+						"plugin": {
+							"kind": "signoz/DynamicVariable",
+							"spec": {"name": "service.name", "signal": "metrics", "extraField": "bad"}
+						}
+					}
+				}],
+				"layouts": []
+			}`,
+			wantContain: "extraField",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			_, err := UnmarshalAndValidateDashboardV2JSON([]byte(tt.data))
+			require.Error(t, err, "expected error for unknown field")
+			require.Contains(t, err.Error(), tt.wantContain, "error should mention %q", tt.wantContain)
+		})
+	}
+}
+
+func TestInvalidateWrongFieldTypeInPluginSpec(t *testing.T) {
+	tests := []struct {
+		name        string
+		data        string
+		wantContain string
+	}{
+		{
+			name: "wrong type on panel plugin field",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {
+								"kind": "signoz/TimeSeriesPanel",
+								"spec": {"visualization": {"fillSpans": "notabool"}}
+							}
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "fillSpans",
+		},
+		{
+			name: "wrong type on query plugin field",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {"kind": "signoz/TimeSeriesPanel", "spec": {}},
+							"queries": [{
+								"kind": "TimeSeriesQuery",
+								"spec": {
+									"plugin": {
+										"kind": "signoz/PromQLQuery",
+										"spec": {"name": "A", "query": 123}
+									}
+								}
+							}]
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "",
+		},
+		{
+			name: "wrong type on variable plugin field",
+			data: `{
+				"variables": [{
+					"kind": "ListVariable",
+					"spec": {
+						"name": "v",
+						"allowAllValue": false,
+						"allowMultiple": false,
+						"plugin": {
+							"kind": "signoz/DynamicVariable",
+							"spec": {"name": 123, "signal": "metrics"}
+						}
+					}
+				}],
+				"layouts": []
+			}`,
+			wantContain: "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			_, err := UnmarshalAndValidateDashboardV2JSON([]byte(tt.data))
+			require.Error(t, err, "expected validation error")
+			if tt.wantContain != "" {
+				require.Contains(t, err.Error(), tt.wantContain, "error should mention %q", tt.wantContain)
+			}
+		})
+	}
+}
+
+func TestInvalidateBadPanelSpecValues(t *testing.T) {
+	tests := []struct {
+		name        string
+		data        string
+		wantContain string
+	}{
+		{
+			name: "bad signal in builder query",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {
+								"kind": "signoz/TimeSeriesPanel",
+								"spec": {}
+							},
+							"queries": [{
+								"kind": "TimeSeriesQuery",
+								"spec": {
+									"plugin": {
+										"kind": "signoz/BuilderQuery",
+										"spec": {"signal": "foo"}
+									}
+								}
+							}]
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "signal",
+		},
+		{
+			name: "bad line interpolation",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {
+								"kind": "signoz/TimeSeriesPanel",
+								"spec": {"chartAppearance": {"lineInterpolation": "cubic"}}
+							}
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "line interpolation",
+		},
+		{
+			name: "bad line style",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {
+								"kind": "signoz/TimeSeriesPanel",
+								"spec": {"chartAppearance": {"lineStyle": "dotted"}}
+							}
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "line style",
+		},
+		{
+			name: "bad fill mode",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {
+								"kind": "signoz/TimeSeriesPanel",
+								"spec": {"chartAppearance": {"fillMode": "striped"}}
+							}
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "fill mode",
+		},
+		{
+			name: "bad spanGaps fillLessThan",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {
+								"kind": "signoz/TimeSeriesPanel",
+								"spec": {"chartAppearance": {"spanGaps": {"fillLessThan": "notaduration"}}}
+							}
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "duration",
+		},
+		{
+			name: "bad time preference",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {
+								"kind": "signoz/TimeSeriesPanel",
+								"spec": {"visualization": {"timePreference": "last2Hr"}}
+							}
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "timePreference",
+		},
+		{
+			name: "bad legend position",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {
+								"kind": "signoz/BarChartPanel",
+								"spec": {"legend": {"position": "top"}}
+							}
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "legend position",
+		},
+		{
+			name: "bad threshold format",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {
+								"kind": "signoz/NumberPanel",
+								"spec": {"thresholds": [{"value": 100, "operator": ">", "color": "Red", "format": "Color"}]}
+							}
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "threshold format",
+		},
+		{
+			name: "bad comparison operator",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {
+								"kind": "signoz/NumberPanel",
+								"spec": {"thresholds": [{"value": 100, "operator": "!=", "color": "Red", "format": "text"}]}
+							}
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "comparison operator",
+		},
+		{
+			name: "bad precision",
+			data: `{
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"plugin": {
+								"kind": "signoz/TimeSeriesPanel",
+								"spec": {"formatting": {"decimalPrecision": "9"}}
+							}
+						}
+					}
+				},
+				"layouts": []
+			}`,
+			wantContain: "precision",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			_, err := UnmarshalAndValidateDashboardV2JSON([]byte(tt.data))
+			require.Error(t, err, "expected error containing %q, got nil", tt.wantContain)
+			require.Contains(t, err.Error(), tt.wantContain, "error should mention %q", tt.wantContain)
+		})
+	}
+}
+
+func TestValidateRequiredFields(t *testing.T) {
+	wrapVariable := func(pluginKind, pluginSpec string) string {
+		return `{
+			"variables": [{
+				"kind": "ListVariable",
+				"spec": {
+					"name": "v",
+					"allowAllValue": false,
+					"allowMultiple": false,
+					"plugin": {"kind": "` + pluginKind + `", "spec": ` + pluginSpec + `}
+				}
+			}],
+			"layouts": []
+		}`
+	}
+	wrapPanel := func(panelKind, panelSpec string) string {
+		return `{
+			"panels": {
+				"p1": {
+					"kind": "Panel",
+					"spec": {
+						"plugin": {"kind": "` + panelKind + `", "spec": ` + panelSpec + `}
+					}
+				}
+			},
+			"layouts": []
+		}`
+	}
+
+	tests := []struct {
+		name        string
+		data        string
+		wantContain string
+	}{
+		{
+			name:        "DynamicVariable missing name",
+			data:        wrapVariable("signoz/DynamicVariable", `{"signal": "metrics"}`),
+			wantContain: "Name",
+		},
+		{
+			name:        "QueryVariable missing queryValue",
+			data:        wrapVariable("signoz/QueryVariable", `{}`),
+			wantContain: "QueryValue",
+		},
+		{
+			name:        "CustomVariable missing customValue",
+			data:        wrapVariable("signoz/CustomVariable", `{}`),
+			wantContain: "CustomValue",
+		},
+		{
+			name:        "ThresholdWithLabel missing value",
+			data:        wrapPanel("signoz/TimeSeriesPanel", `{"thresholds": [{"color": "Red", "label": "high"}]}`),
+			wantContain: "Value",
+		},
+		{
+			name:        "ThresholdWithLabel missing color",
+			data:        wrapPanel("signoz/TimeSeriesPanel", `{"thresholds": [{"value": 100, "label": "high", "color": ""}]}`),
+			wantContain: "Color",
+		},
+		{
+			name:        "ThresholdWithLabel missing label",
+			data:        wrapPanel("signoz/TimeSeriesPanel", `{"thresholds": [{"value": 100, "color": "Red", "label": ""}]}`),
+			wantContain: "Label",
+		},
+		{
+			name:        "ComparisonThreshold missing value",
+			data:        wrapPanel("signoz/NumberPanel", `{"thresholds": [{"operator": ">", "format": "text", "color": "Red"}]}`),
+			wantContain: "Value",
+		},
+		{
+			name:        "ComparisonThreshold missing color",
+			data:        wrapPanel("signoz/NumberPanel", `{"thresholds": [{"value": 100, "operator": ">", "format": "text", "color": ""}]}`),
+			wantContain: "Color",
+		},
+		{
+			name:        "TableThreshold missing columnName",
+			data:        wrapPanel("signoz/TablePanel", `{"thresholds": [{"value": 100, "operator": ">", "format": "text", "color": "Red", "columnName": ""}]}`),
+			wantContain: "ColumnName",
+		},
+		{
+			name:        "SelectField missing name",
+			data:        wrapPanel("signoz/ListPanel", `{"selectFields": [{"name": ""}]}`),
+			wantContain: "Name",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			_, err := UnmarshalAndValidateDashboardV2JSON([]byte(tt.data))
+			require.Error(t, err, "expected error containing %q, got nil", tt.wantContain)
+			require.Contains(t, err.Error(), tt.wantContain, "error should mention %q", tt.wantContain)
+		})
+	}
+}
+
+func TestTimeSeriesPanelDefaults(t *testing.T) {
+	data := []byte(`{
+		"panels": {
+			"p1": {
+				"kind": "Panel",
+				"spec": {
+					"plugin": {
+						"kind": "signoz/TimeSeriesPanel",
+						"spec": {}
+					}
+				}
+			}
+		},
+		"layouts": []
+	}`)
+	d, err := UnmarshalAndValidateDashboardV2JSON(data)
+	require.NoError(t, err, "unmarshal and validate failed")
+
+	// After validation+normalization, the plugin spec should be a typed struct.
+	require.IsType(t, &TimeSeriesPanelSpec{}, d.Panels["p1"].Spec.Plugin.Spec)
+	spec := d.Panels["p1"].Spec.Plugin.Spec.(*TimeSeriesPanelSpec)
+
+	require.Equal(t, "2", spec.Formatting.DecimalPrecision.ValueOrDefault(), "expected DecimalPrecision default 2")
+	require.Equal(t, "spline", spec.ChartAppearance.LineInterpolation.ValueOrDefault(), "expected LineInterpolation default spline")
+	require.Equal(t, "solid", spec.ChartAppearance.LineStyle.ValueOrDefault(), "expected LineStyle default solid")
+	require.Equal(t, "solid", spec.ChartAppearance.FillMode.ValueOrDefault(), "expected FillMode default solid")
+	require.False(t, spec.ChartAppearance.SpanGaps.FillOnlyBelow, "expected SpanGaps.FillOnlyBelow default false")
+	require.Equal(t, "global_time", spec.Visualization.TimePreference.ValueOrDefault(), "expected TimePreference default global_time")
+	require.Equal(t, "bottom", spec.Legend.Position.ValueOrDefault(), "expected LegendPosition default bottom")
+
+	// Re-marshal the full dashboard (what we'd store in DB / return in API response)
+	// and verify the output contains the default values.
+	output, err := json.Marshal(d)
+	require.NoError(t, err, "marshal dashboard failed")
+	outputStr := string(output)
+	for field, want := range map[string]string{
+		"decimalPrecision":  `"2"`,
+		"lineInterpolation": `"spline"`,
+		"lineStyle":         `"solid"`,
+		"fillMode":          `"solid"`,
+		"timePreference":    `"global_time"`,
+		"position":          `"bottom"`,
+	} {
+		assert.Contains(t, outputStr, `"`+field+`":`+want, "expected stored/response JSON to contain %s:%s", field, want)
+	}
+}
+
+func TestNumberPanelDefaults(t *testing.T) {
+	data := []byte(`{
+		"panels": {
+			"p1": {
+				"kind": "Panel",
+				"spec": {
+					"plugin": {
+						"kind": "signoz/NumberPanel",
+						"spec": {"thresholds": [{"value": 100, "color": "Red"}]}
+					}
+				}
+			}
+		},
+		"layouts": []
+	}`)
+	d, err := UnmarshalAndValidateDashboardV2JSON(data)
+	require.NoError(t, err, "unmarshal and validate failed")
+
+	require.IsType(t, &NumberPanelSpec{}, d.Panels["p1"].Spec.Plugin.Spec)
+	spec := d.Panels["p1"].Spec.Plugin.Spec.(*NumberPanelSpec)
+
+	require.Len(t, spec.Thresholds, 1, "expected 1 threshold")
+	require.Equal(t, ">", spec.Thresholds[0].Operator.ValueOrDefault(), "expected ComparisonOperator default >")
+	require.Equal(t, "text", spec.Thresholds[0].Format.ValueOrDefault(), "expected ThresholdFormat default text")
+
+	// Marshal back and verify defaults in JSON output.
+	output, err := json.Marshal(d)
+	require.NoError(t, err, "marshal dashboard failed")
+	outputStr := string(output)
+	assert.Contains(t, outputStr, `"format":"text"`, "expected stored/response JSON to contain format:text")
+	// Go's json.Marshal escapes ">" as "\u003e", so check for both forms.
+	assert.True(t,
+		strings.Contains(outputStr, `"operator":">"`) || strings.Contains(outputStr, `"operator":"\u003e"`),
+		"expected stored/response JSON to contain operator:>, got: %s", outputStr)
+}
+
+// TestStorageRoundTrip simulates the future DB store/load cycle:
+// marshal the normalized dashboard to JSON (what would be written to DB),
+// then unmarshal it back (what would be read from DB), and verify defaults survive.
+func TestStorageRoundTrip(t *testing.T) {
+	input := []byte(`{
+		"panels": {
+			"p1": {
+				"kind": "Panel",
+				"spec": {
+					"plugin": {
+						"kind": "signoz/TimeSeriesPanel",
+						"spec": {}
+					}
+				}
+			},
+			"p2": {
+				"kind": "Panel",
+				"spec": {
+					"plugin": {
+						"kind": "signoz/NumberPanel",
+						"spec": {"thresholds": [{"value": 100, "color": "Red"}]}
+					}
+				}
+			}
+		},
+		"layouts": []
+	}`)
+
+	// Step 1: Unmarshal + validate + normalize (what the API handler does).
+	d, err := UnmarshalAndValidateDashboardV2JSON(input)
+	require.NoError(t, err, "unmarshal and validate failed")
+
+	// Step 1.5: Verify struct fields have correct defaults (extra validation before storing).
+	tsSpec := d.Panels["p1"].Spec.Plugin.Spec.(*TimeSeriesPanelSpec)
+	assert.Equal(t, "2", tsSpec.Formatting.DecimalPrecision.ValueOrDefault())
+	assert.Equal(t, "spline", tsSpec.ChartAppearance.LineInterpolation.ValueOrDefault())
+	assert.Equal(t, "solid", tsSpec.ChartAppearance.LineStyle.ValueOrDefault())
+	assert.Equal(t, "solid", tsSpec.ChartAppearance.FillMode.ValueOrDefault())
+	assert.Equal(t, "global_time", tsSpec.Visualization.TimePreference.ValueOrDefault())
+	assert.Equal(t, "bottom", tsSpec.Legend.Position.ValueOrDefault())
+	numSpec := d.Panels["p2"].Spec.Plugin.Spec.(*NumberPanelSpec)
+	assert.Equal(t, ">", numSpec.Thresholds[0].Operator.ValueOrDefault())
+	assert.Equal(t, "text", numSpec.Thresholds[0].Format.ValueOrDefault())
+
+	// Step 2: Marshal to JSON (simulates writing to DB).
+	stored, err := json.Marshal(d)
+	require.NoError(t, err, "marshal for storage failed")
+
+	// Step 3: Unmarshal from JSON (simulates reading from DB).
+	loaded, err := UnmarshalAndValidateDashboardV2JSON(stored)
+	require.NoError(t, err, "unmarshal from storage failed")
+
+	// Step 3.5: Verify struct fields have correct defaults after loading (before returning in API).
+	tsLoaded := loaded.Panels["p1"].Spec.Plugin.Spec.(*TimeSeriesPanelSpec)
+	assert.Equal(t, "2", tsLoaded.Formatting.DecimalPrecision.ValueOrDefault(), "after load")
+	assert.Equal(t, "spline", tsLoaded.ChartAppearance.LineInterpolation.ValueOrDefault(), "after load")
+	assert.Equal(t, "solid", tsLoaded.ChartAppearance.LineStyle.ValueOrDefault(), "after load")
+	assert.Equal(t, "solid", tsLoaded.ChartAppearance.FillMode.ValueOrDefault(), "after load")
+	assert.Equal(t, "global_time", tsLoaded.Visualization.TimePreference.ValueOrDefault(), "after load")
+	assert.Equal(t, "bottom", tsLoaded.Legend.Position.ValueOrDefault(), "after load")
+	numLoaded := loaded.Panels["p2"].Spec.Plugin.Spec.(*NumberPanelSpec)
+	assert.Equal(t, ">", numLoaded.Thresholds[0].Operator.ValueOrDefault(), "after load")
+	assert.Equal(t, "text", numLoaded.Thresholds[0].Format.ValueOrDefault(), "after load")
+
+	// Step 4: Marshal again (simulates API response) and verify defaults.
+	response, err := json.Marshal(loaded)
+	require.NoError(t, err, "marshal for response failed")
+	responseStr := string(response)
+
+	for field, want := range map[string]string{
+		"decimalPrecision":  `"2"`,
+		"lineInterpolation": `"spline"`,
+		"lineStyle":         `"solid"`,
+		"fillMode":          `"solid"`,
+		"timePreference":    `"global_time"`,
+		"position":          `"bottom"`,
+		"format":            `"text"`,
+	} {
+		assert.Contains(t, responseStr, `"`+field+`":`+want, "expected %s:%s after storage round-trip", field, want)
+	}
+
+	// Verify operator default (Go escapes ">" as "\u003e").
+	assert.True(t,
+		strings.Contains(responseStr, `"operator":">"`) || strings.Contains(responseStr, `"operator":"\u003e"`),
+		"expected operator:> after storage round-trip")
+}
+
+func TestSpanGaps(t *testing.T) {
+	unmarshal := func(t *testing.T, val string) SpanGaps {
+		t.Helper()
+		var sg SpanGaps
+		require.NoError(t, json.Unmarshal([]byte(val), &sg))
+		return sg
+	}
+
+	t.Run("defaults", func(t *testing.T) {
+		var sg SpanGaps
+		assert.False(t, sg.FillOnlyBelow, "expected FillOnlyBelow default false")
+		assert.True(t, sg.FillLessThan.IsZero(), "expected FillLessThan default zero")
+	})
+
+	t.Run("fillOnlyBelow true", func(t *testing.T) {
+		sg := unmarshal(t, `{"fillOnlyBelow": true}`)
+		assert.True(t, sg.FillOnlyBelow)
+	})
+
+	t.Run("fillLessThan duration", func(t *testing.T) {
+		sg := unmarshal(t, `{"fillOnlyBelow": false, "fillLessThan": "5m"}`)
+		assert.False(t, sg.FillOnlyBelow)
+		assert.Equal(t, 5*time.Minute, sg.FillLessThan.Duration())
+	})
+
+	t.Run("fillLessThan compound duration", func(t *testing.T) {
+		sg := unmarshal(t, `{"fillLessThan": "1h30m"}`)
+		assert.Equal(t, 90*time.Minute, sg.FillLessThan.Duration())
+	})
+}
+
+func TestPanelTypeQueryTypeCompatibility(t *testing.T) {
+	mkQuery := func(panelKind, queryKind, querySpec string) []byte {
+		return []byte(`{
+			"panels": {"p1": {"kind": "Panel", "spec": {
+				"plugin": {"kind": "` + panelKind + `", "spec": {}},
+				"queries": [{"kind": "TimeSeriesQuery", "spec": {"plugin": {"kind": "` + queryKind + `", "spec": ` + querySpec + `}}}]
+			}}},
+			"layouts": []
+		}`)
+	}
+	mkComposite := func(panelKind, subType, subSpec string) []byte {
+		return []byte(`{
+			"panels": {"p1": {"kind": "Panel", "spec": {
+				"plugin": {"kind": "` + panelKind + `", "spec": {}},
+				"queries": [{"kind": "TimeSeriesQuery", "spec": {"plugin": {"kind": "signoz/CompositeQuery", "spec": {
+					"queries": [{"type": "` + subType + `", "spec": ` + subSpec + `}]
+				}}}}]
+			}}},
+			"layouts": []
+		}`)
+	}
+
+	cases := []struct {
+		name    string
+		data    []byte
+		wantErr bool
+	}{
+		// Top-level: allowed
+		{"TimeSeries+PromQL", mkQuery("signoz/TimeSeriesPanel", "signoz/PromQLQuery", `{"name":"A","query":"up"}`), false},
+		{"Table+ClickHouse", mkQuery("signoz/TablePanel", "signoz/ClickHouseSQL", `{"name":"A","query":"SELECT 1"}`), false},
+		{"List+Builder", mkQuery("signoz/ListPanel", "signoz/BuilderQuery", `{"name":"A","signal":"logs"}`), false},
+		// Top-level: rejected
+		{"Table+PromQL", mkQuery("signoz/TablePanel", "signoz/PromQLQuery", `{"name":"A","query":"up"}`), true},
+		{"List+ClickHouse", mkQuery("signoz/ListPanel", "signoz/ClickHouseSQL", `{"name":"A","query":"SELECT 1"}`), true},
+		{"List+PromQL", mkQuery("signoz/ListPanel", "signoz/PromQLQuery", `{"name":"A","query":"up"}`), true},
+		{"List+Composite", mkQuery("signoz/ListPanel", "signoz/CompositeQuery", `{"queries":[]}`), true},
+		{"List+Formula", mkQuery("signoz/ListPanel", "signoz/Formula", `{"name":"F1","expression":"A+B"}`), true},
+		// Composite sub-queries
+		{"Table+Composite(promql)", mkComposite("signoz/TablePanel", "promql", `{"name":"A","query":"up"}`), true},
+		{"Table+Composite(clickhouse)", mkComposite("signoz/TablePanel", "clickhouse_sql", `{"name":"A","query":"SELECT 1"}`), false},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			_, err := UnmarshalAndValidateDashboardV2JSON(tc.data)
+			if tc.wantErr {
+				require.Error(t, err)
+			} else {
+				require.NoError(t, err)
+			}
+		})
+	}
+}

pkg/types/dashboardtypes/perses_plugin_types.go

@@ -0,0 +1,615 @@
+package dashboardtypes
+
+import (
+	"encoding/json"
+	"strconv"
+
+	"github.com/SigNoz/signoz/pkg/errors"
+	qb "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
+	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
+	"github.com/SigNoz/signoz/pkg/valuer"
+)
+
+// ══════════════════════════════════════════════
+// SigNoz variable plugin specs
+// ══════════════════════════════════════════════
+
+type VariablePluginKind string
+
+const (
+	VariableKindDynamic VariablePluginKind = "signoz/DynamicVariable"
+	VariableKindQuery   VariablePluginKind = "signoz/QueryVariable"
+	VariableKindCustom  VariablePluginKind = "signoz/CustomVariable"
+	VariableKindTextbox VariablePluginKind = "signoz/TextboxVariable"
+)
+
+func (VariablePluginKind) Enum() []any {
+	return []any{VariableKindDynamic, VariableKindQuery, VariableKindCustom, VariableKindTextbox}
+}
+
+type DynamicVariableSpec struct {
+	// Name is the name of the attribute being fetched dynamically from the
+	// signal. This could be extended to a richer selector in the future.
+	Name   string                `json:"name" validate:"required" required:"true"`
+	Signal telemetrytypes.Signal `json:"signal"`
+}
+
+type QueryVariableSpec struct {
+	QueryValue string `json:"queryValue" validate:"required" required:"true"`
+}
+
+type CustomVariableSpec struct {
+	CustomValue string `json:"customValue" validate:"required" required:"true"`
+}
+
+type TextboxVariableSpec struct{}
+
+// ══════════════════════════════════════════════
+// SigNoz query plugin specs — aliased from querybuildertypesv5
+// ══════════════════════════════════════════════
+
+type QueryPluginKind string
+
+const (
+	QueryKindBuilder       QueryPluginKind = "signoz/BuilderQuery"
+	QueryKindComposite     QueryPluginKind = "signoz/CompositeQuery"
+	QueryKindFormula       QueryPluginKind = "signoz/Formula"
+	QueryKindPromQL        QueryPluginKind = "signoz/PromQLQuery"
+	QueryKindClickHouseSQL QueryPluginKind = "signoz/ClickHouseSQL"
+	QueryKindTraceOperator QueryPluginKind = "signoz/TraceOperator"
+)
+
+func (QueryPluginKind) Enum() []any {
+	return []any{QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindPromQL, QueryKindClickHouseSQL, QueryKindTraceOperator}
+}
+
+type (
+	CompositeQuerySpec     = qb.CompositeQuery
+	QueryEnvelope          = qb.QueryEnvelope
+	FormulaSpec            = qb.QueryBuilderFormula
+	PromQLQuerySpec        = qb.PromQuery
+	ClickHouseSQLQuerySpec = qb.ClickHouseQuery
+	TraceOperatorSpec      = qb.QueryBuilderTraceOperator
+)
+
+// BuilderQuerySpec dispatches to the correct generic QueryBuilderQuery type
+// based on the signal field, reusing the shared dispatch logic.
+type BuilderQuerySpec struct {
+	Spec any
+}
+
+func (b *BuilderQuerySpec) UnmarshalJSON(data []byte) error {
+	spec, err := qb.UnmarshalBuilderQueryBySignal(data)
+	if err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "invalid builder query spec")
+	}
+	b.Spec = spec
+	return nil
+}
+
+// ══════════════════════════════════════════════
+// SigNoz panel plugin specs
+// ══════════════════════════════════════════════
+
+type PanelPluginKind string
+
+const (
+	PanelKindTimeSeries PanelPluginKind = "signoz/TimeSeriesPanel"
+	PanelKindBarChart   PanelPluginKind = "signoz/BarChartPanel"
+	PanelKindNumber     PanelPluginKind = "signoz/NumberPanel"
+	PanelKindPieChart   PanelPluginKind = "signoz/PieChartPanel"
+	PanelKindTable      PanelPluginKind = "signoz/TablePanel"
+	PanelKindHistogram  PanelPluginKind = "signoz/HistogramPanel"
+	PanelKindList       PanelPluginKind = "signoz/ListPanel"
+)
+
+func (PanelPluginKind) Enum() []any {
+	return []any{PanelKindTimeSeries, PanelKindBarChart, PanelKindNumber, PanelKindPieChart, PanelKindTable, PanelKindHistogram, PanelKindList}
+}
+
+type DatasourcePluginKind string
+
+const (
+	DatasourceKindSigNoz DatasourcePluginKind = "signoz/Datasource"
+)
+
+func (DatasourcePluginKind) Enum() []any {
+	return []any{DatasourceKindSigNoz}
+}
+
+type TimeSeriesPanelSpec struct {
+	Visualization   TimeSeriesVisualization   `json:"visualization"`
+	Formatting      PanelFormatting           `json:"formatting"`
+	ChartAppearance TimeSeriesChartAppearance `json:"chartAppearance"`
+	Axes            Axes                      `json:"axes"`
+	Legend          Legend                    `json:"legend"`
+	Thresholds      []ThresholdWithLabel      `json:"thresholds" validate:"dive"`
+}
+
+type TimeSeriesChartAppearance struct {
+	LineInterpolation LineInterpolation `json:"lineInterpolation"`
+	ShowPoints        bool              `json:"showPoints"`
+	LineStyle         LineStyle         `json:"lineStyle"`
+	FillMode          FillMode          `json:"fillMode"`
+	SpanGaps          SpanGaps          `json:"spanGaps"`
+}
+
+type BarChartPanelSpec struct {
+	Visualization BarChartVisualization `json:"visualization"`
+	Formatting    PanelFormatting       `json:"formatting"`
+	Axes          Axes                  `json:"axes"`
+	Legend        Legend                `json:"legend"`
+	Thresholds    []ThresholdWithLabel  `json:"thresholds" validate:"dive"`
+}
+
+type NumberPanelSpec struct {
+	Visualization BasicVisualization    `json:"visualization"`
+	Formatting    PanelFormatting       `json:"formatting"`
+	Thresholds    []ComparisonThreshold `json:"thresholds" validate:"dive"`
+}
+
+type PieChartPanelSpec struct {
+	Visualization BasicVisualization `json:"visualization"`
+	Formatting    PanelFormatting    `json:"formatting"`
+	Legend        Legend             `json:"legend"`
+}
+
+type TablePanelSpec struct {
+	Visualization BasicVisualization `json:"visualization"`
+	Formatting    TableFormatting    `json:"formatting"`
+	Thresholds    []TableThreshold   `json:"thresholds" validate:"dive"`
+}
+
+type HistogramPanelSpec struct {
+	HistogramBuckets HistogramBuckets `json:"histogramBuckets"`
+	Legend           Legend           `json:"legend"`
+}
+
+type HistogramBuckets struct {
+	BucketCount           *float64 `json:"bucketCount"`
+	BucketWidth           *float64 `json:"bucketWidth"`
+	MergeAllActiveQueries bool     `json:"mergeAllActiveQueries"`
+}
+
+type ListPanelSpec struct {
+	SelectFields []telemetrytypes.TelemetryFieldKey `json:"selectFields,omitempty" validate:"dive"`
+}
+
+// ══════════════════════════════════════════════
+// Panel common types
+// ══════════════════════════════════════════════
+
+type Axes struct {
+	SoftMin    *float64 `json:"softMin"`
+	SoftMax    *float64 `json:"softMax"`
+	IsLogScale bool     `json:"isLogScale"`
+}
+
+type BasicVisualization struct {
+	TimePreference TimePreference `json:"timePreference"`
+}
+
+type TimeSeriesVisualization struct {
+	BasicVisualization
+	FillSpans bool `json:"fillSpans"`
+}
+
+type BarChartVisualization struct {
+	BasicVisualization
+	FillSpans       bool `json:"fillSpans"`
+	StackedBarChart bool `json:"stackedBarChart"`
+}
+
+type PanelFormatting struct {
+	Unit             string          `json:"unit"`
+	DecimalPrecision PrecisionOption `json:"decimalPrecision"`
+}
+
+type TableFormatting struct {
+	ColumnUnits      map[string]string `json:"columnUnits"`
+	DecimalPrecision PrecisionOption   `json:"decimalPrecision"`
+}
+
+type Legend struct {
+	Position     LegendPosition    `json:"position"`
+	CustomColors map[string]string `json:"customColors"`
+}
+
+type ThresholdWithLabel struct {
+	Value float64 `json:"value" validate:"required" required:"true"`
+	Unit  string  `json:"unit"`
+	Color string  `json:"color" validate:"required" required:"true"`
+	Label string  `json:"label" validate:"required" required:"true"`
+}
+
+type ComparisonThreshold struct {
+	Value    float64            `json:"value" validate:"required" required:"true"`
+	Operator ComparisonOperator `json:"operator"`
+	Unit     string             `json:"unit"`
+	Color    string             `json:"color" validate:"required" required:"true"`
+	Format   ThresholdFormat    `json:"format"`
+}
+
+type TableThreshold struct {
+	ComparisonThreshold
+	ColumnName string `json:"columnName" validate:"required" required:"true"`
+}
+
+// ══════════════════════════════════════════════
+// Constrained scalar types — with default value
+// ══════════════════════════════════════════════
+
+type TimePreference struct{ valuer.String }
+
+var (
+	TimePreferenceGlobalTime = TimePreference{valuer.NewString("global_time")} // default
+	TimePreferenceLast5Min   = TimePreference{valuer.NewString("last_5_min")}
+	TimePreferenceLast15Min  = TimePreference{valuer.NewString("last_15_min")}
+	TimePreferenceLast30Min  = TimePreference{valuer.NewString("last_30_min")}
+	TimePreferenceLast1Hr    = TimePreference{valuer.NewString("last_1_hr")}
+	TimePreferenceLast6Hr    = TimePreference{valuer.NewString("last_6_hr")}
+	TimePreferenceLast1Day   = TimePreference{valuer.NewString("last_1_day")}
+	TimePreferenceLast3Days  = TimePreference{valuer.NewString("last_3_days")}
+	TimePreferenceLast1Week  = TimePreference{valuer.NewString("last_1_week")}
+	TimePreferenceLast1Month = TimePreference{valuer.NewString("last_1_month")}
+)
+
+func (TimePreference) Enum() []any {
+	return []any{TimePreferenceGlobalTime, TimePreferenceLast5Min, TimePreferenceLast15Min, TimePreferenceLast30Min, TimePreferenceLast1Hr, TimePreferenceLast6Hr, TimePreferenceLast1Day, TimePreferenceLast3Days, TimePreferenceLast1Week, TimePreferenceLast1Month}
+}
+
+func (t TimePreference) ValueOrDefault() string {
+	if t.IsZero() {
+		return TimePreferenceGlobalTime.StringValue()
+	}
+	return t.StringValue()
+}
+
+func (t TimePreference) MarshalJSON() ([]byte, error) {
+	return json.Marshal(t.ValueOrDefault())
+}
+
+func (t *TimePreference) UnmarshalJSON(data []byte) error {
+	var v string
+	if err := json.Unmarshal(data, &v); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "invalid timePreference: must be a string, one of `global_time`, `last_5_min`, `last_15_min`, `last_30_min`, `last_1_hr`, `last_6_hr`, `last_1_day`, `last_3_days`, `last_1_week`, or `last_1_month`")
+	}
+	if v == "" {
+		*t = TimePreferenceGlobalTime
+		return nil
+	}
+	tp := TimePreference{valuer.NewString(v)}
+	switch tp {
+	case TimePreferenceGlobalTime, TimePreferenceLast5Min, TimePreferenceLast15Min, TimePreferenceLast30Min, TimePreferenceLast1Hr, TimePreferenceLast6Hr, TimePreferenceLast1Day, TimePreferenceLast3Days, TimePreferenceLast1Week, TimePreferenceLast1Month:
+		*t = tp
+		return nil
+	default:
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "invalid timePreference %q: must be `global_time`, `last_5_min`, `last_15_min`, `last_30_min`, `last_1_hr`, `last_6_hr`, `last_1_day`, `last_3_days`, `last_1_week`, or `last_1_month`", v)
+	}
+}
+
+type LegendPosition struct{ valuer.String }
+
+var (
+	LegendPositionBottom = LegendPosition{valuer.NewString("bottom")} // default
+	LegendPositionRight  = LegendPosition{valuer.NewString("right")}
+)
+
+func (LegendPosition) Enum() []any {
+	return []any{LegendPositionBottom, LegendPositionRight}
+}
+
+func (l LegendPosition) ValueOrDefault() string {
+	if l.IsZero() {
+		return LegendPositionBottom.StringValue()
+	}
+	return l.StringValue()
+}
+
+func (l LegendPosition) MarshalJSON() ([]byte, error) {
+	return json.Marshal(l.ValueOrDefault())
+}
+
+func (l *LegendPosition) UnmarshalJSON(data []byte) error {
+	var v string
+	if err := json.Unmarshal(data, &v); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "invalid legend position: must be a string, one of `bottom` or `right`")
+	}
+	if v == "" {
+		*l = LegendPositionBottom
+		return nil
+	}
+	lp := LegendPosition{valuer.NewString(v)}
+	switch lp {
+	case LegendPositionBottom, LegendPositionRight:
+		*l = lp
+		return nil
+	default:
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "invalid legend position %q: must be `bottom` or `right`", v)
+	}
+}
+
+type ThresholdFormat struct{ valuer.String }
+
+var (
+	ThresholdFormatText       = ThresholdFormat{valuer.NewString("text")} // default
+	ThresholdFormatBackground = ThresholdFormat{valuer.NewString("background")}
+)
+
+func (ThresholdFormat) Enum() []any {
+	return []any{ThresholdFormatText, ThresholdFormatBackground}
+}
+
+func (f ThresholdFormat) ValueOrDefault() string {
+	if f.IsZero() {
+		return ThresholdFormatText.StringValue()
+	}
+	return f.StringValue()
+}
+
+func (f ThresholdFormat) MarshalJSON() ([]byte, error) {
+	return json.Marshal(f.ValueOrDefault())
+}
+
+func (f *ThresholdFormat) UnmarshalJSON(data []byte) error {
+	var v string
+	if err := json.Unmarshal(data, &v); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "invalid threshold format: must be a string, one of `text` or `background`")
+	}
+	if v == "" {
+		*f = ThresholdFormatText
+		return nil
+	}
+	tf := ThresholdFormat{valuer.NewString(v)}
+	switch tf {
+	case ThresholdFormatText, ThresholdFormatBackground:
+		*f = tf
+		return nil
+	default:
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "invalid threshold format %q: must be `text` or `background`", v)
+	}
+}
+
+// Uses valuer.String with custom UnmarshalJSON for validation, rather than
+// ruletypes.CompareOperator which accepts any string at unmarshal time.
+type ComparisonOperator struct{ valuer.String }
+
+var (
+	ComparisonOperatorGT           = ComparisonOperator{valuer.NewString(">")} // default
+	ComparisonOperatorLT           = ComparisonOperator{valuer.NewString("<")}
+	ComparisonOperatorGTE          = ComparisonOperator{valuer.NewString(">=")}
+	ComparisonOperatorLTE          = ComparisonOperator{valuer.NewString("<=")}
+	ComparisonOperatorEQ           = ComparisonOperator{valuer.NewString("=")}
+	ComparisonOperatorAbove        = ComparisonOperator{valuer.NewString("above")}
+	ComparisonOperatorBelow        = ComparisonOperator{valuer.NewString("below")}
+	ComparisonOperatorAboveOrEqual = ComparisonOperator{valuer.NewString("above_or_equal")}
+	ComparisonOperatorBelowOrEqual = ComparisonOperator{valuer.NewString("below_or_equal")}
+	ComparisonOperatorEqual        = ComparisonOperator{valuer.NewString("equal")}
+	ComparisonOperatorNotEqual     = ComparisonOperator{valuer.NewString("not_equal")}
+)
+
+func (ComparisonOperator) Enum() []any {
+	return []any{ComparisonOperatorGT, ComparisonOperatorLT, ComparisonOperatorGTE, ComparisonOperatorLTE, ComparisonOperatorEQ, ComparisonOperatorAbove, ComparisonOperatorBelow, ComparisonOperatorAboveOrEqual, ComparisonOperatorBelowOrEqual, ComparisonOperatorEqual, ComparisonOperatorNotEqual}
+}
+
+func (o ComparisonOperator) ValueOrDefault() string {
+	if o.IsZero() {
+		return ComparisonOperatorGT.StringValue()
+	}
+	return o.StringValue()
+}
+
+func (o ComparisonOperator) MarshalJSON() ([]byte, error) {
+	return json.Marshal(o.ValueOrDefault())
+}
+
+func (o *ComparisonOperator) UnmarshalJSON(data []byte) error {
+	var v string
+	if err := json.Unmarshal(data, &v); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "invalid comparison operator: must be a string, one of `>`, `<`, `>=`, `<=`, `=`, `above`, `below`, `above_or_equal`, `below_or_equal`, `equal`, or `not_equal`")
+	}
+	if v == "" {
+		*o = ComparisonOperatorGT
+		return nil
+	}
+	co := ComparisonOperator{valuer.NewString(v)}
+	switch co {
+	case ComparisonOperatorGT, ComparisonOperatorLT, ComparisonOperatorGTE, ComparisonOperatorLTE, ComparisonOperatorEQ,
+		ComparisonOperatorAbove, ComparisonOperatorBelow, ComparisonOperatorAboveOrEqual, ComparisonOperatorBelowOrEqual,
+		ComparisonOperatorEqual, ComparisonOperatorNotEqual:
+		*o = co
+		return nil
+	default:
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "invalid comparison operator %q: must be `>`, `<`, `>=`, `<=`, `=`, `above`, `below`, `above_or_equal`, `below_or_equal`, `equal`, or `not_equal`", v)
+	}
+}
+
+type LineInterpolation struct{ valuer.String }
+
+var (
+	LineInterpolationLinear     = LineInterpolation{valuer.NewString("linear")}
+	LineInterpolationSpline     = LineInterpolation{valuer.NewString("spline")} // default
+	LineInterpolationStepAfter  = LineInterpolation{valuer.NewString("step_after")}
+	LineInterpolationStepBefore = LineInterpolation{valuer.NewString("step_before")}
+)
+
+func (LineInterpolation) Enum() []any {
+	return []any{LineInterpolationLinear, LineInterpolationSpline, LineInterpolationStepAfter, LineInterpolationStepBefore}
+}
+
+func (li LineInterpolation) ValueOrDefault() string {
+	if li.IsZero() {
+		return LineInterpolationSpline.StringValue()
+	}
+	return li.StringValue()
+}
+
+func (li LineInterpolation) MarshalJSON() ([]byte, error) {
+	return json.Marshal(li.ValueOrDefault())
+}
+
+func (li *LineInterpolation) UnmarshalJSON(data []byte) error {
+	var v string
+	if err := json.Unmarshal(data, &v); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "invalid line interpolation: must be a string, one of `linear`, `spline`, `step_after`, or `step_before`")
+	}
+	if v == "" {
+		*li = LineInterpolationSpline
+		return nil
+	}
+	val := LineInterpolation{valuer.NewString(v)}
+	switch val {
+	case LineInterpolationLinear, LineInterpolationSpline, LineInterpolationStepAfter, LineInterpolationStepBefore:
+		*li = val
+		return nil
+	default:
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "invalid line interpolation %q: must be `linear`, `spline`, `step_after`, or `step_before`", v)
+	}
+}
+
+type LineStyle struct{ valuer.String }
+
+var (
+	LineStyleSolid  = LineStyle{valuer.NewString("solid")} // default
+	LineStyleDashed = LineStyle{valuer.NewString("dashed")}
+)
+
+func (LineStyle) Enum() []any {
+	return []any{LineStyleSolid, LineStyleDashed}
+}
+
+func (ls LineStyle) ValueOrDefault() string {
+	if ls.IsZero() {
+		return LineStyleSolid.StringValue()
+	}
+	return ls.StringValue()
+}
+
+func (ls LineStyle) MarshalJSON() ([]byte, error) {
+	return json.Marshal(ls.ValueOrDefault())
+}
+
+func (ls *LineStyle) UnmarshalJSON(data []byte) error {
+	var v string
+	if err := json.Unmarshal(data, &v); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "invalid line style: must be a string, one of `solid` or `dashed`")
+	}
+	if v == "" {
+		*ls = LineStyleSolid
+		return nil
+	}
+	val := LineStyle{valuer.NewString(v)}
+	switch val {
+	case LineStyleSolid, LineStyleDashed:
+		*ls = val
+		return nil
+	default:
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "invalid line style %q: must be `solid` or `dashed`", v)
+	}
+}
+
+type FillMode struct{ valuer.String }
+
+var (
+	FillModeSolid    = FillMode{valuer.NewString("solid")} // default
+	FillModeGradient = FillMode{valuer.NewString("gradient")}
+	FillModeNone     = FillMode{valuer.NewString("none")}
+)
+
+func (FillMode) Enum() []any {
+	return []any{FillModeSolid, FillModeGradient, FillModeNone}
+}
+
+func (fm FillMode) ValueOrDefault() string {
+	if fm.IsZero() {
+		return FillModeSolid.StringValue()
+	}
+	return fm.StringValue()
+}
+
+func (fm FillMode) MarshalJSON() ([]byte, error) {
+	return json.Marshal(fm.ValueOrDefault())
+}
+
+func (fm *FillMode) UnmarshalJSON(data []byte) error {
+	var v string
+	if err := json.Unmarshal(data, &v); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "invalid fill mode: must be a string, one of `solid`, `gradient`, or `none`")
+	}
+	if v == "" {
+		*fm = FillModeSolid
+		return nil
+	}
+	val := FillMode{valuer.NewString(v)}
+	switch val {
+	case FillModeSolid, FillModeGradient, FillModeNone:
+		*fm = val
+		return nil
+	default:
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "invalid fill mode %q: must be `solid`, `gradient`, or `none`", v)
+	}
+}
+
+// SpanGaps controls whether lines connect across null values.
+// When FillOnlyBelow is false (default), all gaps are connected.
+// When FillOnlyBelow is true, only gaps smaller than FillLessThan are connected.
+type SpanGaps struct {
+	FillOnlyBelow bool                `json:"fillOnlyBelow"`
+	FillLessThan  valuer.TextDuration `json:"fillLessThan"`
+}
+
+type PrecisionOption struct{ valuer.String }
+
+var (
+	PrecisionOption0    = PrecisionOption{valuer.NewString("0")}
+	PrecisionOption1    = PrecisionOption{valuer.NewString("1")}
+	PrecisionOption2    = PrecisionOption{valuer.NewString("2")} // default
+	PrecisionOption3    = PrecisionOption{valuer.NewString("3")}
+	PrecisionOption4    = PrecisionOption{valuer.NewString("4")}
+	PrecisionOptionFull = PrecisionOption{valuer.NewString("full")}
+)
+
+func (PrecisionOption) Enum() []any {
+	return []any{PrecisionOption0, PrecisionOption1, PrecisionOption2, PrecisionOption3, PrecisionOption4, PrecisionOptionFull}
+}
+
+func (p PrecisionOption) ValueOrDefault() string {
+	if p.IsZero() {
+		return PrecisionOption2.StringValue()
+	}
+	return p.StringValue()
+}
+
+func (p PrecisionOption) MarshalJSON() ([]byte, error) {
+	return json.Marshal(p.ValueOrDefault())
+}
+
+func (p *PrecisionOption) UnmarshalJSON(data []byte) error {
+	// Accept int values 0-4 and store as string.
+	var n int
+	if err := json.Unmarshal(data, &n); err == nil {
+		switch n {
+		case 0, 1, 2, 3, 4:
+			p.String = valuer.NewString(strconv.Itoa(n))
+			return nil
+		default:
+			return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "invalid precision option %d: must be `0`, `1`, `2`, `3`, `4`, or `full`", n)
+		}
+	}
+	var v string
+	if err := json.Unmarshal(data, &v); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "invalid precision option: must be `0`, `1`, `2`, `3`, `4`, or `full`")
+	}
+	if v == "" {
+		*p = PrecisionOption2
+		return nil
+	}
+	val := PrecisionOption{valuer.NewString(v)}
+	switch val {
+	case PrecisionOption0, PrecisionOption1, PrecisionOption2, PrecisionOption3, PrecisionOption4, PrecisionOptionFull:
+		*p = val
+		return nil
+	default:
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "invalid precision option %q: must be `0`, `1`, `2`, `3`, `4`, or `full`", v)
+	}
+}

pkg/types/dashboardtypes/testdata/perses.json

@@ -0,0 +1,861 @@
+{
+    "display": {
+        "name": "The everything dashboard",
+        "description": "Trying to cover as many concepts here as possible"
+    },
+    "duration": "1h",
+    "datasources": {
+        "SigNozDatasource": {
+            "default": true,
+            "plugin": {
+                "kind": "signoz/Datasource",
+                "spec": {}
+            }
+        }
+    },
+    "variables": [
+        {
+            "kind": "ListVariable",
+            "spec": {
+                "name": "serviceName",
+                "display": {
+                    "name": "serviceName"
+                },
+                "allowAllValue": true,
+                "allowMultiple": false,
+                "sort": "none",
+                "plugin": {
+                    "kind": "signoz/DynamicVariable",
+                    "spec": {
+                        "name": "service.name",
+                        "signal": "metrics"
+                    }
+                }
+            }
+        },
+        {
+            "kind": "ListVariable",
+            "spec": {
+                "name": "statusCodesFromQuery",
+                "display": {
+                    "name": "statusCodesFromQuery"
+                },
+                "allowAllValue": true,
+                "allowMultiple": true,
+                "sort": "alphabetical-asc",
+                "plugin": {
+                    "kind": "signoz/QueryVariable",
+                    "spec": {
+                        "queryValue": "SELECT JSONExtractString(labels, 'http.status_code') AS status_code FROM signoz_metrics.distributed_time_series_v4_1day WHERE status_code != '' GROUP BY status_code"
+                    }
+                }
+            }
+        },
+        {
+            "kind": "ListVariable",
+            "spec": {
+                "name": "limit",
+                "display": {
+                    "name": "limit"
+                },
+                "allowAllValue": false,
+                "allowMultiple": false,
+                "sort": "none",
+                "plugin": {
+                    "kind": "signoz/CustomVariable",
+                    "spec": {
+                        "customValue": "1,10,20,40,80,160,200"
+                    }
+                }
+            }
+        },
+        {
+            "kind": "TextVariable",
+            "spec": {
+                "name": "textboxvar",
+                "display": {
+                    "name": "textboxvar"
+                },
+                "value": "defaultvaluegoeshere",
+                "plugin": {
+                    "kind": "signoz/TextboxVariable",
+                    "spec": {}
+                }
+            }
+        }
+    ],
+    "panels": {
+        "24e2697b": {
+            "kind": "Panel",
+            "spec": {
+                "display": {
+                    "name": "total resp size",
+                    "description": ""
+                },
+                "plugin": {
+                    "kind": "signoz/TimeSeriesPanel",
+                    "spec": {
+                        "visualization": {
+                            "fillSpans": true
+                        },
+                        "formatting": {
+                            "unit": "By",
+                            "decimalPrecision": "3"
+                        },
+                        "axes": {
+                            "softMax": 800,
+                            "isLogScale": true
+                        },
+                        "legend": {
+                            "position": "right",
+                            "customColors": {
+                                "{service.name=\"sampleapp-gateway\"}": "#9ea5f7"
+                            }
+                        },
+                        "thresholds": [
+                            {
+                                "value": 1024,
+                                "unit": "By",
+                                "color": "Red",
+                                "label": "upper limit"
+                            },
+                            {
+                                "value": 100,
+                                "unit": "By",
+                                "color": "Orange",
+                                "label": "kinda bad"
+                            }
+                        ]
+                    }
+                },
+                "links": [
+                    {
+                        "name": "View service details",
+                        "url": "http://localhost:8080/{{_service.name}}?dfddf=%7B%7Blimit%7D%7D"
+                    }
+                ],
+                "queries": [
+                    {
+                        "kind": "TimeSeriesQuery",
+                        "spec": {
+                            "plugin": {
+                                "kind": "signoz/BuilderQuery",
+                                "spec": {
+                                    "name": "A",
+                                    "signal": "metrics",
+                                    "aggregations": [
+                                        {
+                                            "metricName": "http.server.response.body.size.sum",
+                                            "reduceTo": "sum",
+                                            "spaceAggregation": "sum",
+                                            "timeAggregation": "rate"
+                                        }
+                                    ],
+                                    "filter": {
+                                        "expression": "http.response.status_code IN $statusCodesFromQuery"
+                                    },
+                                    "groupBy": [
+                                        {
+                                            "name": "service.name",
+                                            "fieldDataType": "string",
+                                            "fieldContext": "tag"
+                                        }
+                                    ]
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        "ff2f72f1": {
+            "kind": "Panel",
+            "spec": {
+                "display": {
+                    "name": "fraction of calls",
+                    "description": ""
+                },
+                "plugin": {
+                    "kind": "signoz/TimeSeriesPanel",
+                    "spec": {
+                        "visualization": {
+                            "fillSpans": true
+                        },
+                        "formatting": {
+                            "decimalPrecision": "1"
+                        },
+                        "thresholds": [
+                            {
+                                "value": 1,
+                                "color": "Blue",
+                                "label": "max possible"
+                            }
+                        ]
+                    }
+                },
+                "queries": [
+                    {
+                        "kind": "TimeSeriesQuery",
+                        "spec": {
+                            "plugin": {
+                                "kind": "signoz/CompositeQuery",
+                                "spec": {
+                                    "queries": [
+                                        {
+                                            "type": "builder_query",
+                                            "spec": {
+                                                "name": "A",
+                                                "signal": "metrics",
+                                                "disabled": true,
+                                                "aggregations": [
+                                                    {
+                                                        "metricName": "signoz_calls_total",
+                                                        "reduceTo": "sum",
+                                                        "spaceAggregation": "sum",
+                                                        "timeAggregation": "rate"
+                                                    }
+                                                ],
+                                                "filter": {
+                                                    "expression": "service.name IN $serviceName  AND http.status_code IN $statusCodesFromQuery"
+                                                }
+                                            }
+                                        },
+                                        {
+                                            "type": "builder_query",
+                                            "spec": {
+                                                "name": "B",
+                                                "signal": "metrics",
+                                                "disabled": true,
+                                                "aggregations": [
+                                                    {
+                                                        "metricName": "signoz_calls_total",
+                                                        "reduceTo": "sum",
+                                                        "spaceAggregation": "sum",
+                                                        "timeAggregation": "rate"
+                                                    }
+                                                ],
+                                                "filter": {
+                                                    "expression": "service.name in $serviceName"
+                                                }
+                                            }
+                                        },
+                                        {
+                                            "type": "builder_formula",
+                                            "spec": {
+                                                "name": "F1",
+                                                "expression": "A / B"
+                                            }
+                                        }
+                                    ]
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        "011605e7": {
+            "kind": "Panel",
+            "spec": {
+                "display": {
+                    "name": "total resp size"
+                },
+                "plugin": {
+                    "kind": "signoz/BarChartPanel",
+                    "spec": {
+                        "visualization": {
+                            "stackedBarChart": false
+                        },
+                        "formatting": {
+                            "unit": "By"
+                        }
+                    }
+                },
+                "queries": [
+                    {
+                        "kind": "TimeSeriesQuery",
+                        "spec": {
+                            "plugin": {
+                                "kind": "signoz/BuilderQuery",
+                                "spec": {
+                                    "name": "A",
+                                    "signal": "metrics",
+                                    "aggregations": [
+                                        {
+                                            "metricName": "http.server.response.body.size.sum",
+                                            "reduceTo": "sum",
+                                            "spaceAggregation": "sum",
+                                            "timeAggregation": "rate"
+                                        }
+                                    ],
+                                    "filter": {
+                                        "expression": "http.response.status_code IN $statusCodesFromQuery"
+                                    },
+                                    "groupBy": [
+                                        {
+                                            "name": "service.name",
+                                            "fieldDataType": "string",
+                                            "fieldContext": "tag"
+                                        }
+                                    ]
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        "e23516fc": {
+            "kind": "Panel",
+            "spec": {
+                "display": {
+                    "name": "num traces for service"
+                },
+                "plugin": {
+                    "kind": "signoz/NumberPanel",
+                    "spec": {
+                        "formatting": {
+                            "unit": "none",
+                            "decimalPrecision": "1"
+                        },
+                        "thresholds": [
+                            {
+                                "value": 1200000,
+                                "operator": ">",
+                                "unit": "none",
+                                "color": "Red",
+                                "format": "text"
+                            },
+                            {
+                                "value": 1200000,
+                                "operator": "<=",
+                                "unit": "none",
+                                "color": "Green",
+                                "format": "text"
+                            }
+                        ]
+                    }
+                },
+                "queries": [
+                    {
+                        "kind": "TimeSeriesQuery",
+                        "spec": {
+                            "plugin": {
+                                "kind": "signoz/BuilderQuery",
+                                "spec": {
+                                    "name": "A",
+                                    "signal": "traces",
+                                    "aggregations": [
+                                        {
+                                            "expression": "count() "
+                                        }
+                                    ],
+                                    "filter": {
+                                        "expression": "service.name = $serviceName "
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        "130c8d6b": {
+            "kind": "Panel",
+            "spec": {
+                "display": {
+                    "name": "num logs for service"
+                },
+                "plugin": {
+                    "kind": "signoz/NumberPanel",
+                    "spec": {
+                        "formatting": {
+                            "unit": "none",
+                            "decimalPrecision": "1"
+                        }
+                    }
+                },
+                "queries": [
+                    {
+                        "kind": "TimeSeriesQuery",
+                        "spec": {
+                            "plugin": {
+                                "kind": "signoz/BuilderQuery",
+                                "spec": {
+                                    "name": "A",
+                                    "signal": "logs",
+                                    "aggregations": [
+                                        {
+                                            "expression": "count() "
+                                        }
+                                    ],
+                                    "filter": {
+                                        "expression": "service.name = $serviceName "
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        "246f7c6d": {
+            "kind": "Panel",
+            "spec": {
+                "display": {
+                    "name": "num traces for service per resp code"
+                },
+                "plugin": {
+                    "kind": "signoz/PieChartPanel",
+                    "spec": {
+                        "formatting": {
+                            "decimalPrecision": "1"
+                        },
+                        "legend": {
+                            "customColors": {
+                                "\"201\"": "#2bc051",
+                                "\"400\"": "#cc462e",
+                                "\"500\"": "#ff0000"
+                            }
+                        }
+                    }
+                },
+                "queries": [
+                    {
+                        "kind": "TimeSeriesQuery",
+                        "spec": {
+                            "plugin": {
+                                "kind": "signoz/BuilderQuery",
+                                "spec": {
+                                    "name": "A",
+                                    "signal": "traces",
+                                    "aggregations": [
+                                        {
+                                            "expression": "count() "
+                                        }
+                                    ],
+                                    "filter": {
+                                        "expression": "service.name = $serviceName isEntryPoint = 'true'"
+                                    },
+                                    "groupBy": [
+                                        {
+                                            "name": "http.response.status_code",
+                                            "fieldDataType": "float64",
+                                            "fieldContext": "tag"
+                                        }
+                                    ],
+                                    "legend": "\"{{http.response.status_code}}\""
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        "21f7d4d0": {
+            "kind": "Panel",
+            "spec": {
+                "display": {
+                    "name": "average latency per service"
+                },
+                "plugin": {
+                    "kind": "signoz/TablePanel",
+                    "spec": {
+                        "formatting": {
+                            "columnUnits": {
+                                "A": "s"
+                            }
+                        },
+                        "thresholds": [
+                            {
+                                "value": 1,
+                                "operator": ">",
+                                "unit": "min",
+                                "color": "Red",
+                                "format": "text",
+                                "columnName": "A"
+                            }
+                        ]
+                    }
+                },
+                "queries": [
+                    {
+                        "kind": "TimeSeriesQuery",
+                        "spec": {
+                            "plugin": {
+                                "kind": "signoz/ClickHouseSQL",
+                                "spec": {
+                                    "name": "A",
+                                    "query": "WITH\n    __spatial_aggregation_cte AS\n    (\n        SELECT\n            toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(60)) AS ts,\n            `service.name`,\n            le,\n            sum(value) / 60 AS value\n        FROM signoz_metrics.distributed_samples_v4 AS points\n        INNER JOIN\n        (\n            SELECT\n                fingerprint,\n                JSONExtractString(labels, 'service.name') AS `service.name`,\n                JSONExtractString(labels, 'le') AS le\n            FROM signoz_metrics.time_series_v4\n            WHERE (metric_name IN ('signoz_latency.bucket')) AND (LOWER(temporality) LIKE LOWER('delta')) AND (__normalized = 0)\n            GROUP BY\n                fingerprint,\n                `service.name`,\n                le\n        ) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint\n        WHERE metric_name IN ('signoz_latency.bucket')\n        GROUP BY\n            ts,\n            `service.name`,\n            le\n    ),\n    __histogramCTE AS\n    (\n        SELECT\n            ts,\n            `service.name`,\n            histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), 0.9) AS value\n        FROM __spatial_aggregation_cte\n        GROUP BY\n            `service.name`,\n            ts\n        ORDER BY\n            `service.name` ASC,\n            ts ASC\n    )\nSELECT\n    `service.name` AS service,\n    avg(value) AS A\nFROM __histogramCTE\nGROUP BY `service.name`"
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        "ad5fd556": {
+            "kind": "Panel",
+            "spec": {
+                "display": {
+                    "name": "logs from service"
+                },
+                "plugin": {
+                    "kind": "signoz/ListPanel",
+                    "spec": {
+                        "selectFields": [
+                            {
+                                "name": "timestamp",
+                                "signal": "logs"
+                            },
+                            {
+                                "name": "body",
+                                "signal": "logs"
+                            },
+                            {
+                                "name": "error",
+                                "fieldDataType": "string"
+                            }
+                        ]
+                    }
+                },
+                "queries": [
+                    {
+                        "kind": "LogQuery",
+                        "spec": {
+                            "plugin": {
+                                "kind": "signoz/BuilderQuery",
+                                "spec": {
+                                    "name": "A",
+                                    "signal": "logs",
+                                    "aggregations": [
+                                        {
+                                            "expression": "count() "
+                                        }
+                                    ],
+                                    "filter": {
+                                        "expression": "service.name = $serviceName"
+                                    },
+                                    "groupBy": [],
+                                    "order": [
+                                        {
+                                            "key": {
+                                                "name": "timestamp"
+                                            },
+                                            "direction": "desc"
+                                        },
+                                        {
+                                            "key": {
+                                                "name": "id"
+                                            },
+                                            "direction": "desc"
+                                        }
+                                    ]
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        "f07b59ee": {
+            "kind": "Panel",
+            "spec": {
+                "display": {
+                    "name": "response size buckets"
+                },
+                "plugin": {
+                    "kind": "signoz/HistogramPanel",
+                    "spec": {
+                        "histogramBuckets": {
+                            "bucketCount": 60,
+                            "mergeAllActiveQueries": true
+                        }
+                    }
+                },
+                "queries": [
+                    {
+                        "kind": "TimeSeriesQuery",
+                        "spec": {
+                            "plugin": {
+                                "kind": "signoz/BuilderQuery",
+                                "spec": {
+                                    "name": "A",
+                                    "signal": "metrics",
+                                    "aggregations": [
+                                        {
+                                            "metricName": "http.server.response.body.size.bucket",
+                                            "reduceTo": "avg",
+                                            "spaceAggregation": "p90",
+                                            "timeAggregation": "rate"
+                                        }
+                                    ]
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        "e1a41831": {
+            "kind": "Panel",
+            "spec": {
+                "display": {
+                    "name": "trace operator",
+                    "description": ""
+                },
+                "plugin": {
+                    "kind": "signoz/TimeSeriesPanel",
+                    "spec": {
+                        "legend": {
+                            "position": "right"
+                        }
+                    }
+                },
+                "queries": [
+                    {
+                        "kind": "TimeSeriesQuery",
+                        "spec": {
+                            "plugin": {
+                                "kind": "signoz/CompositeQuery",
+                                "spec": {
+                                    "queries": [
+                                        {
+                                            "type": "builder_query",
+                                            "spec": {
+                                                "name": "A",
+                                                "signal": "traces",
+                                                "aggregations": [
+                                                    {
+                                                        "expression": "count() "
+                                                    }
+                                                ],
+                                                "filter": {
+                                                    "expression": "service.name = 'sampleapp-gateway' "
+                                                },
+                                                "legend": "Gateway"
+                                            }
+                                        },
+                                        {
+                                            "type": "builder_query",
+                                            "spec": {
+                                                "name": "B",
+                                                "signal": "traces",
+                                                "aggregations": [
+                                                    {
+                                                        "expression": "count() "
+                                                    }
+                                                ],
+                                                "filter": {
+                                                    "expression": "http.response.status_code = 200"
+                                                },
+                                                "legend": "$serviceName"
+                                            }
+                                        },
+                                        {
+                                            "type": "builder_trace_operator",
+                                            "spec": {
+                                                "name": "T1",
+                                                "aggregations": [
+                                                    {
+                                                        "expression": "count()",
+                                                        "alias": "request_count"
+                                                    }
+                                                ]
+                                            }
+                                        }
+                                    ]
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        "f0d70491": {
+            "kind": "Panel",
+            "spec": {
+                "display": {
+                    "name": "no results in this promql",
+                    "description": ""
+                },
+                "plugin": {
+                    "kind": "signoz/TimeSeriesPanel",
+                    "spec": {}
+                },
+                "queries": [
+                    {
+                        "kind": "TimeSeriesQuery",
+                        "spec": {
+                            "plugin": {
+                                "kind": "signoz/CompositeQuery",
+                                "spec": {
+                                    "queries": [
+                                        {
+                                            "type": "promql",
+                                            "spec": {
+                                                "name": "A",
+                                                "query": "sum(rate(flask_exporter_info[5m]))"
+                                            }
+                                        },
+                                        {
+                                            "type": "promql",
+                                            "spec": {
+                                                "name": "B",
+                                                "query": "sum(increase(flask_exporter_info[5m]))"
+                                            }
+                                        }
+                                    ]
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        "0e6eb4ca": {
+            "kind": "Panel",
+            "spec": {
+                "display": {
+                    "name": "no results in this promql",
+                    "description": ""
+                },
+                "plugin": {
+                    "kind": "signoz/TimeSeriesPanel",
+                    "spec": {}
+                },
+                "queries": [
+                    {
+                        "kind": "TimeSeriesQuery",
+                        "spec": {
+                            "plugin": {
+                                "kind": "signoz/PromQLQuery",
+                                "spec": {
+                                    "name": "A",
+                                    "query": "sum(rate(flask_exporter_info[5m]))"
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        }
+    },
+    "layouts": [
+        {
+            "kind": "Grid",
+            "spec": {
+                "items": [
+                    {
+                        "x": 0,
+                        "y": 0,
+                        "width": 6,
+                        "height": 6,
+                        "content": {
+                            "$ref": "#/spec/panels/24e2697b"
+                        }
+                    },
+                    {
+                        "x": 6,
+                        "y": 0,
+                        "width": 6,
+                        "height": 6,
+                        "content": {
+                            "$ref": "#/spec/panels/ff2f72f1"
+                        }
+                    },
+                    {
+                        "x": 0,
+                        "y": 6,
+                        "width": 6,
+                        "height": 6,
+                        "content": {
+                            "$ref": "#/spec/panels/011605e7"
+                        }
+                    },
+                    {
+                        "x": 6,
+                        "y": 6,
+                        "width": 6,
+                        "height": 3,
+                        "content": {
+                            "$ref": "#/spec/panels/e23516fc"
+                        }
+                    },
+                    {
+                        "x": 6,
+                        "y": 9,
+                        "width": 6,
+                        "height": 3,
+                        "content": {
+                            "$ref": "#/spec/panels/130c8d6b"
+                        }
+                    },
+                    {
+                        "x": 0,
+                        "y": 12,
+                        "width": 6,
+                        "height": 6,
+                        "content": {
+                            "$ref": "#/spec/panels/246f7c6d"
+                        }
+                    },
+                    {
+                        "x": 6,
+                        "y": 12,
+                        "width": 6,
+                        "height": 6,
+                        "content": {
+                            "$ref": "#/spec/panels/21f7d4d0"
+                        }
+                    },
+                    {
+                        "x": 0,
+                        "y": 18,
+                        "width": 6,
+                        "height": 6,
+                        "content": {
+                            "$ref": "#/spec/panels/ad5fd556"
+                        }
+                    },
+                    {
+                        "x": 6,
+                        "y": 18,
+                        "width": 6,
+                        "height": 6,
+                        "content": {
+                            "$ref": "#/spec/panels/f07b59ee"
+                        }
+                    },
+                    {
+                        "x": 0,
+                        "y": 24,
+                        "width": 12,
+                        "height": 6,
+                        "content": {
+                            "$ref": "#/spec/panels/e1a41831"
+                        }
+                    },
+                    {
+                        "x": 0,
+                        "y": 30,
+                        "width": 6,
+                        "height": 6,
+                        "content": {
+                            "$ref": "#/spec/panels/f0d70491"
+                        }
+                    },
+                    {
+                        "x": 6,
+                        "y": 30,
+                        "width": 6,
+                        "height": 6,
+                        "content": {
+                            "$ref": "#/spec/panels/0e6eb4ca"
+                        }
+                    }
+                ]
+            }
+        }
+    ]
+}

pkg/types/dashboardtypes/testdata/perses_with_sections.json

@@ -0,0 +1,154 @@
+{
+    "display": {
+        "name": "NV dashboard with sections",
+        "description": ""
+    },
+    "datasources": {
+        "SigNozDatasource": {
+            "default": true,
+            "plugin": {
+                "kind": "signoz/Datasource",
+                "spec": {}
+            }
+        }
+    },
+    "panels": {
+        "b424e23b": {
+            "kind": "Panel",
+            "spec": {
+                "display": {
+                    "name": ""
+                },
+                "plugin": {
+                    "kind": "signoz/NumberPanel",
+                    "spec": {
+                        "formatting": {
+                            "unit": "s",
+                            "decimalPrecision": "2"
+                        }
+                    }
+                },
+                "queries": [
+                    {
+                        "kind": "TimeSeriesQuery",
+                        "spec": {
+                            "plugin": {
+                                "kind": "signoz/BuilderQuery",
+                                "spec": {
+                                    "name": "A",
+                                    "signal": "metrics",
+                                    "aggregations": [
+                                        {
+                                            "metricName": "container.cpu.time",
+                                            "reduceTo": "sum",
+                                            "spaceAggregation": "sum",
+                                            "timeAggregation": "rate"
+                                        }
+                                    ],
+                                    "filter": {
+                                        "expression": ""
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        "251df4d5": {
+            "kind": "Panel",
+            "spec": {
+                "display": {
+                    "name": ""
+                },
+                "plugin": {
+                    "kind": "signoz/TimeSeriesPanel",
+                    "spec": {
+                        "visualization": {
+                            "fillSpans": false
+                        },
+                        "formatting": {
+                            "unit": "recommendations",
+                            "decimalPrecision": "2"
+                        },
+                        "chartAppearance": {
+                            "lineInterpolation": "spline",
+                            "showPoints": false,
+                            "lineStyle": "solid",
+                            "fillMode": "none",
+                            "spanGaps": {"fillOnlyBelow": true}
+                        },
+                        "legend": {
+                            "position": "bottom"
+                        }
+                    }
+                },
+                "queries": [
+                    {
+                        "kind": "TimeSeriesQuery",
+                        "spec": {
+                            "plugin": {
+                                "kind": "signoz/BuilderQuery",
+                                "spec": {
+                                    "name": "A",
+                                    "signal": "metrics",
+                                    "aggregations": [
+                                        {
+                                            "metricName": "app_recommendations_counter",
+                                            "reduceTo": "sum",
+                                            "spaceAggregation": "sum",
+                                            "timeAggregation": "rate"
+                                        }
+                                    ],
+                                    "filter": {
+                                        "expression": ""
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        }
+    },
+    "layouts": [
+        {
+            "kind": "Grid",
+            "spec": {
+                "display": {
+                    "title": "Bravo"
+                },
+                "items": [
+                    {
+                        "x": 0,
+                        "y": 0,
+                        "width": 6,
+                        "height": 6,
+                        "content": {
+                            "$ref": "#/spec/panels/b424e23b"
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "kind": "Grid",
+            "spec": {
+                "display": {
+                    "title": "Alpha"
+                },
+                "items": [
+                    {
+                        "x": 0,
+                        "y": 0,
+                        "width": 6,
+                        "height": 6,
+                        "content": {
+                            "$ref": "#/spec/panels/251df4d5"
+                        }
+                    }
+                ]
+            }
+        }
+    ]
+}

pkg/types/querybuildertypes/querybuildertypesv5/req.go

@@ -99,45 +99,11 @@ func (q *QueryEnvelope) UnmarshalJSON(data []byte) error {
 	// 2. Decode the spec based on the Type.
 	switch shadow.Type {
 	case QueryTypeBuilder, QueryTypeSubQuery:
-		var header struct {
-			Signal telemetrytypes.Signal `json:"signal"`
-		}
-		if err := json.Unmarshal(shadow.Spec, &header); err != nil {
-			return errors.NewInvalidInputf(
-				errors.CodeInvalidInput,
-				"cannot detect builder signal: %v",
-				err,
-			)
-		}
-
-		switch header.Signal {
-		case telemetrytypes.SignalTraces:
-			var spec QueryBuilderQuery[TraceAggregation]
-			if err := json.Unmarshal(shadow.Spec, &spec); err != nil {
-				return wrapUnmarshalError(err, "invalid trace builder query spec: %v", err)
-			}
-			q.Spec = spec
-		case telemetrytypes.SignalLogs:
-			var spec QueryBuilderQuery[LogAggregation]
-			if err := json.Unmarshal(shadow.Spec, &spec); err != nil {
-				return wrapUnmarshalError(err, "invalid log builder query spec: %v", err)
-			}
-			q.Spec = spec
-		case telemetrytypes.SignalMetrics:
-			var spec QueryBuilderQuery[MetricAggregation]
-			if err := json.Unmarshal(shadow.Spec, &spec); err != nil {
-				return wrapUnmarshalError(err, "invalid metric builder query spec: %v", err)
-			}
-			q.Spec = spec
-		default:
-			return errors.NewInvalidInputf(
-				errors.CodeInvalidInput,
-				"unknown builder signal %q",
-				header.Signal,
-			).WithAdditional(
-				"Valid signals are: traces, logs, metrics",
-			)
+		spec, err := UnmarshalBuilderQueryBySignal(shadow.Spec)
+		if err != nil {
+			return err
 		}
+		q.Spec = spec
 
 	case QueryTypeFormula:
 		var spec QueryBuilderFormula
@@ -191,6 +157,49 @@ func (q *QueryEnvelope) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
+// UnmarshalBuilderQueryBySignal peeks at the "signal" field in the JSON data and
+// unmarshals into the correct generic QueryBuilderQuery type. Returns the typed spec.
+func UnmarshalBuilderQueryBySignal(data []byte) (any, error) {
+	var header struct {
+		Signal telemetrytypes.Signal `json:"signal"`
+	}
+	if err := json.Unmarshal(data, &header); err != nil {
+		return nil, errors.NewInvalidInputf(
+			errors.CodeInvalidInput,
+			"cannot detect builder signal: %v",
+			err,
+		)
+	}
+
+	switch header.Signal {
+	case telemetrytypes.SignalTraces:
+		var spec QueryBuilderQuery[TraceAggregation]
+		if err := json.Unmarshal(data, &spec); err != nil {
+			return nil, wrapUnmarshalError(err, "invalid trace builder query spec: %v", err)
+		}
+		return spec, nil
+	case telemetrytypes.SignalLogs:
+		var spec QueryBuilderQuery[LogAggregation]
+		if err := json.Unmarshal(data, &spec); err != nil {
+			return nil, wrapUnmarshalError(err, "invalid log builder query spec: %v", err)
+		}
+		return spec, nil
+	case telemetrytypes.SignalMetrics:
+		var spec QueryBuilderQuery[MetricAggregation]
+		if err := json.Unmarshal(data, &spec); err != nil {
+			return nil, wrapUnmarshalError(err, "invalid metric builder query spec: %v", err)
+		}
+		return spec, nil
+	default:
+		return nil, errors.NewInvalidInputf(
+			errors.CodeInvalidInput,
+			"invalid signal %q; allowed values: %v",
+			header.Signal.StringValue(),
+			telemetrytypes.Signal{}.Enum(),
+		)
+	}
+}
+
 type CompositeQuery struct {
 	// Queries is the queries to use for the request.
 	Queries []QueryEnvelope `json:"queries"`

pkg/types/telemetrytypes/field.go

@@ -30,7 +30,7 @@ const (
 )
 
 type TelemetryFieldKey struct {
-	Name          string        `json:"name" required:"true"`
+	Name          string        `json:"name" validate:"required" required:"true"`
 	Description   string        `json:"description,omitempty"`
 	Unit          string        `json:"unit,omitempty"`
 	Signal        Signal        `json:"signal,omitzero"`