Merge branch 'main' into nv/11280

fix: do not show errors for non-existent cost meter metrics (#10843 )
* fix: show warning for non-existent cost meter metrics * chore: lint fix by removing unused list * chore: py fmt add new line * chore: missing newline between tests * fix: no warnings or errors for internal metrics * fix: pylint fix by adding new line * fix: lint fix in test
2026-06-03 23:50:33 +01:00 · 2026-06-03 17:14:59 +05:30 · 2026-06-03 10:09:08 +00:00 · 2026-06-03 07:55:44 +00:00 · 2026-06-03 07:22:32 +00:00 · 2026-06-03 11:30:40 +05:30
25 changed files with 306 additions and 189 deletions
--- a/deploy/docker-swarm/docker-compose.ha.yaml
+++ b/deploy/docker-swarm/docker-compose.ha.yaml
@@ -190,7 +190,7 @@ services:
      # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
  signoz:
    !!merge <<: *db-depend
-    image: signoz/signoz:v0.126.1
+    image: signoz/signoz:v0.127.0
    ports:
      - "8080:8080" # signoz port
    #   - "6060:6060"     # pprof port
@@ -213,7 +213,7 @@ services:
      retries: 3
  otel-collector:
    !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.144.4
+    image: signoz/signoz-otel-collector:v0.144.5
    entrypoint:
      - /bin/sh
    command:
@@ -241,7 +241,7 @@ services:
      replicas: 3
  signoz-telemetrystore-migrator:
    !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.144.4
+    image: signoz/signoz-otel-collector:v0.144.5
    environment:
      - SIGNOZ_OTEL_COLLECTOR_CLICKHOUSE_DSN=tcp://clickhouse:9000
      - SIGNOZ_OTEL_COLLECTOR_CLICKHOUSE_CLUSTER=cluster
--- a/deploy/docker-swarm/docker-compose.yaml
+++ b/deploy/docker-swarm/docker-compose.yaml
@@ -117,7 +117,7 @@ services:
      # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
  signoz:
    !!merge <<: *db-depend
-    image: signoz/signoz:v0.126.1
+    image: signoz/signoz:v0.127.0
    ports:
      - "8080:8080" # signoz port
    volumes:
@@ -139,7 +139,7 @@ services:
      retries: 3
  otel-collector:
    !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.144.4
+    image: signoz/signoz-otel-collector:v0.144.5
    entrypoint:
      - /bin/sh
    command:
@@ -167,7 +167,7 @@ services:
      replicas: 3
  signoz-telemetrystore-migrator:
    !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.144.4
+    image: signoz/signoz-otel-collector:v0.144.5
    environment:
      - SIGNOZ_OTEL_COLLECTOR_CLICKHOUSE_DSN=tcp://clickhouse:9000
      - SIGNOZ_OTEL_COLLECTOR_CLICKHOUSE_CLUSTER=cluster
--- a/deploy/docker/docker-compose.ha.yaml
+++ b/deploy/docker/docker-compose.ha.yaml
@@ -181,7 +181,7 @@ services:
      # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
  signoz:
    !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.126.1}
+    image: signoz/signoz:${VERSION:-v0.127.0}
    container_name: signoz
    ports:
      - "8080:8080" # signoz port
@@ -204,7 +204,7 @@ services:
      retries: 3
  otel-collector:
    !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.4}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.5}
    container_name: signoz-otel-collector
    entrypoint:
      - /bin/sh
@@ -229,7 +229,7 @@ services:
      - "4318:4318" # OTLP HTTP receiver
  signoz-telemetrystore-migrator:
    !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.4}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.5}
    container_name: signoz-telemetrystore-migrator
    environment:
      - SIGNOZ_OTEL_COLLECTOR_CLICKHOUSE_DSN=tcp://clickhouse:9000
--- a/deploy/docker/docker-compose.yaml
+++ b/deploy/docker/docker-compose.yaml
@@ -109,7 +109,7 @@ services:
      # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
  signoz:
    !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.126.1}
+    image: signoz/signoz:${VERSION:-v0.127.0}
    container_name: signoz
    ports:
      - "8080:8080" # signoz port
@@ -132,7 +132,7 @@ services:
      retries: 3
  otel-collector:
    !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.4}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.5}
    container_name: signoz-otel-collector
    entrypoint:
      - /bin/sh
@@ -157,7 +157,7 @@ services:
      - "4318:4318" # OTLP HTTP receiver
  signoz-telemetrystore-migrator:
    !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.4}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.5}
    container_name: signoz-telemetrystore-migrator
    environment:
      - SIGNOZ_OTEL_COLLECTOR_CLICKHOUSE_DSN=tcp://clickhouse:9000
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -128,7 +128,7 @@
    "timestamp-nano": "^1.0.0",
    "typescript": "5.9.3",
    "uplot": "1.6.31",
-    "uuid": "^11.1.1",
+    "uuid": "^8.3.2",
    "vite": "npm:rolldown-vite@7.3.1",
    "vite-plugin-html": "3.2.2",
    "zod": "4.3.6",
@@ -180,6 +180,7 @@
    "@types/redux-mock-store": "1.0.4",
    "@types/styled-components": "^5.1.4",
    "@types/testing-library__jest-dom": "^5.14.5",
+    "@types/uuid": "^8.3.1",
    "@typescript/native-preview": "7.0.0-dev.20260430.1",
    "eslint-plugin-sonarjs": "4.0.2",
    "glob": "^13.0.6",
@@ -237,21 +238,9 @@
    "prismjs": "1.30.0",
    "got": "11.8.5",
    "form-data": "4.0.4",
-    "brace-expansion": "^2.0.3",
+    "brace-expansion": "^2.0.2",
    "on-headers": "^1.1.0",
-    "tmp": "^0.2.6",
-    "vite": "npm:rolldown-vite@7.3.1",
-    "js-cookie": "^3.0.7",
-    "js-yaml": "^3.14.2",
-    "dompurify": "^3.4.0",
-    "protocol-buffers-schema": "^3.6.1",
-    "ws": "^8.20.1"
-  },
-  "pnpm": {
-    "overrides": {
-      "yaml@1": "^1.10.3",
-      "yaml@2": "^2.8.3",
-      "hast-util-raw>mdast-util-to-hast": "^13.2.1"
-    }
+    "tmp": "0.2.4",
+    "vite": "npm:rolldown-vite@7.3.1"
  }
 }
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
@@ -19,18 +19,10 @@ overrides:
  prismjs: 1.30.0
  got: 11.8.5
  form-data: 4.0.4
-  brace-expansion: ^2.0.3
+  brace-expansion: ^2.0.2
  on-headers: ^1.1.0
