From 9a17e9abd6b1dd471b4d58290445cadd0d9884a9 Mon Sep 17 00:00:00 2001
From: kay delaney <45561153+kaydelaney@users.noreply.github.com>
Date: Mon, 16 Jun 2025 16:29:07 +0100
Subject: [PATCH] Chore: Bump node to v22.16.0 (#106758)

---
 .drone.yml                                    | 66 +++++++++----------
 .../detect-breaking-changes-levitate.yml      |  6 +-
 .github/workflows/lint-build-docs.yml         |  2 +-
 .nvmrc                                        |  2 +-
 .../grafana-extensionstest-app/package.json   |  2 +-
 .../grafana-test-datasource/package.json      |  2 +-
 package.json                                  |  2 +-
 packages/grafana-data/package.json            |  2 +-
 packages/grafana-e2e-selectors/package.json   |  2 +-
 packages/grafana-flamegraph/package.json      |  2 +-
 .../grafana-o11y-ds-frontend/package.json     |  2 +-
 packages/grafana-prometheus/package.json      |  2 +-
 packages/grafana-sql/package.json             |  2 +-
 packages/grafana-test-utils/package.json      |  2 +-
 packages/grafana-ui/package.json              |  2 +-
 .../datasource/azuremonitor/package.json      |  2 +-
 .../datasource/cloud-monitoring/package.json  |  2 +-
 .../package.json                              |  2 +-
 .../grafana-pyroscope-datasource/package.json |  2 +-
 .../grafana-testdata-datasource/package.json  |  2 +-
 .../plugins/datasource/jaeger/package.json    |  2 +-
 .../app/plugins/datasource/mssql/package.json |  2 +-
 .../app/plugins/datasource/mysql/package.json |  2 +-
 .../app/plugins/datasource/parca/package.json |  2 +-
 .../app/plugins/datasource/tempo/package.json |  2 +-
 .../plugins/datasource/zipkin/package.json    |  2 +-
 scripts/drone/variables.star                  |  2 +-
 yarn.lock                                     | 63 ++++++++++--------
 28 files changed, 96 insertions(+), 89 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 40e64d7e17f..776e8c1dc7b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -117,14 +117,14 @@ steps:
 - commands:
   - yarn install --immutable || yarn install --immutable
   depends_on: []
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: yarn-install
 - commands:
   - yarn storybook --quiet
   depends_on:
   - yarn-install
   detach: true
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: start-storybook
 - commands:
   - npx wait-on@7.2.0 -t 1m http://$HOST:$PORT
@@ -461,7 +461,7 @@ steps:
 - commands:
   - yarn install --immutable || yarn install --immutable
   depends_on: []
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: yarn-install
 - commands:
   - apk add --update jq bash
@@ -472,7 +472,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: build-frontend-packages
 - failure: ignore
   image: grafana/drone-downstream
@@ -538,7 +538,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: build-test-plugins
 - commands:
   - apk add --update tar bash
@@ -756,7 +756,7 @@ steps:
   - build-frontend-packages
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: build-storybook
   when:
     paths:
@@ -1067,7 +1067,7 @@ steps:
 - commands:
   - yarn install --immutable || yarn install --immutable
   depends_on: []
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: yarn-install
 - commands:
   - yarn run prettier:checkDocs
@@ -1075,7 +1075,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: lint-docs
 - commands:
   - mkdir -p /hugo/content/docs/grafana/latest
@@ -1424,7 +1424,7 @@ steps:
 - commands:
   - yarn install --immutable || yarn install --immutable
   depends_on: []
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: yarn-install
 - commands:
   - yarn run prettier:checkDocs
@@ -1432,7 +1432,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: lint-docs
 - commands:
   - mkdir -p /hugo/content/docs/grafana/latest
@@ -1641,14 +1641,14 @@ steps:
 - commands:
   - yarn install --immutable || yarn install --immutable
   depends_on: []
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: yarn-install
 - commands:
   - yarn storybook --quiet
   depends_on:
   - yarn-install
   detach: true
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: start-storybook
 - commands:
   - npx wait-on@7.2.0 -t 1m http://$HOST:$PORT
@@ -1748,7 +1748,7 @@ steps:
 - commands:
   - yarn install --immutable || yarn install --immutable
   depends_on: []
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: yarn-install
 - commands:
   - apk add --update jq
@@ -1759,7 +1759,7 @@ steps:
   - yarn install --mode=update-lockfile
   depends_on:
   - yarn-install
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: update-package-json-version
 - commands:
   - apk add --update jq bash
@@ -1771,7 +1771,7 @@ steps:
   - update-package-json-version
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: build-frontend-packages
 - commands:
   - wget -qO- https://github.com/dagger/dagger/releases/download/v0.18.8/dagger_v0.18.8_linux_amd64.tar.gz
@@ -1828,7 +1828,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: build-test-plugins
 - commands:
   - apk add --update tar bash
@@ -2046,7 +2046,7 @@ steps:
   - build-frontend-packages
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: build-storybook
   when:
     paths:
@@ -2096,7 +2096,7 @@ steps:
     GRAFANA_MISC_STATS_API_KEY:
       from_secret: grafana_misc_stats_api_key
   failure: ignore
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: publish-frontend-metrics
   when:
     repo:
@@ -2136,7 +2136,7 @@ steps:
   environment:
     NPM_TOKEN:
       from_secret: npm_token
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: release-canary-npm-packages
   when:
     paths:
@@ -2506,14 +2506,14 @@ steps:
 - commands:
   - yarn install --immutable || yarn install --immutable
   depends_on: []
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: yarn-install
 - commands:
   - apk add --update git bash
   - yarn betterer:ci
   depends_on:
   - yarn-install
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: betterer-frontend
 - commands:
   - yarn run ci:test-frontend
@@ -2521,7 +2521,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: test-frontend
 trigger:
   branch:
@@ -2562,7 +2562,7 @@ steps:
 - commands:
   - yarn install --immutable || yarn install --immutable
   depends_on: []
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: yarn-install
 - commands:
   - yarn run prettier:check
@@ -2572,7 +2572,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: lint-frontend
 - commands:
   - |-
@@ -3398,7 +3398,7 @@ steps:
 - commands:
   - yarn install --immutable || yarn install --immutable
   depends_on: []
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: yarn-install
 - commands:
   - ./bin/build artifacts npm retrieve --tag ${DRONE_TAG}
@@ -3422,7 +3422,7 @@ steps:
     NPM_TOKEN:
       from_secret: npm_token
   failure: ignore
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: release-npm-packages
 trigger:
   event:
@@ -3457,7 +3457,7 @@ steps:
     1\n                else\n                    sleep 60\n                fi\n            done\n
     \           "
   depends_on: []
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: verify-grafanacom
 trigger:
   event:
@@ -3557,7 +3557,7 @@ steps:
     \           "
   depends_on:
   - publish-grafanacom
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: verify-grafanacom
 trigger:
   event:
@@ -3941,14 +3941,14 @@ steps:
 - commands:
   - yarn install --immutable || yarn install --immutable
   depends_on: []
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: yarn-install
 - commands:
   - apk add --update git bash
   - yarn betterer:ci
   depends_on:
   - yarn-install
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: betterer-frontend
 - commands:
   - yarn run ci:test-frontend
@@ -3956,7 +3956,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: node:22.11.0-alpine
+  image: node:22.16.0-alpine
   name: test-frontend
 trigger:
   cron:
@@ -4912,7 +4912,7 @@ steps:
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM docker:27-cli
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.24.4-alpine
-  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22.11.0-alpine
+  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22.16.0-alpine
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22-bookworm
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3
@@ -4950,7 +4950,7 @@ steps:
   - trivy --exit-code 1 --severity HIGH,CRITICAL docker:27-cli
   - trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1
   - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.24.4-alpine
-  - trivy --exit-code 1 --severity HIGH,CRITICAL node:22.11.0-alpine
+  - trivy --exit-code 1 --severity HIGH,CRITICAL node:22.16.0-alpine
   - trivy --exit-code 1 --severity HIGH,CRITICAL node:22-bookworm
   - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0
   - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3
diff --git a/.github/workflows/detect-breaking-changes-levitate.yml b/.github/workflows/detect-breaking-changes-levitate.yml
index c793791b6d2..9f02c839b71 100644
--- a/.github/workflows/detect-breaking-changes-levitate.yml
+++ b/.github/workflows/detect-breaking-changes-levitate.yml
@@ -34,7 +34,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 22.11.0
+          node-version: 22.16.0
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -86,7 +86,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 22.11.0
+          node-version: 22.16.0
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -136,7 +136,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 22.11.0
+          node-version: 22.16.0
 
       - name: Get built packages from pr
         uses: actions/download-artifact@v4
diff --git a/.github/workflows/lint-build-docs.yml b/.github/workflows/lint-build-docs.yml
index 667a8215565..233474d58ac 100644
--- a/.github/workflows/lint-build-docs.yml
+++ b/.github/workflows/lint-build-docs.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '22.11.0'
+          node-version: '22.16.0'
           cache: 'yarn'
 
       - name: Install dependencies
diff --git a/.nvmrc b/.nvmrc
index bb8c76c68e2..aebd91c521b 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v22.11.0
+v22.16.0
diff --git a/e2e/test-plugins/grafana-extensionstest-app/package.json b/e2e/test-plugins/grafana-extensionstest-app/package.json
index 73e3b952bc8..5fe3da7246e 100644
--- a/e2e/test-plugins/grafana-extensionstest-app/package.json
+++ b/e2e/test-plugins/grafana-extensionstest-app/package.json
@@ -13,7 +13,7 @@
   "devDependencies": {
     "@grafana/plugin-configs": "workspace:*",
     "@types/lodash": "4.17.7",
-    "@types/node": "22.10.2",
+    "@types/node": "22.15.0",
     "@types/prismjs": "1.26.4",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
diff --git a/e2e/test-plugins/grafana-test-datasource/package.json b/e2e/test-plugins/grafana-test-datasource/package.json
index bfac0051d93..437d542510a 100644
--- a/e2e/test-plugins/grafana-test-datasource/package.json
+++ b/e2e/test-plugins/grafana-test-datasource/package.json
@@ -13,7 +13,7 @@
   "devDependencies": {
     "@grafana/plugin-configs": "workspace:*",
     "@types/lodash": "4.17.7",
-    "@types/node": "22.10.2",
+    "@types/node": "22.15.0",
     "@types/prismjs": "1.26.4",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
diff --git a/package.json b/package.json
index 047dc634449..f21602632a1 100644
--- a/package.json
+++ b/package.json
@@ -133,7 +133,7 @@
     "@types/lodash": "4.17.15",
     "@types/logfmt": "^1.2.3",
     "@types/lucene": "^2",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/node-forge": "^1",
     "@types/ol-ext": "npm:@siedlerchr/types-ol-ext@3.3.0",
     "@types/pluralize": "^0.0.33",
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index 4de96104985..57f3967b17c 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -86,7 +86,7 @@
     "@rollup/plugin-node-resolve": "16.0.0",
     "@types/history": "4.7.11",
     "@types/lodash": "4.17.15",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/papaparse": "5.3.16",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json
index 44283da0639..6ebb0e74af1 100644
--- a/packages/grafana-e2e-selectors/package.json
+++ b/packages/grafana-e2e-selectors/package.json
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "16.0.0",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/semver": "7.7.0",
     "esbuild": "0.25.0",
     "rimraf": "6.0.1",
diff --git a/packages/grafana-flamegraph/package.json b/packages/grafana-flamegraph/package.json
index f3926f46cdf..7adc38a06c9 100644
--- a/packages/grafana-flamegraph/package.json
+++ b/packages/grafana-flamegraph/package.json
@@ -68,7 +68,7 @@
     "@types/d3": "^7",
     "@types/jest": "^29.5.4",
     "@types/lodash": "4.17.15",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "@types/react-virtualized-auto-sizer": "1.0.4",
     "@types/tinycolor2": "1.4.6",
diff --git a/packages/grafana-o11y-ds-frontend/package.json b/packages/grafana-o11y-ds-frontend/package.json
index 0cdcec2db12..8dc9cb66b4c 100644
--- a/packages/grafana-o11y-ds-frontend/package.json
+++ b/packages/grafana-o11y-ds-frontend/package.json
@@ -36,7 +36,7 @@
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "^29.5.4",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "@types/systemjs": "6.15.1",
     "jest": "^29.6.4",
diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json
index e1de7c8a8b4..53ec02a7532 100644
--- a/packages/grafana-prometheus/package.json
+++ b/packages/grafana-prometheus/package.json
@@ -85,7 +85,7 @@
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "29.5.14",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/pluralize": "^0.0.33",
     "@types/prismjs": "1.26.5",
     "esbuild": "0.25.0",
diff --git a/packages/grafana-sql/package.json b/packages/grafana-sql/package.json
index 7bc977ffa56..b8761ec2eac 100644
--- a/packages/grafana-sql/package.json
+++ b/packages/grafana-sql/package.json
@@ -43,7 +43,7 @@
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "^29.5.4",
     "@types/lodash": "4.17.15",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
     "@types/react-virtualized-auto-sizer": "1.0.4",
diff --git a/packages/grafana-test-utils/package.json b/packages/grafana-test-utils/package.json
index 45722bcf530..f57925cc312 100644
--- a/packages/grafana-test-utils/package.json
+++ b/packages/grafana-test-utils/package.json
@@ -50,7 +50,7 @@
   },
   "devDependencies": {
     "@grafana/tsconfig": "^2.0.0",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "typescript": "5.7.3"
   }
 }
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index c4b81c7ddc9..4d7c890c1f7 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -164,7 +164,7 @@
     "@types/is-hotkey": "0.1.10",
     "@types/jest": "29.5.14",
     "@types/mock-raf": "1.0.6",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/prismjs": "1.26.5",
     "@types/react": "18.3.18",
     "@types/react-color": "3.0.13",
diff --git a/public/app/plugins/datasource/azuremonitor/package.json b/public/app/plugins/datasource/azuremonitor/package.json
index 0534f946682..40fba96f296 100644
--- a/public/app/plugins/datasource/azuremonitor/package.json
+++ b/public/app/plugins/datasource/azuremonitor/package.json
@@ -34,7 +34,7 @@
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.15",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/prismjs": "1.26.5",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
diff --git a/public/app/plugins/datasource/cloud-monitoring/package.json b/public/app/plugins/datasource/cloud-monitoring/package.json
index e5f4fe75054..415a33cb2cc 100644
--- a/public/app/plugins/datasource/cloud-monitoring/package.json
+++ b/public/app/plugins/datasource/cloud-monitoring/package.json
@@ -35,7 +35,7 @@
     "@types/debounce-promise": "3.1.9",
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.15",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/prismjs": "1.26.5",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json
index 5026ffc6ba3..7cf8249325a 100644
--- a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json
@@ -23,7 +23,7 @@
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.15",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "ts-node": "10.9.2",
     "typescript": "5.7.3",
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
index d7e15364d0d..bd13cbb89b9 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
@@ -27,7 +27,7 @@
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.15",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/prismjs": "1.26.5",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/package.json b/public/app/plugins/datasource/grafana-testdata-datasource/package.json
index d2231408551..662c7e38a89 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/package.json
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/package.json
@@ -29,7 +29,7 @@
     "@types/d3-random": "^3.0.2",
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.15",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
     "@types/uuid": "10.0.0",
diff --git a/public/app/plugins/datasource/jaeger/package.json b/public/app/plugins/datasource/jaeger/package.json
index 68bd3647eee..eb9054b40af 100644
--- a/public/app/plugins/datasource/jaeger/package.json
+++ b/public/app/plugins/datasource/jaeger/package.json
@@ -31,7 +31,7 @@
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.15",
     "@types/logfmt": "^1.2.3",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
     "@types/react-window": "1.8.8",
diff --git a/public/app/plugins/datasource/mssql/package.json b/public/app/plugins/datasource/mssql/package.json
index dfd14a498d1..0216f5d4034 100644
--- a/public/app/plugins/datasource/mssql/package.json
+++ b/public/app/plugins/datasource/mssql/package.json
@@ -24,7 +24,7 @@
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.15",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "i18next-parser": "9.3.0",
     "ts-node": "10.9.2",
diff --git a/public/app/plugins/datasource/mysql/package.json b/public/app/plugins/datasource/mysql/package.json
index 5aff1121b6e..de0d3551247 100644
--- a/public/app/plugins/datasource/mysql/package.json
+++ b/public/app/plugins/datasource/mysql/package.json
@@ -23,7 +23,7 @@
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.15",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "ts-node": "10.9.2",
     "typescript": "5.7.3",
diff --git a/public/app/plugins/datasource/parca/package.json b/public/app/plugins/datasource/parca/package.json
index 775fb60ddb0..d70ede80010 100644
--- a/public/app/plugins/datasource/parca/package.json
+++ b/public/app/plugins/datasource/parca/package.json
@@ -23,7 +23,7 @@
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
     "@types/lodash": "4.17.15",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
     "ts-node": "10.9.2",
diff --git a/public/app/plugins/datasource/tempo/package.json b/public/app/plugins/datasource/tempo/package.json
index f2780ff3b9d..35cca587071 100644
--- a/public/app/plugins/datasource/tempo/package.json
+++ b/public/app/plugins/datasource/tempo/package.json
@@ -45,7 +45,7 @@
     "@testing-library/user-event": "14.6.1",
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.15",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/prismjs": "1.26.5",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
diff --git a/public/app/plugins/datasource/zipkin/package.json b/public/app/plugins/datasource/zipkin/package.json
index 60bfa62383a..9b1d06e329b 100644
--- a/public/app/plugins/datasource/zipkin/package.json
+++ b/public/app/plugins/datasource/zipkin/package.json
@@ -26,7 +26,7 @@
     "@testing-library/react": "16.2.0",
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.15",
-    "@types/node": "22.12.0",
+    "@types/node": "22.15.0",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
     "ts-node": "10.9.2",
diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star
index d0ed5fbd63e..95dfc640eb3 100644
--- a/scripts/drone/variables.star
+++ b/scripts/drone/variables.star
@@ -6,5 +6,5 @@ grabpl_version = "v3.1.2"
 golang_version = "1.24.4"
 
 # nodejs_version should match what's in ".nvmrc", but without the v prefix.
-nodejs_version = "22.11.0"
+nodejs_version = "22.16.0"
 dagger_version = "v0.18.8"
diff --git a/yarn.lock b/yarn.lock
index d00dd33f5c0..7daa5c7c194 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2536,7 +2536,7 @@ __metadata:
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:29.5.14"
     "@types/lodash": "npm:4.17.15"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/prismjs": "npm:1.26.5"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
@@ -2579,7 +2579,7 @@ __metadata:
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:29.5.14"
     "@types/lodash": "npm:4.17.15"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     lodash: "npm:4.17.21"
     react: "npm:18.3.1"
@@ -2609,7 +2609,7 @@ __metadata:
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:29.5.14"
     "@types/lodash": "npm:4.17.15"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/prismjs": "npm:1.26.5"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
@@ -2650,7 +2650,7 @@ __metadata:
     "@types/d3-random": "npm:^3.0.2"
     "@types/jest": "npm:29.5.14"
     "@types/lodash": "npm:4.17.15"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
     "@types/uuid": "npm:10.0.0"
@@ -2691,7 +2691,7 @@ __metadata:
     "@types/jest": "npm:29.5.14"
     "@types/lodash": "npm:4.17.15"
     "@types/logfmt": "npm:^1.2.3"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
     "@types/react-window": "npm:1.8.8"
@@ -2732,7 +2732,7 @@ __metadata:
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:29.5.14"
     "@types/lodash": "npm:4.17.15"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     i18next-parser: "npm:9.3.0"
     lodash: "npm:4.17.21"
@@ -2764,7 +2764,7 @@ __metadata:
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:29.5.14"
     "@types/lodash": "npm:4.17.15"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     lodash: "npm:4.17.21"
     react: "npm:18.3.1"
@@ -2792,7 +2792,7 @@ __metadata:
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
     "@types/lodash": "npm:4.17.15"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
     lodash: "npm:4.17.21"
@@ -2830,7 +2830,7 @@ __metadata:
     "@types/debounce-promise": "npm:3.1.9"
     "@types/jest": "npm:29.5.14"
     "@types/lodash": "npm:4.17.15"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/prismjs": "npm:1.26.5"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
@@ -2882,7 +2882,7 @@ __metadata:
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:29.5.14"
     "@types/lodash": "npm:4.17.15"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/prismjs": "npm:1.26.5"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
@@ -2932,7 +2932,7 @@ __metadata:
     "@testing-library/react": "npm:16.2.0"
     "@types/jest": "npm:29.5.14"
     "@types/lodash": "npm:4.17.15"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
     lodash: "npm:4.17.21"
@@ -3020,7 +3020,7 @@ __metadata:
     "@types/d3-interpolate": "npm:^3.0.0"
     "@types/history": "npm:4.7.11"
     "@types/lodash": "npm:4.17.15"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/papaparse": "npm:5.3.16"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
@@ -3067,7 +3067,7 @@ __metadata:
   dependencies:
     "@grafana/tsconfig": "npm:^2.0.0"
     "@rollup/plugin-node-resolve": "npm:16.0.0"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/semver": "npm:7.7.0"
     esbuild: "npm:0.25.0"
     rimraf: "npm:6.0.1"
@@ -3174,7 +3174,7 @@ __metadata:
     "@types/d3": "npm:^7"
     "@types/jest": "npm:^29.5.4"
     "@types/lodash": "npm:4.17.15"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     "@types/react-virtualized-auto-sizer": "npm:1.0.4"
     "@types/tinycolor2": "npm:1.4.6"
@@ -3296,7 +3296,7 @@ __metadata:
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:^29.5.4"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     "@types/systemjs": "npm:6.15.1"
     jest: "npm:^29.6.4"
@@ -3407,7 +3407,7 @@ __metadata:
     "@types/debounce-promise": "npm:3.1.9"
     "@types/jest": "npm:29.5.14"
     "@types/lodash": "npm:4.17.15"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/pluralize": "npm:^0.0.33"
     "@types/prismjs": "npm:1.26.5"
     "@types/react": "npm:18.3.18"
@@ -3569,7 +3569,7 @@ __metadata:
     "@testing-library/user-event": "npm:14.6.1"
     "@types/jest": "npm:^29.5.4"
     "@types/lodash": "npm:4.17.15"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
     "@types/react-virtualized-auto-sizer": "npm:1.0.4"
@@ -3601,7 +3601,7 @@ __metadata:
   resolution: "@grafana/test-utils@workspace:packages/grafana-test-utils"
   dependencies:
     "@grafana/tsconfig": "npm:^2.0.0"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     msw: "npm:2.7.0"
     typescript: "npm:5.7.3"
   languageName: unknown
@@ -3669,7 +3669,7 @@ __metadata:
     "@types/jquery": "npm:3.5.32"
     "@types/lodash": "npm:4.17.15"
     "@types/mock-raf": "npm:1.0.6"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/prismjs": "npm:1.26.5"
     "@types/react": "npm:18.3.18"
     "@types/react-color": "npm:3.0.13"
@@ -8465,7 +8465,7 @@ __metadata:
     "@grafana/schema": "workspace:*"
     "@grafana/ui": "workspace:*"
     "@types/lodash": "npm:4.17.7"
-    "@types/node": "npm:22.10.2"
+    "@types/node": "npm:22.15.0"
     "@types/prismjs": "npm:1.26.4"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
@@ -8497,7 +8497,7 @@ __metadata:
     "@grafana/schema": "workspace:*"
     "@grafana/ui": "workspace:*"
     "@types/lodash": "npm:4.17.7"
-    "@types/node": "npm:22.10.2"
+    "@types/node": "npm:22.15.0"
     "@types/prismjs": "npm:1.26.4"
     "@types/react": "npm:18.3.18"
     "@types/react-dom": "npm:18.3.5"
@@ -9636,7 +9636,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:22.12.0, @types/node@npm:>=10.0.0, @types/node@npm:>=13.7.0, @types/node@npm:>=13.7.4":
+"@types/node@npm:*, @types/node@npm:>=10.0.0, @types/node@npm:>=13.7.0, @types/node@npm:>=13.7.4":
   version: 22.12.0
   resolution: "@types/node@npm:22.12.0"
   dependencies:
@@ -9652,12 +9652,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:22.10.2":
-  version: 22.10.2
-  resolution: "@types/node@npm:22.10.2"
+"@types/node@npm:22.15.0":
+  version: 22.15.0
+  resolution: "@types/node@npm:22.15.0"
   dependencies:
-    undici-types: "npm:~6.20.0"
-  checksum: 10/451adfefed4add58b069407173e616220fd4aaa3307cdde1bb701aa053b65b54ced8483db2f870dcedec7a58cb3b06101fbc19d85852716672ec1fd3660947fa
+    undici-types: "npm:~6.21.0"
+  checksum: 10/96911bc8bcebd32e96d0d6b46214f5b935e47ff3dac1fc6cf6a5256ebdd01dfecf689a41b3e3a1f35385c3341e0b79e0cf42a6409ce81e6b5fb9b3d7317fedbb
   languageName: node
   linkType: hard
 
@@ -18073,7 +18073,7 @@ __metadata:
     "@types/lodash": "npm:4.17.15"
     "@types/logfmt": "npm:^1.2.3"
     "@types/lucene": "npm:^2"
-    "@types/node": "npm:22.12.0"
+    "@types/node": "npm:22.15.0"
     "@types/node-forge": "npm:^1"
     "@types/ol-ext": "npm:@siedlerchr/types-ol-ext@3.3.0"
     "@types/pluralize": "npm:^0.0.33"
@@ -31052,6 +31052,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"undici-types@npm:~6.21.0":
+  version: 6.21.0
+  resolution: "undici-types@npm:6.21.0"
+  checksum: 10/ec8f41aa4359d50f9b59fa61fe3efce3477cc681908c8f84354d8567bb3701fafdddf36ef6bff307024d3feb42c837cf6f670314ba37fc8145e219560e473d14
+  languageName: node
+  linkType: hard
+
 "undici@npm:^6.19.5":
   version: 6.21.2
   resolution: "undici@npm:6.21.2"