diff --git a/packages/grafana-ui/src/components/DateTimePickers/RelativeTimeRangePicker/RelativeTimeRangePicker.tsx b/packages/grafana-ui/src/components/DateTimePickers/RelativeTimeRangePicker/RelativeTimeRangePicker.tsx
index ad419960600..2c93cc5a506 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/RelativeTimeRangePicker/RelativeTimeRangePicker.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/RelativeTimeRangePicker/RelativeTimeRangePicker.tsx
@@ -14,7 +14,6 @@ import { Field } from '../../Forms/Field';
import { Icon } from '../../Icon/Icon';
import { getInputStyles, Input } from '../../Input/Input';
import { ScrollContainer } from '../../ScrollContainer/ScrollContainer';
-import { Tooltip } from '../../Tooltip/Tooltip';
import { TimePickerTitle } from '../TimeRangePicker/TimePickerTitle';
import { TimeRangeList } from '../TimeRangePicker/TimeRangeList';
import { quickOptions } from '../options';
@@ -170,13 +169,7 @@ export function RelativeTimeRangePicker(props: RelativeTimeRangePickerProps) {
- } placement="bottom" theme="info">
-
-
- Specify time range
-
-
-
+ Specify time range
{
- const styles = useStyles2(toolTipStyles);
- return (
- <>
-
-
- Supported formats: now-[digit]s/m/h/d/w
-
-
-
-
- Example: to select a time range from 10 minutes ago to now
-
-
-
- From: now-10m To: now
-
-
-
- For more information see{' '}
-
- docs
-
- .
-
-
- >
- );
-};
-
-const toolTipStyles = (theme: GrafanaTheme2) => ({
- supported: css({
- marginBottom: theme.spacing(1),
- }),
- tooltip: css({
- margin: 0,
- }),
- link: css({
- marginTop: theme.spacing(1),
- }),
-});
-
const getStyles = (fromError?: string, toError?: string) => (theme: GrafanaTheme2) => {
const inputStyles = getInputStyles({ theme, invalid: false });
const bodyMinimumHeight = 250;
diff --git a/public/app/core/utils/richHistory.ts b/public/app/core/utils/richHistory.ts
index 8816613a51b..7b261a13b06 100644
--- a/public/app/core/utils/richHistory.ts
+++ b/public/app/core/utils/richHistory.ts
@@ -202,8 +202,8 @@ export const createUrlFromRichHistory = (query: RichHistoryQuery) => {
const exploreState: ExploreUrlState = {
/* Default range, as we are not saving timerange in rich history */
range: {
- from: t('explore.rich-history-utils.default-from', 'now-1h'),
- to: t('explore.rich-history-utils.default-to', 'now'),
+ from: 'now-1h',
+ to: 'now',
},
datasource: query.datasourceName,
queries: query.queries,
diff --git a/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
index 03faa36a160..5072a676597 100644
--- a/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
@@ -123,7 +123,7 @@ export class TimePickerSettings extends PureComponent {
label={t('dashboard-settings.time-picker.refresh-live-dashboards-label', 'Refresh live dashboards')}
description={t(
'dashboard-settings.time-picker.refresh-live-dashboards-description',
- "Continuously re-draw panels where the time range references 'now'"
+ 'Continuously update panels when the time range includes the current time'
)}
>
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 1c8e02997c4..163e7a4ff60 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -4288,7 +4288,7 @@
"hide-time-picker": "Hide time picker",
"now-delay-description": "Exclude recent data that may be incomplete.",
"now-delay-label": "Now delay",
- "refresh-live-dashboards-description": "Continuously re-draw panels where the time range references 'now'",
+ "refresh-live-dashboards-description": "Continuously update panels when the time range includes the current time",
"refresh-live-dashboards-label": "Refresh live dashboards",
"time-options-label": "Time options",
"time-zone-label": "Time zone",
@@ -4859,8 +4859,6 @@
"rich-history-utils": {
"a-week-ago": "a week ago",
"days-ago": "{{num}} days ago",
- "default-from": "now-1h",
- "default-to": "now",
"today": "today",
"two-weeks-ago": "two weeks ago",
"yesterday": "yesterday"
@@ -8522,15 +8520,11 @@
"apply": "Apply time range",
"aria-role": "Time range selection",
"default-title": "Time ranges",
- "example": "Example: to select a time range from 10 minutes ago to now",
- "example-details": "From: now-10m To: now",
"example-title": "Example time ranges",
"from-label": "From",
"from-to": "{{timeOptionFrom}} to {{timeOptionTo}}",
- "more-info": "For more information see <2>docs <1>1>2>.",
- "specify": "Specify time range <1>1>",
+ "specify": "Specify time range",
"submit-button-label": "TimePicker submit button",
- "supported-formats": "Supported formats: <1>now-[digit]s/m/h/d/w1>",
"to-label": "To"
},
"zone": {