-  tmp: ^0.2.6
+  tmp: 0.2.4
  vite: npm:rolldown-vite@7.3.1
-  js-cookie: ^3.0.7
-  js-yaml: ^3.14.2
-  dompurify: ^3.4.0
-  protocol-buffers-schema: ^3.6.1
-  ws: ^8.20.1
-  yaml@1: ^1.10.3
-  yaml@2: ^2.8.3
-  hast-util-raw>mdast-util-to-hast: ^13.2.1

 importers:

@@ -160,7 +152,7 @@ importers:
        specifier: ^1.10.7
        version: 1.11.20
      dompurify:
-        specifier: ^3.4.0
+        specifier: 3.4.0
        version: 3.4.0
      event-source-polyfill:
        specifier: 1.0.31
@@ -319,8 +311,8 @@ importers:
        specifier: 1.6.31
        version: 1.6.31
      uuid:
-        specifier: ^11.1.1
-        version: 11.1.1
+        specifier: ^8.3.2
+        version: 8.3.2
      vite:
        specifier: npm:rolldown-vite@7.3.1
        version: rolldown-vite@7.3.1(@types/node@16.18.25)(esbuild@0.27.7)(jiti@2.6.1)(less@4.4.0)(sass@1.97.3)(stylus@0.62.0)(terser@5.46.2)(yaml@2.8.4)
@@ -433,6 +425,9 @@ importers:
      '@types/testing-library__jest-dom':
        specifier: ^5.14.5
        version: 5.14.5
+      '@types/uuid':
+        specifier: ^8.3.1
+        version: 8.3.4
      '@typescript/native-preview':
        specifier: 7.0.0-dev.20260430.1
        version: 7.0.0-dev.20260430.1
@@ -3615,6 +3610,9 @@ packages:
  '@types/unist@3.0.2':
    resolution: {integrity: sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==}

+  '@types/uuid@8.3.4':
+    resolution: {integrity: sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==}
+
  '@types/yargs-parser@21.0.0':
    resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==}

@@ -4133,8 +4131,8 @@ packages:
  boolbase@1.0.0:
    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}

-  brace-expansion@2.1.1:
-    resolution: {integrity: sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==}
+  brace-expansion@2.0.2:
+    resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}

  braces@3.0.3:
    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
@@ -4795,6 +4793,12 @@ packages:
    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
    engines: {node: '>= 4'}

+  dompurify@3.2.4:
+    resolution: {integrity: sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==}
+
+  dompurify@3.2.7:
+    resolution: {integrity: sha512-WhL/YuveyGXJaerVlMYGWhvQswa7myDG17P7Vu65EWC05o8vfeNbvNf4d/BOvH99+ZW+LlQsc1GDKMa1vNK6dw==}
+
  dompurify@3.4.0:
    resolution: {integrity: sha512-nolgK9JcaUXMSmW+j1yaSvaEaoXYHwWyGJlkoCTghc97KgGDDSnpoU/PlEnw63Ah+TGKFOyY+X5LnxaWbCSfXg==}

@@ -6031,8 +6035,8 @@ packages:
  js-base64@3.7.5:
    resolution: {integrity: sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA==}

-  js-cookie@3.0.8:
-    resolution: {integrity: sha512-yeJd4aNAdYZQjaon2bpD/Gb0B/omw7HQOsynXXcOiWVCacbBcPlgn8S/d1X6blFSaHao7ozqtW7NZW19xpCtIw==}
+  js-cookie@2.2.1:
+    resolution: {integrity: sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==}

  js-levenshtein@1.1.6:
    resolution: {integrity: sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==}
@@ -6044,8 +6048,12 @@ packages:
  js-tokens@4.0.0:
    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}

-  js-yaml@3.14.2:
-    resolution: {integrity: sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==}
+  js-yaml@3.14.1:
+    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+    hasBin: true
+
+  js-yaml@4.1.1:
+    resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
    hasBin: true

  jsdom@20.0.3:
@@ -6414,8 +6422,8 @@ packages:
  mdast-util-to-hast@12.3.0:
    resolution: {integrity: sha512-pits93r8PhnIoU4Vy9bjW39M2jJ6/tdHyja9rrot9uujkN7UTU9SDnE6WNJz/IGyQk3XHX6yNNtrBH6cQzm8Hw==}

-  mdast-util-to-hast@13.2.1:
-    resolution: {integrity: sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==}
+  mdast-util-to-hast@13.1.0:
+    resolution: {integrity: sha512-/e2l/6+OdGp/FB+ctrJ9Avz71AN/GRH3oi/3KAx/kMnoUsD6q0woXlDT8lLEeViVKE7oZxE7RXzvO3T8kF2/sA==}

  mdast-util-to-markdown@1.5.0:
    resolution: {integrity: sha512-bbv7TPv/WC49thZPg3jXuqzuvI45IL2EVAr/KxF0BSdHsU0ceFHOmwQn6evxAh1GaoK/6GQ1wp4R4oW2+LFL/A==}
@@ -7156,8 +7164,8 @@ packages:
  property-information@6.3.0:
    resolution: {integrity: sha512-gVNZ74nqhRMiIUYWGQdosYetaKc83x8oT41a0LlV3AAFCAZwCpg4vmGkq8t34+cUhp3cnM4XDiU/7xlgK7HGrg==}

-  protocol-buffers-schema@3.6.1:
-    resolution: {integrity: sha512-VG2K63Igkiv9p76tk1lilczEK1cT+kCjKtkdhw1dQZV3k3IXJbd3o6Ho8b9zJZaHSnT2hKe4I+ObmX9w6m5SmQ==}
+  protocol-buffers-schema@3.6.0:
+    resolution: {integrity: sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==}

  proxy-from-env@1.1.0:
    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
@@ -7899,7 +7907,7 @@ packages:
      sugarss: ^5.0.0
      terser: ^5.16.0
      tsx: ^4.8.1
-      yaml: ^2.8.3
+      yaml: ^2.4.2
    peerDependenciesMeta:
      '@types/node':
        optional: true
@@ -8377,8 +8385,8 @@ packages:
    resolution: {integrity: sha512-Pugqs6M0m7Lv1I7FtxN4aoyToKg1C4tu+/381vH35y8oENM/Ai7f7C4StcoK4/+BSw9ebcS8jRiVrORFKCALLw==}
    engines: {node: ^20.0.0 || >=22.0.0}

-  tmp@0.2.7:
-    resolution: {integrity: sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw==}
+  tmp@0.2.4:
+    resolution: {integrity: sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==}
    engines: {node: '>=14.14'}

  tmpl@1.0.5:
