apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Schema V2: Adjust quick_ranges in time settings and remove time_options (#100135)

Browse Source 
* adjut quickRanges type in v2

* clean up unused time_options property

* remove deprecated time_options property on time picker

* add schema migration for time_options

* adjust test
pull/100554/head
Sergej-Vlasov 3 months ago committed by GitHub
parent e60e217a23
commit d1dee968c3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
81 changed files with 129 additions and 345 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      .betterer.results
  2. 12
      devenv/bulk-dashboards/bulkdash.jsonnet
  3. 3
      devenv/dev-dashboards-without-uid/panel_tests_graph.json
  4. 11
      devenv/dev-dashboards-without-uid/panel_tests_graph_time_regions.json
  5. 3
      devenv/dev-dashboards-without-uid/panel_tests_polystat.json
  6. 1
      devenv/dev-dashboards/datasource-influxdb/influxdb-templated.json
  7. 3
      devenv/dev-dashboards/datasource-mssql/mssql_fakedata.json
  8. 3
      devenv/dev-dashboards/datasource-mssql/mssql_unittest.json
  9. 3
      devenv/dev-dashboards/datasource-mysql/mysql_fakedata.json
  10. 3
      devenv/dev-dashboards/datasource-mysql/mysql_unittest.json
  11. 3
      devenv/dev-dashboards/datasource-postgres/postgres_fakedata.json
  12. 3
      devenv/dev-dashboards/datasource-postgres/postgres_unittest.json
  13. 1
      devenv/dev-dashboards/datasource-testdata/demo1.json
  14. 3
      devenv/dev-dashboards/datasource-testdata/new_features_in_v62.json
  15. 11
      devenv/dev-dashboards/home.json
  16. 3
      devenv/dev-dashboards/panel-bargauge/bar_gauge_demo.json
  17. 11
      devenv/dev-dashboards/panel-bargauge/panel_tests_bar_gauge.json
  18. 3
      devenv/dev-dashboards/panel-bargauge/panel_tests_bar_gauge2.json
  19. 3
      devenv/dev-dashboards/panel-common/lazy_loading.json
  20. 3
      devenv/dev-dashboards/panel-common/panels_without_title.json
  21. 3
      devenv/dev-dashboards/panel-gauge/gauge-multi-series.json
  22. 3
      devenv/dev-dashboards/panel-gauge/gauge_tests.json
  23. 3
      devenv/dev-dashboards/panel-graph/graph-gradient-area-fills.json
  24. 3
      devenv/dev-dashboards/panel-graph/graph-time-regions.json
  25. 3
      devenv/dev-dashboards/panel-graph/graph_tests.json
  26. 3
      devenv/dev-dashboards/panel-polystat/polystat_test.json
  27. 3
      devenv/dev-dashboards/panel-table/table_tests.json
  28. 3
      devenv/dev-dashboards/panel-timeseries/timeseries-gradient-area.json
  29. 3
      devenv/dev-dashboards/scenarios/slow_queries_and_annotations.json
  30. 3
      devenv/dev-dashboards/scenarios/time_zone_support.json
  31. 11
      devenv/docker/ha-test-unified-alerting/grafana/provisioning/dashboards/alerts/overview.json
  32. 11
      devenv/docker/ha-test-unified-alerting/grafana/provisioning/dashboards/mysql/overview.json
  33. 11
      devenv/docker/ha_test/grafana/provisioning/dashboards/alerts/overview.json
  34. 11
      devenv/docker/ha_test/grafana/provisioning/dashboards/mysql/overview.json
  35. 4
      docs/sources/dashboards/build-dashboards/view-dashboard-json-model/index.md
  36. 4
      kinds/dashboard/dashboard_kind.cue
  37. 3
      packages/grafana-prometheus/src/dashboards/grafana_stats.json
  38. 3
      packages/grafana-prometheus/src/dashboards/prometheus_2_stats.json
  39. 3
      packages/grafana-prometheus/src/dashboards/prometheus_stats.json
  40. 7
      packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
  41. 8
      packages/grafana-schema/src/schema/dashboard/v2alpha0/dashboard.schema.cue
  42. 1
      packages/grafana-schema/src/schema/dashboard/v2alpha0/examples.ts
  43. 27
      packages/grafana-schema/src/schema/dashboard/v2alpha0/types.gen.ts
  44. 5
      pkg/kinds/dashboard/dashboard_spec_gen.go
  45. 3
      pkg/services/dashboardimport/service/testdata/dashboard.json
  46. 11
      pkg/services/provisioning/dashboards/testdata/test-dashboards/containing-id/dashboard1.json
  47. 11
      pkg/services/provisioning/dashboards/testdata/test-dashboards/dashboard-with-uid/dashboard1.json
  48. 11
      pkg/services/provisioning/dashboards/testdata/test-dashboards/folder-one/dashboard1.json
  49. 11
      pkg/services/provisioning/dashboards/testdata/test-dashboards/folder-one/dashboard2.json
  50. 11
      pkg/services/provisioning/dashboards/testdata/test-dashboards/folders-from-files-structure/folderOne/dashboard1.json
  51. 11
      pkg/services/provisioning/dashboards/testdata/test-dashboards/folders-from-files-structure/folderTwo/dashboard2.json
  52. 11
      pkg/services/provisioning/dashboards/testdata/test-dashboards/folders-from-files-structure/root.json
  53. 11
      pkg/services/provisioning/dashboards/testdata/test-dashboards/one-dashboard/dashboard1.json
  54. 11
      pkg/services/provisioning/dashboards/testdata/test-dashboards/two-dashboards-with-uid/dashboard1.json
  55. 11
      pkg/services/provisioning/dashboards/testdata/test-dashboards/two-dashboards-with-uid/dashboard2.json
  56. 11
      pkg/services/provisioning/dashboards/testdata/test-dashboards/unprovision/dashboard1.json
  57. 11
      pkg/tests/api/dashboards/home.json
  58. 1
      public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts
  59. 2
      public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts
  60. 3
      public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.ts
  61. 6
      public/app/features/dashboard-scene/serialization/__snapshots__/transformSceneToSaveModel.test.ts.snap
  62. 1
      public/app/features/dashboard-scene/serialization/__snapshots__/transformSceneToSaveModelSchemaV2.test.ts.snap
  63. 1
      public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts
  64. 7
      public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts
  65. 1
      public/app/features/dashboard-scene/settings/version-history/__mocks__/dashboardHistoryMocks.ts
  66. 29
      public/app/features/dashboard/api/ResponseTransformers.test.ts
  67. 4
      public/app/features/dashboard/api/ResponseTransformers.ts
  68. 1
      public/app/features/dashboard/components/DashboardSettings/GeneralSettings.test.tsx
  69. 2
      public/app/features/dashboard/containers/PublicDashboardPage.test.tsx
  70. 22
      public/app/features/dashboard/state/DashboardMigrator.test.ts
  71. 12
      public/app/features/dashboard/state/DashboardMigrator.ts
  72. 3
      public/app/plugins/datasource/grafana-testdata-datasource/dashboards/streaming.json
  73. 1
      public/app/plugins/datasource/graphite/dashboards/carbon_metrics.json
  74. 1
      public/app/plugins/datasource/graphite/dashboards/metrictank.json
  75. 3
      public/app/plugins/datasource/prometheus/dashboards/grafana_stats.json
  76. 3
      public/app/plugins/datasource/prometheus/dashboards/prometheus_2_stats.json
  77. 3
      public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json
  78. 1
      public/dashboards/default.json
  79. 1
      public/dashboards/home.json
  80. 1
      public/dashboards/template_vars.json
  81. 2
      scripts/import_many_dashboards.sh

3
.betterer.results
Unescape View File

@ -2212,8 +2212,7 @@ exports[`better eslint`] = {
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "7"],
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "8"],
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "9"],
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "10"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "11"]
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "10"]
],
"public/app/features/alerting/unified/components/rule-editor/GrafanaFolderAndLabelsStep.tsx:5381": [
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "0"]

