mirror of
https://github.com/grafana/grafana.git
synced 2025-09-14 12:02:53 +08:00
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
This commit is contained in:
2
.github/workflows/pr-e2e-tests.yml
vendored
2
.github/workflows/pr-e2e-tests.yml
vendored
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user