@@ -8668,8 +8676,9 @@ packages:
  util@0.12.5:
    resolution: {integrity: sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==}

-  uuid@11.1.1:
-    resolution: {integrity: sha512-vIYxrBCC/N/K+Js3qSN88go7kIfNPssr/hHCesKCQNAjmgvYS2oqr69kIufEG+O4+PfezOH4EbIeHCfFov8ZgQ==}
+  uuid@8.3.2:
+    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
+    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
    hasBin: true

  uvu@0.5.6:
@@ -8892,8 +8901,8 @@ packages:
    resolution: {integrity: sha512-OTIk8iR8/aCRWBqvxrzxR0hgxWpnYBblY1S5hDWBQfk/VFmJwzmJgQFN3WsoUKHISv2eAwe+PpbUzyL1CKTLXg==}
    engines: {node: ^20.17.0 || >=22.9.0}

-  ws@8.21.0:
-    resolution: {integrity: sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==}
+  ws@8.19.0:
+    resolution: {integrity: sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==}
    engines: {node: '>=10.0.0'}
    peerDependencies:
      bufferutil: ^4.0.1
@@ -8937,10 +8946,15 @@ packages:
  yallist@4.0.0:
    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}

-  yaml@1.10.3:
-    resolution: {integrity: sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==}
+  yaml@1.10.2:
+    resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
    engines: {node: '>= 6'}

+  yaml@2.8.2:
+    resolution: {integrity: sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==}
+    engines: {node: '>= 14.6'}
+    hasBin: true
+
  yaml@2.8.4:
    resolution: {integrity: sha512-ml/JPOj9fOQK8RNnWojA67GbZ0ApXAUlN2UQclwv2eVgTgn7O9gg9o7paZWKMp4g0H3nTLtS9LVzhkpOFIKzog==}
    engines: {node: '>= 14.6'}
@@ -9054,7 +9068,7 @@ snapshots:
    dependencies:
      '@jsdevtools/ono': 7.1.3
      '@types/json-schema': 7.0.15
-      js-yaml: 3.14.2
+      js-yaml: 4.1.1

  '@babel/code-frame@7.29.0':
    dependencies:
@@ -10313,7 +10327,7 @@ snapshots:
      '@types/string-hash': 1.1.3
      d3-interpolate: 3.0.1
      date-fns: 4.1.0
-      dompurify: 3.4.0
+      dompurify: 3.2.4
      eventemitter3: 5.0.1
      fast_array_intersect: 1.1.0
      history: 4.10.1
@@ -10464,7 +10478,7 @@ snapshots:
      camelcase: 5.3.1
      find-up: 4.1.0
      get-package-type: 0.1.0
-      js-yaml: 3.14.2
+      js-yaml: 3.14.1
      resolve-from: 5.0.0

  '@istanbuljs/schema@0.1.3': {}
@@ -11855,7 +11869,7 @@ snapshots:
    dependencies:
      '@scalar/helpers': 0.5.2
      pathe: 2.0.3
-      yaml: 2.8.4
+      yaml: 2.8.2

  '@scalar/openapi-parser@0.25.12':
    dependencies:
@@ -11868,7 +11882,7 @@ snapshots:
      ajv-formats: 3.0.1(ajv@8.18.0)
      jsonpointer: 5.0.1
      leven: 4.1.0
-      yaml: 2.8.4
+      yaml: 2.8.2

  '@scalar/openapi-types@0.8.0': {}

@@ -12425,6 +12439,8 @@ snapshots:

  '@types/unist@3.0.2': {}

+  '@types/uuid@8.3.4': {}
+
  '@types/yargs-parser@21.0.0': {}

  '@types/yargs@17.0.35':
@@ -13040,7 +13056,7 @@ snapshots:

  boolbase@1.0.0: {}

-  brace-expansion@2.1.1:
+  brace-expansion@2.0.2:
    dependencies:
      balanced-match: 1.0.2

@@ -13364,14 +13380,14 @@ snapshots:
      import-fresh: 3.3.1
      parse-json: 5.2.0
      path-type: 4.0.0
-      yaml: 1.10.3
+      yaml: 1.10.2
    optional: true

  cosmiconfig@9.0.1(typescript@5.9.3):
    dependencies:
      env-paths: 2.2.1
      import-fresh: 3.3.1
-      js-yaml: 3.14.2
+      js-yaml: 4.1.1
      parse-json: 5.2.0
    optionalDependencies:
      typescript: 5.9.3
@@ -13703,6 +13719,14 @@ snapshots:
    dependencies:
      domelementtype: 2.3.0

+  dompurify@3.2.4:
+    optionalDependencies:
+      '@types/trusted-types': 2.0.7
+
+  dompurify@3.2.7:
+    optionalDependencies:
+      '@types/trusted-types': 2.0.7
+
  dompurify@3.4.0:
    optionalDependencies:
      '@types/trusted-types': 2.0.7
@@ -14007,7 +14031,7 @@ snapshots:
    dependencies:
      chardet: 0.7.0
      iconv-lite: 0.4.24
-      tmp: 0.2.7
+      tmp: 0.2.4

  fast-deep-equal@3.1.3: {}

@@ -14394,7 +14418,7 @@ snapshots:
      hast-util-from-parse5: 8.0.1
      hast-util-to-parse5: 8.0.0
      html-void-elements: 3.0.0
-      mdast-util-to-hast: 13.2.1
+      mdast-util-to-hast: 13.1.0
      parse5: 7.3.0
      unist-util-position: 5.0.0
      unist-util-visit: 5.0.0
@@ -15322,7 +15346,7 @@ snapshots:

  js-base64@3.7.5: {}

-  js-cookie@3.0.8: {}
+  js-cookie@2.2.1: {}

  js-levenshtein@1.1.6: {}

@@ -15330,11 +15354,15 @@ snapshots:

  js-tokens@4.0.0: {}

-  js-yaml@3.14.2:
+  js-yaml@3.14.1:
    dependencies:
      argparse: 1.0.10
      esprima: 4.0.1

+  js-yaml@4.1.1:
+    dependencies:
+      argparse: 2.0.1
+
  jsdom@20.0.3:
    dependencies:
      abab: 2.0.6
@@ -15361,7 +15389,7 @@ snapshots:
      whatwg-encoding: 2.0.0
      whatwg-mimetype: 3.0.0
      whatwg-url: 11.0.0
-      ws: 8.21.0
+      ws: 8.19.0
      xml-name-validator: 4.0.0
    transitivePeerDependencies:
      - bufferutil
@@ -15380,7 +15408,7 @@ snapshots:
      '@types/json-schema': 7.0.15
      '@types/lodash': 4.17.24
      is-glob: 4.0.3