12
devenv/bulk-dashboards/bulkdash.jsonnet vendored
Unescape View File

@ -1118,18 +1118,6 @@
"1d"
],
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"2h",
" 6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"type": "timepicker"
},
"timezone": "browser",

3
devenv/dev-dashboards-without-uid/panel_tests_graph.json vendored
Unescape View File

@ -1639,8 +1639,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "browser",
"title": "Panel Tests - Graph",

11
devenv/dev-dashboards-without-uid/panel_tests_graph_time_regions.json vendored
Unescape View File

@ -490,17 +490,6 @@
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
},
"timezone": "browser",

3
devenv/dev-dashboards-without-uid/panel_tests_polystat.json vendored
Unescape View File

@ -3408,8 +3408,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Panel Tests - Polystat",

1
devenv/dev-dashboards/datasource-influxdb/influxdb-templated.json vendored
Unescape View File

@ -312,7 +312,6 @@
"now": true,
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"status": "Stable",
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"],
"type": "timepicker"
},
"timezone": "browser",

3
devenv/dev-dashboards/datasource-mssql/mssql_fakedata.json vendored
Unescape View File

@ -537,8 +537,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Datasource tests - MSSQL",

3
devenv/dev-dashboards/datasource-mssql/mssql_unittest.json vendored
Unescape View File

@ -2831,8 +2831,7 @@
"to": "2018-03-15T13:55:01.000Z"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Datasource tests - MSSQL (unit test)",

3
devenv/dev-dashboards/datasource-mysql/mysql_fakedata.json vendored
Unescape View File

@ -541,8 +541,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Datasource tests - MySQL",

3
devenv/dev-dashboards/datasource-mysql/mysql_unittest.json vendored
Unescape View File

@ -2643,8 +2643,7 @@
"to": "2018-03-15T13:55:01.000Z"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Datasource tests - MySQL (unittest)",

3
devenv/dev-dashboards/datasource-postgres/postgres_fakedata.json vendored
Unescape View File

@ -577,8 +577,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Datasource tests - Postgres",

3
devenv/dev-dashboards/datasource-postgres/postgres_unittest.json vendored
Unescape View File

@ -2621,8 +2621,7 @@
"to": "2018-03-15T13:55:01.000Z"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Datasource tests - Postgres (unittest)",

1
devenv/dev-dashboards/datasource-testdata/demo1.json vendored
Unescape View File

@ -1092,7 +1092,6 @@
"now": true,
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"status": "Stable",
"time_options": ["5m", "15m", "1h", "2h", " 6h", "12h", "24h", "2d", "7d", "30d"],
"type": "timepicker"
},
"timezone": "browser",

3
devenv/dev-dashboards/datasource-testdata/new_features_in_v62.json vendored
Unescape View File

@ -1326,8 +1326,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "New Features in v6.2",

11
devenv/dev-dashboards/home.json vendored
Unescape View File

@ -240,17 +240,6 @@
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
},
"timezone": "",

3
devenv/dev-dashboards/panel-bargauge/bar_gauge_demo.json vendored
Unescape View File

@ -654,8 +654,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["2s", "5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["2s", "5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Bar Gauge Demo",

11
devenv/dev-dashboards/panel-bargauge/panel_tests_bar_gauge.json vendored
Unescape View File

@ -1423,17 +1423,6 @@
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
},
"timezone": "",

3
devenv/dev-dashboards/panel-bargauge/panel_tests_bar_gauge2.json vendored
Unescape View File

@ -519,8 +519,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Panel Tests - Bar Gauge 2",

3
devenv/dev-dashboards/panel-common/lazy_loading.json vendored
Unescape View File

@ -2202,8 +2202,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Lazy Loading",

3
devenv/dev-dashboards/panel-common/panels_without_title.json vendored
Unescape View File

@ -893,8 +893,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Panel Tests - With & Without title",

3
devenv/dev-dashboards/panel-gauge/gauge-multi-series.json vendored
Unescape View File

@ -254,8 +254,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Panel Tests - Gauge Multi Series",

3
devenv/dev-dashboards/panel-gauge/gauge_tests.json vendored
Unescape View File

@ -1319,8 +1319,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Panel Tests - Gauge",

3
devenv/dev-dashboards/panel-graph/graph-gradient-area-fills.json vendored
Unescape View File

@ -372,8 +372,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Panel Tests - Graph - Gradient Area Fills",

3
devenv/dev-dashboards/panel-graph/graph-time-regions.json vendored
Unescape View File

@ -569,8 +569,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "browser",
"title": "Panel Tests - Graph Time Regions",

3
devenv/dev-dashboards/panel-graph/graph_tests.json vendored
Unescape View File

@ -1639,8 +1639,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "browser",
"title": "Panel Tests - Graph",

3
devenv/dev-dashboards/panel-polystat/polystat_test.json vendored
Unescape View File

@ -3408,8 +3408,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Panel Tests - Polystat",

3
devenv/dev-dashboards/panel-table/table_tests.json vendored
Unescape View File

@ -440,8 +440,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "browser",
"title": "Panel Tests - Table",

3
devenv/dev-dashboards/panel-timeseries/timeseries-gradient-area.json vendored
Unescape View File

@ -562,8 +562,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Panel Tests - Graph NG - Gradient Area Fills",

3
devenv/dev-dashboards/scenarios/slow_queries_and_annotations.json vendored
Unescape View File

@ -1132,8 +1132,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Panel tests - Slow Queries & Annotations",

3
devenv/dev-dashboards/scenarios/time_zone_support.json vendored
Unescape View File

@ -684,8 +684,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "utc",
"title": "Panel Tests - Time zone support",

11
devenv/docker/ha-test-unified-alerting/grafana/provisioning/dashboards/alerts/overview.json vendored
Unescape View File

@ -151,17 +151,6 @@
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
},
"timezone": "",

11
devenv/docker/ha-test-unified-alerting/grafana/provisioning/dashboards/mysql/overview.json vendored
Unescape View File

@ -5376,17 +5376,6 @@
"1d"
],
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"type": "timepicker"
},
"timezone": "browser",

11
devenv/docker/ha_test/grafana/provisioning/dashboards/alerts/overview.json vendored
Unescape View File

@ -151,17 +151,6 @@
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
},
"timezone": "",

11
devenv/docker/ha_test/grafana/provisioning/dashboards/mysql/overview.json vendored
Unescape View File

@ -5376,17 +5376,6 @@
"1d"
],
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"type": "timepicker"
},
"timezone": "browser",

