From 1c3628f3c65eb0876cb428cf0cac423f34561db4 Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Thu, 7 Aug 2025 21:59:22 +0100 Subject: [PATCH] [release-12.1.1] Config: Fix date_formats options being moved to a different section (#109366) 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 (cherry picked from commit 0069d112fc16106d127826d6ce967da4a8b6b184) --- conf/defaults.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 093c66e18ab..e1eaaf82a44 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -1997,17 +1997,17 @@ provider = static # instance = "grafana" # version = 11.0.0 +[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