-      js-yaml: 3.14.2
+      js-yaml: 4.1.1
      lodash: 4.18.1
      minimist: 1.2.8
      prettier: 3.8.3
@@ -15756,7 +15784,7 @@ snapshots:
      unist-util-position: 4.0.4
      unist-util-visit: 4.1.2

-  mdast-util-to-hast@13.2.1:
+  mdast-util-to-hast@13.1.0:
    dependencies:
      '@types/hast': 3.0.4
      '@types/mdast': 4.0.3
@@ -16033,23 +16061,23 @@ snapshots:

  minimatch@10.2.5:
    dependencies:
-      brace-expansion: 2.1.1
+      brace-expansion: 2.0.2

  minimatch@3.1.5:
    dependencies:
-      brace-expansion: 2.1.1
+      brace-expansion: 2.0.2

  minimatch@5.1.9:
    dependencies:
-      brace-expansion: 2.1.1
+      brace-expansion: 2.0.2

  minimatch@8.0.7:
    dependencies:
-      brace-expansion: 2.1.1
+      brace-expansion: 2.0.2

  minimatch@9.0.9:
    dependencies:
-      brace-expansion: 2.1.1
+      brace-expansion: 2.0.2

  minimist@1.2.8: {}

@@ -16065,7 +16093,7 @@ snapshots:

  monaco-editor@0.55.1:
    dependencies:
-      dompurify: 3.4.0
+      dompurify: 3.2.7
      marked: 14.0.0

  motion-dom@11.18.1:
@@ -16326,7 +16354,7 @@ snapshots:
      find-up: 8.0.0
      fs-extra: 11.3.3
      jiti: 2.6.1
-      js-yaml: 3.14.2
+      js-yaml: 4.1.1
      remeda: 2.34.0
      string-argv: 0.3.2
      tsconfck: 3.1.6(typescript@5.9.3)
@@ -16539,7 +16567,7 @@ snapshots:
  postcss-load-config@3.1.4(postcss@8.5.14)(ts-node@10.9.1(@types/node@16.18.25)(typescript@5.9.3)):
    dependencies:
      lilconfig: 2.1.0
-      yaml: 1.10.3
+      yaml: 1.10.2
    optionalDependencies:
      postcss: 8.5.14
      ts-node: 10.9.1(@types/node@16.18.25)(typescript@5.9.3)
@@ -16644,7 +16672,7 @@ snapshots:

  property-information@6.3.0: {}

-  protocol-buffers-schema@3.6.1: {}
+  protocol-buffers-schema@3.6.0: {}

  proxy-from-env@1.1.0: {}

@@ -17321,7 +17349,7 @@ snapshots:
      copy-to-clipboard: 3.3.3
      fast-deep-equal: 3.1.3
      fast-shallow-equal: 1.0.0
-      js-cookie: 3.0.8
+      js-cookie: 2.2.1
      nano-css: 5.6.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
      react: 18.2.0
      react-dom: 18.2.0(react@18.2.0)
@@ -17340,7 +17368,7 @@ snapshots:
      copy-to-clipboard: 3.3.3
      fast-deep-equal: 3.1.3
      fast-shallow-equal: 1.0.0
-      js-cookie: 3.0.8
+      js-cookie: 2.2.1
      nano-css: 5.6.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
      react: 18.2.0
      react-dom: 18.2.0(react@18.2.0)
@@ -17507,7 +17535,7 @@ snapshots:

  resolve-protobuf-schema@2.1.0:
    dependencies:
-      protocol-buffers-schema: 3.6.1
+      protocol-buffers-schema: 3.6.0

  resolve@1.22.11:
    dependencies:
@@ -18088,7 +18116,7 @@ snapshots:

  tinypool@2.1.0: {}

-  tmp@0.2.7: {}
+  tmp@0.2.4: {}

  tmpl@1.0.5: {}

@@ -18400,7 +18428,7 @@ snapshots:
      is-typed-array: 1.1.15
      which-typed-array: 1.1.20

-  uuid@11.1.1: {}
+  uuid@8.3.2: {}

  uvu@0.5.6:
    dependencies:
@@ -18648,7 +18676,7 @@ snapshots:
    dependencies:
      signal-exit: 4.1.0

-  ws@8.21.0: {}
+  ws@8.19.0: {}

  wsl-utils@0.3.1:
    dependencies:
@@ -18674,7 +18702,9 @@ snapshots:

  yallist@4.0.0: {}

-  yaml@1.10.3: {}
+  yaml@1.10.2: {}
+
+  yaml@2.8.2: {}

  yaml@2.8.4: {}