4
docs/sources/dashboards/build-dashboards/view-dashboard-json-model/index.md
Unescape View File

@ -138,12 +138,12 @@ The grid has a negative gravity that moves panels up if there is empty space abo
"nowDelay": "",
"quick_ranges": [
{
"display": "Last 6 hours"
"display": "Last 6 hours",
"from": "now-6h",
"to": "now"
},
{
"display": "Last 7 days"
"display": "Last 7 days",
"from": "now-7d",
"to": "now"
}

4
kinds/dashboard/dashboard_kind.cue
Unescape View File

@ -74,7 +74,7 @@ lineage: schemas: [{
// Version of the JSON schema, incremented each time a Grafana update brings
// changes to said schema.
schemaVersion: uint16 | *39
schemaVersion: uint16 | *41
// Version of the dashboard, incremented each time the dashboard is updated.
version?: uint32
@ -473,8 +473,6 @@ lineage: schemas: [{
hidden?: bool | *false
// Interval options available in the refresh picker dropdown.
refresh_intervals?: [...string] | *["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
// Selectable options available in the time picker dropdown. Has no effect on provisioned dashboard.
time_options?: [...string] | *["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
// Quick ranges for time picker.
quick_ranges?: [...#TimeOption]
// Override the now time by entering a time delay. Use this option to accommodate known delays in data aggregation to avoid null values.

3
packages/grafana-prometheus/src/dashboards/grafana_stats.json
Unescape View File

@ -1178,8 +1178,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Grafana metrics",

3
packages/grafana-prometheus/src/dashboards/prometheus_2_stats.json
Unescape View File

@ -1394,8 +1394,7 @@
},
"timepicker": {
"now": true,
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "browser",
"title": "Prometheus 2.0 Stats",

3
packages/grafana-prometheus/src/dashboards/prometheus_stats.json
Unescape View File

@ -825,8 +825,7 @@
},
"timepicker": {
"now": true,
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "browser",
"title": "Prometheus Stats",

7
packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
Unescape View File

@ -681,17 +681,12 @@ export interface TimePickerConfig {
* Interval options available in the refresh picker dropdown.
*/
refresh_intervals?: Array<string>;
/**
* Selectable options available in the time picker dropdown. Has no effect on provisioned dashboard.
*/
time_options?: Array<string>;
}
export const defaultTimePickerConfig: Partial<TimePickerConfig> = {
hidden: false,
quick_ranges: [],
refresh_intervals: ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
};
/**
@ -1205,7 +1200,7 @@ export const defaultDashboard: Partial<Dashboard> = {
graphTooltip: DashboardCursorSync.Off,
links: [],
panels: [],
schemaVersion: 39,
schemaVersion: 41,
tags: [],
timezone: 'browser',
};

8
packages/grafana-schema/src/schema/dashboard/v2alpha0/dashboard.schema.cue
Unescape View File

@ -447,6 +447,12 @@ QueryGroupKind: {
spec: QueryGroupSpec
}
TimeRangeOption: {
display: string | *"Last 6 hours"
from: string | *"now-6h"
to: string | *"now"
}
// Time configuration
// It defines the default time config for the time picker, the refresh picker for the specific dashboard.
TimeSettingsSpec: {
@ -463,7 +469,7 @@ TimeSettingsSpec: {
// Interval options available in the refresh picker dropdown.
autoRefreshIntervals: [...string] | *["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"] // v1: timepicker.refresh_intervals
// Selectable options available in the time picker dropdown. Has no effect on provisioned dashboard.
quickRanges: [...string] | *["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"] // v1: timepicker.time_options , not exposed in the UI
quickRanges?: [...TimeRangeOption] // v1: timepicker.quick_ranges , not exposed in the UI
// Whether timepicker is visible or not.
hideTimepicker: bool // v1: timepicker.hidden
// Day when the week starts. Expressed by the name of the day in lowercase, e.g. "monday".

1
packages/grafana-schema/src/schema/dashboard/v2alpha0/examples.ts
Unescape View File

@ -15,7 +15,6 @@ export const handyTestingSchema: DashboardV2Spec = {
from: 'now-1h',
hideTimepicker: false,
nowDelay: '1m',
quickRanges: [],
timezone: 'UTC',
to: 'now',
weekStart: 'monday',

27
packages/grafana-schema/src/schema/dashboard/v2alpha0/types.gen.ts
Unescape View File

@ -620,6 +620,18 @@ export const defaultQueryGroupKind = (): QueryGroupKind => ({
spec: defaultQueryGroupSpec(),
});
export interface TimeRangeOption {
display: string;
from: string;
to: string;
}
export const defaultTimeRangeOption = (): TimeRangeOption => ({
display: "Last 6 hours",
from: "now-6h",
to: "now",
});
// Time configuration
// It defines the default time config for the time picker, the refresh picker for the specific dashboard.
export interface TimeSettingsSpec {
@ -638,8 +650,8 @@ export interface TimeSettingsSpec {
// v1: timepicker.refresh_intervals
autoRefreshIntervals: string[];
// Selectable options available in the time picker dropdown. Has no effect on provisioned dashboard.
// v1: timepicker.time_options , not exposed in the UI
quickRanges: string[];
// v1: timepicker.quick_ranges , not exposed in the UI
quickRanges?: TimeRangeOption[];
// Whether timepicker is visible or not.
// v1: timepicker.hidden
hideTimepicker: boolean;
@ -668,17 +680,6 @@ export const defaultTimeSettingsSpec = (): TimeSettingsSpec => ({
"1h",
"2h",
"1d",
],
quickRanges: [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d",
],
hideTimepicker: false,
fiscalYearStartMonth: 0,

5
pkg/kinds/dashboard/dashboard_spec_gen.go
Unescape View File

@ -48,8 +48,6 @@ type TimePickerConfig struct {
Hidden *bool `json:"hidden,omitempty"`
// Interval options available in the refresh picker dropdown.
RefreshIntervals []string `json:"refresh_intervals,omitempty"`
// Selectable options available in the time picker dropdown. Has no effect on provisioned dashboard.
TimeOptions []string `json:"time_options,omitempty"`
// Quick ranges for time picker.
QuickRanges []TimeOption `json:"quick_ranges,omitempty"`
// Override the now time by entering a time delay. Use this option to accommodate known delays in data aggregation to avoid null values.
@ -61,7 +59,6 @@ func NewTimePickerConfig() *TimePickerConfig {
return &TimePickerConfig{
Hidden: (func(input bool) *bool { return &input })(false),
RefreshIntervals: []string{"5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"},
TimeOptions: []string{"5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"},
}
}
@ -927,7 +924,7 @@ func NewSpec() *Spec {
Editable: (func(input bool) *bool { return &input })(true),
GraphTooltip: (func(input DashboardCursorSync) *DashboardCursorSync { return &input })(DashboardCursorSyncOff),
FiscalYearStartMonth: (func(input uint8) *uint8 { return &input })(0),
SchemaVersion: 39,
SchemaVersion: 41,
}
}

3
pkg/services/dashboardimport/service/testdata/dashboard.json vendored
Unescape View File

@ -209,8 +209,7 @@
},
"timepicker": {
"now": true,
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "browser",
"title": "Prometheus 2.0 Stats",

11
pkg/services/provisioning/dashboards/testdata/test-dashboards/containing-id/dashboard1.json vendored
Unescape View File

@ -30,17 +30,6 @@
"collapse": false,
"enable": true,
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"refresh_intervals": [
"5s",
"10s",

11
pkg/services/provisioning/dashboards/testdata/test-dashboards/dashboard-with-uid/dashboard1.json vendored
Unescape View File

@ -134,17 +134,6 @@
"collapse": false,
"enable": true,
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"refresh_intervals": [
"5s",
"10s",

11
pkg/services/provisioning/dashboards/testdata/test-dashboards/folder-one/dashboard1.json vendored
Unescape View File

@ -134,17 +134,6 @@
"collapse": false,
"enable": true,
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"refresh_intervals": [
"5s",
"10s",

11
pkg/services/provisioning/dashboards/testdata/test-dashboards/folder-one/dashboard2.json vendored
Unescape View File

@ -134,17 +134,6 @@
"collapse": false,
"enable": true,
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"refresh_intervals": [
"5s",
"10s",

11
pkg/services/provisioning/dashboards/testdata/test-dashboards/folders-from-files-structure/folderOne/dashboard1.json vendored
Unescape View File

@ -134,17 +134,6 @@
"collapse": false,
"enable": true,
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"refresh_intervals": [
"5s",
"10s",

11
pkg/services/provisioning/dashboards/testdata/test-dashboards/folders-from-files-structure/folderTwo/dashboard2.json vendored
Unescape View File

@ -134,17 +134,6 @@
"collapse": false,
"enable": true,
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"refresh_intervals": [
"5s",
"10s",

11
pkg/services/provisioning/dashboards/testdata/test-dashboards/folders-from-files-structure/root.json vendored
Unescape View File

@ -134,17 +134,6 @@
"collapse": false,
"enable": true,
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"refresh_intervals": [
"5s",
"10s",

11
pkg/services/provisioning/dashboards/testdata/test-dashboards/one-dashboard/dashboard1.json vendored
Unescape View File

@ -134,17 +134,6 @@
"collapse": false,
"enable": true,
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"refresh_intervals": [
"5s",
"10s",

11
pkg/services/provisioning/dashboards/testdata/test-dashboards/two-dashboards-with-uid/dashboard1.json vendored
Unescape View File

@ -134,17 +134,6 @@
"collapse": false,
"enable": true,
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"refresh_intervals": [
"5s",
"10s",

11
pkg/services/provisioning/dashboards/testdata/test-dashboards/two-dashboards-with-uid/dashboard2.json vendored
Unescape View File

@ -134,17 +134,6 @@
"collapse": false,
"enable": true,
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"refresh_intervals": [
"5s",
"10s",

11
pkg/services/provisioning/dashboards/testdata/test-dashboards/unprovision/dashboard1.json vendored
Unescape View File

@ -134,17 +134,6 @@
"collapse": false,
"enable": true,
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"refresh_intervals": [
"5s",
"10s",

11
pkg/tests/api/dashboards/home.json
Unescape View File

@ -210,17 +210,6 @@
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
},
"timezone": "",

1
public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts
Unescape View File

@ -661,7 +661,6 @@ const customHomeDashboardV2Spec = {
to: 'now',
autoRefresh: '',
autoRefreshIntervals: ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
quickRanges: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
hideTimepicker: false,
fiscalYearStartMonth: 0,
},

2
public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts
Unescape View File

@ -584,7 +584,6 @@ describe('DashboardSceneSerializer', () => {
to: '',
autoRefresh: '',
autoRefreshIntervals: [],
quickRanges: [],
hideTimepicker: false,
fiscalYearStartMonth: 0,
timezone: '',
@ -646,7 +645,6 @@ describe('DashboardSceneSerializer', () => {
from: 'now-1h',
hideTimepicker: false,
nowDelay: undefined,
quickRanges: [],
timezone: 'browser',
to: 'now',
});

3
public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.ts
Unescape View File

@ -4,6 +4,7 @@ import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alp
import { AnnoKeyDashboardSnapshotOriginalUrl } from 'app/features/apiserver/types';
import { DashboardWithAccessInfo } from 'app/features/dashboard/api/types';
import { SaveDashboardAsOptions } from 'app/features/dashboard/components/SaveDashboard/types';
import { DASHBOARD_SCHEMA_VERSION } from 'app/features/dashboard/state/DashboardMigrator';
import {
getPanelPluginCounts,
getV1SchemaVariables,
@ -185,7 +186,7 @@ export class V2DashboardSerializer
if (this.initialSaveModel) {
return {
schemaVersion: 40,
schemaVersion: DASHBOARD_SCHEMA_VERSION,
uid: s.state.uid,
title: this.initialSaveModel.title,
panels_count: panelPluginIds.length || 0,

6
public/app/features/dashboard-scene/serialization/__snapshots__/transformSceneToSaveModel.test.ts.snap
Unescape View File

@ -280,7 +280,7 @@ exports[`transformSceneToSaveModel Given a scene with rows Should transform back
],
"preload": false,
"refresh": "",
"schemaVersion": 40,
"schemaVersion": 41,
"tags": [
"templating",
"gdev",
@ -548,7 +548,7 @@ exports[`transformSceneToSaveModel Given a simple scene with custom settings Sho
],
"preload": false,
"refresh": "5m",
"schemaVersion": 40,
"schemaVersion": 41,
"tags": [
"tag1",
"tag2",
@ -906,7 +906,7 @@ exports[`transformSceneToSaveModel Given a simple scene with variables Should tr
],
"preload": false,
"refresh": "",
"schemaVersion": 40,
"schemaVersion": 41,
"tags": [
"gdev",
"graph-ng",

1
public/app/features/dashboard-scene/serialization/__snapshots__/transformSceneToSaveModelSchemaV2.test.ts.snap
Unescape View File

@ -195,7 +195,6 @@ exports[`transformSceneToSaveModelSchemaV2 should transform scene to save model
"from": "now-1h",
"hideTimepicker": false,
"nowDelay": "1m",
"quickRanges": [],
"timezone": "UTC",
"to": "now",
"weekStart": "monday",

1
public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts
Unescape View File

@ -185,7 +185,6 @@ describe('transformSceneToSaveModel', () => {
timepicker: {
...dashboard_to_load1.timepicker,
refresh_intervals: ['5m', '15m', '30m', '1h'],
time_options: ['5m', '15m', '30m'],
hidden: true,
},
links: [{ ...NEW_LINK, title: 'Link 1' }],

7
public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts
Unescape View File

@ -89,7 +89,6 @@ export function transformSceneToSaveModelSchemaV2(scene: DashboardScene, isSnaps
to: timeRange.to,
autoRefresh: refreshPicker?.state.refresh || '',
autoRefreshIntervals: refreshPicker?.state.intervals,
quickRanges: [], //FIXME is coming timepicker.time_options,
hideTimepicker: controlsState?.hideTimeControls ?? false,
weekStart: timeRange.weekStart,
fiscalYearStartMonth: timeRange.fiscalYearStartMonth,
@ -502,7 +501,11 @@ function validateDashboardSchemaV2(dash: unknown): dash is DashboardV2Spec {
if (!('autoRefreshIntervals' in dash.timeSettings) || !Array.isArray(dash.timeSettings.autoRefreshIntervals)) {
throw new Error('AutoRefreshIntervals is not an array');
}
if (!('quickRanges' in dash.timeSettings) || !Array.isArray(dash.timeSettings.quickRanges)) {
if (
'quickRanges' in dash.timeSettings &&
dash.timeSettings.quickRanges &&
!Array.isArray(dash.timeSettings.quickRanges)
) {
throw new Error('QuickRanges is not an array');
}
if (!('hideTimepicker' in dash.timeSettings) || typeof dash.timeSettings.hideTimepicker !== 'boolean') {

1
public/app/features/dashboard-scene/settings/version-history/__mocks__/dashboardHistoryMocks.ts
Unescape View File

@ -166,7 +166,6 @@ export function restore(version: number, restoredFrom?: number) {
},
timepicker: {
refresh_intervals: ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
},
timezone: 'utc',
title: 'History Dashboard',

29
public/app/features/dashboard/api/ResponseTransformers.test.ts
Unescape View File

@ -113,8 +113,19 @@ describe('ResponseTransformers', () => {
timepicker: {
refresh_intervals: ['5s', '10s', '30s'],
hidden: false,
time_options: ['5m', '15m', '1h'],
nowDelay: '1m',
quick_ranges: [
{
display: 'Last 6 hours',
from: 'now-6h',
to: 'now',
},
{
display: 'Last 7 days',
from: 'now-7d',
to: 'now',
},
],
},
fiscalYearStartMonth: 1,
weekStart: 'monday',
@ -462,7 +473,7 @@ describe('ResponseTransformers', () => {
expect(spec.timeSettings.autoRefresh).toBe(dashboardV1.refresh);
expect(spec.timeSettings.autoRefreshIntervals).toEqual(dashboardV1.timepicker?.refresh_intervals);
expect(spec.timeSettings.hideTimepicker).toBe(dashboardV1.timepicker?.hidden);
expect(spec.timeSettings.quickRanges).toEqual(dashboardV1.timepicker?.time_options);
expect(spec.timeSettings.quickRanges).toEqual(dashboardV1.timepicker?.quick_ranges);
expect(spec.timeSettings.nowDelay).toBe(dashboardV1.timepicker?.nowDelay);
expect(spec.timeSettings.fiscalYearStartMonth).toBe(dashboardV1.fiscalYearStartMonth);
expect(spec.timeSettings.weekStart).toBe(dashboardV1.weekStart);
@ -655,7 +666,18 @@ describe('ResponseTransformers', () => {
autoRefresh: '5m',
autoRefreshIntervals: ['5s', '10s', '30s'],
hideTimepicker: false,
quickRanges: ['5m', '15m', '1h'],
quickRanges: [
{
display: 'Last 6 hours',
from: 'now-6h',
to: 'now',
},
{
display: 'Last 7 days',
from: 'now-7d',
to: 'now',
},
],
nowDelay: '1m',
fiscalYearStartMonth: 1,
weekStart: 'monday',
@ -730,7 +752,6 @@ describe('ResponseTransformers', () => {
expect(dashboard.refresh).toBe(dashboardV2.spec.timeSettings.autoRefresh);
expect(dashboard.timepicker?.refresh_intervals).toEqual(dashboardV2.spec.timeSettings.autoRefreshIntervals);
expect(dashboard.timepicker?.hidden).toBe(dashboardV2.spec.timeSettings.hideTimepicker);
expect(dashboard.timepicker?.time_options).toEqual(dashboardV2.spec.timeSettings.quickRanges);
expect(dashboard.timepicker?.nowDelay).toBe(dashboardV2.spec.timeSettings.nowDelay);
expect(dashboard.fiscalYearStartMonth).toBe(dashboardV2.spec.timeSettings.fiscalYearStartMonth);
expect(dashboard.weekStart).toBe(dashboardV2.spec.timeSettings.weekStart);

4
public/app/features/dashboard/api/ResponseTransformers.ts
Unescape View File

@ -160,7 +160,7 @@ export function ensureV2Response(
autoRefreshIntervals: dashboard.timepicker?.refresh_intervals || timeSettingsDefaults.autoRefreshIntervals,
fiscalYearStartMonth: dashboard.fiscalYearStartMonth || timeSettingsDefaults.fiscalYearStartMonth,
hideTimepicker: dashboard.timepicker?.hidden || timeSettingsDefaults.hideTimepicker,
quickRanges: dashboard.timepicker?.time_options || timeSettingsDefaults.quickRanges,
quickRanges: dashboard.timepicker?.quick_ranges,
// casting WeekStart here to avoid editing old schema
weekStart: (dashboard.weekStart as WeekStart) || timeSettingsDefaults.weekStart,
nowDelay: dashboard.timepicker?.nowDelay || timeSettingsDefaults.nowDelay,
@ -252,7 +252,7 @@ export function ensureV1Response(
timepicker: {
refresh_intervals: spec.timeSettings.autoRefreshIntervals,
hidden: spec.timeSettings.hideTimepicker,
time_options: spec.timeSettings.quickRanges,
quick_ranges: spec.timeSettings.quickRanges,
nowDelay: spec.timeSettings.nowDelay,
},
fiscalYearStartMonth: spec.timeSettings.fiscalYearStartMonth,

1
public/app/features/dashboard/components/DashboardSettings/GeneralSettings.test.tsx
Unescape View File

@ -23,7 +23,6 @@ const setupTestContext = (options: Partial<Props>) => {
description: 'test dashboard description',
timepicker: {
refresh_intervals: ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d', '2d'],
time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
hidden: false,
},
timezone: 'utc',

2
public/app/features/dashboard/containers/PublicDashboardPage.test.tsx
Unescape View File

@ -245,7 +245,7 @@ describe('PublicDashboardPage', () => {
...dashboardBase,
getModel: () =>
getTestDashboard({
timepicker: { hidden: false, refresh_intervals: [], time_options: [] },
timepicker: { hidden: false, refresh_intervals: [] },
}),
},
});

22
public/app/features/dashboard/state/DashboardMigrator.test.ts
Unescape View File

@ -2428,6 +2428,28 @@ describe('when migrating variable refresh to on dashboard load', () => {
});
});
describe('when migrating time_options in timepicker', () => {
let model: DashboardModel;
it('should remove the property', () => {
model = new DashboardModel({
timepicker: {
//@ts-expect-error
time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
},
});
expect(model.timepicker).not.toHaveProperty('time_options');
});
it('should not throw with empty timepicker', () => {
//@ts-expect-error
model = new DashboardModel({});
expect(model.timepicker).not.toHaveProperty('time_options');
});
});
function createRow(options: any, panelDescriptions: any[]) {
const PANEL_HEIGHT_STEP = GRID_CELL_HEIGHT + GRID_CELL_VMARGIN;
const { collapse, showTitle, title, repeat, repeatIteration } = options;

12
public/app/features/dashboard/state/DashboardMigrator.ts
Unescape View File

@ -81,7 +81,7 @@ type PanelSchemeUpgradeHandler = (panel: PanelModel) => PanelModel;
* kinds/dashboard/dashboard_kind.cue
* Example PR: #87712
*/
export const DASHBOARD_SCHEMA_VERSION = 40;
export const DASHBOARD_SCHEMA_VERSION = 41;
export class DashboardMigrator {
dashboard: DashboardModel;
@ -905,12 +905,20 @@ export class DashboardMigrator {
}
if (oldVersion < 40) {
// In old ashboards refresh property can be a boolean
// In old dashboards refresh property can be a boolean
if (typeof this.dashboard.refresh !== 'string') {
this.dashboard.refresh = '';
}
}
if (oldVersion < 41) {
// time_options is a legacy property that was not used since grafana version 5
// therefore deprecating this property from the schema
if ('time_options' in this.dashboard.timepicker) {
delete this.dashboard.timepicker.time_options;
}
}
/**
* -==- Add migration here -==-
* Your migration should go below the previous

3
public/app/plugins/datasource/grafana-testdata-datasource/dashboards/streaming.json
Unescape View File

@ -199,8 +199,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Simple Streaming Example",

1
public/app/plugins/datasource/graphite/dashboards/carbon_metrics.json
Unescape View File

@ -154,7 +154,6 @@
"now": true,
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"status": "Stable",
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"],
"type": "timepicker"
},
"templating": {

1
public/app/plugins/datasource/graphite/dashboards/metrictank.json
Unescape View File

@ -4771,7 +4771,6 @@
"now": true,
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"status": "Stable",
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"],
"type": "timepicker"
},
"timezone": "utc",

3
public/app/plugins/datasource/prometheus/dashboards/grafana_stats.json
Unescape View File

@ -1177,8 +1177,7 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Grafana metrics",

3
public/app/plugins/datasource/prometheus/dashboards/prometheus_2_stats.json
Unescape View File

@ -1393,8 +1393,7 @@
},
"timepicker": {
"now": true,
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "browser",
"title": "Prometheus 2.0 Stats",

3
public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json
Unescape View File

@ -824,8 +824,7 @@
},
"timepicker": {
"now": true,
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "browser",
"title": "Prometheus Stats",

1
public/dashboards/default.json
Unescape View File

@ -131,7 +131,6 @@
"collapse": false,
"enable": true,
"status": "Stable",
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"],
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"now": true
}

1
public/dashboards/home.json
Unescape View File

@ -68,7 +68,6 @@
"timepicker": {
"hidden": true,
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"],
"type": "timepicker"
},
"timezone": "browser",

1
public/dashboards/template_vars.json
Unescape View File

@ -169,7 +169,6 @@
"notice": false,
"enable": true,
"status": "Stable",
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"],
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"now": true
}

2
scripts/import_many_dashboards.sh
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save