opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-14 20:33:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Config: Fix date_formats options being moved to a different section (#109339)

Browse Source 
* Config: Fix date_formats options being moved to a different section

* fix builder cache key
This commit is contained in:
Josh Hunt
2025-08-07 21:30:47 +01:00
committed by GitHub
parent 6ca8c6c6da
commit 0069d112fc
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/pr-e2e-tests.yml vendored
View File

@ -55,7 +55,7 @@ jobs:
- uses: actions/cache@v4 - uses: actions/cache@v4
id: cache id: cache
with: 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: | path: |
build-dir build-dir

10
conf/defaults.ini
View File

@ -2030,17 +2030,17 @@ provider = static
# This is EXPERIMENTAL. Please, do not use this section # This is EXPERIMENTAL. Please, do not use this section
# foo = bar # 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] [date_formats]
# For information on what formatting patterns that are supported https://momentjs.com/docs/#/displaying/ # 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 # 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 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 # Used by graph and other places where we only show small intervals
interval_second = HH:mm:ss interval_second = HH:mm:ss
interval_minute = HH:mm interval_minute = HH:mm