Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
68b353a
Update to latest (#184)
GurinderRawala Sep 3, 2024
24b0abd
workflows fix (#185)
GurinderRawala Sep 4, 2024
c83f2af
docker file and webpack fix (#186)
GurinderRawala Sep 5, 2024
7264168
webpack fix and warning fixes (#187)
GurinderRawala Sep 5, 2024
f69ec4e
Update deploy-cloud-run-grafana-prod.yaml
dikshant-infracloud Sep 6, 2024
2710396
Update deploy-cloud-run-grafana-prod.yaml
dikshant-infracloud Sep 6, 2024
71c9177
added tenant id header (#188)
GurinderRawala Oct 4, 2024
de00151
added tenant id header fix (#189)
GurinderRawala Oct 17, 2024
04a4be1
new color palette (#190)
GurinderRawala Oct 24, 2024
4e1ac22
changed colors (#191)
GurinderRawala Oct 25, 2024
f633be4
fixed tooltip for pie chart (#192)
GurinderRawala Nov 11, 2024
9f51b61
scoping query using rls (#194)
GurinderRawala Jan 8, 2025
874cb7a
Added team filter support (#195)
GurinderRawala Mar 24, 2025
9086dab
Team filter fix (#196)
GurinderRawala Mar 24, 2025
3dcf553
style fixes for dashboards (#197)
GurinderRawala Mar 25, 2025
755f999
removed time range option under 24hrs (#198)
GurinderRawala Apr 25, 2025
0ffaebc
Update deploy-cloud-run-grafana.yaml (#199)
dikshant-coderabbit May 29, 2025
9624da6
Drill down metrics (#200)
GurinderRawala Jun 6, 2025
94f75e5
theme fix
GurinderRawala Jun 10, 2025
b1d871b
dark theme added
GurinderRawala Aug 2, 2025
133f0eb
added fix for theme mode update
GurinderRawala Aug 11, 2025
e02c4d3
dark mode color fix
GurinderRawala Aug 15, 2025
2b5e30f
removed cr auth logic
GurinderRawala Aug 16, 2025
a1153f2
changed loader
GurinderRawala Nov 11, 2025
476dfe7
fixed build updated go
GurinderRawala Nov 11, 2025
693a466
Update deploy-cloud-run-grafana.yaml
dikshant-coderabbit Nov 21, 2025
8662bbf
Update deploy-cloud-run-grafana.yaml
dikshant-coderabbit Nov 21, 2025
47db80d
Update deploy-cloud-run-grafana.yaml
dikshant-coderabbit Nov 21, 2025
74e8d47
Update deploy-cloud-run-grafana.yaml
dikshant-coderabbit Nov 22, 2025
b2f17b7
Update deploy-cloud-run-grafana.yaml
dikshant-coderabbit Nov 25, 2025
e746cf0
Update deploy-cloud-run-grafana.yaml
dikshant-coderabbit Nov 25, 2025
b6e13b1
Update deploy-cloud-run-grafana.yaml
dikshant-coderabbit Nov 26, 2025
92acbbf
new theme colors (#201)
GurinderRawala Dec 4, 2025
647774c
Update deploy-cloud-run-grafana-prod.yaml
dikshant-coderabbit Dec 5, 2025
5daabed
css fix
GurinderRawala Dec 9, 2025
b6361e5
moved time range selector for MFE
GurinderRawala Dec 9, 2025
c378bfb
RLS query fix
GurinderRawala Dec 12, 2025
8d453fc
Update deploy-cloud-run-grafana.yaml
dikshant-coderabbit Dec 17, 2025
2bf46c9
type and query variable fix
GurinderRawala Dec 19, 2025
6d06baf
build grafana using prod webpack and added prefix to avoid css leak (…
GurinderRawala Dec 24, 2025
2ce9712
Combined RLS queries with main query
GurinderRawala Jan 5, 2026
f6a6578
revert combined query
GurinderRawala Jan 5, 2026
9047a9c
set org_id in transection
GurinderRawala Jan 5, 2026
a1e212f
transection fix
GurinderRawala Jan 5, 2026
1c2f9a2
set org_id fix
GurinderRawala Jan 5, 2026
9279cbd
added loading state on missing org_id
GurinderRawala Jan 6, 2026
8b34d88
Use session variable to retrieve org (#203)
GurinderRawala Jan 8, 2026
9d93577
common errors fix
GurinderRawala Jan 9, 2026
1346108
circleci fix
GurinderRawala Jan 9, 2026
75a32bc
CodeRabbit db pool (#204)
GurinderRawala Jan 11, 2026
4c85636
issues fixed
GurinderRawala Jan 11, 2026
3a4b37c
database is closed issue fix
GurinderRawala Jan 11, 2026
d9bef90
transection fix
GurinderRawala Jan 11, 2026
7addcf1
avoid desposing db
GurinderRawala Jan 11, 2026
78683a6
conn pool config fix
GurinderRawala Jan 12, 2026
c3acd38
[BUG:FIX] missing org_id in queries (#205)
GurinderRawala Jan 28, 2026
a35f3c6
Apply security patch security-patch-202505051005.patch (#105754) (#206)
GurinderRawala Jan 29, 2026
f89e2e6
docs: adding logs to identify why orgId is missing (#207)
PrashantHalaki Jan 30, 2026
0444287
made state and bar panel clickable (#208)
GurinderRawala Feb 2, 2026
6e9099c
bar panel tooltip clickable
GurinderRawala Feb 3, 2026
77febb4
bar click data
GurinderRawala Feb 4, 2026
75425b4
Added self hosted query scoping (#209)
GurinderRawala Feb 11, 2026
42b074e
support self hosted id
GurinderRawala Feb 14, 2026
9bad01a
version fix
GurinderRawala Feb 19, 2026
0c0f33f
self-hosted scoping fix
GurinderRawala Feb 20, 2026
3f287df
more fixes
GurinderRawala Feb 21, 2026
ce1f1cd
tooltip error fix on mobile (#210)
GurinderRawala Feb 24, 2026
f8d3495
tooltip error fix on mobile
GurinderRawala Feb 24, 2026
a1e8ea2
feat/keyless oidc integration for prod and prod2
sumedh-coderabbit Apr 9, 2026
774eb98
fix image tag
dikshant-coderabbit Apr 9, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 1 addition & 8 deletions .betterer.results
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down
62 changes: 62 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
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
- run:
name: Update browserslist database
command: npx update-browserslist-db@latest --yes
- 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
23 changes: 23 additions & 0 deletions .circleci/scripts/asdf_install.sh
Original file line number Diff line number Diff line change
@@ -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[@]}"
122 changes: 122 additions & 0 deletions .circleci/scripts/manage_tools.sh
Original file line number Diff line number Diff line change
@@ -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
40 changes: 40 additions & 0 deletions .circleci/scripts/update_environment.sh
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading