grafana · Sep 3, 2024 · Sep 4, 2024 · Sep 5, 2024 · Sep 5, 2024 · Sep 6, 2024
Showing 489 changed files with 18,339 additions and 11,330 deletions.
diff --git a/.betterer.results b/.betterer.results
@@ -1296,11 +1296,7 @@ exports[`better eslint`] = {
     ],
     "public/app/core/services/backend_srv.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/core/services/context_srv.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -3103,9 +3099,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "7"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"]
     ],
-    "public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx:5381": [
       [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "0"],
       [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "1"],

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,59 @@
+version: 2.1
+
+executors:
+  go-executor:
+    docker:
+      - image: cimg/go:1.22.6
+    working_directory: ~/github.com/grafana
+
+  node-executor:
+    docker:
+      - image: cimg/node:22.7.0
+    working_directory: ~/frontend
+    resource_class: large
+
+jobs:
+  go-mod-install:
+    executor: go-executor
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - go-mod-cache-{{ checksum "go.sum" }}
+            - go-mod-cache-
+      - run:
+          name: Install Go dependencies
+          command: go mod download
+      - run:
+          name: Go mod tidy
+          command: go mod tidy
+      - save_cache:
+          paths:
+            - ~/go/pkg/mod
+          key: go-mod-cache-{{ checksum "go.sum" }}
+
+  build-frontend:
+    executor: node-executor
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - yarn-cache-{{ checksum "yarn.lock" }}
+            - yarn-cache-
+      - run:
+          name: Install frontend dependencies
+          command: yarn install --immutable
+      - save_cache:
+          paths:
+            - ~/.cache/yarn
+          key: yarn-cache-{{ checksum "yarn.lock" }}
+      - run:
+          name: Build frontend
+          command: yarn run build
+
+workflows:
+  version: 2
+  build-and-test:
+    jobs:
+      - go-mod-install
+      - build-frontend
diff --git a/.circleci/scripts/asdf_install.sh b/.circleci/scripts/asdf_install.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+set -euo pipefail
+set -x
+
+# shellcheck disable=SC2153
+readarray -t tools <<<"${TOOLS?}"
+if [ "${#tools[@]}" -eq 1 ] && [ -z "${tools[0]:-}" ]; then
+	# Parameter was set to empty string
+	tools=()
+fi
+
+sudo apt-get update
+sudo apt-get install graphviz
+
+# If we need to setup python
+if grep <<<"${TOOLS}" '^python$'; then
+	# See https://github.com/pyenv/pyenv/wiki#suggested-build-environment
+	sudo apt-get install make build-essential libssl-dev zlib1g-dev \
+		libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm \
+		libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev
+fi
+
+(yes || true) | ./.circleci/scripts/manage_tools.sh setup "${tools[@]}"
diff --git a/.circleci/scripts/manage_tools.sh b/.circleci/scripts/manage_tools.sh
@@ -0,0 +1,122 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+git_root="$(git rev-parse --show-toplevel)"
+readonly git_root="${git_root}"
+readonly version_file="${git_root}"/.tool-versions
+
+set -x
+
+add_plugins() {
+	check_asdf
+
+	[ -f "$version_file" ] || {
+		printf 'ASDF .tool-versions does not exist. Exiting\n'
+		return 1
+	}
+
+	readarray -t intended_plugins < <(cut -d" " -f1 "${version_file}")
+	readarray -t added_plugins < <(asdf plugin-list)
+	if [ "${#@}" -eq 0 ]; then
+		local -r wanted_plugins=("${intended_plugins[@]}")
+	else
+		local -r wanted_plugins=("${@}")
+	fi
+
+	local plugin
+	for plugin in "${wanted_plugins[@]}"; do
+		if ! array_contains "${plugin}" "${intended_plugins[@]}"; then
+			printf 'The specified tool %s is not specified in ASDF config!\n' "${plugin}"
+			printf 'Declared plugins: %s\n' "${intended_plugins[*]}"
+			return 1
+		fi
+	done
+
+	for plugin in "${wanted_plugins[@]}"; do
+		if ! array_contains "${plugin}" "${added_plugins[@]}"; then
+			printf 'Adding asdf plugin: "%s"\n' "${plugin}"
+			asdf plugin add "${plugin}"
+		fi
+	done
+}
+
+install_plugins() {
+	check_asdf
+	if [ "${#@}" = 0 ]; then
+		asdf install
+	else
+		local plug
+		for plug in "${@}"; do
+			asdf install "${plug}"
+		done
+	fi
+
+	if python --version &>/dev/null; then
+		printf 'Installing Python tools\n'
+		# install python tools
+		pushd "${git_root}" >/dev/null
+		pip install -r "${git_root}"/requirements.txt
+		popd >/dev/null
+	fi
+	if asdf where python &>/dev/null; then
+		asdf reshim python
+	fi
+}
+
+setup() {
+	add_plugins "${@}"
+	install_plugins "${@}"
+}
+
+main() {
+	local -r command="${1:-}"
+	shift
+	local -r tools=("${@}")
+	case "${command:-}" in
+	add) add_plugins "${tools[@]}" ;;
+	install) install_plugins "${tools[@]}" ;;
+	setup | '') setup "${tools[@]}" ;;
+	help) print_help ;;
+	*)
+		printf 'Invalid argument: "%s"\n' "${command}" >&2
+		print_help
+		return 1
+		;;
+	esac
+}
+
+check_asdf() {
+	command -v asdf >/dev/null || {
+		printf 'Please install asdf: https://asdf-vm.com/guide/getting-started.html#_3-install-asdf\n' >&2
+		return 1
+	}
+}
+
+array_contains() {
+	# Checks if first passed item, exists somewhere in the array passed as second and further arguments
+	local -r item="${1?Item required}"
+	shift
+	local -r arr=("${@}")
+	local other
+	for other in "${arr[@]}"; do
+		if [ "${item}" = "${other}" ]; then
+			return 0 # Found the item
+		fi
+	done
+	return 1 # didn't find the item
+}
+
+print_help() {
+	local -r script_called_name="${BASH_SOURCE[0]}"
+	printf 'Usage: %s <add|install|setup> [tool_names]\n' "${script_called_name}" >&2
+	printf 'Commands:\n' >&2
+	printf '   add - add to asdf plugins from .tool-versions file\n' >&2
+	printf '   install - install plugins which have been added into asdf and are versioned in .tool-versions file\n' >&2
+	printf '   setup - (default, if no command specified) and & install\n' >&2
+	printf 'Can additionally pass names of the tools to limit the install to\n' >&2
+}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+	main "$@"
+fi
diff --git a/.circleci/scripts/update_environment.sh b/.circleci/scripts/update_environment.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+set -euo pipefail
+export LOGURU_LEVEL=TRACE
+export GIT_SSH_COMMAND="fn circleci ssh -o IdentitiesOnly=yes -o IdentityAgent=none"
+
+commit_author=$(git show --format="%aN <%aE>" --quiet)
+
+args=(
+    --author "${commit_author}"
+    --update "${UPDATE}"
+    --release-train "latest"
+    --manifests-repo-url "${MANIFESTS_REPO}"
+    --manifests-base-branch "${MANIFESTS_BRANCH}"
+    --manifests-repo-ref "${MANIFESTS_BRANCH}"
+    --skip-pull-request
+    --push
+)
+
+if [ -n "${COMPONENT}" ]; then
+    args+=(--component "${COMPONENT}")
+fi
+
+retry_counter=10
+errcode=1
+while true; do
+    (( retry_counter-- )) || break
+
+    set +e
+    if fn --config-path "${JOB_ROOT}"/project/.opsninja.yaml \
+          manifests update "${args[@]}" "${ENVIRONMENT_PATH}"; then
+        errcode=0
+        break
+    else
+        errcode="${?}"
+    fi
+    set -e
+    sleep 1
+done
+
+exit $errcode
diff --git a/.eslintignore b/.eslintignore
@@ -25,3 +25,6 @@ playwright-report
 
 # Auto-generated icon file
 /packages/grafana-ui/src/components/Icon/iconBundle.ts
+
+# Sankey chart module.js
+public/app/plugins/panel/sankey-panel-0.5.0/module.js