From 0069d112fc16106d127826d6ce967da4a8b6b184 Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Thu, 7 Aug 2025 21:30:47 +0100 Subject: [PATCH] Config: Fix date_formats options being moved to a different section (#109339) * Config: Fix date_formats options being moved to a different section * fix builder cache key --- .github/workflows/pr-e2e-tests.yml | 2 +- conf/defaults.ini | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr-e2e-tests.yml b/.github/workflows/pr-e2e-tests.yml index 824b621d198..03ba03b8031 100644 --- a/.github/workflows/pr-e2e-tests.yml +++ b/.github/workflows/pr-e2e-tests.yml @@ -55,7 +55,7 @@ jobs: - uses: actions/cache@v4 id: cache with: - key: "build-grafana-${{ runner.os }}-${{ hashFiles('yarn.lock', 'public/*', 'packages/*', 'pkg/**/*.go', '**/go.mod', '**/go.sum', '!**_test.go', '!**.test.ts', '!**.test.tsx', 'Dockerfile') }}" + key: "build-grafana-${{ runner.os }}-${{ hashFiles('yarn.lock', 'public/*', 'packages/*', 'conf/*', 'pkg/**/*.go', '**/go.mod', '**/go.sum', '!**_test.go', '!**.test.ts', '!**.test.tsx', 'Dockerfile') }}" path: | build-dir diff --git a/conf/defaults.ini b/conf/defaults.ini index 65cec28cfbe..081d660a5d8 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -2030,17 +2030,17 @@ provider = static # This is EXPERIMENTAL. Please, do not use this section # foo = bar +[time_picker] +# Custom quick ranges for the time picker. Each quick range has a display name, a from value, and a to value. +# Format: [{"from":"now-5m","to":"now","display":"Last 5 minutes"},{"from":"now-15m","to":"now","display":"Last 15 minutes"}] +quick_ranges = + [date_formats] # For information on what formatting patterns that are supported https://momentjs.com/docs/#/displaying/ # Default system date format used in time range picker and other places where full time is displayed full_date = YYYY-MM-DD HH:mm:ss -[time_picker] -# Custom quick ranges for the time picker. Each quick range has a display name, a from value, and a to value. -# Format: [{"from":"now-5m","to":"now","display":"Last 5 minutes"},{"from":"now-15m","to":"now","display":"Last 15 minutes"}] -quick_ranges = - # Used by graph and other places where we only show small intervals interval_second = HH:mm:ss interval_minute = HH:mm