Screencasts
diff --git a/docs/sources/installation/upgrading.md b/docs/sources/installation/upgrading.md index 6cedf46afa147..bd2a5434b25fd 100644 --- a/docs/sources/installation/upgrading.md +++ b/docs/sources/installation/upgrading.md @@ -157,6 +157,7 @@ The default cookie name for storing the auth token is `grafana_session`. you can Datasources store passwords and basic auth passwords in secureJsonData encrypted by default. Existing datasource will keep working with unencrypted passwords. If you want to migrate to encrypted storage for your existing datasources you can do that by: + - For datasources created through UI, you need to go to datasource config, re enter the password or basic auth password and save the datasource. - For datasources created by provisioning, you need to update your config file and use secureJsonData.password or diff --git a/docs/sources/plugins/developing/auth-for-datasources.md b/docs/sources/plugins/developing/auth-for-datasources.md index c03793e745ff2..49cd747e2b640 100644 --- a/docs/sources/plugins/developing/auth-for-datasources.md +++ b/docs/sources/plugins/developing/auth-for-datasources.md @@ -51,6 +51,36 @@ then the Grafana proxy will transform it into "https://management.azure.com/foo/ The `method` parameter is optional. It can be set to any HTTP verb to provide more fine-grained control. +### Dynamic Routes + +When using routes, you can also reference a variable stored in JsonData or SecureJsonData which will be interpolated when connecting to the datasource. + +With JsonData: +```json +"routes": [ + { + "path": "custom/api/v5/*", + "method": "*", + "url": "{{.JsonData.dynamicUrl}}", + ... + }, +] +``` + +With SecureJsonData: +```json +"routes": [{ + "path": "custom/api/v5/*", + "method": "*", + "url": "{{.SecureJsonData.dynamicUrl}}", + ... +}] +``` + +In the above example, the app is able to set the value for `dynamicUrl` in JsonData or SecureJsonData and it will be replaced on-demand. + +An app using this feature can be found [here](https://github.com/grafana/kentik-app). + ## Encrypting Sensitive Data When a user saves a password or secret with your datasource plugin's Config page, then you can save data to a column in the datasource table called `secureJsonData` that is an encrypted blob. Any data saved in the blob is encrypted by Grafana and can only be decrypted by the Grafana server on the backend. This means once a password is saved, no sensitive data is sent to the browser. If the password is saved in the `jsonData` blob or the `password` field then it is unencrypted and anyone with Admin access (with the help of Chrome Developer Tools) can read it. diff --git a/jest.config.e2e.js b/jest.config.e2e.js new file mode 100644 index 0000000000000..feb6f7d4f3a34 --- /dev/null +++ b/jest.config.e2e.js @@ -0,0 +1,15 @@ +require('module-alias/register'); + +module.exports = { + verbose: false, + transform: { + '^.+\\.(ts|tsx)$': 'ts-jest', + }, + moduleDirectories: ['node_modules', 'public'], + roots: ['
+ Show
+
+
+ {values ? (
+
- Show
-
- {values ? (
-
- Calc
-
- )}
- {children}
-
-
@@ -64,49 +66,47 @@ export class FieldPropertiesEditor extends PureComponent {
);
return (
-
- <>
-
+ | any,
@@ -53,10 +53,13 @@ export const sharedSingleStatMigrationCheck = (panel: PanelModel s.id);
}
}
+
field.min = old.minValue;
field.max = old.maxValue;
- return omit(old, 'valueMappings', 'thresholds', 'valueOptions');
+ // remove old props
+ return omit(old, 'valueMappings', 'thresholds', 'valueOptions', 'minValue', 'maxValue');
}
+
return panel.options;
};
diff --git a/packages/grafana-ui/src/components/Switch/Switch.story.tsx b/packages/grafana-ui/src/components/Switch/Switch.story.tsx
new file mode 100644
index 0000000000000..c3cb6fef76d48
--- /dev/null
+++ b/packages/grafana-ui/src/components/Switch/Switch.story.tsx
@@ -0,0 +1,22 @@
+import React, { useState } from 'react';
+
+import { storiesOf } from '@storybook/react';
+import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
+import { Switch } from './Switch';
+import { text } from '@storybook/addon-knobs';
+
+const getKnobs = () => {
+ return {
+ label: text('Label Text', 'Label'),
+ };
+};
+
+const SwitchWrapper = () => {
+ const { label } = getKnobs();
+ const [checked, setChecked] = useState(false);
+ return setChecked(!checked)} />;
+};
+
+const story = storiesOf('UI/Switch', module);
+story.addDecorator(withCenteredStory);
+story.add('switch', () => {
diff --git a/packages/grafana-ui/src/components/Table/Table.tsx b/packages/grafana-ui/src/components/Table/Table.tsx
index 3d759ec1ae521..72b7d6392b938 100644
--- a/packages/grafana-ui/src/components/Table/Table.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.tsx
@@ -14,7 +14,6 @@ import { Themeable } from '../../types/theme';
import { sortSeriesData } from '../../utils/processSeriesData';
-import { SeriesData, InterpolateFunction } from '@grafana/ui';
import {
TableCellBuilder,
ColumnStyle,
@@ -23,6 +22,8 @@ import {
simpleCellBuilder,
} from './TableCellBuilder';
import { stringToJsRegex } from '../../utils/index';
+import { SeriesData } from '../../types/data';
+import { InterpolateFunction } from '../../types/panel';
export interface Props extends Themeable {
data: SeriesData;
diff --git a/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx b/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx
index 2d11f10c8ce2a..f7e54d7bb5d7e 100644
--- a/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx
+++ b/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx
@@ -3,11 +3,11 @@ import _ from 'lodash';
import React, { ReactElement } from 'react';
import { GridCellProps } from 'react-virtualized';
import { Table, Props } from './Table';
-import moment from 'moment';
-import { ValueFormatter } from '../../utils/index';
+import { ValueFormatter, getValueFormat, getColorFromHexRgbOrName } from '../../utils/index';
import { GrafanaTheme } from '../../types/theme';
-import { getValueFormat, getColorFromHexRgbOrName, Field } from '@grafana/ui';
import { InterpolateFunction } from '../../types/panel';
+import { Field } from '../../types/data';
+import { dateTime } from '../../utils/moment_wrapper';
export interface TableCellBuilderOptions {
value: any;
@@ -96,7 +96,7 @@ export function getCellBuilder(schema: Field, style: ColumnStyle | null, props:
if (_.isArray(v)) {
v = v[0];
}
- let date = moment(v);
+ let date = dateTime(v);
if (false) {
// TODO?????? this.props.isUTC) {
date = date.utc();
diff --git a/packages/grafana-ui/src/components/Table/examples.ts b/packages/grafana-ui/src/components/Table/examples.ts
index efeac94969d1e..9fce97f49d479 100644
--- a/packages/grafana-ui/src/components/Table/examples.ts
+++ b/packages/grafana-ui/src/components/Table/examples.ts
@@ -1,7 +1,6 @@
import { SeriesData } from '../../types/data';
import { ColumnStyle } from './TableCellBuilder';
-
-import { getColorDefinitionByName } from '@grafana/ui';
+import { getColorDefinitionByName } from '../../utils/namedColorsPalette';
const SemiDarkOrange = getColorDefinitionByName('semi-dark-orange');
diff --git a/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
index 12206b6f8bfa4..123c9085a88e4 100644
--- a/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
+++ b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
@@ -1,10 +1,11 @@
import React, { PureComponent, ChangeEvent } from 'react';
import { Threshold } from '../../types';
-import { ColorPicker } from '..';
-import { Input, PanelOptionsGroup } from '..';
import { colors } from '../../utils';
import { ThemeContext } from '../../themes';
import { getColorFromHexRgbOrName } from '../../utils';
+import { Input } from '../Input/Input';
+import { ColorPicker } from '../ColorPicker/ColorPicker';
+import { PanelOptionsGroup } from '../PanelOptionsGroup/PanelOptionsGroup';
export interface Props {
thresholds: Threshold[];
diff --git a/packages/grafana-ui/src/components/TimePicker/TimePicker.story.tsx b/packages/grafana-ui/src/components/TimePicker/TimePicker.story.tsx
index 18cdf82258356..36c6eaf3f1116 100644
--- a/packages/grafana-ui/src/components/TimePicker/TimePicker.story.tsx
+++ b/packages/grafana-ui/src/components/TimePicker/TimePicker.story.tsx
@@ -1,11 +1,12 @@
import React from 'react';
-import moment, { Moment } from 'moment';
import { storiesOf } from '@storybook/react';
import { action } from '@storybook/addon-actions';
import { TimePicker } from './TimePicker';
import { UseState } from '../../utils/storybook/UseState';
import { withRighAlignedStory } from '../../utils/storybook/withRightAlignedStory';
+import { TimeFragment } from '../../types/time';
+import { dateTime } from '../../utils/moment_wrapper';
const TimePickerStories = storiesOf('UI/TimePicker', module);
export const popoverOptions = {
@@ -177,9 +178,9 @@ TimePickerStories.add('default', () => {
return (
{(value, updateValue) => {
diff --git a/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx b/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx
index 54d9cce30fd69..5fb625df25716 100644
--- a/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx
+++ b/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx
@@ -1,12 +1,13 @@
import React, { PureComponent } from 'react';
-import moment from 'moment';
-import { TimeRange, TimeOptions, TimeOption, SelectOptionItem } from '@grafana/ui';
import { ButtonSelect } from '../Select/ButtonSelect';
import { mapTimeOptionToTimeRange, mapTimeRangeToRangeString } from './time';
import { Props as TimePickerPopoverProps } from './TimePickerPopover';
import { TimePickerOptionGroup } from './TimePickerOptionGroup';
import { PopperContent } from '../Tooltip/PopperController';
import { Timezone } from '../../utils/datemath';
+import { TimeRange, TimeOption, TimeOptions } from '../../types/time';
+import { SelectOptionItem } from '../Select/Select';
+import { isDateTime } from '../../utils/moment_wrapper';
export interface Props {
value: TimeRange;
@@ -265,7 +266,7 @@ export class TimePicker extends PureComponent {
} = this.props;
const options = this.mapTimeOptionsToSelectOptionItems(selectTimeOptions);
const rangeString = mapTimeRangeToRangeString(value);
- const isAbsolute = moment.isMoment(value.raw.to);
+ const isAbsolute = isDateTime(value.raw.to);
return (
@@ -236,10 +233,7 @@ exports[`Render should render component 1`] = `
className="btn btn-secondary"
onClick={[Function]}
>
-
- How to add an alert
+ How to add an alert
- Unit
-
- {showMinMax && (
- <>
-
+ Unit
+
+ {showMinMax && (
+ <>
+
diff --git a/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.story.tsx b/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.story.tsx
index 3cc044430b151..5a6687d17fc50 100644
--- a/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.story.tsx
+++ b/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.story.tsx
@@ -1,18 +1,18 @@
import React from 'react';
import { storiesOf } from '@storybook/react';
import { action } from '@storybook/addon-actions';
-import { Moment } from 'moment';
import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
import { TimePickerCalendar } from './TimePickerCalendar';
import { UseState } from '../../utils/storybook/UseState';
+import { TimeFragment } from '../../types/time';
const TimePickerCalendarStories = storiesOf('UI/TimePicker/TimePickerCalendar', module);
TimePickerCalendarStories.addDecorator(withCenteredStory);
TimePickerCalendarStories.add('default', () => (
-
+
{(value, updateValue) => {
return (
void;
+ onChange: (value: DateTime) => void;
}
export class TimePickerCalendar extends PureComponent {
@@ -22,15 +22,15 @@ export class TimePickerCalendar extends PureComponent {
return;
}
- onChange(moment(date));
+ onChange(dateTime(date));
};
render() {
const { value, isTimezoneUtc, roundup, timezone } = this.props;
- const dateValue = moment.isMoment(value)
+ const dateValue = isDateTime(value)
? value.toDate()
- : stringToMoment(value, isTimezoneUtc, roundup, timezone).toDate();
- const calendarValue = dateValue instanceof Date && !isNaN(dateValue.getTime()) ? dateValue : moment().toDate();
+ : stringToDateTimeType(value, isTimezoneUtc, roundup, timezone).toDate();
+ const calendarValue = dateValue instanceof Date && !isNaN(dateValue.getTime()) ? dateValue : dateTime().toDate();
return (
{
return isValid;
}
- const parsed = stringToMoment(value, isTimezoneUtc);
+ const parsed = stringToDateTimeType(value, isTimezoneUtc);
const isValid = parsed.isValid();
return isValid;
};
@@ -35,7 +34,7 @@ export class TimePickerInput extends PureComponent {
};
valueToString = (value: TimeFragment) => {
- if (moment.isMoment(value)) {
+ if (isDateTime(value)) {
return value.format(TIME_FORMAT);
} else {
return value;
diff --git a/packages/grafana-ui/src/components/TimePicker/TimePickerOptionGroup.story.tsx b/packages/grafana-ui/src/components/TimePicker/TimePickerOptionGroup.story.tsx
index e5d104d9921a3..795c536ece25b 100644
--- a/packages/grafana-ui/src/components/TimePicker/TimePickerOptionGroup.story.tsx
+++ b/packages/grafana-ui/src/components/TimePicker/TimePickerOptionGroup.story.tsx
@@ -1,12 +1,12 @@
import React, { ComponentType } from 'react';
import { storiesOf } from '@storybook/react';
-import moment from 'moment';
import { action } from '@storybook/addon-actions';
import { TimePickerOptionGroup } from './TimePickerOptionGroup';
import { TimeRange } from '../../types/time';
import { withRighAlignedStory } from '../../utils/storybook/withRightAlignedStory';
import { popoverOptions } from './TimePicker.story';
+import { dateTime } from '../../utils/moment_wrapper';
const TimePickerOptionGroupStories = storiesOf('UI/TimePicker/TimePickerOptionGroup', module);
@@ -21,7 +21,7 @@ const data = {
action('onPopoverClose fired')(timeRange);
},
popoverProps: {
- value: { from: moment(), to: moment(), raw: { from: 'now/d', to: 'now/d' } },
+ value: { from: dateTime(), to: dateTime(), raw: { from: 'now/d', to: 'now/d' } },
options: popoverOptions,
isTimezoneUtc: false,
onChange: (timeRange: TimeRange) => {
diff --git a/packages/grafana-ui/src/components/TimePicker/TimePickerOptionGroup.tsx b/packages/grafana-ui/src/components/TimePicker/TimePickerOptionGroup.tsx
index a7ff0c2587bc2..017668b40569e 100644
--- a/packages/grafana-ui/src/components/TimePicker/TimePickerOptionGroup.tsx
+++ b/packages/grafana-ui/src/components/TimePicker/TimePickerOptionGroup.tsx
@@ -1,8 +1,8 @@
import React, { PureComponent, createRef } from 'react';
import { GroupProps } from 'react-select/lib/components/Group';
-import { Popper } from '@grafana/ui/src/components/Tooltip/Popper';
import { Props as TimePickerProps, TimePickerPopover } from './TimePickerPopover';
-import { TimeRange } from '@grafana/ui';
+import { TimeRange } from '../../types/time';
+import { Popper } from '../Tooltip/Popper';
export interface DataProps {
onPopoverOpen: () => void;
diff --git a/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.story.tsx b/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.story.tsx
index 38f5e48bbe0a5..03dfaa1fb63f1 100644
--- a/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.story.tsx
+++ b/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.story.tsx
@@ -1,12 +1,12 @@
import React from 'react';
import { action } from '@storybook/addon-actions';
-import moment, { Moment } from 'moment';
import { storiesOf } from '@storybook/react';
import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
import { TimePickerPopover } from './TimePickerPopover';
import { UseState } from '../../utils/storybook/UseState';
import { popoverOptions } from './TimePicker.story';
+import { dateTime, DateTime } from '../../utils/moment_wrapper';
const TimePickerPopoverStories = storiesOf('UI/TimePicker/TimePickerPopover', module);
@@ -15,9 +15,9 @@ TimePickerPopoverStories.addDecorator(withCenteredStory);
TimePickerPopoverStories.add('default', () => (
{(value, updateValue) => {
diff --git a/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.tsx b/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.tsx
index 0367659808968..37c05863a03a2 100644
--- a/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.tsx
+++ b/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.tsx
@@ -1,11 +1,11 @@
import React, { Component, SyntheticEvent } from 'react';
import { TimeRange, TimeOptions, TimeOption } from '../../types/time';
-import { Moment } from 'moment';
import { TimePickerCalendar } from './TimePickerCalendar';
import { TimePickerInput } from './TimePickerInput';
import { mapTimeOptionToTimeRange } from './time';
import { Timezone } from '../../utils/datemath';
+import { DateTime } from '../../utils/moment_wrapper';
export interface Props {
value: TimeRange;
@@ -42,13 +42,13 @@ export class TimePickerPopover extends Component {
});
};
- onFromCalendarChanged = (value: Moment) => {
+ onFromCalendarChanged = (value: DateTime) => {
this.setState({
value: { ...this.state.value, raw: { ...this.state.value.raw, from: value } },
});
};
- onToCalendarChanged = (value: Moment) => {
+ onToCalendarChanged = (value: DateTime) => {
this.setState({
value: { ...this.state.value, raw: { ...this.state.value.raw, to: value } },
});
diff --git a/packages/grafana-ui/src/components/TimePicker/time.ts b/packages/grafana-ui/src/components/TimePicker/time.ts
index 77a554b38de4f..f697456eeb378 100644
--- a/packages/grafana-ui/src/components/TimePicker/time.ts
+++ b/packages/grafana-ui/src/components/TimePicker/time.ts
@@ -1,40 +1,39 @@
-import moment, { Moment } from 'moment';
-import { TimeOption, TimeRange, TIME_FORMAT } from '@grafana/ui';
-
-import * as dateMath from '@grafana/ui/src/utils/datemath';
-import { describeTimeRange } from '@grafana/ui/src/utils/rangeutil';
+import { TimeOption, TimeRange, TIME_FORMAT } from '../../types/time';
+import { describeTimeRange } from '../../utils/rangeutil';
+import * as dateMath from '../../utils/datemath';
+import { dateTime, DateTime, toUtc } from '../../utils/moment_wrapper';
export const mapTimeOptionToTimeRange = (
timeOption: TimeOption,
isTimezoneUtc: boolean,
timezone?: dateMath.Timezone
): TimeRange => {
- const fromMoment = stringToMoment(timeOption.from, isTimezoneUtc, false, timezone);
- const toMoment = stringToMoment(timeOption.to, isTimezoneUtc, true, timezone);
+ const fromMoment = stringToDateTimeType(timeOption.from, isTimezoneUtc, false, timezone);
+ const toMoment = stringToDateTimeType(timeOption.to, isTimezoneUtc, true, timezone);
return { from: fromMoment, to: toMoment, raw: { from: timeOption.from, to: timeOption.to } };
};
-export const stringToMoment = (
+export const stringToDateTimeType = (
value: string,
isTimezoneUtc: boolean,
roundUp?: boolean,
timezone?: dateMath.Timezone
-): Moment => {
+): DateTime => {
if (value.indexOf('now') !== -1) {
if (!dateMath.isValid(value)) {
- return moment();
+ return dateTime();
}
const parsed = dateMath.parse(value, roundUp, timezone);
- return parsed || moment();
+ return parsed || dateTime();
}
if (isTimezoneUtc) {
- return moment.utc(value, TIME_FORMAT);
+ return toUtc(value, TIME_FORMAT);
}
- return moment(value, TIME_FORMAT);
+ return dateTime(value, TIME_FORMAT);
};
export const mapTimeRangeToRangeString = (timeRange: TimeRange): string => {
diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts
index fee2c2bff0aee..5a4f58626c6a7 100644
--- a/packages/grafana-ui/src/components/index.ts
+++ b/packages/grafana-ui/src/components/index.ts
@@ -33,6 +33,7 @@ export { UnitPicker } from './UnitPicker/UnitPicker';
export { StatsPicker } from './StatsPicker/StatsPicker';
export { Input, InputStatus } from './Input/Input';
export { RefreshPicker } from './RefreshPicker/RefreshPicker';
+export { List } from './List/List';
// Renderless
export { SetInterval } from './SetInterval/SetInterval';
diff --git a/packages/grafana-ui/src/types/data.ts b/packages/grafana-ui/src/types/data.ts
index 9eb75ea403060..678efc40f0074 100644
--- a/packages/grafana-ui/src/types/data.ts
+++ b/packages/grafana-ui/src/types/data.ts
@@ -70,6 +70,7 @@ export interface Column {
}
export interface TableData extends QueryResultBase {
+ name?: string;
columns: Column[];
rows: any[][];
}
diff --git a/packages/grafana-ui/src/types/datasource.ts b/packages/grafana-ui/src/types/datasource.ts
index f918063d06bcf..2622efd3ed50c 100644
--- a/packages/grafana-ui/src/types/datasource.ts
+++ b/packages/grafana-ui/src/types/datasource.ts
@@ -1,4 +1,4 @@
-import { ComponentClass } from 'react';
+import { ComponentType, ComponentClass } from 'react';
import { TimeRange } from './time';
import { PluginMeta, GrafanaPlugin } from './plugin';
import { TableData, TimeSeries, SeriesData, LoadingState } from './data';
@@ -11,19 +11,20 @@ export interface DataSourcePluginOptionsEditorProps {
}
export class DataSourcePlugin<
- TOptions extends DataSourceJsonData = DataSourceJsonData,
- TQuery extends DataQuery = DataQuery
+ DSType extends DataSourceApi,
+ TQuery extends DataQuery = DataQuery,
+ TOptions extends DataSourceJsonData = DataSourceJsonData
> extends GrafanaPlugin {
- DataSourceClass: DataSourceConstructor;
- components: DataSourcePluginComponents;
+ DataSourceClass: DataSourceConstructor;
+ components: DataSourcePluginComponents;
- constructor(DataSourceClass: DataSourceConstructor) {
+ constructor(DataSourceClass: DataSourceConstructor) {
super();
this.DataSourceClass = DataSourceClass;
this.components = {};
}
- setConfigEditor(editor: React.ComponentType>>) {
+ setConfigEditor(editor: ComponentType>>) {
this.components.ConfigEditor = editor;
return this;
}
@@ -38,12 +39,12 @@ export class DataSourcePlugin<
return this;
}
- setQueryEditor(QueryEditor: ComponentClass>) {
+ setQueryEditor(QueryEditor: ComponentType>) {
this.components.QueryEditor = QueryEditor;
return this;
}
- setExploreQueryField(ExploreQueryField: ComponentClass>) {
+ setExploreQueryField(ExploreQueryField: ComponentClass>) {
this.components.ExploreQueryField = ExploreQueryField;
return this;
}
@@ -79,7 +80,9 @@ export interface DataSourcePluginMeta extends PluginMeta {
annotations?: boolean;
mixed?: boolean;
hasQueryHelp?: boolean;
+ category?: string;
queryOptions?: PluginMetaQueryOptions;
+ sort?: number;
}
interface PluginMetaQueryOptions {
@@ -89,31 +92,55 @@ interface PluginMetaQueryOptions {
}
export interface DataSourcePluginComponents<
- TOptions extends DataSourceJsonData = DataSourceJsonData,
- TQuery extends DataQuery = DataQuery
+ DSType extends DataSourceApi,
+ TQuery extends DataQuery = DataQuery,
+ TOptions extends DataSourceJsonData = DataSourceJsonData
> {
QueryCtrl?: any;
AnnotationsQueryCtrl?: any;
VariableQueryEditor?: any;
- QueryEditor?: ComponentClass>;
- ExploreQueryField?: ComponentClass>;
+ QueryEditor?: ComponentType>;
+ ExploreQueryField?: ComponentClass>;
ExploreStartPage?: ComponentClass;
- ConfigEditor?: React.ComponentType>>;
+ ConfigEditor?: ComponentType>>;
}
-export interface DataSourceConstructor {
- new (instanceSettings: DataSourceInstanceSettings, ...args: any[]): DataSourceApi;
+// Only exported for tests
+export interface DataSourceConstructor<
+ DSType extends DataSourceApi,
+ TQuery extends DataQuery = DataQuery,
+ TOptions extends DataSourceJsonData = DataSourceJsonData
+> {
+ new (instanceSettings: DataSourceInstanceSettings, ...args: any[]): DSType;
}
/**
* The main data source abstraction interface, represents an instance of a data source
*/
-export interface DataSourceApi {
+export abstract class DataSourceApi<
+ TQuery extends DataQuery = DataQuery,
+ TOptions extends DataSourceJsonData = DataSourceJsonData
+> {
+ /**
+ * Set in constructor
+ */
+ readonly name: string;
+
+ /**
+ * Set in constructor
+ */
+ readonly id: number;
+
/**
* min interval range
*/
interval?: string;
+ constructor(instanceSettings: DataSourceInstanceSettings) {
+ this.name = instanceSettings.name;
+ this.id = instanceSettings.id;
+ }
+
/**
* Imports queries from a different datasource
*/
@@ -127,12 +154,12 @@ export interface DataSourceApi {
/**
* Main metrics / data query action
*/
- query(options: DataQueryRequest, observer?: DataStreamObserver): Promise;
+ abstract query(options: DataQueryRequest, observer?: DataStreamObserver): Promise;
/**
* Test & verify datasource settings & connection details
*/
- testDatasource(): Promise;
+ abstract testDatasource(): Promise;
/**
* Get hints for query improvements
@@ -144,21 +171,11 @@ export interface DataSourceApi {
*/
getQueryDisplayText?(query: TQuery): string;
- /**
- * Set after constructor is called by Grafana
- */
- name?: string;
-
- /**
- * Set after constructor is called by Grafana
- */
- id?: number;
-
/**
* Set after constructor call, as the data source instance is the most common thing to pass around
* we attach the components to this instance for easy access
*/
- components?: DataSourcePluginComponents;
+ components?: DataSourcePluginComponents, TQuery, TOptions>;
/**
* static information about the datasource
@@ -166,13 +183,20 @@ export interface DataSourceApi {
meta?: DataSourcePluginMeta;
}
-export interface ExploreDataSourceApi extends DataSourceApi {
+export abstract class ExploreDataSourceApi<
+ TQuery extends DataQuery = DataQuery,
+ TOptions extends DataSourceJsonData = DataSourceJsonData
+> extends DataSourceApi {
modifyQuery?(query: TQuery, action: QueryFixAction): TQuery;
getHighlighterExpression?(query: TQuery): string;
languageProvider?: any;
}
-export interface QueryEditorProps {
+export interface QueryEditorProps<
+ DSType extends DataSourceApi,
+ TQuery extends DataQuery = DataQuery,
+ TOptions extends DataSourceJsonData = DataSourceJsonData
+> {
datasource: DSType;
query: TQuery;
onRunQuery: () => void;
@@ -186,16 +210,14 @@ export enum DataSourceStatus {
Disconnected,
}
-export interface ExploreQueryFieldProps {
- datasource: DSType;
+export interface ExploreQueryFieldProps<
+ DSType extends DataSourceApi,
+ TQuery extends DataQuery = DataQuery,
+ TOptions extends DataSourceJsonData = DataSourceJsonData
+> extends QueryEditorProps {
datasourceStatus: DataSourceStatus;
- query: TQuery;
- error?: string | JSX.Element;
- hint?: QueryHint;
history: any[];
- onExecuteQuery?: () => void;
- onQueryChange?: (value: TQuery) => void;
- onExecuteHint?: (action: QueryFixAction) => void;
+ onHint?: (action: QueryFixAction) => void;
}
export interface ExploreStartPageProps {
diff --git a/packages/grafana-ui/src/types/input.ts b/packages/grafana-ui/src/types/input.ts
index 95026c30be9ad..d3522e77b3592 100644
--- a/packages/grafana-ui/src/types/input.ts
+++ b/packages/grafana-ui/src/types/input.ts
@@ -4,5 +4,6 @@
}
export interface ValidationEvents {
+ // Event name should be one of EventsWithValidation enum
[eventName: string]: ValidationRule[];
}
diff --git a/packages/grafana-ui/src/types/panel.ts b/packages/grafana-ui/src/types/panel.ts
index ea28ca2fb47da..a1756ff02fea9 100644
--- a/packages/grafana-ui/src/types/panel.ts
+++ b/packages/grafana-ui/src/types/panel.ts
@@ -7,18 +7,9 @@ import { PluginMeta, GrafanaPlugin } from './plugin';
export type InterpolateFunction = (value: string, scopedVars?: ScopedVars, format?: string | Function) => string;
export interface PanelPluginMeta extends PluginMeta {
+ skipDataQuery?: boolean;
hideFromList?: boolean;
sort: number;
-
- // if length>0 the query tab will show up
- // Before 6.2 this could be table and/or series, but 6.2+ supports both transparently
- // so it will be deprecated soon
- dataFormats?: PanelDataFormat[];
-}
-
-export enum PanelDataFormat {
- Table = 'table',
- TimeSeries = 'time_series',
}
export interface PanelData {
@@ -32,6 +23,7 @@ export interface PanelData {
}
export interface PanelProps {
+ id: number; // ID within the current dashboard
data: PanelData;
// TODO: annotation?: PanelData;
diff --git a/packages/grafana-ui/src/types/time.ts b/packages/grafana-ui/src/types/time.ts
index d6c524ac19a9d..c7120776facf6 100644
--- a/packages/grafana-ui/src/types/time.ts
+++ b/packages/grafana-ui/src/types/time.ts
@@ -1,13 +1,13 @@
-import { Moment } from 'moment';
+import { DateTime } from '../utils/moment_wrapper';
export interface RawTimeRange {
- from: Moment | string;
- to: Moment | string;
+ from: DateTime | string;
+ to: DateTime | string;
}
export interface TimeRange {
- from: Moment;
- to: Moment;
+ from: DateTime;
+ to: DateTime;
raw: RawTimeRange;
}
@@ -47,6 +47,6 @@ export interface TimeOptions {
[key: string]: TimeOption[];
}
-export type TimeFragment = string | Moment;
+export type TimeFragment = string | DateTime;
export const TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
diff --git a/packages/grafana-ui/src/utils/datemath.test.ts b/packages/grafana-ui/src/utils/datemath.test.ts
index 73407d558217f..802fb0e0785b8 100644
--- a/packages/grafana-ui/src/utils/datemath.test.ts
+++ b/packages/grafana-ui/src/utils/datemath.test.ts
@@ -1,13 +1,13 @@
import sinon, { SinonFakeTimers } from 'sinon';
+import each from 'lodash/each';
import * as dateMath from './datemath';
-import moment, { Moment, unitOfTime } from 'moment';
-import each from 'lodash/each';
+import { dateTime, DurationUnit, DateTime } from '../utils/moment_wrapper';
describe('DateMath', () => {
- const spans: unitOfTime.Base[] = ['s', 'm', 'h', 'd', 'w', 'M', 'y'];
+ const spans: DurationUnit[] = ['s', 'm', 'h', 'd', 'w', 'M', 'y'];
const anchor = '2014-01-01T06:06:06.666Z';
- const unix = moment(anchor).valueOf();
+ const unix = dateTime(anchor).valueOf();
const format = 'YYYY-MM-DDTHH:mm:ss.SSSZ';
let clock: SinonFakeTimers;
@@ -55,13 +55,13 @@ describe('DateMath', () => {
});
describe('subtraction', () => {
- let now: Moment;
- let anchored: Moment;
+ let now: DateTime;
+ let anchored: DateTime;
beforeEach(() => {
clock = sinon.useFakeTimers(unix);
- now = moment();
- anchored = moment(anchor);
+ now = dateTime();
+ anchored = dateTime(anchor);
});
each(spans, span => {
@@ -83,11 +83,11 @@ describe('DateMath', () => {
});
describe('rounding', () => {
- let now: Moment;
+ let now: DateTime;
beforeEach(() => {
clock = sinon.useFakeTimers(unix);
- now = moment();
+ now = dateTime();
});
each(spans, span => {
@@ -116,17 +116,17 @@ describe('DateMath', () => {
describe('relative time to date parsing', () => {
it('should handle negative time', () => {
- const date = dateMath.parseDateMath('-2d', moment([2014, 1, 5]));
- expect(date!.valueOf()).toEqual(moment([2014, 1, 3]).valueOf());
+ const date = dateMath.parseDateMath('-2d', dateTime([2014, 1, 5]));
+ expect(date!.valueOf()).toEqual(dateTime([2014, 1, 3]).valueOf());
});
it('should handle multiple math expressions', () => {
- const date = dateMath.parseDateMath('-2d-6h', moment([2014, 1, 5]));
- expect(date!.valueOf()).toEqual(moment([2014, 1, 2, 18]).valueOf());
+ const date = dateMath.parseDateMath('-2d-6h', dateTime([2014, 1, 5]));
+ expect(date!.valueOf()).toEqual(dateTime([2014, 1, 2, 18]).valueOf());
});
it('should return false when invalid expression', () => {
- const date = dateMath.parseDateMath('2', moment([2014, 1, 5]));
+ const date = dateMath.parseDateMath('2', dateTime([2014, 1, 5]));
expect(date).toEqual(undefined);
});
});
diff --git a/packages/grafana-ui/src/utils/datemath.ts b/packages/grafana-ui/src/utils/datemath.ts
index af9719a73a3e0..6ab7b61ec6629 100644
--- a/packages/grafana-ui/src/utils/datemath.ts
+++ b/packages/grafana-ui/src/utils/datemath.ts
@@ -1,8 +1,8 @@
import includes from 'lodash/includes';
import isDate from 'lodash/isDate';
-import moment, { unitOfTime } from 'moment';
+import { DateTime, dateTime, toUtc, ISO_8601, isDateTime, DurationUnit } from '../utils/moment_wrapper';
-const units: unitOfTime.Base[] = ['y', 'M', 'w', 'd', 'h', 'm', 's'];
+const units: DurationUnit[] = ['y', 'M', 'w', 'd', 'h', 'm', 's'];
export type Timezone = 'utc';
@@ -13,21 +13,17 @@ export type Timezone = 'utc';
* @param roundUp See parseDateMath function.
* @param timezone Only string 'utc' is acceptable here, for anything else, local timezone is used.
*/
-export function parse(
- text: string | moment.Moment | Date,
- roundUp?: boolean,
- timezone?: Timezone
-): moment.Moment | undefined {
+export function parse(text: string | DateTime | Date, roundUp?: boolean, timezone?: Timezone): DateTime | undefined {
if (!text) {
return undefined;
}
if (typeof text !== 'string') {
- if (moment.isMoment(text)) {
+ if (isDateTime(text)) {
return text;
}
if (isDate(text)) {
- return moment(text);
+ return dateTime(text);
}
// We got some non string which is not a moment nor Date. TS should be able to check for that but not always.
return undefined;
@@ -39,9 +35,9 @@ export function parse(
if (text.substring(0, 3) === 'now') {
if (timezone === 'utc') {
- time = moment.utc();
+ time = toUtc();
} else {
- time = moment();
+ time = dateTime();
}
mathString = text.substring('now'.length);
} else {
@@ -54,7 +50,7 @@ export function parse(
mathString = text.substring(index + 2);
}
// We're going to just require ISO8601 timestamps, k?
- time = moment(parseString, moment.ISO_8601);
+ time = dateTime(parseString, ISO_8601);
}
if (!mathString.length) {
@@ -70,13 +66,13 @@ export function parse(
* by parse function. See parse function to see what is considered acceptable.
* @param text
*/
-export function isValid(text: string | moment.Moment): boolean {
+export function isValid(text: string | DateTime): boolean {
const date = parse(text);
if (!date) {
return false;
}
- if (moment.isMoment(date)) {
+ if (isDateTime(date)) {
return date.isValid();
}
@@ -90,7 +86,7 @@ export function isValid(text: string | moment.Moment): boolean {
* @param roundUp If true it will round the time to endOf time unit, otherwise to startOf time unit.
*/
// TODO: Had to revert Andrejs `time: moment.Moment` to `time: any`
-export function parseDateMath(mathString: string, time: any, roundUp?: boolean): moment.Moment | undefined {
+export function parseDateMath(mathString: string, time: any, roundUp?: boolean): DateTime | undefined {
const dateTime = time;
let i = 0;
const len = mathString.length;
diff --git a/packages/grafana-ui/src/utils/displayValue.ts b/packages/grafana-ui/src/utils/displayValue.ts
index 7c3a6e07034ab..59a04fefc2b93 100644
--- a/packages/grafana-ui/src/utils/displayValue.ts
+++ b/packages/grafana-ui/src/utils/displayValue.ts
@@ -1,6 +1,5 @@
// Libraries
import _ from 'lodash';
-import moment from 'moment';
// Utils
import { getValueFormat } from './valueFormats/valueFormats';
@@ -18,6 +17,7 @@ import {
DecimalCount,
Field,
} from '../types';
+import { DateTime, dateTime } from './moment_wrapper';
export type DisplayProcessor = (value: any) => DisplayValue;
@@ -91,18 +91,18 @@ export function getDisplayProcessor(options?: DisplayValueOptions): DisplayProce
return toStringProcessor;
}
-function toMoment(value: any, numeric: number, format: string): moment.Moment {
+function toMoment(value: any, numeric: number, format: string): DateTime {
if (!isNaN(numeric)) {
- const v = moment(numeric);
+ const v = dateTime(numeric);
if (v.isValid()) {
return v;
}
}
- const v = moment(value, format);
+ const v = dateTime(value, format);
if (v.isValid) {
return v;
}
- return moment(value); // moment will try to parse the format
+ return dateTime(value); // moment will try to parse the format
}
/** Will return any value as a number or NaN */
diff --git a/packages/grafana-ui/src/utils/index.ts b/packages/grafana-ui/src/utils/index.ts
index d3b11d3e20796..8a8857364682a 100644
--- a/packages/grafana-ui/src/utils/index.ts
+++ b/packages/grafana-ui/src/utils/index.ts
@@ -16,6 +16,7 @@ export * from './validate';
export { getFlotPairs } from './flotPairs';
export * from './object';
export * from './fieldCache';
+export * from './moment_wrapper';
// Names are too general to export
// rangeutils, datemath
diff --git a/packages/grafana-ui/src/utils/moment_wrapper.ts b/packages/grafana-ui/src/utils/moment_wrapper.ts
new file mode 100644
index 0000000000000..063c427372b6d
--- /dev/null
+++ b/packages/grafana-ui/src/utils/moment_wrapper.ts
@@ -0,0 +1,90 @@
+/* tslint:disable:import-blacklist ban ban-types */
+import moment, { MomentInput, DurationInputArg1 } from 'moment';
+
+export interface DateTimeBuiltinFormat {
+ __momentBuiltinFormatBrand: any;
+}
+export const ISO_8601: DateTimeBuiltinFormat = moment.ISO_8601;
+export type DateTimeInput = Date | string | number | Array | DateTime; // null | undefined
+export type FormatInput = string | DateTimeBuiltinFormat | undefined;
+export type DurationInput = string | number | DateTimeDuration;
+export type DurationUnit =
+ | 'year'
+ | 'years'
+ | 'y'
+ | 'month'
+ | 'months'
+ | 'M'
+ | 'week'
+ | 'weeks'
+ | 'w'
+ | 'day'
+ | 'days'
+ | 'd'
+ | 'hour'
+ | 'hours'
+ | 'h'
+ | 'minute'
+ | 'minutes'
+ | 'm'
+ | 'second'
+ | 'seconds'
+ | 's'
+ | 'millisecond'
+ | 'milliseconds'
+ | 'ms'
+ | 'quarter'
+ | 'quarters'
+ | 'Q';
+
+export interface DateTimeLocale {
+ firstDayOfWeek: () => number;
+}
+
+export interface DateTimeDuration {
+ asHours: () => number;
+}
+
+export interface DateTime extends Object {
+ add: (amount?: DateTimeInput, unit?: DurationUnit) => DateTime;
+ diff: (amount: DateTimeInput, unit?: DurationUnit, truncate?: boolean) => number;
+ endOf: (unitOfTime: DurationUnit) => DateTime;
+ format: (formatInput?: FormatInput) => string;
+ fromNow: (withoutSuffix?: boolean) => string;
+ from: (formaInput: DateTimeInput) => string;
+ isSame: (input?: DateTimeInput, granularity?: DurationUnit) => boolean;
+ isValid: () => boolean;
+ local: () => DateTime;
+ locale: (locale: string) => DateTime;
+ startOf: (unitOfTime: DurationUnit) => DateTime;
+ subtract: (amount?: DateTimeInput, unit?: DurationUnit) => DateTime;
+ toDate: () => Date;
+ toISOString: () => string;
+ valueOf: () => number;
+ unix: () => number;
+ utc: () => DateTime;
+}
+
+export const setLocale = (language: string) => {
+ moment.locale(language);
+};
+
+export const getLocaleData = (): DateTimeLocale => {
+ return moment.localeData();
+};
+
+export const isDateTime = (value: any): value is DateTime => {
+ return moment.isMoment(value);
+};
+
+export const toUtc = (input?: DateTimeInput, formatInput?: FormatInput): DateTime => {
+ return moment.utc(input as MomentInput, formatInput) as DateTime;
+};
+
+export const toDuration = (input?: DurationInput, unit?: DurationUnit): DateTimeDuration => {
+ return moment.duration(input as DurationInputArg1, unit) as DateTimeDuration;
+};
+
+export const dateTime = (input?: DateTimeInput, formatInput?: FormatInput): DateTime => {
+ return moment(input as MomentInput, formatInput) as DateTime;
+};
diff --git a/packages/grafana-ui/src/utils/processSeriesData.test.ts b/packages/grafana-ui/src/utils/processSeriesData.test.ts
index 03b1a889db255..96afa79aa8c00 100644
--- a/packages/grafana-ui/src/utils/processSeriesData.test.ts
+++ b/packages/grafana-ui/src/utils/processSeriesData.test.ts
@@ -7,7 +7,7 @@ import {
guessFieldTypeFromValue,
} from './processSeriesData';
import { FieldType, TimeSeries } from '../types/data';
-import moment from 'moment';
+import { dateTime } from './moment_wrapper';
describe('toSeriesData', () => {
it('converts timeseries to series', () => {
@@ -45,7 +45,7 @@ describe('toSeriesData', () => {
expect(guessFieldTypeFromValue(true)).toBe(FieldType.boolean);
expect(guessFieldTypeFromValue(false)).toBe(FieldType.boolean);
expect(guessFieldTypeFromValue(new Date())).toBe(FieldType.time);
- expect(guessFieldTypeFromValue(moment())).toBe(FieldType.time);
+ expect(guessFieldTypeFromValue(dateTime())).toBe(FieldType.time);
});
it('Guess Colum Types from strings', () => {
diff --git a/packages/grafana-ui/src/utils/processSeriesData.ts b/packages/grafana-ui/src/utils/processSeriesData.ts
index 0a8d420fdaa13..1ba31e3bbdee1 100644
--- a/packages/grafana-ui/src/utils/processSeriesData.ts
+++ b/packages/grafana-ui/src/utils/processSeriesData.ts
@@ -2,10 +2,10 @@
import isNumber from 'lodash/isNumber';
import isString from 'lodash/isString';
import isBoolean from 'lodash/isBoolean';
-import moment from 'moment';
// Types
import { SeriesData, Field, TimeSeries, FieldType, TableData } from '../types/index';
+import { isDateTime } from './moment_wrapper';
function convertTableToSeriesData(table: TableData): SeriesData {
return {
@@ -19,6 +19,7 @@ function convertTableToSeriesData(table: TableData): SeriesData {
rows: table.rows,
refId: table.refId,
meta: table.meta,
+ name: table.name,
};
}
@@ -73,7 +74,7 @@ export function guessFieldTypeFromValue(v: any): FieldType {
return FieldType.boolean;
}
- if (v instanceof Date || v instanceof moment) {
+ if (v instanceof Date || isDateTime(v)) {
return FieldType.time;
}
diff --git a/packages/grafana-ui/src/utils/rangeutil.ts b/packages/grafana-ui/src/utils/rangeutil.ts
index 75f2b81443335..bcc27ecfd8eae 100644
--- a/packages/grafana-ui/src/utils/rangeutil.ts
+++ b/packages/grafana-ui/src/utils/rangeutil.ts
@@ -1,10 +1,10 @@
// @ts-ignore
import _ from 'lodash';
-import moment from 'moment';
-import { RawTimeRange } from '@grafana/ui';
+import { RawTimeRange } from '../types/time';
import * as dateMath from './datemath';
+import { isDateTime, DateTime } from '../utils/moment_wrapper';
const spans: { [key: string]: { display: string; section?: number } } = {
s: { display: 'second' },
@@ -85,7 +85,7 @@ export function getRelativeTimesList(timepickerSettings: any, currentDisplay: an
return groups;
}
-function formatDate(date: any) {
+function formatDate(date: DateTime) {
return date.format(absoluteFormat);
}
@@ -139,16 +139,16 @@ export function describeTimeRange(range: RawTimeRange): string {
return option.display;
}
- if (moment.isMoment(range.from) && moment.isMoment(range.to)) {
+ if (isDateTime(range.from) && isDateTime(range.to)) {
return formatDate(range.from) + ' to ' + formatDate(range.to);
}
- if (moment.isMoment(range.from)) {
+ if (isDateTime(range.from)) {
const toMoment = dateMath.parse(range.to, true);
return toMoment ? formatDate(range.from) + ' to ' + toMoment.fromNow() : '';
}
- if (moment.isMoment(range.to)) {
+ if (isDateTime(range.to)) {
const from = dateMath.parse(range.from, false);
return from ? from.fromNow() + ' to ' + formatDate(range.to) : '';
}
diff --git a/packages/grafana-ui/src/utils/string.test.ts b/packages/grafana-ui/src/utils/string.test.ts
index b1a2859986084..b99614c040686 100644
--- a/packages/grafana-ui/src/utils/string.test.ts
+++ b/packages/grafana-ui/src/utils/string.test.ts
@@ -1,4 +1,4 @@
-import { stringToJsRegex, stringToMs } from '@grafana/ui';
+import { stringToJsRegex, stringToMs } from './string';
describe('stringToJsRegex', () => {
it('should parse the valid regex value', () => {
diff --git a/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.test.ts b/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.test.ts
index cf69a1d433ad6..f800d2b75fd6f 100644
--- a/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.test.ts
+++ b/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.test.ts
@@ -1,4 +1,3 @@
-import moment from 'moment';
import {
dateTimeAsIso,
dateTimeAsUS,
@@ -9,11 +8,12 @@ import {
toDurationInMilliseconds,
toDurationInSeconds,
} from './dateTimeFormatters';
+import { toUtc, dateTime } from '../moment_wrapper';
describe('date time formats', () => {
const epoch = 1505634997920;
- const utcTime = moment.utc(epoch);
- const browserTime = moment(epoch);
+ const utcTime = toUtc(epoch);
+ const browserTime = dateTime(epoch);
it('should format as iso date', () => {
const expected = browserTime.format('YYYY-MM-DD HH:mm:ss');
@@ -28,14 +28,14 @@ describe('date time formats', () => {
});
it('should format as iso date and skip date when today', () => {
- const now = moment();
+ const now = dateTime();
const expected = now.format('HH:mm:ss');
const actual = dateTimeAsIso(now.valueOf(), 0, 0, false);
expect(actual).toBe(expected);
});
it('should format as iso date (in UTC) and skip date when today', () => {
- const now = moment.utc();
+ const now = toUtc();
const expected = now.format('HH:mm:ss');
const actual = dateTimeAsIso(now.valueOf(), 0, 0, true);
expect(actual).toBe(expected);
@@ -54,42 +54,42 @@ describe('date time formats', () => {
});
it('should format as US date and skip date when today', () => {
- const now = moment();
+ const now = dateTime();
const expected = now.format('h:mm:ss a');
const actual = dateTimeAsUS(now.valueOf(), 0, 0, false);
expect(actual).toBe(expected);
});
it('should format as US date (in UTC) and skip date when today', () => {
- const now = moment.utc();
+ const now = toUtc();
const expected = now.format('h:mm:ss a');
const actual = dateTimeAsUS(now.valueOf(), 0, 0, true);
expect(actual).toBe(expected);
});
it('should format as from now with days', () => {
- const daysAgo = moment().add(-7, 'd');
+ const daysAgo = dateTime().add(-7, 'd');
const expected = '7 days ago';
const actual = dateTimeFromNow(daysAgo.valueOf(), 0, 0, false);
expect(actual).toBe(expected);
});
it('should format as from now with days (in UTC)', () => {
- const daysAgo = moment.utc().add(-7, 'd');
+ const daysAgo = toUtc().add(-7, 'd');
const expected = '7 days ago';
const actual = dateTimeFromNow(daysAgo.valueOf(), 0, 0, true);
expect(actual).toBe(expected);
});
it('should format as from now with minutes', () => {
- const daysAgo = moment().add(-2, 'm');
+ const daysAgo = dateTime().add(-2, 'm');
const expected = '2 minutes ago';
const actual = dateTimeFromNow(daysAgo.valueOf(), 0, 0, false);
expect(actual).toBe(expected);
});
it('should format as from now with minutes (in UTC)', () => {
- const daysAgo = moment.utc().add(-2, 'm');
+ const daysAgo = toUtc().add(-2, 'm');
const expected = '2 minutes ago';
const actual = dateTimeFromNow(daysAgo.valueOf(), 0, 0, true);
expect(actual).toBe(expected);
diff --git a/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.ts b/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.ts
index bad77191fb5e0..2c2ab34681608 100644
--- a/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.ts
+++ b/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.ts
@@ -1,6 +1,6 @@
import { toFixed, toFixedScaled } from './valueFormats';
import { DecimalCount } from '../../types';
-import moment from 'moment';
+import { toUtc, toDuration as duration, dateTime } from '../moment_wrapper';
interface IntervalsInSeconds {
[interval: string]: number;
@@ -237,7 +237,7 @@ export function toClock(size: number, decimals?: DecimalCount) {
// < 1 second
if (size < 1000) {
- return moment.utc(size).format('SSS\\m\\s');
+ return toUtc(size).format('SSS\\m\\s');
}
// < 1 minute
@@ -246,7 +246,7 @@ export function toClock(size: number, decimals?: DecimalCount) {
if (decimals === 0) {
format = 'ss\\s';
}
- return moment.utc(size).format(format);
+ return toUtc(size).format(format);
}
// < 1 hour
@@ -257,12 +257,12 @@ export function toClock(size: number, decimals?: DecimalCount) {
} else if (decimals === 1) {
format = 'mm\\m:ss\\s';
}
- return moment.utc(size).format(format);
+ return toUtc(size).format(format);
}
let format = 'mm\\m:ss\\s:SSS\\m\\s';
- const hours = `${('0' + Math.floor(moment.duration(size, 'milliseconds').asHours())).slice(-2)}h`;
+ const hours = `${('0' + Math.floor(duration(size, 'milliseconds').asHours())).slice(-2)}h`;
if (decimals === 0) {
format = '';
@@ -272,7 +272,7 @@ export function toClock(size: number, decimals?: DecimalCount) {
format = 'mm\\m:ss\\s';
}
- return format ? `${hours}:${moment.utc(size).format(format)}` : hours;
+ return format ? `${hours}:${toUtc(size).format(format)}` : hours;
}
export function toDurationInMilliseconds(size: number, decimals: DecimalCount) {
@@ -307,24 +307,24 @@ export function toClockSeconds(size: number, decimals: DecimalCount) {
}
export function dateTimeAsIso(value: number, decimals: DecimalCount, scaledDecimals: DecimalCount, isUtc?: boolean) {
- const time = isUtc ? moment.utc(value) : moment(value);
+ const time = isUtc ? toUtc(value) : dateTime(value);
- if (moment().isSame(value, 'day')) {
+ if (dateTime().isSame(value, 'day')) {
return time.format('HH:mm:ss');
}
return time.format('YYYY-MM-DD HH:mm:ss');
}
export function dateTimeAsUS(value: number, decimals: DecimalCount, scaledDecimals: DecimalCount, isUtc?: boolean) {
- const time = isUtc ? moment.utc(value) : moment(value);
+ const time = isUtc ? toUtc(value) : dateTime(value);
- if (moment().isSame(value, 'day')) {
+ if (dateTime().isSame(value, 'day')) {
return time.format('h:mm:ss a');
}
return time.format('MM/DD/YYYY h:mm:ss a');
}
export function dateTimeFromNow(value: number, decimals: DecimalCount, scaledDecimals: DecimalCount, isUtc?: boolean) {
- const time = isUtc ? moment.utc(value) : moment(value);
+ const time = isUtc ? toUtc(value) : dateTime(value);
return time.fromNow();
}
diff --git a/packages/grafana-ui/tslint.json b/packages/grafana-ui/tslint.json
index 0946f20963a3d..937aa29800e5e 100644
--- a/packages/grafana-ui/tslint.json
+++ b/packages/grafana-ui/tslint.json
@@ -1,3 +1,6 @@
{
- "extends": "../../tslint.json"
+ "extends": "../../tslint.json",
+ "rules": {
+ "import-blacklist": [true, "moment", ["^@grafana/ui.*"]]
+ }
}
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index d72accb0cd924..2db48e095250f 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -47,8 +47,8 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
"$GF_PATHS_DATA" && \
cp "$GF_PATHS_HOME/conf/sample.ini" "$GF_PATHS_CONFIG" && \
cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/grafana/ldap.toml && \
- chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" && \
- chmod 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS"
+ chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
+ chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
EXPOSE 3000
diff --git a/packaging/rpm/systemd/grafana-server.service b/packaging/rpm/systemd/grafana-server.service
index ad5006d1d4ce3..f16fda7f54a65 100644
--- a/packaging/rpm/systemd/grafana-server.service
+++ b/packaging/rpm/systemd/grafana-server.service
@@ -3,7 +3,7 @@ Description=Grafana instance
Documentation=http://docs.grafana.org
Wants=network-online.target
After=network-online.target
-After=postgresql.service mariadb.service mysql.service
+After=postgresql.service mariadb.service mysqld.service
[Service]
EnvironmentFile=/etc/sysconfig/grafana-server
diff --git a/pkg/api/app_routes.go b/pkg/api/app_routes.go
index 27fba4fe3c3ea..e85a19dbce817 100644
--- a/pkg/api/app_routes.go
+++ b/pkg/api/app_routes.go
@@ -27,7 +27,6 @@ func (hs *HTTPServer) initAppPluginRoutes(r *macaron.Macaron) {
Dial: (&net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
- DualStack: true,
}).Dial,
TLSHandshakeTimeout: 10 * time.Second,
}
diff --git a/pkg/api/dashboard_snapshot.go b/pkg/api/dashboard_snapshot.go
index ba4a09f6f0123..a71169ac3767e 100644
--- a/pkg/api/dashboard_snapshot.go
+++ b/pkg/api/dashboard_snapshot.go
@@ -99,8 +99,14 @@ func CreateDashboardSnapshot(c *m.ReqContext, cmd m.CreateDashboardSnapshotComma
metrics.M_Api_Dashboard_Snapshot_External.Inc()
} else {
- cmd.Key = util.GetRandomString(32)
- cmd.DeleteKey = util.GetRandomString(32)
+ if cmd.Key == "" {
+ cmd.Key = util.GetRandomString(32)
+ }
+
+ if cmd.DeleteKey == "" {
+ cmd.DeleteKey = util.GetRandomString(32)
+ }
+
url = setting.ToAbsUrl("dashboard/snapshot/" + cmd.Key)
metrics.M_Api_Dashboard_Snapshot_Create.Inc()
diff --git a/pkg/api/dtos/plugins.go b/pkg/api/dtos/plugins.go
index edc9d96d1ac5a..8b32bea41dc1c 100644
--- a/pkg/api/dtos/plugins.go
+++ b/pkg/api/dtos/plugins.go
@@ -34,6 +34,7 @@ type PluginListItem struct {
LatestVersion string `json:"latestVersion"`
HasUpdate bool `json:"hasUpdate"`
DefaultNavUrl string `json:"defaultNavUrl"`
+ Category string `json:"category"`
State plugins.PluginState `json:"state"`
}
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 1fceca12bfa12..e4fb0ed34c01a 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -1,9 +1,11 @@
package api
import (
- "github.com/grafana/grafana/pkg/util"
"strconv"
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/util"
+
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models"
@@ -85,12 +87,13 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
defaultDatasource = ds.Name
}
- if ds.JsonData != nil {
- dsMap["jsonData"] = ds.JsonData
- } else {
- dsMap["jsonData"] = make(map[string]string)
+ jsonData := ds.JsonData
+ if jsonData == nil {
+ jsonData = simplejson.New()
}
+ dsMap["jsonData"] = jsonData
+
if ds.Access == m.DS_ACCESS_DIRECT {
if ds.BasicAuth {
dsMap["basicAuth"] = util.GetBasicAuthHeader(ds.BasicAuthUser, ds.DecryptedBasicAuthPassword())
@@ -122,7 +125,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
if ds.Type == m.DS_PROMETHEUS {
// add unproxied server URL for link to Prometheus web UI
- dsMap["directUrl"] = ds.Url
+ jsonData.Set("directUrl", ds.Url)
}
datasources[ds.Name] = dsMap
@@ -154,15 +157,15 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
}
panels[panel.Id] = map[string]interface{}{
- "module": panel.Module,
- "baseUrl": panel.BaseUrl,
- "name": panel.Name,
- "id": panel.Id,
- "info": panel.Info,
- "hideFromList": panel.HideFromList,
- "sort": getPanelSort(panel.Id),
- "dataFormats": panel.DataFormats,
- "state": panel.State,
+ "module": panel.Module,
+ "baseUrl": panel.BaseUrl,
+ "name": panel.Name,
+ "id": panel.Id,
+ "info": panel.Info,
+ "hideFromList": panel.HideFromList,
+ "sort": getPanelSort(panel.Id),
+ "skipDataQuery": panel.SkipDataQuery,
+ "state": panel.State,
}
}
diff --git a/pkg/api/grafana_com_proxy.go b/pkg/api/grafana_com_proxy.go
index 541d66b0b35db..2a7a5427c7a1b 100644
--- a/pkg/api/grafana_com_proxy.go
+++ b/pkg/api/grafana_com_proxy.go
@@ -17,7 +17,6 @@ var grafanaComProxyTransport = &http.Transport{
Dial: (&net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
- DualStack: true,
}).Dial,
TLSHandshakeTimeout: 10 * time.Second,
}
diff --git a/pkg/api/index.go b/pkg/api/index.go
index e7555e1462111..d4103b0aa5263 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -233,7 +233,7 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er
if len(appLink.Children) > 0 && c.OrgRole == m.ROLE_ADMIN {
appLink.Children = append(appLink.Children, &dtos.NavLink{Divider: true})
- appLink.Children = append(appLink.Children, &dtos.NavLink{Text: "Plugin Config", Icon: "gicon gicon-cog", Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/edit"})
+ appLink.Children = append(appLink.Children, &dtos.NavLink{Text: "Plugin Config", Icon: "gicon gicon-cog", Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/"})
}
if len(appLink.Children) > 0 {
diff --git a/pkg/api/pluginproxy/access_token_provider.go b/pkg/api/pluginproxy/access_token_provider.go
index 22407823ff99a..fb07bea00200e 100644
--- a/pkg/api/pluginproxy/access_token_provider.go
+++ b/pkg/api/pluginproxy/access_token_provider.go
@@ -67,14 +67,14 @@ func (provider *accessTokenProvider) getAccessToken(data templateData) (string,
}
}
- urlInterpolated, err := interpolateString(provider.route.TokenAuth.Url, data)
+ urlInterpolated, err := InterpolateString(provider.route.TokenAuth.Url, data)
if err != nil {
return "", err
}
params := make(url.Values)
for key, value := range provider.route.TokenAuth.Params {
- interpolatedParam, err := interpolateString(value, data)
+ interpolatedParam, err := InterpolateString(value, data)
if err != nil {
return "", err
}
@@ -119,7 +119,7 @@ func (provider *accessTokenProvider) getJwtAccessToken(ctx context.Context, data
conf := &jwt.Config{}
if val, ok := provider.route.JwtTokenAuth.Params["client_email"]; ok {
- interpolatedVal, err := interpolateString(val, data)
+ interpolatedVal, err := InterpolateString(val, data)
if err != nil {
return "", err
}
@@ -127,7 +127,7 @@ func (provider *accessTokenProvider) getJwtAccessToken(ctx context.Context, data
}
if val, ok := provider.route.JwtTokenAuth.Params["private_key"]; ok {
- interpolatedVal, err := interpolateString(val, data)
+ interpolatedVal, err := InterpolateString(val, data)
if err != nil {
return "", err
}
@@ -135,7 +135,7 @@ func (provider *accessTokenProvider) getJwtAccessToken(ctx context.Context, data
}
if val, ok := provider.route.JwtTokenAuth.Params["token_uri"]; ok {
- interpolatedVal, err := interpolateString(val, data)
+ interpolatedVal, err := InterpolateString(val, data)
if err != nil {
return "", err
}
diff --git a/pkg/api/pluginproxy/ds_auth_provider.go b/pkg/api/pluginproxy/ds_auth_provider.go
index 7e0a88bae3d2d..e4147d494b9d3 100644
--- a/pkg/api/pluginproxy/ds_auth_provider.go
+++ b/pkg/api/pluginproxy/ds_auth_provider.go
@@ -1,13 +1,11 @@
package pluginproxy
import (
- "bytes"
"context"
"fmt"
"net/http"
"net/url"
"strings"
- "text/template"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins"
@@ -24,7 +22,7 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
SecureJsonData: ds.SecureJsonData.Decrypt(),
}
- interpolatedURL, err := interpolateString(route.Url, data)
+ interpolatedURL, err := InterpolateString(route.Url, data)
if err != nil {
logger.Error("Error interpolating proxy url", "error", err)
return
@@ -81,24 +79,9 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
logger.Info("Requesting", "url", req.URL.String())
}
-func interpolateString(text string, data templateData) (string, error) {
- t, err := template.New("content").Parse(text)
- if err != nil {
- return "", fmt.Errorf("could not parse template %s", text)
- }
-
- var contentBuf bytes.Buffer
- err = t.Execute(&contentBuf, data)
- if err != nil {
- return "", fmt.Errorf("failed to execute template %s", text)
- }
-
- return contentBuf.String(), nil
-}
-
func addHeaders(reqHeaders *http.Header, route *plugins.AppPluginRoute, data templateData) error {
for _, header := range route.Headers {
- interpolated, err := interpolateString(header.Content, data)
+ interpolated, err := InterpolateString(header.Content, data)
if err != nil {
return err
}
diff --git a/pkg/api/pluginproxy/ds_auth_provider_test.go b/pkg/api/pluginproxy/ds_auth_provider_test.go
index 9bd98a339e5eb..fa22cc0a168d4 100644
--- a/pkg/api/pluginproxy/ds_auth_provider_test.go
+++ b/pkg/api/pluginproxy/ds_auth_provider_test.go
@@ -14,7 +14,7 @@ func TestDsAuthProvider(t *testing.T) {
},
}
- interpolated, err := interpolateString("{{.SecureJsonData.Test}}", data)
+ interpolated, err := InterpolateString("{{.SecureJsonData.Test}}", data)
So(err, ShouldBeNil)
So(interpolated, ShouldEqual, "0asd+asd")
})
diff --git a/pkg/api/pluginproxy/pluginproxy.go b/pkg/api/pluginproxy/pluginproxy.go
index 5ee59017a825f..4ee4e5b8db3ab 100644
--- a/pkg/api/pluginproxy/pluginproxy.go
+++ b/pkg/api/pluginproxy/pluginproxy.go
@@ -2,12 +2,13 @@ package pluginproxy
import (
"encoding/json"
- "github.com/grafana/grafana/pkg/setting"
"net"
"net/http"
"net/http/httputil"
"net/url"
+ "github.com/grafana/grafana/pkg/setting"
+
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models"
@@ -38,6 +39,24 @@ func getHeaders(route *plugins.AppPluginRoute, orgId int64, appID string) (http.
return result, err
}
+func updateURL(route *plugins.AppPluginRoute, orgId int64, appID string) (string, error) {
+ query := m.GetPluginSettingByIdQuery{OrgId: orgId, PluginId: appID}
+ if err := bus.Dispatch(&query); err != nil {
+ return "", err
+ }
+
+ data := templateData{
+ JsonData: query.Result.JsonData,
+ SecureJsonData: query.Result.SecureJsonData.Decrypt(),
+ }
+ interpolated, err := InterpolateString(route.Url, data)
+ if err != nil {
+ return "", err
+ }
+ return interpolated, err
+}
+
+// NewApiPluginProxy create a plugin proxy
func NewApiPluginProxy(ctx *m.ReqContext, proxyPath string, route *plugins.AppPluginRoute, appID string, cfg *setting.Cfg) *httputil.ReverseProxy {
targetURL, _ := url.Parse(route.Url)
@@ -48,7 +67,6 @@ func NewApiPluginProxy(ctx *m.ReqContext, proxyPath string, route *plugins.AppPl
req.Host = targetURL.Host
req.URL.Path = util.JoinURLFragments(targetURL.Path, proxyPath)
-
// clear cookie headers
req.Header.Del("Cookie")
req.Header.Del("Set-Cookie")
@@ -72,13 +90,13 @@ func NewApiPluginProxy(ctx *m.ReqContext, proxyPath string, route *plugins.AppPl
}
// Create a HTTP header with the context in it.
- ctxJson, err := json.Marshal(ctx.SignedInUser)
+ ctxJSON, err := json.Marshal(ctx.SignedInUser)
if err != nil {
ctx.JsonApiErr(500, "failed to marshal context to json.", err)
return
}
- req.Header.Add("X-Grafana-Context", string(ctxJson))
+ req.Header.Add("X-Grafana-Context", string(ctxJSON))
if cfg.SendUserHeader && !ctx.SignedInUser.IsAnonymous {
req.Header.Add("X-Grafana-User", ctx.SignedInUser.Login)
@@ -97,6 +115,27 @@ func NewApiPluginProxy(ctx *m.ReqContext, proxyPath string, route *plugins.AppPl
}
}
+ if len(route.Url) > 0 {
+ interpolatedURL, err := updateURL(route, ctx.OrgId, appID)
+ if err != nil {
+ ctx.JsonApiErr(500, "Could not interpolate plugin route url", err)
+ }
+ targetURL, err := url.Parse(interpolatedURL)
+ if err != nil {
+ ctx.JsonApiErr(500, "Could not parse custom url: %v", err)
+ return
+ }
+ req.URL.Scheme = targetURL.Scheme
+ req.URL.Host = targetURL.Host
+ req.Host = targetURL.Host
+ req.URL.Path = util.JoinURLFragments(targetURL.Path, proxyPath)
+
+ if err != nil {
+ ctx.JsonApiErr(500, "Could not interpolate plugin route url", err)
+ return
+ }
+ }
+
// reqBytes, _ := httputil.DumpRequestOut(req, true);
// log.Trace("Proxying plugin request: %s", string(reqBytes))
}
diff --git a/pkg/api/pluginproxy/pluginproxy_test.go b/pkg/api/pluginproxy/pluginproxy_test.go
index e4a4fdb25baa0..343823b00a277 100644
--- a/pkg/api/pluginproxy/pluginproxy_test.go
+++ b/pkg/api/pluginproxy/pluginproxy_test.go
@@ -53,6 +53,7 @@ func TestPluginProxy(t *testing.T) {
},
},
&setting.Cfg{SendUserHeader: true},
+ nil,
)
Convey("Should add header with username", func() {
@@ -69,6 +70,7 @@ func TestPluginProxy(t *testing.T) {
},
},
&setting.Cfg{SendUserHeader: false},
+ nil,
)
Convey("Should not add header with username", func() {
// Get will return empty string even if header is not set
@@ -82,6 +84,7 @@ func TestPluginProxy(t *testing.T) {
SignedInUser: &m.SignedInUser{IsAnonymous: true},
},
&setting.Cfg{SendUserHeader: true},
+ nil,
)
Convey("Should not add header with username", func() {
@@ -89,14 +92,59 @@ func TestPluginProxy(t *testing.T) {
So(req.Header.Get("X-Grafana-User"), ShouldEqual, "")
})
})
+
+ Convey("When getting templated url", t, func() {
+ route := &plugins.AppPluginRoute{
+ Url: "{{.JsonData.dynamicUrl}}",
+ Method: "GET",
+ }
+
+ bus.AddHandler("test", func(query *m.GetPluginSettingByIdQuery) error {
+ query.Result = &m.PluginSetting{
+ JsonData: map[string]interface{}{
+ "dynamicUrl": "https://dynamic.grafana.com",
+ },
+ }
+ return nil
+ })
+
+ req := getPluginProxiedRequest(
+ &m.ReqContext{
+ SignedInUser: &m.SignedInUser{
+ Login: "test_user",
+ },
+ },
+ &setting.Cfg{SendUserHeader: true},
+ route,
+ )
+ Convey("Headers should be updated", func() {
+ header, err := getHeaders(route, 1, "my-app")
+ So(err, ShouldBeNil)
+ So(header.Get("X-Grafana-User"), ShouldEqual, "")
+ })
+ Convey("Should set req.URL to be interpolated value from jsonData", func() {
+ So(req.URL.String(), ShouldEqual, "https://dynamic.grafana.com")
+ })
+ Convey("Route url should not be modified", func() {
+ So(route.Url, ShouldEqual, "{{.JsonData.dynamicUrl}}")
+ })
+ })
+
}
// getPluginProxiedRequest is a helper for easier setup of tests based on global config and ReqContext.
-func getPluginProxiedRequest(ctx *m.ReqContext, cfg *setting.Cfg) *http.Request {
- route := &plugins.AppPluginRoute{}
+func getPluginProxiedRequest(ctx *m.ReqContext, cfg *setting.Cfg, route *plugins.AppPluginRoute) *http.Request {
+ // insert dummy route if none is specified
+ if route == nil {
+ route = &plugins.AppPluginRoute{
+ Path: "api/v4/",
+ Url: "https://www.google.com",
+ ReqRole: m.ROLE_EDITOR,
+ }
+ }
proxy := NewApiPluginProxy(ctx, "", route, "", cfg)
- req, err := http.NewRequest(http.MethodGet, "http://grafana.com/sub", nil)
+ req, err := http.NewRequest(http.MethodGet, route.Url, nil)
So(err, ShouldBeNil)
proxy.Director(req)
return req
diff --git a/pkg/api/pluginproxy/utils.go b/pkg/api/pluginproxy/utils.go
new file mode 100644
index 0000000000000..f507a54d37608
--- /dev/null
+++ b/pkg/api/pluginproxy/utils.go
@@ -0,0 +1,49 @@
+package pluginproxy
+
+import (
+ "bytes"
+ "fmt"
+ "net/url"
+ "text/template"
+
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/plugins"
+)
+
+// InterpolateString accepts template data and return a string with substitutions
+func InterpolateString(text string, data templateData) (string, error) {
+ t, err := template.New("content").Parse(text)
+ if err != nil {
+ return "", fmt.Errorf("could not parse template %s", text)
+ }
+
+ var contentBuf bytes.Buffer
+ err = t.Execute(&contentBuf, data)
+ if err != nil {
+ return "", fmt.Errorf("failed to execute template %s", text)
+ }
+
+ return contentBuf.String(), nil
+}
+
+// InterpolateURL accepts template data and return a string with substitutions
+func InterpolateURL(anURL *url.URL, route *plugins.AppPluginRoute, orgID int64, appID string) (*url.URL, error) {
+ query := m.GetPluginSettingByIdQuery{OrgId: orgID, PluginId: appID}
+ result, err := url.Parse(anURL.String())
+ if query.Result != nil {
+ if len(query.Result.JsonData) > 0 {
+ data := templateData{
+ JsonData: query.Result.JsonData,
+ }
+ interpolatedResult, err := InterpolateString(anURL.String(), data)
+ if err == nil {
+ result, err = url.Parse(interpolatedResult)
+ if err != nil {
+ return nil, fmt.Errorf("Error parsing plugin route url %v", err)
+ }
+ }
+ }
+ }
+
+ return result, err
+}
diff --git a/pkg/api/pluginproxy/utils_test.go b/pkg/api/pluginproxy/utils_test.go
new file mode 100644
index 0000000000000..430ce34115c5f
--- /dev/null
+++ b/pkg/api/pluginproxy/utils_test.go
@@ -0,0 +1,21 @@
+package pluginproxy
+
+import (
+ "testing"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestInterpolateString(t *testing.T) {
+ Convey("When interpolating string", t, func() {
+ data := templateData{
+ SecureJsonData: map[string]string{
+ "Test": "0asd+asd",
+ },
+ }
+
+ interpolated, err := InterpolateString("{{.SecureJsonData.Test}}", data)
+ So(err, ShouldBeNil)
+ So(interpolated, ShouldEqual, "0asd+asd")
+ })
+}
diff --git a/pkg/api/plugins.go b/pkg/api/plugins.go
index bec33313d0db9..92b5076de2eea 100644
--- a/pkg/api/plugins.go
+++ b/pkg/api/plugins.go
@@ -47,6 +47,7 @@ func (hs *HTTPServer) GetPluginList(c *m.ReqContext) Response {
Id: pluginDef.Id,
Name: pluginDef.Name,
Type: pluginDef.Type,
+ Category: pluginDef.Category,
Info: &pluginDef.Info,
LatestVersion: pluginDef.GrafanaNetVersion,
HasUpdate: pluginDef.GrafanaNetHasUpdate,
diff --git a/pkg/cmd/grafana-cli/services/services.go b/pkg/cmd/grafana-cli/services/services.go
index 8495aeea8112a..1bc1fb7fb1057 100644
--- a/pkg/cmd/grafana-cli/services/services.go
+++ b/pkg/cmd/grafana-cli/services/services.go
@@ -32,7 +32,6 @@ func Init(version string, skipTLSVerify bool) {
DialContext: (&net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
- DualStack: true,
}).DialContext,
MaxIdleConns: 100,
IdleConnTimeout: 90 * time.Second,
diff --git a/pkg/components/imguploader/webdavuploader.go b/pkg/components/imguploader/webdavuploader.go
index d7fa7f4889a5b..7fd513ed61e03 100644
--- a/pkg/components/imguploader/webdavuploader.go
+++ b/pkg/components/imguploader/webdavuploader.go
@@ -25,8 +25,7 @@ type WebdavUploader struct {
var netTransport = &http.Transport{
Proxy: http.ProxyFromEnvironment,
Dial: (&net.Dialer{
- Timeout: 60 * time.Second,
- DualStack: true,
+ Timeout: 60 * time.Second,
}).Dial,
TLSHandshakeTimeout: 5 * time.Second,
}
diff --git a/pkg/models/datasource_cache.go b/pkg/models/datasource_cache.go
index 864adb4a5a64d..c1c29c2c834b9 100644
--- a/pkg/models/datasource_cache.go
+++ b/pkg/models/datasource_cache.go
@@ -61,7 +61,6 @@ func (ds *DataSource) GetHttpTransport() (*http.Transport, error) {
Dial: (&net.Dialer{
Timeout: time.Duration(setting.DataProxyTimeout) * time.Second,
KeepAlive: 30 * time.Second,
- DualStack: true,
}).Dial,
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,
diff --git a/pkg/plugins/models.go b/pkg/plugins/models.go
index feeae9366807d..132bb9e265859 100644
--- a/pkg/plugins/models.go
+++ b/pkg/plugins/models.go
@@ -45,6 +45,7 @@ type PluginBase struct {
Includes []*PluginInclude `json:"includes"`
Module string `json:"module"`
BaseUrl string `json:"baseUrl"`
+ Category string `json:"category"`
HideFromList bool `json:"hideFromList,omitempty"`
Preload bool `json:"preload"`
State PluginState `json:"state,omitempty"`
diff --git a/pkg/plugins/panel_plugin.go b/pkg/plugins/panel_plugin.go
index b90fd41e4650f..f44cd21bf00c8 100644
--- a/pkg/plugins/panel_plugin.go
+++ b/pkg/plugins/panel_plugin.go
@@ -4,7 +4,7 @@ import "encoding/json"
type PanelPlugin struct {
FrontendPluginBase
- DataFormats []string `json:"dataFormats"`
+ SkipDataQuery bool `json:"skipDataQuery"`
}
func (p *PanelPlugin) Load(decoder *json.Decoder, pluginDir string) error {
@@ -16,10 +16,6 @@ func (p *PanelPlugin) Load(decoder *json.Decoder, pluginDir string) error {
return err
}
- if p.DataFormats == nil {
- p.DataFormats = []string{"time_series", "table"}
- }
-
Panels[p.Id] = p
return nil
}
diff --git a/pkg/services/alerting/eval_context_test.go b/pkg/services/alerting/eval_context_test.go
index af7e66b2f07e8..06d3ae16ed800 100644
--- a/pkg/services/alerting/eval_context_test.go
+++ b/pkg/services/alerting/eval_context_test.go
@@ -6,6 +6,8 @@ import (
"testing"
"time"
+ "github.com/stretchr/testify/assert"
+
"github.com/grafana/grafana/pkg/models"
)
@@ -195,12 +197,10 @@ func TestGetStateFromEvalContext(t *testing.T) {
}
for _, tc := range tcs {
- ctx := NewEvalContext(context.TODO(), &Rule{Conditions: []Condition{&conditionStub{firing: true}}})
+ evalContext := NewEvalContext(context.Background(), &Rule{Conditions: []Condition{&conditionStub{firing: true}}})
- tc.applyFn(ctx)
- have := ctx.GetNewState()
- if have != tc.expected {
- t.Errorf("failed: %s \n expected '%s' have '%s'\n", tc.name, tc.expected, string(have))
- }
+ tc.applyFn(evalContext)
+ newState := evalContext.GetNewState()
+ assert.Equal(t, tc.expected, newState, "failed: %s \n expected '%s' have '%s'\n", tc.name, tc.expected, string(newState))
}
}
diff --git a/pkg/services/alerting/notifiers/base.go b/pkg/services/alerting/notifiers/base.go
index 9616c2ab7cf6b..800505b63801b 100644
--- a/pkg/services/alerting/notifiers/base.go
+++ b/pkg/services/alerting/notifiers/base.go
@@ -48,12 +48,15 @@ func NewNotifierBase(model *models.AlertNotification) NotifierBase {
// ShouldNotify checks this evaluation should send an alert notification
func (n *NotifierBase) ShouldNotify(ctx context.Context, context *alerting.EvalContext, notiferState *models.AlertNotificationState) bool {
+ prevState := context.PrevAlertState
+ newState := context.Rule.State
+
// Only notify on state change.
- if context.PrevAlertState == context.Rule.State && !n.SendReminder {
+ if prevState == newState && !n.SendReminder {
return false
}
- if context.PrevAlertState == context.Rule.State && n.SendReminder {
+ if prevState == newState && n.SendReminder {
// Do not notify if interval has not elapsed
lastNotify := time.Unix(notiferState.UpdatedAt, 0)
if notiferState.UpdatedAt != 0 && lastNotify.Add(n.Frequency).After(time.Now()) {
@@ -61,32 +64,35 @@ func (n *NotifierBase) ShouldNotify(ctx context.Context, context *alerting.EvalC
}
// Do not notify if alert state is OK or pending even on repeated notify
- if context.Rule.State == models.AlertStateOK || context.Rule.State == models.AlertStatePending {
+ if newState == models.AlertStateOK || newState == models.AlertStatePending {
return false
}
}
- // Do not notify when we become OK for the first time.
- if context.PrevAlertState == models.AlertStateUnknown && context.Rule.State == models.AlertStateOK {
+ unknownOrNoData := prevState == models.AlertStateUnknown || prevState == models.AlertStateNoData
+ okOrPending := newState == models.AlertStatePending || newState == models.AlertStateOK
+
+ // Do not notify when new state is ok/pending when previous is unknown or no_data
+ if unknownOrNoData && okOrPending {
return false
}
- // Do not notify when we become OK for the first time.
- if context.PrevAlertState == models.AlertStateUnknown && context.Rule.State == models.AlertStatePending {
+ // Do not notify when we become Pending for the first
+ if prevState == models.AlertStateNoData && newState == models.AlertStatePending {
return false
}
// Do not notify when we become OK from pending
- if context.PrevAlertState == models.AlertStatePending && context.Rule.State == models.AlertStateOK {
+ if prevState == models.AlertStatePending && newState == models.AlertStateOK {
return false
}
// Do not notify when we OK -> Pending
- if context.PrevAlertState == models.AlertStateOK && context.Rule.State == models.AlertStatePending {
+ if prevState == models.AlertStateOK && newState == models.AlertStatePending {
return false
}
- // Do not notifu if state pending and it have been updated last minute
+ // Do not notify if state pending and it have been updated last minute
if notiferState.State == models.AlertNotificationStatePending {
lastUpdated := time.Unix(notiferState.UpdatedAt, 0)
if lastUpdated.Add(1 * time.Minute).After(time.Now()) {
@@ -95,7 +101,7 @@ func (n *NotifierBase) ShouldNotify(ctx context.Context, context *alerting.EvalC
}
// Do not notify when state is OK if DisableResolveMessage is set to true
- if context.Rule.State == models.AlertStateOK && n.DisableResolveMessage {
+ if newState == models.AlertStateOK && n.DisableResolveMessage {
return false
}
diff --git a/pkg/services/alerting/notifiers/base_test.go b/pkg/services/alerting/notifiers/base_test.go
index bf09ecab0cd68..84294bfb29d58 100644
--- a/pkg/services/alerting/notifiers/base_test.go
+++ b/pkg/services/alerting/notifiers/base_test.go
@@ -5,8 +5,10 @@ import (
"testing"
"time"
+ "github.com/stretchr/testify/assert"
+
"github.com/grafana/grafana/pkg/components/simplejson"
- m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting"
. "github.com/smartystreets/goconvey/convey"
)
@@ -16,76 +18,76 @@ func TestShouldSendAlertNotification(t *testing.T) {
tcs := []struct {
name string
- prevState m.AlertStateType
- newState m.AlertStateType
+ prevState models.AlertStateType
+ newState models.AlertStateType
sendReminder bool
frequency time.Duration
- state *m.AlertNotificationState
+ state *models.AlertNotificationState
expect bool
}{
{
name: "pending -> ok should not trigger an notification",
- newState: m.AlertStateOK,
- prevState: m.AlertStatePending,
+ newState: models.AlertStateOK,
+ prevState: models.AlertStatePending,
sendReminder: false,
expect: false,
},
{
name: "ok -> alerting should trigger an notification",
- newState: m.AlertStateAlerting,
- prevState: m.AlertStateOK,
+ newState: models.AlertStateAlerting,
+ prevState: models.AlertStateOK,
sendReminder: false,
expect: true,
},
{
name: "ok -> pending should not trigger an notification",
- newState: m.AlertStatePending,
- prevState: m.AlertStateOK,
+ newState: models.AlertStatePending,
+ prevState: models.AlertStateOK,
sendReminder: false,
expect: false,
},
{
name: "ok -> ok should not trigger an notification",
- newState: m.AlertStateOK,
- prevState: m.AlertStateOK,
+ newState: models.AlertStateOK,
+ prevState: models.AlertStateOK,
sendReminder: false,
expect: false,
},
{
name: "ok -> ok with reminder should not trigger an notification",
- newState: m.AlertStateOK,
- prevState: m.AlertStateOK,
+ newState: models.AlertStateOK,
+ prevState: models.AlertStateOK,
sendReminder: true,
expect: false,
},
{
name: "alerting -> ok should trigger an notification",
- newState: m.AlertStateOK,
- prevState: m.AlertStateAlerting,
+ newState: models.AlertStateOK,
+ prevState: models.AlertStateAlerting,
sendReminder: false,
expect: true,
},
{
name: "alerting -> ok should trigger an notification when reminders enabled",
- newState: m.AlertStateOK,
- prevState: m.AlertStateAlerting,
+ newState: models.AlertStateOK,
+ prevState: models.AlertStateAlerting,
frequency: time.Minute * 10,
sendReminder: true,
- state: &m.AlertNotificationState{UpdatedAt: tnow.Add(-time.Minute).Unix()},
+ state: &models.AlertNotificationState{UpdatedAt: tnow.Add(-time.Minute).Unix()},
expect: true,
},
{
name: "alerting -> alerting with reminder and no state should trigger",
- newState: m.AlertStateAlerting,
- prevState: m.AlertStateAlerting,
+ newState: models.AlertStateAlerting,
+ prevState: models.AlertStateAlerting,
frequency: time.Minute * 10,
sendReminder: true,
@@ -93,78 +95,84 @@ func TestShouldSendAlertNotification(t *testing.T) {
},
{
name: "alerting -> alerting with reminder and last notification sent 1 minute ago should not trigger",
- newState: m.AlertStateAlerting,
- prevState: m.AlertStateAlerting,
+ newState: models.AlertStateAlerting,
+ prevState: models.AlertStateAlerting,
frequency: time.Minute * 10,
sendReminder: true,
- state: &m.AlertNotificationState{UpdatedAt: tnow.Add(-time.Minute).Unix()},
+ state: &models.AlertNotificationState{UpdatedAt: tnow.Add(-time.Minute).Unix()},
expect: false,
},
{
name: "alerting -> alerting with reminder and last notifciation sent 11 minutes ago should trigger",
- newState: m.AlertStateAlerting,
- prevState: m.AlertStateAlerting,
+ newState: models.AlertStateAlerting,
+ prevState: models.AlertStateAlerting,
frequency: time.Minute * 10,
sendReminder: true,
- state: &m.AlertNotificationState{UpdatedAt: tnow.Add(-11 * time.Minute).Unix()},
+ state: &models.AlertNotificationState{UpdatedAt: tnow.Add(-11 * time.Minute).Unix()},
expect: true,
},
{
name: "OK -> alerting with notifciation state pending and updated 30 seconds ago should not trigger",
- newState: m.AlertStateAlerting,
- prevState: m.AlertStateOK,
- state: &m.AlertNotificationState{State: m.AlertNotificationStatePending, UpdatedAt: tnow.Add(-30 * time.Second).Unix()},
+ newState: models.AlertStateAlerting,
+ prevState: models.AlertStateOK,
+ state: &models.AlertNotificationState{State: models.AlertNotificationStatePending, UpdatedAt: tnow.Add(-30 * time.Second).Unix()},
expect: false,
},
{
name: "OK -> alerting with notifciation state pending and updated 2 minutes ago should trigger",
- newState: m.AlertStateAlerting,
- prevState: m.AlertStateOK,
- state: &m.AlertNotificationState{State: m.AlertNotificationStatePending, UpdatedAt: tnow.Add(-2 * time.Minute).Unix()},
+ newState: models.AlertStateAlerting,
+ prevState: models.AlertStateOK,
+ state: &models.AlertNotificationState{State: models.AlertNotificationStatePending, UpdatedAt: tnow.Add(-2 * time.Minute).Unix()},
expect: true,
},
{
name: "unknown -> ok",
- prevState: m.AlertStateUnknown,
- newState: m.AlertStateOK,
+ prevState: models.AlertStateUnknown,
+ newState: models.AlertStateOK,
expect: false,
},
{
name: "unknown -> pending",
- prevState: m.AlertStateUnknown,
- newState: m.AlertStatePending,
+ prevState: models.AlertStateUnknown,
+ newState: models.AlertStatePending,
expect: false,
},
{
name: "unknown -> alerting",
- prevState: m.AlertStateUnknown,
- newState: m.AlertStateAlerting,
+ prevState: models.AlertStateUnknown,
+ newState: models.AlertStateAlerting,
expect: true,
},
+ {
+ name: "no_data -> pending",
+ prevState: models.AlertStateNoData,
+ newState: models.AlertStatePending,
+
+ expect: false,
+ },
}
for _, tc := range tcs {
- evalContext := alerting.NewEvalContext(context.TODO(), &alerting.Rule{
+ evalContext := alerting.NewEvalContext(context.Background(), &alerting.Rule{
State: tc.prevState,
})
if tc.state == nil {
- tc.state = &m.AlertNotificationState{}
+ tc.state = &models.AlertNotificationState{}
}
evalContext.Rule.State = tc.newState
nb := &NotifierBase{SendReminder: tc.sendReminder, Frequency: tc.frequency}
- if nb.ShouldNotify(evalContext.Ctx, evalContext, tc.state) != tc.expect {
- t.Errorf("failed test %s.\n expected \n%+v \nto return: %v", tc.name, tc, tc.expect)
- }
+ r := nb.ShouldNotify(evalContext.Ctx, evalContext, tc.state)
+ assert.Equal(t, r, tc.expect, "failed test %s. expected %+v to return: %v", tc.name, tc, tc.expect)
}
}
@@ -172,7 +180,7 @@ func TestBaseNotifier(t *testing.T) {
Convey("default constructor for notifiers", t, func() {
bJson := simplejson.New()
- model := &m.AlertNotification{
+ model := &models.AlertNotification{
Uid: "1",
Name: "name",
Type: "email",
diff --git a/pkg/services/notifications/mailer.go b/pkg/services/notifications/mailer.go
index 4730ef7f0f113..f88deb2bf9608 100644
--- a/pkg/services/notifications/mailer.go
+++ b/pkg/services/notifications/mailer.go
@@ -14,6 +14,7 @@ import (
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
+ "github.com/pkg/errors"
gomail "gopkg.in/mail.v2"
)
@@ -23,6 +24,7 @@ func (ns *NotificationService) send(msg *Message) (int, error) {
return 0, err
}
+ var num int
for _, address := range msg.To {
m := gomail.NewMessage()
m.SetHeader("From", msg.From)
@@ -34,12 +36,16 @@ func (ns *NotificationService) send(msg *Message) (int, error) {
m.SetBody("text/html", msg.Body)
- if err := dialer.DialAndSend(m); err != nil {
- return 0, err
+ e := dialer.DialAndSend(m)
+ if e != nil {
+ err = errors.Wrapf(e, "Failed to send notification to email address: %s", address)
+ continue
}
+
+ num += 1
}
- return len(msg.To), nil
+ return num, err
}
func (ns *NotificationService) createDialer() (*gomail.Dialer, error) {
diff --git a/pkg/services/notifications/webhook.go b/pkg/services/notifications/webhook.go
index 2be3b14537299..3e2d097847f6f 100644
--- a/pkg/services/notifications/webhook.go
+++ b/pkg/services/notifications/webhook.go
@@ -32,8 +32,7 @@ var netTransport = &http.Transport{
},
Proxy: http.ProxyFromEnvironment,
Dial: (&net.Dialer{
- Timeout: 30 * time.Second,
- DualStack: true,
+ Timeout: 30 * time.Second,
}).Dial,
TLSHandshakeTimeout: 5 * time.Second,
}
diff --git a/pkg/services/rendering/http_mode.go b/pkg/services/rendering/http_mode.go
index 40259c44746f6..a4d509f95659d 100644
--- a/pkg/services/rendering/http_mode.go
+++ b/pkg/services/rendering/http_mode.go
@@ -15,8 +15,7 @@ import (
var netTransport = &http.Transport{
Proxy: http.ProxyFromEnvironment,
Dial: (&net.Dialer{
- Timeout: 30 * time.Second,
- DualStack: true,
+ Timeout: 30 * time.Second,
}).Dial,
TLSHandshakeTimeout: 5 * time.Second,
}
diff --git a/public/app/app.ts b/public/app/app.ts
index c72d17bbf5a24..9f95634330d57 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -19,7 +19,6 @@ import angular from 'angular';
import config from 'app/core/config';
// @ts-ignore ignoring this for now, otherwise we would have to extend _ interface with move
import _ from 'lodash';
-import moment from 'moment';
import { addClassIfNoOverlayScrollbar } from 'app/core/utils/scrollbar';
import { importPluginModule } from 'app/features/plugins/plugin_loader';
@@ -36,6 +35,7 @@ import { setupAngularRoutes } from 'app/routes/routes';
import 'app/routes/GrafanaCtrl';
import 'app/features/all';
+import { setLocale } from '@grafana/ui/src/utils/moment_wrapper';
// import symlinked extensions
const extensionsIndex = (require as any).context('.', true, /extensions\/index.ts/);
@@ -68,7 +68,7 @@ export class GrafanaApp {
init() {
const app = angular.module('grafana', []);
- moment.locale(config.bootData.user.locale);
+ setLocale(config.bootData.user.locale);
app.config(
(
diff --git a/public/app/core/components/search/search_results.html b/public/app/core/components/search/search_results.html
index 09d21ba80c03c..a2337cfbc19cd 100644
--- a/public/app/core/components/search/search_results.html
+++ b/public/app/core/components/search/search_results.html
@@ -20,7 +20,7 @@
diff --git a/public/app/features/alerting/__snapshots__/AlertRuleList.test.tsx.snap b/public/app/features/alerting/__snapshots__/AlertRuleList.test.tsx.snap
index dbc8945a1e73b..3e255c5e70241 100644
--- a/public/app/features/alerting/__snapshots__/AlertRuleList.test.tsx.snap
+++ b/public/app/features/alerting/__snapshots__/AlertRuleList.test.tsx.snap
@@ -89,10 +89,7 @@ exports[`Render should render alert rules 1`] = `
className="btn btn-secondary"
onClick={[Function]}
>
-
- How to add an alert
+ How to add an alert
-
+
{
- option.selected = false;
- });
+ this.selectedValues = _.filter(this.options, { selected: true });
+ if (this.selectedValues.length > 1) {
+ _.each(this.options, option => {
+ option.selected = false;
+ });
+ } else {
+ _.each(this.search.options, option => {
+ option.selected = true;
+ });
+ }
this.selectionsChanged(false);
}
diff --git a/public/app/core/filters/filters.ts b/public/app/core/filters/filters.ts
index 22e1f9a79837f..1176395d09afe 100644
--- a/public/app/core/filters/filters.ts
+++ b/public/app/core/filters/filters.ts
@@ -1,8 +1,8 @@
import _ from 'lodash';
import angular from 'angular';
-import moment from 'moment';
import coreModule from '../core_module';
import { TemplateSrv } from 'app/features/templating/template_srv';
+import { dateTime } from '@grafana/ui/src/utils/moment_wrapper';
coreModule.filter('stringSort', () => {
return (input: any) => {
@@ -33,9 +33,9 @@ coreModule.filter('moment', () => {
return (date: string, mode: string) => {
switch (mode) {
case 'ago':
- return moment(date).fromNow();
+ return dateTime(date).fromNow();
}
- return moment(date).fromNow();
+ return dateTime(date).fromNow();
};
});
diff --git a/public/app/core/logs_model.ts b/public/app/core/logs_model.ts
index 03420f8029949..2ba60ce428e9f 100644
--- a/public/app/core/logs_model.ts
+++ b/public/app/core/logs_model.ts
@@ -1,5 +1,4 @@
import _ from 'lodash';
-import moment from 'moment';
import ansicolor from 'vendor/ansicolor/ansicolor';
import {
@@ -17,6 +16,7 @@ import {
} from '@grafana/ui';
import { getThemeColor } from 'app/core/utils/colors';
import { hasAnsiCodes } from 'app/core/utils/text';
+import { dateTime } from '@grafana/ui/src/utils/moment_wrapper';
export const LogLevelColor = {
[LogLevel.critical]: colors[7],
@@ -356,7 +356,12 @@ export function seriesDataToLogsModel(seriesData: SeriesData[], intervalMs: numb
return logsModel;
}
- return undefined;
+ return {
+ hasUniqueLabels: false,
+ rows: [],
+ meta: [],
+ series: [],
+ };
}
export function logSeriesToLogsModel(logSeries: SeriesData[]): LogsModel {
@@ -435,7 +440,7 @@ export function processLogSeriesRow(
const ts = row[timeFieldIndex];
const stringFieldIndex = fieldCache.getFirstFieldOfType(FieldType.string).index;
const message = row[stringFieldIndex];
- const time = moment(ts);
+ const time = dateTime(ts);
const timeEpochMs = time.valueOf();
const timeFromNow = time.fromNow();
const timeLocal = time.format('YYYY-MM-DD HH:mm:ss');
diff --git a/public/app/core/specs/logs_model.test.ts b/public/app/core/specs/logs_model.test.ts
index 807605965ef95..c30a3ebfa3910 100644
--- a/public/app/core/specs/logs_model.test.ts
+++ b/public/app/core/specs/logs_model.test.ts
@@ -333,22 +333,29 @@ describe('LogsParsers', () => {
});
});
+const emptyLogsModel = {
+ hasUniqueLabels: false,
+ rows: [],
+ meta: [],
+ series: [],
+};
+
describe('seriesDataToLogsModel', () => {
- it('given empty series should return undefined', () => {
- expect(seriesDataToLogsModel([] as SeriesData[], 0)).toBeUndefined();
+ it('given empty series should return empty logs model', () => {
+ expect(seriesDataToLogsModel([] as SeriesData[], 0)).toMatchObject(emptyLogsModel);
});
- it('given series without correct series name should not be processed', () => {
+ it('given series without correct series name should return empty logs model', () => {
const series: SeriesData[] = [
{
fields: [],
rows: [],
},
];
- expect(seriesDataToLogsModel(series, 0)).toBeUndefined();
+ expect(seriesDataToLogsModel(series, 0)).toMatchObject(emptyLogsModel);
});
- it('given series without a time field should not be processed', () => {
+ it('given series without a time field should return empty logs model', () => {
const series: SeriesData[] = [
{
fields: [
@@ -360,10 +367,10 @@ describe('seriesDataToLogsModel', () => {
rows: [],
},
];
- expect(seriesDataToLogsModel(series, 0)).toBeUndefined();
+ expect(seriesDataToLogsModel(series, 0)).toMatchObject(emptyLogsModel);
});
- it('given series without a string field should not be processed', () => {
+ it('given series without a string field should return empty logs model', () => {
const series: SeriesData[] = [
{
fields: [
@@ -375,7 +382,7 @@ describe('seriesDataToLogsModel', () => {
rows: [],
},
];
- expect(seriesDataToLogsModel(series, 0)).toBeUndefined();
+ expect(seriesDataToLogsModel(series, 0)).toMatchObject(emptyLogsModel);
});
it('given one series should return expected logs model', () => {
diff --git a/public/app/core/specs/rangeutil.test.ts b/public/app/core/specs/rangeutil.test.ts
index 0094b714cd9d3..d23bbf9f0eb24 100644
--- a/public/app/core/specs/rangeutil.test.ts
+++ b/public/app/core/specs/rangeutil.test.ts
@@ -1,6 +1,6 @@
import * as rangeUtil from '@grafana/ui/src/utils/rangeutil';
import _ from 'lodash';
-import moment from 'moment';
+import { dateTime } from '@grafana/ui/src/utils/moment_wrapper';
describe('rangeUtil', () => {
describe('Can get range grouped list of ranges', () => {
@@ -69,7 +69,7 @@ describe('rangeUtil', () => {
it('Date range with absolute to now', () => {
const text = rangeUtil.describeTimeRange({
- from: moment([2014, 10, 10, 2, 3, 4]),
+ from: dateTime([2014, 10, 10, 2, 3, 4]),
to: 'now',
});
expect(text).toBe('Nov 10, 2014 02:03:04 to a few seconds ago');
@@ -77,7 +77,7 @@ describe('rangeUtil', () => {
it('Date range with absolute to relative', () => {
const text = rangeUtil.describeTimeRange({
- from: moment([2014, 10, 10, 2, 3, 4]),
+ from: dateTime([2014, 10, 10, 2, 3, 4]),
to: 'now-1d',
});
expect(text).toBe('Nov 10, 2014 02:03:04 to a day ago');
@@ -86,7 +86,7 @@ describe('rangeUtil', () => {
it('Date range with relative to absolute', () => {
const text = rangeUtil.describeTimeRange({
from: 'now-7d',
- to: moment([2014, 10, 10, 2, 3, 4]),
+ to: dateTime([2014, 10, 10, 2, 3, 4]),
});
expect(text).toBe('7 days ago to Nov 10, 2014 02:03:04');
});
diff --git a/public/app/core/utils/explore.test.ts b/public/app/core/utils/explore.test.ts
index 2f28e60fdbc20..3a0752d2a5ed0 100644
--- a/public/app/core/utils/explore.test.ts
+++ b/public/app/core/utils/explore.test.ts
@@ -5,10 +5,15 @@ import {
updateHistory,
clearHistory,
hasNonEmptyQuery,
+ instanceOfDataQueryError,
+ getValueWithRefId,
+ getFirstQueryErrorWithoutRefId,
+ getRefIds,
} from './explore';
import { ExploreUrlState } from 'app/types/explore';
import store from 'app/core/store';
import { LogsDedupStrategy } from 'app/core/logs_model';
+import { DataQueryError } from '@grafana/ui';
const DEFAULT_EXPLORE_STATE: ExploreUrlState = {
datasource: null,
@@ -188,3 +193,164 @@ describe('hasNonEmptyQuery', () => {
expect(hasNonEmptyQuery([])).toBeFalsy();
});
});
+
+describe('instanceOfDataQueryError', () => {
+ describe('when called with a DataQueryError', () => {
+ it('then it should return true', () => {
+ const error: DataQueryError = {
+ message: 'A message',
+ status: '200',
+ statusText: 'Ok',
+ };
+ const result = instanceOfDataQueryError(error);
+
+ expect(result).toBe(true);
+ });
+ });
+
+ describe('when called with a non DataQueryError', () => {
+ it('then it should return false', () => {
+ const error = {};
+ const result = instanceOfDataQueryError(error);
+
+ expect(result).toBe(false);
+ });
+ });
+});
+
+describe('hasRefId', () => {
+ describe('when called with a null value', () => {
+ it('then it should return null', () => {
+ const input = null;
+ const result = getValueWithRefId(input);
+
+ expect(result).toBeNull();
+ });
+ });
+
+ describe('when called with a non object value', () => {
+ it('then it should return null', () => {
+ const input = 123;
+ const result = getValueWithRefId(input);
+
+ expect(result).toBeNull();
+ });
+ });
+
+ describe('when called with an object that has refId', () => {
+ it('then it should return the object', () => {
+ const input = { refId: 'A' };
+ const result = getValueWithRefId(input);
+
+ expect(result).toBe(input);
+ });
+ });
+
+ describe('when called with an array that has refId', () => {
+ it('then it should return the object', () => {
+ const input = [123, null, {}, { refId: 'A' }];
+ const result = getValueWithRefId(input);
+
+ expect(result).toBe(input[3]);
+ });
+ });
+
+ describe('when called with an object that has refId somewhere in the object tree', () => {
+ it('then it should return the object', () => {
+ const input: any = { data: [123, null, {}, { series: [123, null, {}, { refId: 'A' }] }] };
+ const result = getValueWithRefId(input);
+
+ expect(result).toBe(input.data[3].series[3]);
+ });
+ });
+});
+
+describe('getFirstQueryErrorWithoutRefId', () => {
+ describe('when called with a null value', () => {
+ it('then it should return null', () => {
+ const errors: DataQueryError[] = null;
+ const result = getFirstQueryErrorWithoutRefId(errors);
+
+ expect(result).toBeNull();
+ });
+ });
+
+ describe('when called with an array with only refIds', () => {
+ it('then it should return undefined', () => {
+ const errors: DataQueryError[] = [{ refId: 'A' }, { refId: 'B' }];
+ const result = getFirstQueryErrorWithoutRefId(errors);
+
+ expect(result).toBeUndefined();
+ });
+ });
+
+ describe('when called with an array with and without refIds', () => {
+ it('then it should return undefined', () => {
+ const errors: DataQueryError[] = [
+ { refId: 'A' },
+ { message: 'A message' },
+ { refId: 'B' },
+ { message: 'B message' },
+ ];
+ const result = getFirstQueryErrorWithoutRefId(errors);
+
+ expect(result).toBe(errors[1]);
+ });
+ });
+});
+
+describe('getRefIds', () => {
+ describe('when called with a null value', () => {
+ it('then it should return empty array', () => {
+ const input = null;
+ const result = getRefIds(input);
+
+ expect(result).toEqual([]);
+ });
+ });
+
+ describe('when called with a non object value', () => {
+ it('then it should return empty array', () => {
+ const input = 123;
+ const result = getRefIds(input);
+
+ expect(result).toEqual([]);
+ });
+ });
+
+ describe('when called with an object that has refId', () => {
+ it('then it should return an array with that refId', () => {
+ const input = { refId: 'A' };
+ const result = getRefIds(input);
+
+ expect(result).toEqual(['A']);
+ });
+ });
+
+ describe('when called with an array that has refIds', () => {
+ it('then it should return an array with unique refIds', () => {
+ const input = [123, null, {}, { refId: 'A' }, { refId: 'A' }, { refId: 'B' }];
+ const result = getRefIds(input);
+
+ expect(result).toEqual(['A', 'B']);
+ });
+ });
+
+ describe('when called with an object that has refIds somewhere in the object tree', () => {
+ it('then it should return return an array with unique refIds', () => {
+ const input: any = {
+ data: [
+ 123,
+ null,
+ { refId: 'B', series: [{ refId: 'X' }] },
+ { refId: 'B' },
+ {},
+ { series: [123, null, {}, { refId: 'A' }] },
+ ],
+ };
+ const result = getRefIds(input);
+
+ expect(result).toEqual(['B', 'X', 'A']);
+ });
+ });
+});
diff --git a/public/app/core/utils/explore.ts b/public/app/core/utils/explore.ts
index 5df42ad92d912..7a19fd5a822da 100644
--- a/public/app/core/utils/explore.ts
+++ b/public/app/core/utils/explore.ts
@@ -1,6 +1,5 @@
// Libraries
import _ from 'lodash';
-import moment, { Moment } from 'moment';
// Services & Utils
import * as dateMath from '@grafana/ui/src/utils/datemath';
@@ -21,6 +20,8 @@ import {
DataSourceApi,
toSeriesData,
guessFieldTypes,
+ TimeFragment,
+ DataQueryError,
} from '@grafana/ui';
import TimeSeries from 'app/core/time_series2';
import {
@@ -33,6 +34,7 @@ import {
ResultGetter,
} from 'app/types/explore';
import { LogsDedupStrategy, seriesDataToLogsModel } from 'app/core/logs_model';
+import { toUtc } from '@grafana/ui/src/utils/moment_wrapper';
export const DEFAULT_RANGE = {
from: 'now-6h',
@@ -109,8 +111,7 @@ export async function getExploreUrl(
}
export function buildQueryTransaction(
- query: DataQuery,
- rowIndex: number,
+ queries: DataQuery[],
resultType: ResultType,
queryOptions: QueryOptions,
range: TimeRange,
@@ -119,12 +120,11 @@ export function buildQueryTransaction(
): QueryTransaction {
const { interval, intervalMs } = queryIntervals;
- const configuredQueries = [
- {
- ...query,
- ...queryOptions,
- },
- ];
+ const configuredQueries = queries.map(query => ({ ...query, ...queryOptions }));
+ const key = queries.reduce((combinedKey, query) => {
+ combinedKey += query.key;
+ return combinedKey;
+ }, '');
// Clone range for query request
// const queryRange: RawTimeRange = { ...range };
@@ -133,7 +133,7 @@ export function buildQueryTransaction(
// Using `format` here because it relates to the view panel that the request is for.
// However, some datasources don't use `panelId + query.refId`, but only `panelId`.
// Therefore panel id has to be unique.
- const panelId = `${queryOptions.format}-${query.key}`;
+ const panelId = `${queryOptions.format}-${key}`;
const options = {
interval,
@@ -150,10 +150,9 @@ export function buildQueryTransaction(
};
return {
+ queries,
options,
- query,
resultType,
- rowIndex,
scanning,
id: generateKey(), // reusing for unique ID
done: false,
@@ -194,6 +193,20 @@ export const safeParseJson = (text: string) => {
}
};
+export const safeStringifyValue = (value: any, space?: number) => {
+ if (!value) {
+ return '';
+ }
+
+ try {
+ return JSON.stringify(value, null, space);
+ } catch (error) {
+ console.error(error);
+ }
+
+ return '';
+};
+
export function parseUrlState(initial: string | undefined): ExploreUrlState {
const parsed = safeParseJson(initial);
const errorResult = {
@@ -264,12 +277,34 @@ export function generateEmptyQuery(queries: DataQuery[], index = 0): DataQuery {
return { refId: getNextRefIdChar(queries), key: generateKey(index) };
}
+export const generateNewKeyAndAddRefIdIfMissing = (target: DataQuery, queries: DataQuery[], index = 0): DataQuery => {
+ const key = generateKey(index);
+ const refId = target.refId || getNextRefIdChar(queries);
+
+ return { ...target, refId, key };
+};
+
/**
* Ensure at least one target exists and that targets have the necessary keys
*/
export function ensureQueries(queries?: DataQuery[]): DataQuery[] {
if (queries && typeof queries === 'object' && queries.length > 0) {
- return queries.map((query, i) => ({ ...query, ...generateEmptyQuery(queries, i) }));
+ const allQueries = [];
+ for (let index = 0; index < queries.length; index++) {
+ const query = queries[index];
+ const key = generateKey(index);
+ let refId = query.refId;
+ if (!refId) {
+ refId = getNextRefIdChar(allQueries);
+ }
+
+ allQueries.push({
+ ...query,
+ refId,
+ key,
+ });
+ }
+ return allQueries;
}
return [{ ...generateEmptyQuery(queries) }];
}
@@ -289,26 +324,20 @@ export function hasNonEmptyQuery(queries: TQuery
);
}
-export function calculateResultsFromQueryTransactions(
- queryTransactions: QueryTransaction[],
- datasource: any,
- graphInterval: number
-) {
- const graphResult = _.flatten(
- queryTransactions.filter(qt => qt.resultType === 'Graph' && qt.done && qt.result).map(qt => qt.result)
- );
- const tableResult = mergeTablesIntoModel(
- new TableModel(),
- ...queryTransactions
- .filter(qt => qt.resultType === 'Table' && qt.done && qt.result && qt.result.columns && qt.result.rows)
- .map(qt => qt.result)
- );
- const logsResult = seriesDataToLogsModel(
- _.flatten(
- queryTransactions.filter(qt => qt.resultType === 'Logs' && qt.done && qt.result).map(qt => qt.result)
- ).map(r => guessFieldTypes(toSeriesData(r))),
- graphInterval
- );
+export function calculateResultsFromQueryTransactions(result: any, resultType: ResultType, graphInterval: number) {
+ const flattenedResult: any[] = _.flatten(result);
+ const graphResult = resultType === 'Graph' && result ? result : null;
+ const tableResult =
+ resultType === 'Table' && result
+ ? mergeTablesIntoModel(
+ new TableModel(),
+ ...flattenedResult.filter((r: any) => r.columns && r.rows).map((r: any) => r as TableModel)
+ )
+ : mergeTablesIntoModel(new TableModel());
+ const logsResult =
+ resultType === 'Logs' && result
+ ? seriesDataToLogsModel(flattenedResult.map(r => guessFieldTypes(toSeriesData(r))), graphInterval)
+ : null;
return {
graphResult,
@@ -401,7 +430,7 @@ export const getTimeRange = (timeZone: TimeZone, rawRange: RawTimeRange): TimeRa
};
};
-const parseRawTime = (value): Moment | string => {
+const parseRawTime = (value): TimeFragment => {
if (value === null) {
return null;
}
@@ -410,19 +439,19 @@ const parseRawTime = (value): Moment | string => {
return value;
}
if (value.length === 8) {
- return moment.utc(value, 'YYYYMMDD');
+ return toUtc(value, 'YYYYMMDD');
}
if (value.length === 15) {
- return moment.utc(value, 'YYYYMMDDTHHmmss');
+ return toUtc(value, 'YYYYMMDDTHHmmss');
}
// Backward compatibility
if (value.length === 19) {
- return moment.utc(value, 'YYYY-MM-DD HH:mm:ss');
+ return toUtc(value, 'YYYY-MM-DD HH:mm:ss');
}
if (!isNaN(value)) {
const epoch = parseInt(value, 10);
- return moment.utc(epoch);
+ return toUtc(epoch);
}
return null;
@@ -440,3 +469,63 @@ export const getTimeRangeFromUrl = (range: RawTimeRange, timeZone: TimeZone): Ti
raw,
};
};
+
+export const instanceOfDataQueryError = (value: any): value is DataQueryError => {
+ return value.message !== undefined && value.status !== undefined && value.statusText !== undefined;
+};
+
+export const getValueWithRefId = (value: any): any | null => {
+ if (!value) {
+ return null;
+ }
+
+ if (typeof value !== 'object') {
+ return null;
+ }
+
+ if (value.refId) {
+ return value;
+ }
+
+ const keys = Object.keys(value);
+ for (let index = 0; index < keys.length; index++) {
+ const key = keys[index];
+ const refId = getValueWithRefId(value[key]);
+ if (refId) {
+ return refId;
+ }
+ }
+
+ return null;
+};
+
+export const getFirstQueryErrorWithoutRefId = (errors: DataQueryError[]) => {
+ if (!errors) {
+ return null;
+ }
+
+ return errors.filter(error => (error.refId ? false : true))[0];
+};
+
+export const getRefIds = (value: any): string[] => {
+ if (!value) {
+ return [];
+ }
+
+ if (typeof value !== 'object') {
+ return [];
+ }
+
+ const keys = Object.keys(value);
+ const refIds = [];
+ for (let index = 0; index < keys.length; index++) {
+ const key = keys[index];
+ if (key === 'refId') {
+ refIds.push(value[key]);
+ continue;
+ }
+ refIds.push(getRefIds(value[key]));
+ }
+
+ return _.uniq(_.flatten(refIds));
+};
diff --git a/public/app/core/utils/file_export.ts b/public/app/core/utils/file_export.ts
index c59d646839fed..6d341b5582e29 100644
--- a/public/app/core/utils/file_export.ts
+++ b/public/app/core/utils/file_export.ts
@@ -1,7 +1,7 @@
import { isBoolean, isNumber, sortedUniq, sortedIndexOf, unescape as htmlUnescaped } from 'lodash';
-import moment from 'moment';
import { saveAs } from 'file-saver';
import { isNullOrUndefined } from 'util';
+import { dateTime } from '@grafana/ui/src/utils/moment_wrapper';
const DEFAULT_DATETIME_FORMAT = 'YYYY-MM-DDTHH:mm:ssZ';
const POINT_TIME_INDEX = 1;
@@ -61,7 +61,7 @@ export function convertSeriesListToCsv(seriesList, dateTimeFormat = DEFAULT_DATE
text += formatRow(
[
seriesList[seriesIndex].alias,
- moment(seriesList[seriesIndex].datapoints[i][POINT_TIME_INDEX]).format(dateTimeFormat),
+ dateTime(seriesList[seriesIndex].datapoints[i][POINT_TIME_INDEX]).format(dateTimeFormat),
seriesList[seriesIndex].datapoints[i][POINT_VALUE_INDEX],
],
i < seriesList[seriesIndex].datapoints.length - 1 || seriesIndex < seriesList.length - 1
@@ -92,7 +92,7 @@ export function convertSeriesListToCsvColumns(seriesList, dateTimeFormat = DEFAU
// make text
for (let i = 0; i < extendedDatapointsList[0].length; i += 1) {
- const timestamp = moment(extendedDatapointsList[0][i][POINT_TIME_INDEX]).format(dateTimeFormat);
+ const timestamp = dateTime(extendedDatapointsList[0][i][POINT_TIME_INDEX]).format(dateTimeFormat);
text += formatRow(
[timestamp].concat(
extendedDatapointsList.map(datapoints => {
diff --git a/public/app/features/alerting/AlertRuleList.tsx b/public/app/features/alerting/AlertRuleList.tsx
index dcd31b71419c8..703feb141d6da 100644
--- a/public/app/features/alerting/AlertRuleList.tsx
+++ b/public/app/features/alerting/AlertRuleList.tsx
@@ -114,7 +114,7 @@ export class AlertRuleList extends PureComponent {
- How to add an alert
+ How to add an alert
-
+
diff --git a/public/app/features/dashboard/components/AddPanelWidget/__snapshots__/AddPanelWidget.test.tsx.snap b/public/app/features/dashboard/components/AddPanelWidget/__snapshots__/AddPanelWidget.test.tsx.snap
index 00faf48d8dfc1..1908aa5f7f146 100644
--- a/public/app/features/dashboard/components/AddPanelWidget/__snapshots__/AddPanelWidget.test.tsx.snap
+++ b/public/app/features/dashboard/components/AddPanelWidget/__snapshots__/AddPanelWidget.test.tsx.snap
@@ -35,6 +35,7 @@ exports[`Render should render component 1`] = `
>
diff --git a/public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts b/public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts
index a710bded5935b..f1d626e9e3479 100644
--- a/public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts
+++ b/public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts
@@ -1,6 +1,5 @@
import _ from 'lodash';
import angular from 'angular';
-import moment from 'moment';
import * as rangeUtil from '@grafana/ui/src/utils/rangeutil';
@@ -38,7 +37,7 @@ export class TimePickerCtrl {
// init options
this.panel = this.dashboard.timepicker;
_.defaults(this.panel, TimePickerCtrl.defaults);
- this.firstDayOfWeek = moment.localeData().firstDayOfWeek();
+ this.firstDayOfWeek = getLocaleData().firstDayOfWeek();
// init time stuff
this.onRefresh();
@@ -51,10 +50,10 @@ export class TimePickerCtrl {
if (!this.dashboard.isTimezoneUtc()) {
time.from.local();
time.to.local();
- if (moment.isMoment(timeRaw.from)) {
+ if (isDateTime(timeRaw.from)) {
timeRaw.from.local();
}
- if (moment.isMoment(timeRaw.to)) {
+ if (isDateTime(timeRaw.to)) {
timeRaw.to.local();
}
this.isUtc = false;
@@ -67,7 +66,7 @@ export class TimePickerCtrl {
this.tooltip = this.dashboard.formatDate(time.from) + '
to
'; this.tooltip += this.dashboard.formatDate(time.to); this.timeRaw = timeRaw; - this.isAbsolute = moment.isMoment(this.timeRaw.to); + this.isAbsolute = isDateTime(this.timeRaw.to); } zoom(factor) { @@ -94,7 +93,7 @@ export class TimePickerCtrl { from = range.from.valueOf(); } - this.timeSrv.setTime({ from: moment.utc(from), to: moment.utc(to) }); + this.timeSrv.setTime({ from: toUtc(from), to: toUtc(to) }); } openDropdown() { @@ -141,7 +140,7 @@ export class TimePickerCtrl { } getAbsoluteMomentForTimezone(jsDate) { - return this.dashboard.isTimezoneUtc() ? moment(jsDate).utc() : moment(jsDate); + return this.dashboard.isTimezoneUtc() ? dateTime(jsDate).utc() : dateTime(jsDate); } setRelativeFilter(timespan) { @@ -186,4 +185,5 @@ angular.module('grafana.directives').directive('gfTimePickerSettings', settingsD angular.module('grafana.directives').directive('gfTimePicker', timePickerDirective); import { inputDateDirective } from './validation'; +import { toUtc, getLocaleData, isDateTime, dateTime } from '@grafana/ui/src/utils/moment_wrapper'; angular.module('grafana.directives').directive('inputDatetime', inputDateDirective); diff --git a/public/app/features/dashboard/components/TimePicker/validation.ts b/public/app/features/dashboard/components/TimePicker/validation.ts index 7bf229441ecab..a99409a0fb0c6 100644 --- a/public/app/features/dashboard/components/TimePicker/validation.ts +++ b/public/app/features/dashboard/components/TimePicker/validation.ts @@ -1,5 +1,5 @@ -import moment from 'moment'; import * as dateMath from '@grafana/ui/src/utils/datemath'; +import { toUtc, dateTime, isDateTime } from '@grafana/ui/src/utils/moment_wrapper'; export function inputDateDirective() { return { @@ -20,9 +20,9 @@ export function inputDateDirective() { let parsed; if ($scope.ctrl.isUtc) { - parsed = moment.utc(text, format); + parsed = toUtc(text, format); } else { - parsed = moment(text, format); + parsed = dateTime(text, format); } if (!parsed.isValid()) { @@ -35,7 +35,7 @@ export function inputDateDirective() { }; const toUser = currentValue => { - if (moment.isMoment(currentValue)) { + if (isDateTime(currentValue)) { return currentValue.format(format); } else { return currentValue; diff --git a/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts index 19795ffc56474..cc918330a5e96 100644 --- a/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts +++ b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts @@ -1,10 +1,10 @@ import _ from 'lodash'; import angular from 'angular'; -import moment from 'moment'; import locationUtil from 'app/core/utils/location_util'; import { DashboardModel } from '../../state/DashboardModel'; import { HistoryListOpts, RevisionsModel, CalculateDiffOptions, HistorySrv } from './HistorySrv'; +import { dateTime, toUtc } from '@grafana/ui/src/utils/moment_wrapper'; export class HistoryListCtrl { appending: boolean; @@ -74,8 +74,8 @@ export class HistoryListCtrl { } formatBasicDate(date) { - const now = this.dashboard.timezone === 'browser' ? moment() : moment.utc(); - const then = this.dashboard.timezone === 'browser' ? moment(date) : moment.utc(date); + const now = this.dashboard.timezone === 'browser' ? dateTime() : toUtc(); + const then = this.dashboard.timezone === 'browser' ? dateTime(date) : toUtc(date); return then.from(now); } diff --git a/public/app/features/dashboard/dashgrid/PanelChrome.tsx b/public/app/features/dashboard/dashgrid/PanelChrome.tsx index 5a6d35a4427c0..38291d787c36c 100644 --- a/public/app/features/dashboard/dashgrid/PanelChrome.tsx +++ b/public/app/features/dashboard/dashgrid/PanelChrome.tsx @@ -222,7 +222,7 @@ export class PanelChrome extends PureComponent {
}
get wantsQueryExecution() {
- return this.props.plugin.meta.dataFormats.length > 0 && !this.hasPanelSnapshot;
+ return !(this.props.plugin.meta.skipDataQuery || this.hasPanelSnapshot);
}
renderPanel(width: number, height: number): JSX.Element {
@@ -250,6 +250,7 @@ export class PanelChrome extends PureComponent {
{loading === LoadingState.Loading && this.renderLoadingState()}
{
return (
<>
-
to
'; this.tooltip += this.dashboard.formatDate(time.to); this.timeRaw = timeRaw; - this.isAbsolute = moment.isMoment(this.timeRaw.to); + this.isAbsolute = isDateTime(this.timeRaw.to); } zoom(factor) { @@ -94,7 +93,7 @@ export class TimePickerCtrl { from = range.from.valueOf(); } - this.timeSrv.setTime({ from: moment.utc(from), to: moment.utc(to) }); + this.timeSrv.setTime({ from: toUtc(from), to: toUtc(to) }); } openDropdown() { @@ -141,7 +140,7 @@ export class TimePickerCtrl { } getAbsoluteMomentForTimezone(jsDate) { - return this.dashboard.isTimezoneUtc() ? moment(jsDate).utc() : moment(jsDate); + return this.dashboard.isTimezoneUtc() ? dateTime(jsDate).utc() : dateTime(jsDate); } setRelativeFilter(timespan) { @@ -186,4 +185,5 @@ angular.module('grafana.directives').directive('gfTimePickerSettings', settingsD angular.module('grafana.directives').directive('gfTimePicker', timePickerDirective); import { inputDateDirective } from './validation'; +import { toUtc, getLocaleData, isDateTime, dateTime } from '@grafana/ui/src/utils/moment_wrapper'; angular.module('grafana.directives').directive('inputDatetime', inputDateDirective); diff --git a/public/app/features/dashboard/components/TimePicker/validation.ts b/public/app/features/dashboard/components/TimePicker/validation.ts index 7bf229441ecab..a99409a0fb0c6 100644 --- a/public/app/features/dashboard/components/TimePicker/validation.ts +++ b/public/app/features/dashboard/components/TimePicker/validation.ts @@ -1,5 +1,5 @@ -import moment from 'moment'; import * as dateMath from '@grafana/ui/src/utils/datemath'; +import { toUtc, dateTime, isDateTime } from '@grafana/ui/src/utils/moment_wrapper'; export function inputDateDirective() { return { @@ -20,9 +20,9 @@ export function inputDateDirective() { let parsed; if ($scope.ctrl.isUtc) { - parsed = moment.utc(text, format); + parsed = toUtc(text, format); } else { - parsed = moment(text, format); + parsed = dateTime(text, format); } if (!parsed.isValid()) { @@ -35,7 +35,7 @@ export function inputDateDirective() { }; const toUser = currentValue => { - if (moment.isMoment(currentValue)) { + if (isDateTime(currentValue)) { return currentValue.format(format); } else { return currentValue; diff --git a/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts index 19795ffc56474..cc918330a5e96 100644 --- a/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts +++ b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts @@ -1,10 +1,10 @@ import _ from 'lodash'; import angular from 'angular'; -import moment from 'moment'; import locationUtil from 'app/core/utils/location_util'; import { DashboardModel } from '../../state/DashboardModel'; import { HistoryListOpts, RevisionsModel, CalculateDiffOptions, HistorySrv } from './HistorySrv'; +import { dateTime, toUtc } from '@grafana/ui/src/utils/moment_wrapper'; export class HistoryListCtrl { appending: boolean; @@ -74,8 +74,8 @@ export class HistoryListCtrl { } formatBasicDate(date) { - const now = this.dashboard.timezone === 'browser' ? moment() : moment.utc(); - const then = this.dashboard.timezone === 'browser' ? moment(date) : moment.utc(date); + const now = this.dashboard.timezone === 'browser' ? dateTime() : toUtc(); + const then = this.dashboard.timezone === 'browser' ? dateTime(date) : toUtc(date); return then.from(now); } diff --git a/public/app/features/dashboard/dashgrid/PanelChrome.tsx b/public/app/features/dashboard/dashgrid/PanelChrome.tsx index 5a6d35a4427c0..38291d787c36c 100644 --- a/public/app/features/dashboard/dashgrid/PanelChrome.tsx +++ b/public/app/features/dashboard/dashgrid/PanelChrome.tsx @@ -222,7 +222,7 @@ export class PanelChrome extends PureComponent
-
+
diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx
index 66a942f0afc64..a50af1eb56c43 100644
--- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx
@@ -14,7 +14,9 @@ export const PanelHeaderMenuItem: FC = props => {
{props.iconClassName && }
- {props.text}
+
+ {props.text}
+
{props.shortcut && {props.shortcut}}
{props.children}
diff --git a/public/app/features/dashboard/dashgrid/PanelPluginNotFound.tsx b/public/app/features/dashboard/dashgrid/PanelPluginNotFound.tsx
index c71ebc4357757..80440c9631cb4 100644
--- a/public/app/features/dashboard/dashgrid/PanelPluginNotFound.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelPluginNotFound.tsx
@@ -49,7 +49,6 @@ export function getPanelPluginNotFound(id: string): PanelPlugin {
type: PluginType.panel,
module: '',
baseUrl: '',
- dataFormats: [],
info: {
author: {
name: '',
diff --git a/public/app/features/dashboard/panel_editor/PanelEditor.tsx b/public/app/features/dashboard/panel_editor/PanelEditor.tsx
index 5cf7ad78d1f89..722b211e4ef12 100644
--- a/public/app/features/dashboard/panel_editor/PanelEditor.tsx
+++ b/public/app/features/dashboard/panel_editor/PanelEditor.tsx
@@ -105,7 +105,7 @@ export class PanelEditor extends PureComponent {
];
// handle panels that do not have queries tab
- if (plugin.meta.dataFormats.length === 0) {
+ if (plugin.meta.skipDataQuery) {
// remove queries tab
tabs.shift();
// switch tab
@@ -145,7 +145,7 @@ function TabItem({ tab, activeTab, onClick }: TabItemParams) {
return (
onClick(tab)}>
-
+
diff --git a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
index 0cfa96da2a48d..eb7bad6524243 100644
--- a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
+++ b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
@@ -185,11 +185,14 @@ export class VisualizationTab extends PureComponent {
);
} else {
return (
- {
onClose={this.onCloseVizPicker}
/>
- {
- datasource: string | DataSourceApi;
+import {
+ PanelData,
+ DataQuery,
+ TimeRange,
+ ScopedVars,
+ DataQueryRequest,
+ DataSourceApi,
+ DataSourceJsonData,
+} from '@grafana/ui';
+
+export interface QueryRunnerOptions<
+ TQuery extends DataQuery = DataQuery,
+ TOptions extends DataSourceJsonData = DataSourceJsonData
+> {
+ datasource: string | DataSourceApi;
queries: TQuery[];
panelId: number;
dashboardId?: number;
diff --git a/public/app/features/dashboard/utils/panel.test.ts b/public/app/features/dashboard/utils/panel.test.ts
index e32b7d84d6867..a05c54b2ab759 100644
--- a/public/app/features/dashboard/utils/panel.test.ts
+++ b/public/app/features/dashboard/utils/panel.test.ts
@@ -1,11 +1,11 @@
-import moment from 'moment';
import { TimeRange } from '@grafana/ui';
import { applyPanelTimeOverrides } from 'app/features/dashboard/utils/panel';
import { advanceTo, clear } from 'jest-date-mock';
+import { dateTime, DateTime } from '@grafana/ui/src/utils/moment_wrapper';
const dashboardTimeRange: TimeRange = {
- from: moment([2019, 1, 11, 12, 0]),
- to: moment([2019, 1, 11, 18, 0]),
+ from: dateTime([2019, 1, 11, 12, 0]),
+ to: dateTime([2019, 1, 11, 18, 0]),
raw: {
from: 'now-6h',
to: 'now',
@@ -13,7 +13,7 @@ const dashboardTimeRange: TimeRange = {
};
describe('applyPanelTimeOverrides', () => {
- const fakeCurrentDate = moment([2019, 1, 11, 14, 0, 0]).toDate();
+ const fakeCurrentDate = dateTime([2019, 1, 11, 14, 0, 0]).toDate();
beforeAll(() => {
advanceTo(fakeCurrentDate);
@@ -31,7 +31,7 @@ describe('applyPanelTimeOverrides', () => {
// @ts-ignore: PanelModel type incositency
const overrides = applyPanelTimeOverrides(panelModel, dashboardTimeRange);
- expect(overrides.timeRange.from.toISOString()).toBe(moment([2019, 1, 11, 12]).toISOString());
+ expect(overrides.timeRange.from.toISOString()).toBe(dateTime([2019, 1, 11, 12]).toISOString());
expect(overrides.timeRange.to.toISOString()).toBe(fakeCurrentDate.toISOString());
expect(overrides.timeRange.raw.from).toBe('now-2h');
expect(overrides.timeRange.raw.to).toBe('now');
@@ -42,16 +42,16 @@ describe('applyPanelTimeOverrides', () => {
timeShift: '2h',
};
- const expectedFromDate = moment([2019, 1, 11, 10, 0, 0]).toDate();
- const expectedToDate = moment([2019, 1, 11, 16, 0, 0]).toDate();
+ const expectedFromDate = dateTime([2019, 1, 11, 10, 0, 0]).toDate();
+ const expectedToDate = dateTime([2019, 1, 11, 16, 0, 0]).toDate();
// @ts-ignore: PanelModel type incositency
const overrides = applyPanelTimeOverrides(panelModel, dashboardTimeRange);
expect(overrides.timeRange.from.toISOString()).toBe(expectedFromDate.toISOString());
expect(overrides.timeRange.to.toISOString()).toBe(expectedToDate.toISOString());
- expect((overrides.timeRange.raw.from as moment.Moment).toISOString()).toEqual(expectedFromDate.toISOString());
- expect((overrides.timeRange.raw.to as moment.Moment).toISOString()).toEqual(expectedToDate.toISOString());
+ expect((overrides.timeRange.raw.from as DateTime).toISOString()).toEqual(expectedFromDate.toISOString());
+ expect((overrides.timeRange.raw.to as DateTime).toISOString()).toEqual(expectedToDate.toISOString());
});
it('should apply both relative time and time shift', () => {
@@ -60,15 +60,15 @@ describe('applyPanelTimeOverrides', () => {
timeShift: '2h',
};
- const expectedFromDate = moment([2019, 1, 11, 10, 0, 0]).toDate();
- const expectedToDate = moment([2019, 1, 11, 12, 0, 0]).toDate();
+ const expectedFromDate = dateTime([2019, 1, 11, 10, 0, 0]).toDate();
+ const expectedToDate = dateTime([2019, 1, 11, 12, 0, 0]).toDate();
// @ts-ignore: PanelModel type incositency
const overrides = applyPanelTimeOverrides(panelModel, dashboardTimeRange);
expect(overrides.timeRange.from.toISOString()).toBe(expectedFromDate.toISOString());
expect(overrides.timeRange.to.toISOString()).toBe(expectedToDate.toISOString());
- expect((overrides.timeRange.raw.from as moment.Moment).toISOString()).toEqual(expectedFromDate.toISOString());
- expect((overrides.timeRange.raw.to as moment.Moment).toISOString()).toEqual(expectedToDate.toISOString());
+ expect((overrides.timeRange.raw.from as DateTime).toISOString()).toEqual(expectedFromDate.toISOString());
+ expect((overrides.timeRange.raw.to as DateTime).toISOString()).toEqual(expectedToDate.toISOString());
});
});
diff --git a/public/app/features/datasources/NewDataSourcePage.tsx b/public/app/features/datasources/NewDataSourcePage.tsx
index ae0eae9e02f4a..6420225f2afec 100644
--- a/public/app/features/datasources/NewDataSourcePage.tsx
+++ b/public/app/features/datasources/NewDataSourcePage.tsx
@@ -1,13 +1,12 @@
-import React, { PureComponent } from 'react';
+import React, { PureComponent, FC } from 'react';
import { connect } from 'react-redux';
import { hot } from 'react-hot-loader';
import Page from 'app/core/components/Page/Page';
import { StoreState } from 'app/types';
import { addDataSource, loadDataSourceTypes, setDataSourceTypeSearchQuery } from './state/actions';
-import { getNavModel } from 'app/core/selectors/navModel';
import { getDataSourceTypes } from './state/selectors';
import { FilterInput } from 'app/core/components/FilterInput/FilterInput';
-import { NavModel, DataSourcePluginMeta } from '@grafana/ui';
+import { NavModel, DataSourcePluginMeta, List } from '@grafana/ui';
export interface Props {
navModel: NavModel;
@@ -15,13 +14,40 @@ export interface Props {
isLoading: boolean;
addDataSource: typeof addDataSource;
loadDataSourceTypes: typeof loadDataSourceTypes;
- dataSourceTypeSearchQuery: string;
+ searchQuery: string;
setDataSourceTypeSearchQuery: typeof setDataSourceTypeSearchQuery;
}
+interface DataSourceCategories {
+ [key: string]: DataSourcePluginMeta[];
+}
+
+interface DataSourceCategoryInfo {
+ id: string;
+ title: string;
+}
+
class NewDataSourcePage extends PureComponent {
+ searchInput: HTMLElement;
+ categoryInfoList: DataSourceCategoryInfo[] = [
+ { id: 'tsdb', title: 'Time series databases' },
+ { id: 'logging', title: 'Logging & document databases' },
+ { id: 'sql', title: 'SQL' },
+ { id: 'cloud', title: 'Cloud' },
+ { id: 'other', title: 'Others' },
+ ];
+
+ sortingRules: { [id: string]: number } = {
+ prometheus: 100,
+ graphite: 95,
+ loki: 90,
+ mysql: 80,
+ postgres: 79,
+ };
+
componentDidMount() {
this.props.loadDataSourceTypes();
+ this.searchInput.focus();
}
onDataSourceTypeClicked = (plugin: DataSourcePluginMeta) => {
@@ -32,34 +58,108 @@ class NewDataSourcePage extends PureComponent {
this.props.setDataSourceTypeSearchQuery(value);
};
+ renderTypes(types: DataSourcePluginMeta[]) {
+ if (!types) {
+ return null;
+ }
+
+ // apply custom sort ranking
+ types.sort((a, b) => {
+ const aSort = this.sortingRules[a.id] || 0;
+ const bSort = this.sortingRules[b.id] || 0;
+ if (aSort > bSort) {
+ return -1;
+ }
+ if (aSort < bSort) {
+ return 1;
+ }
+
+ return a.name > b.name ? -1 : 1;
+ });
+
+ return (
+
- 
-
+ <>
+ {meta.name}
-
-
+
+
+ {meta.name}
+
+ - item.id.toString()}
+ renderItem={item => (
+
+
+ ))}
+
+
+ );
+ }
+
render() {
- const { navModel, dataSourceTypes, dataSourceTypeSearchQuery, isLoading } = this.props;
+ const { navModel, isLoading, searchQuery, dataSourceTypes } = this.props;
+
return (
{category.title}
+ {this.renderTypes(categories[category.id])}
+ Choose data source type
-
-
+
-
+ (this.searchInput = elem)}
+ labelClassName="gf-form--has-input-icon"
+ inputClassName="gf-form-input width-30"
+ value={searchQuery}
+ onChange={this.onSearchQueryChange}
+ placeholder="Filter by name or type"
+ />
+
+
+
+ Cancel
+
- {dataSourceTypes.map((plugin, index) => {
- return (
- {
}
}
+interface DataSourceTypeCardProps {
+ plugin: DataSourcePluginMeta;
+ onClick: () => void;
+ onLearnMoreClick: (evt: React.SyntheticEvent) => void;
+}
+
+const DataSourceTypeCard: FC = props => {
+ const { plugin, onClick, onLearnMoreClick } = props;
+
+ // find first plugin info link
+ const learnMoreLink = plugin.info.links && plugin.info.links.length > 0 ? plugin.info.links[0].url : null;
+
+ return (
+ = ({ isReadOnly, onDelete, onSubmit, onTest }) => {
return (
this.onDataSourceTypeClicked(plugin)}
- className="add-data-source-grid-item"
- key={`${plugin.id}-${index}`}
- >
- 
- {plugin.name}
-
- );
- })}
+
+ {searchQuery && this.renderTypes(dataSourceTypes)}
+ {!searchQuery && this.renderGroupedList()}
@@ -67,11 +167,57 @@ class NewDataSourcePage extends PureComponent
+
+
+ );
+};
+
+export function getNavModel(): NavModel {
+ const main = {
+ icon: 'gicon gicon-add-datasources',
+ id: 'datasource-new',
+ text: 'Add data source',
+ href: 'datasources/new',
+ subTitle: 'Choose a data source type',
+ };
+
+ return {
+ main: main,
+ node: main,
+ };
+}
+
function mapStateToProps(state: StoreState) {
return {
- navModel: getNavModel(state.navIndex, 'datasources'),
+ navModel: getNavModel(),
dataSourceTypes: getDataSourceTypes(state.dataSources),
- dataSourceTypeSearchQuery: state.dataSources.dataSourceTypeSearchQuery,
+ searchQuery: state.dataSources.dataSourceTypeSearchQuery,
isLoading: state.dataSources.isLoadingDataSources,
};
}
diff --git a/public/app/features/datasources/settings/ButtonRow.tsx b/public/app/features/datasources/settings/ButtonRow.tsx
index 2c048a33e7aff..16d25be293cc6 100644
--- a/public/app/features/datasources/settings/ButtonRow.tsx
+++ b/public/app/features/datasources/settings/ButtonRow.tsx
@@ -12,7 +12,13 @@ const ButtonRow: FC
+ {plugin.name}
+ {plugin.info.description && {plugin.info.description}}
+
+
+ {learnMoreLink && (
+
+ Learn more
+
+ )}
+
+
+
{!isReadOnly && (
-