--- a/frontend/src/api/v5/queryRange/convertV5Response.ts
+++ b/frontend/src/api/v5/queryRange/convertV5Response.ts
@@ -349,7 +349,7 @@ function convertV5DataByType(
 */
 // eslint-disable-next-line sonarjs/cognitive-complexity
 export function convertV5ResponseToLegacy(
-	v5Response: SuccessResponse<MetricRangePayloadV5>,
+	v5Response: SuccessResponse<MetricRangePayloadV5, QueryRangeRequestV5>,
 	legendMap: Record<string, string>,
 	formatForWeb?: boolean,
 ): SuccessResponse<MetricRangePayloadV3> & { warning?: Warning } {
@@ -357,7 +357,7 @@ export function convertV5ResponseToLegacy(
 	const v5Data = payload?.data;

 	const aggregationPerQuery =
-		(params as QueryRangeRequestV5)?.compositeQuery?.queries
+		params?.compositeQuery?.queries
 			?.filter((query) => query.type === 'builder_query')
 			.reduce(
 				(acc, query) => {
--- a/frontend/src/container/DashboardContainer/visualization/hooks/tests/usePanelContextMenu.test.ts
+++ b/frontend/src/container/DashboardContainer/visualization/hooks/tests/usePanelContextMenu.test.ts
@@ -1,8 +1,7 @@
 import { renderHook } from '@testing-library/react';
 import { UseQueryResult } from 'react-query';
-import { SuccessResponse } from 'types/api';
 import { Widgets } from 'types/api/dashboard/getAll';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+import { MetricQueryRangeSuccessResponse } from 'types/api/metrics/getQueryRange';

 import { usePanelContextMenu } from '../usePanelContextMenu';

@@ -47,10 +46,7 @@ const mockWidget = { id: 'w-1', query: {} } as unknown as Widgets;
 const mockQueryResponse = {
 	data: undefined,
 	isLoading: false,
-} as unknown as UseQueryResult<
-	SuccessResponse<MetricRangePayloadProps, unknown>,
-	Error
->;
+} as unknown as UseQueryResult<MetricQueryRangeSuccessResponse, Error>;

 describe('usePanelContextMenu', () => {
 	beforeEach(() => {
--- a/frontend/src/container/DashboardContainer/visualization/hooks/usePanelContextMenu.ts
+++ b/frontend/src/container/DashboardContainer/visualization/hooks/usePanelContextMenu.ts
@@ -10,17 +10,13 @@ import {
 	PopoverPosition,
 	useCoordinates,
 } from 'periscope/components/ContextMenu';
-import { SuccessResponse } from 'types/api';
 import { Widgets } from 'types/api/dashboard/getAll';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+import { MetricQueryRangeSuccessResponse } from 'types/api/metrics/getQueryRange';
 import { DataSource } from 'types/common/queryBuilder';

 interface UseTimeSeriesContextMenuParams {
 	widget: Widgets;
-	queryResponse: UseQueryResult<
-		SuccessResponse<MetricRangePayloadProps, unknown>,
-		Error
-	>;
+	queryResponse: UseQueryResult<MetricQueryRangeSuccessResponse, Error>;
 	enableDrillDown?: boolean;
 }

--- a/frontend/src/container/GridCardLayout/GridCard/types.ts
+++ b/frontend/src/container/GridCardLayout/GridCard/types.ts
@@ -5,9 +5,11 @@ import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
 import { RowData } from 'lib/query/createTableColumnsFromQuery';
 import { OnClickPluginOpts } from 'lib/uPlotLib/plugins/onClickPlugin';
 import { IDashboardVariables } from 'providers/Dashboard/store/dashboardVariables/dashboardVariablesStoreTypes';
-import { SuccessResponse } from 'types/api';
 import { Widgets } from 'types/api/dashboard/getAll';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+import {
+	MetricQueryRangeSuccessResponse,
+	MetricRangePayloadProps,
+} from 'types/api/metrics/getQueryRange';
 import { QueryData } from 'types/api/widgets/getQuery';
 import uPlot from 'uplot';

@@ -21,10 +23,7 @@ export interface GraphVisibilityLegendEntryProps {

 export interface WidgetGraphComponentProps {
 	widget: Widgets;
-	queryResponse: UseQueryResult<
-		SuccessResponse<MetricRangePayloadProps, unknown>,
-		Error
-	>;
+	queryResponse: UseQueryResult<MetricQueryRangeSuccessResponse, Error>;
 	errorMessage: string | undefined;
 	version?: string;
 	threshold?: ReactNode;
--- a/frontend/src/container/GridValueComponent/types.ts
+++ b/frontend/src/container/GridValueComponent/types.ts
@@ -1,8 +1,7 @@
 import { UseQueryResult } from 'react-query';
 import { ThresholdProps } from 'container/NewWidget/RightContainer/Threshold/types';
-import { SuccessResponse } from 'types/api';
 import { ContextLinksData, Widgets } from 'types/api/dashboard/getAll';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+import { MetricQueryRangeSuccessResponse } from 'types/api/metrics/getQueryRange';
 import uPlot from 'uplot';

 export type GridValueComponentProps = {
@@ -13,10 +12,7 @@ export type GridValueComponentProps = {
 	thresholds?: ThresholdProps[];
 	// Context menu related props
 	widget?: Widgets;
-	queryResponse?: UseQueryResult<
-		SuccessResponse<MetricRangePayloadProps, unknown>,
-		Error
-	>;
+	queryResponse?: UseQueryResult<MetricQueryRangeSuccessResponse, Error>;
 	contextLinks?: ContextLinksData;
 	enableDrillDown?: boolean;
 };
--- a/frontend/src/container/NewWidget/LeftContainer/WidgetGraph/WidgetGraphs.tsx
+++ b/frontend/src/container/NewWidget/LeftContainer/WidgetGraph/WidgetGraphs.tsx
@@ -28,9 +28,8 @@ import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
 import GetMinMax from 'lib/getMinMax';
 import getTimeString from 'lib/getTimeString';
 import { UpdateTimeInterval } from 'store/actions';
-import { SuccessResponse } from 'types/api';
 import { Widgets } from 'types/api/dashboard/getAll';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+import { MetricQueryRangeSuccessResponse } from 'types/api/metrics/getQueryRange';
 import { DataSource } from 'types/common/queryBuilder';

 function WidgetGraph({
@@ -202,10 +201,7 @@ function WidgetGraph({

 interface WidgetGraphProps {
 	selectedWidget: Widgets;
-	queryResponse: UseQueryResult<
-		SuccessResponse<MetricRangePayloadProps, unknown>,
-		Error
-	>;
+	queryResponse: UseQueryResult<MetricQueryRangeSuccessResponse, Error>;
 	setRequestData: Dispatch<SetStateAction<GetQueryResultsProps>>;
 	selectedGraph: PANEL_TYPES;
 	enableDrillDown?: boolean;
--- a/frontend/src/container/NewWidget/LeftContainer/WidgetGraph/util.ts
+++ b/frontend/src/container/NewWidget/LeftContainer/WidgetGraph/util.ts
@@ -1,11 +1,12 @@
+import { QueryRangeRequestV5 } from 'api/v5/v5';
 import { SuccessResponse } from 'types/api';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
 import { Column, QueryData, QueryDataV3 } from 'types/api/widgets/getQuery';

 // eslint-disable-next-line sonarjs/cognitive-complexity
 export function populateMultipleResults(
-	responseData: SuccessResponse<MetricRangePayloadProps, unknown>,
-): SuccessResponse<MetricRangePayloadProps, unknown> {
+	responseData: SuccessResponse<MetricRangePayloadProps, QueryRangeRequestV5>,
+): SuccessResponse<MetricRangePayloadProps, QueryRangeRequestV5> {
 	const queryResults = responseData?.payload?.data?.newResult?.data?.result;
 	const allFormattedResults: QueryData[] = [];

@@ -66,17 +67,19 @@ export function populateMultipleResults(
 	}

 	// Create a copy instead of mutating the original
-	const updatedResponseData: SuccessResponse<MetricRangePayloadProps, unknown> =
-		{
-			...responseData,
-			payload: {
-				...responseData.payload,
-				data: {
-					...responseData.payload.data,
-					result: allFormattedResults,
-				},
+	const updatedResponseData: SuccessResponse<
+		MetricRangePayloadProps,
+		QueryRangeRequestV5
+	> = {
+		...responseData,
+		payload: {
+			...responseData.payload,
+			data: {
+				...responseData.payload.data,
+				result: allFormattedResults,
 			},
-		};
+		},
+	};

 	return updatedResponseData;
 }
--- a/frontend/src/container/NewWidget/index.tsx
+++ b/frontend/src/container/NewWidget/index.tsx
@@ -52,7 +52,6 @@ import {
 	getSelectedWidgetIndex,
 } from 'providers/Dashboard/util';
 import { AppState } from 'store/reducers';
-import { SuccessResponse } from 'types/api';
 import {
 	ColumnUnit,
 	ContextLinksData,
@@ -61,7 +60,7 @@ import {
 } from 'types/api/dashboard/getAll';
 import { Props } from 'types/api/dashboard/update';
 import { IField } from 'types/api/logs/fields';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+import { MetricQueryRangeSuccessResponse } from 'types/api/metrics/getQueryRange';
 import { EQueryType } from 'types/common/dashboard';
 import { DataSource } from 'types/common/queryBuilder';
 import { GlobalReducer } from 'types/reducer/globalTime';
@@ -398,7 +397,7 @@ function NewWidget({

 	// State to hold query response for sharing between left and right containers
 	const [queryResponse, setQueryResponse] = useState<
-		UseQueryResult<SuccessResponse<MetricRangePayloadProps, unknown>, Error>
+		UseQueryResult<MetricQueryRangeSuccessResponse, Error>
 	>(null as any);

 	// request data should be handled by the parent and the child components should consume the same
--- a/frontend/src/container/NewWidget/types.ts
+++ b/frontend/src/container/NewWidget/types.ts
@@ -2,9 +2,8 @@ import { Dispatch, SetStateAction } from 'react';
 import { UseQueryResult } from 'react-query';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
-import { SuccessResponse, Warning } from 'types/api';
 import { Dashboard, Widgets } from 'types/api/dashboard/getAll';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+import { MetricQueryRangeSuccessResponse } from 'types/api/metrics/getQueryRange';

 import { timePreferance } from './RightContainer/timeItems';

@@ -29,9 +28,7 @@ export interface WidgetGraphProps {
 	setRequestData: Dispatch<SetStateAction<GetQueryResultsProps>>;
 	isLoadingPanelData: boolean;
 	setQueryResponse?: Dispatch<
-		SetStateAction<
-			UseQueryResult<SuccessResponse<MetricRangePayloadProps, unknown>, Error>
-		>
+		SetStateAction<UseQueryResult<MetricQueryRangeSuccessResponse, Error>>
 	>;
 	enableDrillDown?: boolean;
 	dashboardData: Dashboard | undefined;
@@ -39,12 +36,7 @@ export interface WidgetGraphProps {
 }

 export type WidgetGraphContainerProps = {
-	queryResponse: UseQueryResult<
-		SuccessResponse<MetricRangePayloadProps, unknown> & {
-			warning?: Warning;
-		},
-		Error
-	>;
+	queryResponse: UseQueryResult<MetricQueryRangeSuccessResponse, Error>;
 	setRequestData: Dispatch<SetStateAction<GetQueryResultsProps>>;
 	selectedGraph: PANEL_TYPES;
 	selectedWidget: Widgets;
--- a/frontend/src/container/PanelWrapper/TablePanelWrapper.tsx
+++ b/frontend/src/container/PanelWrapper/TablePanelWrapper.tsx
@@ -1,7 +1,6 @@
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import GridTableComponent from 'container/GridTableComponent';
 import { GRID_TABLE_CONFIG } from 'container/GridTableComponent/config';
-import { QueryRangeRequestV5 } from 'types/api/v5/queryRange';

 import { PanelWrapperProps } from './panelWrapper.types';

@@ -20,7 +19,7 @@ function TablePanelWrapper({
 		(queryResponse.data?.payload?.data?.result?.[0] as any)?.table || [];
 	const { thresholds } = widget;

-	const queryRangeRequest = queryResponse.data?.params as QueryRangeRequestV5;
+	const queryRangeRequest = queryResponse.data?.params;

 	return (
 		<GridTableComponent
--- a/frontend/src/container/QueryTable/Drilldown/useAggregateDrilldown.tsx
+++ b/frontend/src/container/QueryTable/Drilldown/useAggregateDrilldown.tsx
@@ -2,9 +2,8 @@ import { useMemo } from 'react';
 import { UseQueryResult } from 'react-query';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import useDashboardVarConfig from 'container/QueryTable/Drilldown/useDashboardVarConfig';
-import { SuccessResponse } from 'types/api';
 import { ContextLinksData } from 'types/api/dashboard/getAll';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+import { MetricQueryRangeSuccessResponse } from 'types/api/metrics/getQueryRange';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';
 import { getTimeRange } from 'utils/getTimeRange';

@@ -44,10 +43,7 @@ const useAggregateDrilldown = ({
 	aggregateData: AggregateData | null;
 	contextLinks?: ContextLinksData;
 	panelType?: PANEL_TYPES;
-	queryRange?: UseQueryResult<
-		SuccessResponse<MetricRangePayloadProps, unknown>,
-		Error
-	>;
+	queryRange?: UseQueryResult<MetricQueryRangeSuccessResponse, Error>;
 }): {
 	aggregateDrilldownConfig: {
 		header?: string | React.ReactNode;
--- a/frontend/src/container/QueryTable/Drilldown/useGraphContextMenu.tsx
+++ b/frontend/src/container/QueryTable/Drilldown/useGraphContextMenu.tsx
@@ -2,9 +2,8 @@ import { useMemo } from 'react';
 import { UseQueryResult } from 'react-query';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import { useGetCompositeQueryParam } from 'hooks/queryBuilder/useGetCompositeQueryParam';
-import { SuccessResponse } from 'types/api';
 import { ContextLinksData } from 'types/api/dashboard/getAll';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+import { MetricQueryRangeSuccessResponse } from 'types/api/metrics/getQueryRange';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';

 import { isValidQueryName } from './drilldownUtils';
@@ -20,10 +19,7 @@ interface UseGraphContextMenuProps {
 	setSubMenu: (subMenu: string) => void;
 	contextLinks?: ContextLinksData;
 	panelType?: PANEL_TYPES;
-	queryRange?: UseQueryResult<
-		SuccessResponse<MetricRangePayloadProps, unknown>,
-		Error
-	>;
+	queryRange?: UseQueryResult<MetricQueryRangeSuccessResponse, Error>;
 }

 export function useGraphContextMenu({
--- a/frontend/src/hooks/queryBuilder/useGetExplorerQueryRange.ts
+++ b/frontend/src/hooks/queryBuilder/useGetExplorerQueryRange.ts
@@ -7,8 +7,7 @@ import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
 import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
 import { AppState } from 'store/reducers';
-import { SuccessResponse, Warning } from 'types/api';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+import { MetricQueryRangeSuccessResponse } from 'types/api/metrics/getQueryRange';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';
 import { GlobalReducer } from 'types/reducer/globalTime';

@@ -19,16 +18,13 @@ export const useGetExplorerQueryRange = (
 	requestData: Query | null,
 	panelType: PANEL_TYPES | null,
 	version: string,
-	options?: UseQueryOptions<SuccessResponse<MetricRangePayloadProps>, Error>,
+	options?: UseQueryOptions<MetricQueryRangeSuccessResponse, Error>,
 	params?: Record<string, unknown>,
 	isDependentOnQB = true,
 	keyRef?: MutableRefObject<any>,
 	headers?: Record<string, string>,
 	selectedTimeInterval?: GetQueryResultsProps['globalSelectedInterval'],
-): UseQueryResult<
-	SuccessResponse<MetricRangePayloadProps> & { warning?: Warning },
-	Error
-> => {
+): UseQueryResult<MetricQueryRangeSuccessResponse, Error> => {
 	const { isEnabledQuery } = useQueryBuilder();
 	const {
 		selectedTime: globalSelectedInterval,
--- a/frontend/src/lib/tests/getLabelName.test.ts
+++ b/frontend/src/lib/tests/getLabelName.test.ts
@@ -0,0 +1,84 @@
+import getLabelName from 'lib/getLabelName';
+
+describe('getLabelName', () => {
+	describe('with a legend template', () => {
+		it('substitutes a single variable that exists on the series', () => {
+			const result = getLabelName(
+				{ 'service.name': 'frontend' },
+				'A',
+				'{{service.name}}',
+			);
+			expect(result).toBe('frontend');
+		});
+
+		it('substitutes a template with surrounding literal text', () => {
+			const result = getLabelName(
+				{ 'service.name': 'frontend' },
+				'A',
+				'rate for {{service.name}}',
+			);
+			expect(result).toBe('rate for frontend');
+		});
+
+		it('substitutes multiple variables when all are present', () => {
+			const result = getLabelName(
+				{ 'service.name': 'frontend', 'http.target': 'GET /api' },
+				'A',
+				'{{service.name}} / {{http.target}}',
+			);
+			expect(result).toBe('frontend / GET /api');
+		});
+
+		it('falls back to query name when a referenced variable is missing', () => {
+			const result = getLabelName(
+				{ 'http.target': 'GET /api' },
+				'F1',
+				'{{service.name}}',
+			);
+			expect(result).toBe('F1');
+		});
+
+		it('falls back to query name even if literal text would still render', () => {
+			const result = getLabelName(
+				{ 'http.target': 'GET /api' },
+				'F1',
+				'label = {{label}}',
+			);
+			expect(result).toBe('F1');
+		});
+
+		it('falls back to query name when any of multiple variables is missing', () => {
+			const result = getLabelName(
+				{ 'service.name': 'frontend' },
+				'F1',
+				'{{service.name}} / {{http.target}}',
+			);
+			expect(result).toBe('F1');
+		});
+
+		it('treats a null label value as missing', () => {
+			const result = getLabelName(
+				{ 'service.name': null } as unknown as Record<string, string>,
+				'F1',
+				'{{service.name}}',
+			);
+			expect(result).toBe('F1');
+		});
+	});
+
+	describe('without a legend template', () => {
+		it('returns key="value" pairs for plain labels', () => {
+			const result = getLabelName(
+				{ 'service.name': 'frontend', 'http.target': 'GET /api' },
+				'A',
+				'',
+			);
+			expect(result).toBe('{service.name="frontend",http.target="GET /api"}');
+		});
+
+		it('returns query name when labels are empty', () => {
+			const result = getLabelName({}, 'A', '');
+			expect(result).toBe('A');
+		});
+	});
+});
--- a/frontend/src/lib/getLabelName.ts
+++ b/frontend/src/lib/getLabelName.ts
@@ -18,6 +18,17 @@ const getLabelName = (

 		const results = variables.map((variable) => metric[variable]);

+		// Fall back to query name if any `{{var}}` references a label that
+		// isn't on this series — avoids rendering "undefined" in the legend.
+		const hasMissingVariable = variables.some(
+			(variable, index) =>
+				legends.includes(`{{${variable}}}`) &&
+				(results[index] === undefined || results[index] === null),
+		);
+		if (hasMissingVariable) {
+			return query;
+		}
+
 		let endResult = legends;

 		variables.forEach((e, index) => {
--- a/frontend/src/types/api/metrics/getQueryRange.ts
+++ b/frontend/src/types/api/metrics/getQueryRange.ts
@@ -8,7 +8,7 @@ import {
 	IClickHouseQuery,
 	IPromQLQuery,
 } from '../queryBuilder/queryBuilderData';
-import { ExecStats } from '../v5/queryRange';
+import { ExecStats, QueryRangeRequestV5 } from '../v5/queryRange';
 import { QueryData, QueryDataV3 } from '../widgets/getQuery';

 export type QueryRangePayload = {
@@ -39,11 +39,16 @@ export interface MetricRangePayloadProps {
 	meta?: ExecStats;
 }

-/** Query range success response including optional warning and meta */
-export type MetricQueryRangeSuccessResponse = SuccessResponse<
+/** Query range success response. `params` is the request that produced the
+ *  payload; `warning` and `meta` are lifted from the payload to the top level
+ *  by `getQueryResults.ts` for consumer convenience. */
+export interface MetricQueryRangeSuccessResponse extends SuccessResponse<
 	MetricRangePayloadProps,
-	unknown
-> & { warning?: Warning; meta?: ExecStats };
+	QueryRangeRequestV5
+> {
+	warning?: Warning;
+	meta?: ExecStats;
+}

 export interface MetricRangePayloadV3 {
 	data: {
--- a/frontend/src/utils/getTimeRange.ts
+++ b/frontend/src/utils/getTimeRange.ts
@@ -1,8 +1,7 @@
 import { UseQueryResult } from 'react-query';
 import getStartEndRangeTime from 'lib/getStartEndRangeTime';
 import store from 'store';
-import { SuccessResponse } from 'types/api';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+import { MetricQueryRangeSuccessResponse } from 'types/api/metrics/getQueryRange';
 import { QueryRangeRequestV5 } from 'types/api/v5/queryRange';

 export const getTimeRangeFromQueryRangeRequest = (
@@ -28,13 +27,9 @@ export const getTimeRangeFromQueryRangeRequest = (
 };

 export const getTimeRange = (
-	widgetQueryRange?: UseQueryResult<
-		SuccessResponse<MetricRangePayloadProps, unknown>,
-		Error
-	>,
+	widgetQueryRange?: UseQueryResult<MetricQueryRangeSuccessResponse, Error>,
 ): Record<string, number> => {
-	const widgetParams =
-		(widgetQueryRange?.data?.params as QueryRangeRequestV5) || null;
+	const widgetParams = widgetQueryRange?.data?.params;

 	return getTimeRangeFromQueryRangeRequest(widgetParams);
 };
--- a/pkg/querier/querier.go
+++ b/pkg/querier/querier.go
@@ -217,7 +217,7 @@ func (q *querier) QueryRange(ctx context.Context, orgID valuer.UUID, req *qbtype
 		}
 	}
 	preseededResults := make(map[string]any)
-	for _, name := range missingMetricQueries { // at this point missing metrics will not have any non existent metrics, only normal ones
+	for _, name := range missingMetricQueries {
 		switch req.RequestType {
 		case qbtypes.RequestTypeTimeSeries:
 			preseededResults[name] = &qbtypes.TimeSeriesData{QueryName: name}
@@ -375,11 +375,24 @@ func (q *querier) resolveMetricMetadata(ctx context.Context, queries []qbtypes.Q
 		return missingMetricQueries, "", nil
 	}

+	isInternalMetric := func(n string) bool { return strings.HasPrefix(n, "signoz.") || strings.HasPrefix(n, "signoz_") }
+	externalMissingMetrics := make([]string, 0, len(missingMetrics))
+	for _, m := range missingMetrics {
+		if !isInternalMetric(m) {
+			externalMissingMetrics = append(externalMissingMetrics, m)
+		}
+	}
+	if len(externalMissingMetrics) == 0 {
+		// this means all missing metrics are internal, and since internal metrics
+		// aren't user-controlled, skip errors/warnings for them since users can't act on them
+		return missingMetricQueries, "", nil
+	}
+
 	// Classify each missing metric: never-seen → NotFound error; seen-but-no-
 	// data-in-window → dormant warning.
-	lastSeenInfo, _ := q.metadataStore.FetchLastSeenInfoMulti(ctx, missingMetrics...)
+	lastSeenInfo, _ := q.metadataStore.FetchLastSeenInfoMulti(ctx, externalMissingMetrics...)
 	nonExistentMetrics := []string{}
-	for _, name := range missingMetrics {
+	for _, name := range externalMissingMetrics {
 		if ts, ok := lastSeenInfo[name]; ok && ts > 0 {
 			continue
 		}
@@ -400,11 +413,11 @@ func (q *querier) resolveMetricMetadata(ctx context.Context, queries []qbtypes.Q
 		}
 		return name
 	}
-	if len(missingMetrics) == 1 {
+	if len(externalMissingMetrics) == 1 {
 		dormantWarning = fmt.Sprintf("no data found for the metric %s in the query time range", lastSeenStr(missingMetrics[0]))
 	} else {
-		parts := make([]string, len(missingMetrics))
-		for i, m := range missingMetrics {
+		parts := make([]string, len(externalMissingMetrics))
+		for i, m := range externalMissingMetrics {
 			parts[i] = lastSeenStr(m)
 		}
 		dormantWarning = fmt.Sprintf("no data found for the following metrics in the query time range: %s", strings.Join(parts, ", "))
--- a/tests/integration/tests/querier/03_metrics.py
+++ b/tests/integration/tests/querier/03_metrics.py
@@ -640,6 +640,32 @@ def test_non_existent_metrics_returns_404(
    assert get_error_message(response.json()) == "could not find the metric whatevergoennnsgoeshere"


+def test_non_existent_internal_metrics_returns_no_warning(
+    signoz: types.SigNoz,
+    create_user_admin: None,  # pylint: disable=unused-argument
+    get_token: Callable[[str, str], str],
+) -> None:
+
+    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
+    metric_name = "signoz_calls_total"
+
+    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
+    query = build_builder_query(
+        "A",
+        metric_name,
+        "doesnotreallymatter",
+        "sum",
+    )
+
+    end_ms = int(now.timestamp() * 1000)
+
+    start_2h = int((now - timedelta(hours=2)).timestamp() * 1000)
+    response = make_query_request(signoz, token, start_2h, end_ms, [query])
+    assert response.status_code == HTTPStatus.OK
+    data = response.json()
+    assert get_all_warnings(data) == []
+
+
 # Verify /api/v1/fields/values filters label values by metricNamespace prefix.
 # Inserts metrics under ns.a and ns.b, then asserts a specific prefix returns
 # only matching values while a common prefix returns both.
Author	SHA1	Message	Date
Naman Verma	2110c04927	Merge branch 'main' into nv/11280	2026-06-03 17:14:59 +05:30
Naman Verma	a0b14e0835	fix: do not show errors for non-existent cost meter metrics (#10843 ) * fix: show warning for non-existent cost meter metrics * chore: lint fix by removing unused list * chore: py fmt add new line * chore: missing newline between tests * fix: no warnings or errors for internal metrics * fix: pylint fix by adding new line * fix: lint fix in test	2026-06-03 10:09:08 +00:00
Abhi kumar	987844dbc8	refactor(types): tighten MetricQueryRangeSuccessResponse shape (#11562 ) Replaces the `SuccessResponse<...> & { warning?: Warning; meta?: ExecStats }` intersection with a single interface that extends SuccessResponse and declares warning + meta on its own — no stitched intersection. Also types `params` as `QueryRangeRequestV5` (was `unknown`), so callers can drop the redundant `as QueryRangeRequestV5` casts. Knock-on updates: 13 consumers switched from the raw `SuccessResponse<MetricRangePayloadProps, unknown>` shape to the new `MetricQueryRangeSuccessResponse`; 3 prod casts removed; convertV5ResponseToLegacy and getTimeRange tightened their accept-params types.	2026-06-03 07:55:44 +00:00
primus-bot[bot]	e0ad7e487a	chore(release): bump to v0.127.0 (#11558 ) Co-authored-by: primus-bot[bot] <171087277+primus-bot[bot]@users.noreply.github.com>	2026-06-03 07:22:32 +00:00
Naman Verma	0e3f644b13	Merge branch 'main' into nv/11280	2026-06-03 11:30:40 +05:30
Naman Verma	01565e58e8	Merge branch 'main' into nv/11280	2026-05-26 11:14:00 +05:30
Naman Verma	0f17899ded	revert: no warning needed	2026-05-26 09:10:23 +05:30
Naman Verma	1f4a2ed8e8	feat: send warning in query range api for missing keys in legends	2026-05-25 10:18:13 +05:30
Naman Verma	77e7798779	fix: replace undefined label with query name as label	2026-05-22 15:59:22 +05:30