diff --git a/packages/grafana-ui/src/components/Select/resetSelectStyles.ts b/packages/grafana-ui/src/components/Select/resetSelectStyles.ts
new file mode 100644
index 00000000000..a980741c17c
--- /dev/null
+++ b/packages/grafana-ui/src/components/Select/resetSelectStyles.ts
@@ -0,0 +1,27 @@
+export default function resetSelectStyles() {
+ return {
+ clearIndicator: () => ({}),
+ container: () => ({}),
+ control: () => ({}),
+ dropdownIndicator: () => ({}),
+ group: () => ({}),
+ groupHeading: () => ({}),
+ indicatorsContainer: () => ({}),
+ indicatorSeparator: () => ({}),
+ input: () => ({}),
+ loadingIndicator: () => ({}),
+ loadingMessage: () => ({}),
+ menu: () => ({}),
+ menuList: ({ maxHeight }: { maxHeight: number }) => ({
+ maxHeight,
+ }),
+ multiValue: () => ({}),
+ multiValueLabel: () => ({}),
+ multiValueRemove: () => ({}),
+ noOptionsMessage: () => ({}),
+ option: () => ({}),
+ placeholder: () => ({}),
+ singleValue: () => ({}),
+ valueContainer: () => ({}),
+ };
+}
diff --git a/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.test.tsx b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.test.tsx
new file mode 100644
index 00000000000..845ff5f6bf4
--- /dev/null
+++ b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.test.tsx
@@ -0,0 +1,173 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+
+import { ThresholdsEditor, Props } from './ThresholdsEditor';
+
+const setup = (propOverrides?: object) => {
+ const props: Props = {
+ onChange: jest.fn(),
+ thresholds: [],
+ };
+
+ Object.assign(props, propOverrides);
+
+ return shallow(
).instance() as ThresholdsEditor;
+};
+
+describe('Initialization', () => {
+ it('should add a base threshold if missing', () => {
+ const instance = setup();
+
+ expect(instance.state.thresholds).toEqual([{ index: 0, value: -Infinity, color: '#7EB26D' }]);
+ });
+});
+
+describe('Add threshold', () => {
+ it('should not add threshold at index 0', () => {
+ const instance = setup();
+
+ instance.onAddThreshold(0);
+
+ expect(instance.state.thresholds).toEqual([{ index: 0, value: -Infinity, color: '#7EB26D' }]);
+ });
+
+ it('should add threshold', () => {
+ const instance = setup();
+
+ instance.onAddThreshold(1);
+
+ expect(instance.state.thresholds).toEqual([
+ { index: 1, value: 50, color: '#EAB839' },
+ { index: 0, value: -Infinity, color: '#7EB26D' },
+ ]);
+ });
+
+ it('should add another threshold above a first', () => {
+ const instance = setup({
+ thresholds: [{ index: 0, value: -Infinity, color: '#7EB26D' }, { index: 1, value: 50, color: '#EAB839' }],
+ });
+
+ instance.onAddThreshold(2);
+
+ expect(instance.state.thresholds).toEqual([
+ { index: 2, value: 75, color: '#6ED0E0' },
+ { index: 1, value: 50, color: '#EAB839' },
+ { index: 0, value: -Infinity, color: '#7EB26D' },
+ ]);
+ });
+
+ it('should add another threshold between first and second index', () => {
+ const instance = setup({
+ thresholds: [
+ { index: 0, value: -Infinity, color: '#7EB26D' },
+ { index: 1, value: 50, color: '#EAB839' },
+ { index: 2, value: 75, color: '#6ED0E0' },
+ ],
+ });
+
+ instance.onAddThreshold(2);
+
+ expect(instance.state.thresholds).toEqual([
+ { index: 3, value: 75, color: '#6ED0E0' },
+ { index: 2, value: 62.5, color: '#EF843C' },
+ { index: 1, value: 50, color: '#EAB839' },
+ { index: 0, value: -Infinity, color: '#7EB26D' },
+ ]);
+ });
+});
+
+describe('Remove threshold', () => {
+ it('should not remove threshold at index 0', () => {
+ const thresholds = [
+ { index: 0, value: -Infinity, color: '#7EB26D' },
+ { index: 1, value: 50, color: '#EAB839' },
+ { index: 2, value: 75, color: '#6ED0E0' },
+ ];
+ const instance = setup({ thresholds });
+
+ instance.onRemoveThreshold(thresholds[0]);
+
+ expect(instance.state.thresholds).toEqual(thresholds);
+ });
+
+ it('should remove threshold', () => {
+ const thresholds = [
+ { index: 0, value: -Infinity, color: '#7EB26D' },
+ { index: 1, value: 50, color: '#EAB839' },
+ { index: 2, value: 75, color: '#6ED0E0' },
+ ];
+ const instance = setup({
+ thresholds,
+ });
+
+ instance.onRemoveThreshold(thresholds[1]);
+
+ expect(instance.state.thresholds).toEqual([
+ { index: 0, value: -Infinity, color: '#7EB26D' },
+ { index: 1, value: 75, color: '#6ED0E0' },
+ ]);
+ });
+});
+
+describe('change threshold value', () => {
+ it('should not change threshold at index 0', () => {
+ const thresholds = [
+ { index: 0, value: -Infinity, color: '#7EB26D' },
+ { index: 1, value: 50, color: '#EAB839' },
+ { index: 2, value: 75, color: '#6ED0E0' },
+ ];
+ const instance = setup({ thresholds });
+
+ const mockEvent = { target: { value: 12 } };
+
+ instance.onChangeThresholdValue(mockEvent, thresholds[0]);
+
+ expect(instance.state.thresholds).toEqual(thresholds);
+ });
+
+ it('should update value', () => {
+ const instance = setup();
+ const thresholds = [
+ { index: 0, value: -Infinity, color: '#7EB26D' },
+ { index: 1, value: 50, color: '#EAB839' },
+ { index: 2, value: 75, color: '#6ED0E0' },
+ ];
+
+ instance.state = {
+ thresholds,
+ };
+
+ const mockEvent = { target: { value: 78 } };
+
+ instance.onChangeThresholdValue(mockEvent, thresholds[1]);
+
+ expect(instance.state.thresholds).toEqual([
+ { index: 0, value: -Infinity, color: '#7EB26D' },
+ { index: 1, value: 78, color: '#EAB839' },
+ { index: 2, value: 75, color: '#6ED0E0' },
+ ]);
+ });
+});
+
+describe('on blur threshold value', () => {
+ it('should resort rows and update indexes', () => {
+ const instance = setup();
+ const thresholds = [
+ { index: 0, value: -Infinity, color: '#7EB26D' },
+ { index: 1, value: 78, color: '#EAB839' },
+ { index: 2, value: 75, color: '#6ED0E0' },
+ ];
+
+ instance.state = {
+ thresholds,
+ };
+
+ instance.onBlur();
+
+ expect(instance.state.thresholds).toEqual([
+ { index: 2, value: 78, color: '#EAB839' },
+ { index: 1, value: 75, color: '#6ED0E0' },
+ { index: 0, value: -Infinity, color: '#7EB26D' },
+ ]);
+ });
+});
diff --git a/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
new file mode 100644
index 00000000000..590aca5c7a1
--- /dev/null
+++ b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
@@ -0,0 +1,211 @@
+import React, { PureComponent } from 'react';
+// import tinycolor, { ColorInput } from 'tinycolor2';
+
+import { Threshold } from '../../types';
+import { ColorPicker } from '../ColorPicker/ColorPicker';
+import { PanelOptionsGroup } from '../PanelOptionsGroup/PanelOptionsGroup';
+import { colors } from '../../utils';
+
+export interface Props {
+ thresholds: Threshold[];
+ onChange: (thresholds: Threshold[]) => void;
+}
+
+interface State {
+ thresholds: Threshold[];
+}
+
+export class ThresholdsEditor extends PureComponent
{
+ constructor(props: Props) {
+ super(props);
+
+ const addDefaultThreshold = this.props.thresholds.length === 0;
+ const thresholds: Threshold[] = addDefaultThreshold
+ ? [{ index: 0, value: -Infinity, color: colors[0] }]
+ : props.thresholds;
+ this.state = { thresholds };
+
+ if (addDefaultThreshold) {
+ this.onChange();
+ }
+ }
+
+ onAddThreshold = (index: number) => {
+ const { thresholds } = this.state;
+ const maxValue = 100;
+ const minValue = 0;
+
+ if (index === 0) {
+ return;
+ }
+
+ const newThresholds = thresholds.map(threshold => {
+ if (threshold.index >= index) {
+ const index = threshold.index + 1;
+ threshold = { ...threshold, index };
+ }
+ return threshold;
+ });
+
+ // Setting value to a value between the previous thresholds
+ const beforeThreshold = newThresholds.filter(t => t.index === index - 1 && t.index !== 0)[0];
+ const afterThreshold = newThresholds.filter(t => t.index === index + 1 && t.index !== 0)[0];
+ const beforeThresholdValue = beforeThreshold !== undefined ? beforeThreshold.value : minValue;
+ const afterThresholdValue = afterThreshold !== undefined ? afterThreshold.value : maxValue;
+ const value = afterThresholdValue - (afterThresholdValue - beforeThresholdValue) / 2;
+
+ // Set a color
+ const color = colors.filter(c => newThresholds.some(t => t.color === c) === false)[0];
+
+ this.setState(
+ {
+ thresholds: this.sortThresholds([
+ ...newThresholds,
+ {
+ index,
+ value: value as number,
+ color,
+ },
+ ]),
+ },
+ () => this.onChange()
+ );
+ };
+
+ onRemoveThreshold = (threshold: Threshold) => {
+ if (threshold.index === 0) {
+ return;
+ }
+
+ this.setState(
+ prevState => {
+ const newThresholds = prevState.thresholds.map(t => {
+ if (t.index > threshold.index) {
+ const index = t.index - 1;
+ t = { ...t, index };
+ }
+ return t;
+ });
+
+ return {
+ thresholds: newThresholds.filter(t => t !== threshold),
+ };
+ },
+ () => this.onChange()
+ );
+ };
+
+ onChangeThresholdValue = (event: any, threshold: Threshold) => {
+ if (threshold.index === 0) {
+ return;
+ }
+
+ const { thresholds } = this.state;
+ const parsedValue = parseInt(event.target.value, 10);
+ const value = isNaN(parsedValue) ? null : parsedValue;
+
+ const newThresholds = thresholds.map(t => {
+ if (t === threshold && t.index !== 0) {
+ t = { ...t, value: value as number };
+ }
+
+ return t;
+ });
+
+ this.setState({ thresholds: newThresholds });
+ };
+
+ onChangeThresholdColor = (threshold: Threshold, color: string) => {
+ const { thresholds } = this.state;
+
+ const newThresholds = thresholds.map(t => {
+ if (t === threshold) {
+ t = { ...t, color: color };
+ }
+
+ return t;
+ });
+
+ this.setState(
+ {
+ thresholds: newThresholds,
+ },
+ () => this.onChange()
+ );
+ };
+
+ onBlur = () => {
+ this.setState(prevState => {
+ const sortThresholds = this.sortThresholds([...prevState.thresholds]);
+ let index = sortThresholds.length - 1;
+ sortThresholds.forEach(t => {
+ t.index = index--;
+ });
+ return { thresholds: sortThresholds };
+ });
+
+ this.onChange();
+ };
+
+ onChange = () => {
+ this.props.onChange(this.state.thresholds);
+ };
+
+ sortThresholds = (thresholds: Threshold[]) => {
+ return thresholds.sort((t1, t2) => {
+ return t2.value - t1.value;
+ });
+ };
+
+ renderInput = (threshold: Threshold) => {
+ const value = threshold.index === 0 ? 'Base' : threshold.value;
+ return (
+
+
+
+ {threshold.color && (
+
+ this.onChangeThresholdColor(threshold, color)} />
+
+ )}
+
+
+ this.onChangeThresholdValue(event, threshold)}
+ value={value}
+ onBlur={this.onBlur}
+ readOnly={threshold.index === 0}
+ />
+
+ {threshold.index > 0 && (
+
this.onRemoveThreshold(threshold)}>
+
+
+ )}
+
+ {thresholds.map((threshold, index) => {
+ return (
+
+
this.onAddThreshold(threshold.index + 1)}>
+
+
+
+
{this.renderInput(threshold)}
+
+ );
+ })}
+
- {children}
-
- )}
-
{transitionState => (
-
+
{({ ref, style, placement, arrowProps }) => {
return (
{
data-placement={placement}
className="popper"
>
-
+
diff --git a/packages/grafana-ui/src/components/Tooltip/PopperController.tsx b/packages/grafana-ui/src/components/Tooltip/PopperController.tsx
new file mode 100644
index 00000000000..5f4010ac58a
--- /dev/null
+++ b/packages/grafana-ui/src/components/Tooltip/PopperController.tsx
@@ -0,0 +1,99 @@
+import React from 'react';
+import * as PopperJS from 'popper.js';
+import { Themes } from './Popper';
+
+type PopperContent = string | (() => JSX.Element);
+
+export interface UsingPopperProps {
+ show?: boolean;
+ placement?: PopperJS.Placement;
+ content: PopperContent;
+ children: JSX.Element;
+ renderContent?: (content: PopperContent) => JSX.Element;
+ theme?: Themes;
+}
+
+type PopperControllerRenderProp = (
+ showPopper: () => void,
+ hidePopper: () => void,
+ popperProps: {
+ show: boolean;
+ placement: PopperJS.Placement;
+ content: string | ((props: any) => JSX.Element);
+ renderContent: (content: any) => any;
+ theme?: Themes;
+ }
+) => JSX.Element;
+
+interface Props {
+ placement?: PopperJS.Placement;
+ content: PopperContent;
+ className?: string;
+ children: PopperControllerRenderProp;
+ theme?: Themes;
+}
+
+interface State {
+ placement: PopperJS.Placement;
+ show: boolean;
+}
+
+class PopperController extends React.Component
{
+ constructor(props: Props) {
+ super(props);
+
+ this.state = {
+ placement: this.props.placement || 'auto',
+ show: false,
+ };
+ }
+
+ componentWillReceiveProps(nextProps: Props) {
+ if (nextProps.placement && nextProps.placement !== this.state.placement) {
+ this.setState((prevState: State) => {
+ return {
+ ...prevState,
+ placement: nextProps.placement || 'auto',
+ };
+ });
+ }
+ }
+
+ showPopper = () => {
+ this.setState(prevState => ({
+ ...prevState,
+ show: true,
+ }));
+ };
+
+ hidePopper = () => {
+ this.setState(prevState => ({
+ ...prevState,
+ show: false,
+ }));
+ };
+
+ renderContent(content: PopperContent) {
+ if (typeof content === 'function') {
+ // If it's a function we assume it's a React component
+ const ReactComponent = content;
+ return ;
+ }
+ return content;
+ }
+
+ render() {
+ const { children, content, theme } = this.props;
+ const { show, placement } = this.state;
+
+ return children(this.showPopper, this.hidePopper, {
+ show,
+ placement,
+ content,
+ renderContent: this.renderContent,
+ theme,
+ });
+ }
+}
+
+export default PopperController;
diff --git a/public/app/core/components/Tooltip/Tooltip.test.tsx b/packages/grafana-ui/src/components/Tooltip/Tooltip.test.tsx
similarity index 56%
rename from public/app/core/components/Tooltip/Tooltip.test.tsx
rename to packages/grafana-ui/src/components/Tooltip/Tooltip.test.tsx
index d2c96bb23d2..95d01c7f2fe 100644
--- a/public/app/core/components/Tooltip/Tooltip.test.tsx
+++ b/packages/grafana-ui/src/components/Tooltip/Tooltip.test.tsx
@@ -1,13 +1,15 @@
import React from 'react';
import renderer from 'react-test-renderer';
-import Tooltip from './Tooltip';
+import { Tooltip } from './Tooltip';
describe('Tooltip', () => {
it('renders correctly', () => {
const tree = renderer
.create(
-
- Link with tooltip
+
+
+ Link with tooltip
+
)
.toJSON();
diff --git a/packages/grafana-ui/src/components/Tooltip/Tooltip.tsx b/packages/grafana-ui/src/components/Tooltip/Tooltip.tsx
new file mode 100644
index 00000000000..9cffb151d83
--- /dev/null
+++ b/packages/grafana-ui/src/components/Tooltip/Tooltip.tsx
@@ -0,0 +1,32 @@
+import React, { createRef } from 'react';
+import * as PopperJS from 'popper.js';
+import Popper from './Popper';
+import PopperController, { UsingPopperProps } from './PopperController';
+
+export const Tooltip = ({ children, renderContent, ...controllerProps }: UsingPopperProps) => {
+ const tooltipTriggerRef = createRef();
+
+ return (
+
+ {(showPopper, hidePopper, popperProps) => {
+ return (
+ <>
+ {tooltipTriggerRef.current && (
+
+ )}
+ {React.cloneElement(children, {
+ ref: tooltipTriggerRef,
+ onMouseEnter: showPopper,
+ onMouseLeave: hidePopper,
+ })}
+
+ );
+ }}
+
+ );
+};
diff --git a/public/sass/components/_popper.scss b/packages/grafana-ui/src/components/Tooltip/_Tooltip.scss
similarity index 83%
rename from public/sass/components/_popper.scss
rename to packages/grafana-ui/src/components/Tooltip/_Tooltip.scss
index d869d52b92f..c8fa099cce6 100644
--- a/public/sass/components/_popper.scss
+++ b/packages/grafana-ui/src/components/Tooltip/_Tooltip.scss
@@ -1,5 +1,13 @@
$popper-margin-from-ref: 5px;
+
+@mixin popper-theme($backgroundColor, $arrowColor) {
+ background: $backgroundColor;
+ .popper__arrow {
+ border-color: $arrowColor;
+ }
+}
+
.popper {
position: absolute;
z-index: $zindex-tooltip;
@@ -8,7 +16,24 @@ $popper-margin-from-ref: 5px;
text-align: center;
}
-.popper .popper__arrow {
+.popper__background {
+ background: $tooltipBackground;
+ border-radius: $border-radius;
+ box-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
+ padding: 10px;
+
+ // Themes
+ &.popper__background--error {
+ @include popper-theme($tooltipBackgroundError, $tooltipBackgroundError);
+ }
+
+ &.popper__background--brand {
+ @include popper-theme($tooltipBackgroundBrand, $tooltipBackgroundBrand);
+ @include gradient-vertical($red, $orange);
+ }
+}
+
+.popper__arrow {
width: 0;
height: 0;
border-style: solid;
@@ -16,17 +41,10 @@ $popper-margin-from-ref: 5px;
margin: 0px;
}
-.popper .popper__arrow {
+.popper__arrow {
border-color: $tooltipBackground;
}
-.popper__background {
- background: $tooltipBackground;
- border-radius: $border-radius;
- box-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
- padding: 10px;
-}
-
// Top
.popper[data-placement^='top'] {
padding-bottom: $popper-margin-from-ref;
diff --git a/packages/grafana-ui/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap b/packages/grafana-ui/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap
new file mode 100644
index 00000000000..761221906d4
--- /dev/null
+++ b/packages/grafana-ui/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap
@@ -0,0 +1,12 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Tooltip renders correctly 1`] = `
+
+ Link with tooltip
+
+`;
diff --git a/public/app/plugins/panel/gauge/MappingRow.tsx b/packages/grafana-ui/src/components/ValueMappingsEditor/MappingRow.tsx
similarity index 51%
rename from public/app/plugins/panel/gauge/MappingRow.tsx
rename to packages/grafana-ui/src/components/ValueMappingsEditor/MappingRow.tsx
index 35d0b2e638c..c5704e8bc88 100644
--- a/public/app/plugins/panel/gauge/MappingRow.tsx
+++ b/packages/grafana-ui/src/components/ValueMappingsEditor/MappingRow.tsx
@@ -1,22 +1,22 @@
-import React, { PureComponent } from 'react';
-import { Label } from 'app/core/components/Label/Label';
-import { Select } from 'app/core/components/Select/Select';
-import { MappingType, RangeMap, ValueMap } from 'app/types';
+import React, { ChangeEvent, PureComponent } from 'react';
-interface Props {
- mapping: ValueMap | RangeMap;
- updateMapping: (mapping) => void;
- removeMapping: () => void;
+import { MappingType, ValueMapping } from '../../types';
+import { FormField, FormLabel, Select } from '..';
+
+export interface Props {
+ valueMapping: ValueMapping;
+ updateValueMapping: (valueMapping: ValueMapping) => void;
+ removeValueMapping: () => void;
}
interface State {
- from: string;
+ from?: string;
id: number;
operator: string;
text: string;
- to: string;
+ to?: string;
type: MappingType;
- value: string;
+ value?: string;
}
const mappingOptions = [
@@ -25,36 +25,34 @@ const mappingOptions = [
];
export default class MappingRow extends PureComponent {
- constructor(props) {
+ constructor(props: Props) {
super(props);
- this.state = {
- ...props.mapping,
- };
+ this.state = { ...props.valueMapping };
}
- onMappingValueChange = event => {
+ onMappingValueChange = (event: ChangeEvent) => {
this.setState({ value: event.target.value });
};
- onMappingFromChange = event => {
+ onMappingFromChange = (event: ChangeEvent) => {
this.setState({ from: event.target.value });
};
- onMappingToChange = event => {
+ onMappingToChange = (event: ChangeEvent) => {
this.setState({ to: event.target.value });
};
- onMappingTextChange = event => {
+ onMappingTextChange = (event: ChangeEvent) => {
this.setState({ text: event.target.value });
};
- onMappingTypeChange = mappingType => {
+ onMappingTypeChange = (mappingType: MappingType) => {
this.setState({ type: mappingType });
};
updateMapping = () => {
- this.props.updateMapping({ ...this.state });
+ this.props.updateValueMapping({ ...this.state } as ValueMapping);
};
renderRow() {
@@ -63,30 +61,28 @@ export default class MappingRow extends PureComponent {
if (type === MappingType.RangeToText) {
return (
<>
-
-
+
+
+
+ Text
-
-
-
-
-
-
-
-
@@ -96,17 +92,16 @@ export default class MappingRow extends PureComponent
{
return (
<>
-
-
-
-
+
-
+
Text
{
return (
{this.renderRow()}
-
diff --git a/public/app/plugins/panel/gauge/ValueMappings.test.tsx b/packages/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.test.tsx
similarity index 61%
rename from public/app/plugins/panel/gauge/ValueMappings.test.tsx
rename to packages/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.test.tsx
index fd9f56343b1..bbad3e5a7ca 100644
--- a/public/app/plugins/panel/gauge/ValueMappings.test.tsx
+++ b/packages/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.test.tsx
@@ -1,26 +1,23 @@
import React from 'react';
import { shallow } from 'enzyme';
-import ValueMappings from './ValueMappings';
-import { defaultProps, OptionModuleProps } from './module';
-import { MappingType } from 'app/types';
+
+import { ValueMappingsEditor, Props } from './ValueMappingsEditor';
+import { MappingType } from '../../types/panel';
const setup = (propOverrides?: object) => {
- const props: OptionModuleProps = {
+ const props: Props = {
onChange: jest.fn(),
- options: {
- ...defaultProps.options,
- mappings: [
- { id: 1, operator: '', type: MappingType.ValueToText, value: '20', text: 'Ok' },
- { id: 2, operator: '', type: MappingType.RangeToText, from: '21', to: '30', text: 'Meh' },
- ],
- },
+ valueMappings: [
+ { id: 1, operator: '', type: MappingType.ValueToText, value: '20', text: 'Ok' },
+ { id: 2, operator: '', type: MappingType.RangeToText, from: '21', to: '30', text: 'Meh' },
+ ],
};
Object.assign(props, propOverrides);
- const wrapper = shallow(
);
+ const wrapper = shallow(
);
- const instance = wrapper.instance() as ValueMappings;
+ const instance = wrapper.instance() as ValueMappingsEditor;
return {
instance,
@@ -39,18 +36,20 @@ describe('Render', () => {
describe('On remove mapping', () => {
it('Should remove mapping with id 0', () => {
const { instance } = setup();
+
instance.onRemoveMapping(1);
- expect(instance.state.mappings).toEqual([
+ expect(instance.state.valueMappings).toEqual([
{ id: 2, operator: '', type: MappingType.RangeToText, from: '21', to: '30', text: 'Meh' },
]);
});
it('should remove mapping with id 1', () => {
const { instance } = setup();
+
instance.onRemoveMapping(2);
- expect(instance.state.mappings).toEqual([
+ expect(instance.state.valueMappings).toEqual([
{ id: 1, operator: '', type: MappingType.ValueToText, value: '20', text: 'Ok' },
]);
});
@@ -66,7 +65,7 @@ describe('Next id to add', () => {
});
it('should default to 1', () => {
- const { instance } = setup({ options: { ...defaultProps.options } });
+ const { instance } = setup({ valueMappings: [] });
expect(instance.state.nextIdToAdd).toEqual(1);
});
diff --git a/packages/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.tsx b/packages/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.tsx
new file mode 100644
index 00000000000..ca0a6e71f4a
--- /dev/null
+++ b/packages/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.tsx
@@ -0,0 +1,105 @@
+import React, { PureComponent } from 'react';
+
+import MappingRow from './MappingRow';
+import { MappingType, ValueMapping } from '../../types/panel';
+import { PanelOptionsGroup } from '../PanelOptionsGroup/PanelOptionsGroup';
+
+export interface Props {
+ valueMappings: ValueMapping[];
+ onChange: (valueMappings: ValueMapping[]) => void;
+}
+
+interface State {
+ valueMappings: ValueMapping[];
+ nextIdToAdd: number;
+}
+
+export class ValueMappingsEditor extends PureComponent
{
+ constructor(props: Props) {
+ super(props);
+
+ const mappings = props.valueMappings;
+
+ this.state = {
+ valueMappings: mappings,
+ nextIdToAdd: mappings.length > 0 ? this.getMaxIdFromValueMappings(mappings) : 1,
+ };
+ }
+
+ getMaxIdFromValueMappings(mappings: ValueMapping[]) {
+ return Math.max.apply(null, mappings.map(mapping => mapping.id).map(m => m)) + 1;
+ }
+
+ addMapping = () =>
+ this.setState(prevState => ({
+ valueMappings: [
+ ...prevState.valueMappings,
+ {
+ id: prevState.nextIdToAdd,
+ operator: '',
+ value: '',
+ text: '',
+ type: MappingType.ValueToText,
+ from: '',
+ to: '',
+ },
+ ],
+ nextIdToAdd: prevState.nextIdToAdd + 1,
+ }));
+
+ onRemoveMapping = (id: number) => {
+ this.setState(
+ prevState => ({
+ valueMappings: prevState.valueMappings.filter(m => {
+ return m.id !== id;
+ }),
+ }),
+ () => {
+ this.props.onChange(this.state.valueMappings);
+ }
+ );
+ };
+
+ updateGauge = (mapping: ValueMapping) => {
+ this.setState(
+ prevState => ({
+ valueMappings: prevState.valueMappings.map(m => {
+ if (m.id === mapping.id) {
+ return { ...mapping };
+ }
+
+ return m;
+ }),
+ }),
+ () => {
+ this.props.onChange(this.state.valueMappings);
+ }
+ );
+ };
+
+ render() {
+ const { valueMappings } = this.state;
+
+ return (
+
+
+ {valueMappings.length > 0 &&
+ valueMappings.map((valueMapping, index) => (
+ this.onRemoveMapping(valueMapping.id)}
+ />
+ ))}
+
+
+
+ );
+ }
+}
diff --git a/public/sass/components/_value-mappings.scss b/packages/grafana-ui/src/components/ValueMappingsEditor/_ValueMappingsEditor.scss
similarity index 100%
rename from public/sass/components/_value-mappings.scss
rename to packages/grafana-ui/src/components/ValueMappingsEditor/_ValueMappingsEditor.scss
diff --git a/public/app/plugins/panel/gauge/__snapshots__/ValueMappings.test.tsx.snap b/packages/grafana-ui/src/components/ValueMappingsEditor/__snapshots__/ValueMappingsEditor.test.tsx.snap
similarity index 73%
rename from public/app/plugins/panel/gauge/__snapshots__/ValueMappings.test.tsx.snap
rename to packages/grafana-ui/src/components/ValueMappingsEditor/__snapshots__/ValueMappingsEditor.test.tsx.snap
index 8a05cb7e91b..8a465ff88df 100644
--- a/public/app/plugins/panel/gauge/__snapshots__/ValueMappings.test.tsx.snap
+++ b/packages/grafana-ui/src/components/ValueMappingsEditor/__snapshots__/ValueMappingsEditor.test.tsx.snap
@@ -1,18 +1,15 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Render should render component 1`] = `
-
+
`;
diff --git a/packages/grafana-ui/src/components/index.scss b/packages/grafana-ui/src/components/index.scss
index d52508c946c..4f5cbf9a51b 100644
--- a/packages/grafana-ui/src/components/index.scss
+++ b/packages/grafana-ui/src/components/index.scss
@@ -1 +1,10 @@
+@import 'CustomScrollbar/CustomScrollbar';
@import 'DeleteButton/DeleteButton';
+@import 'ThresholdsEditor/ThresholdsEditor';
+@import 'Tooltip/Tooltip';
+@import 'Select/Select';
+@import 'PanelOptionsGroup/PanelOptionsGroup';
+@import 'PanelOptionsGrid/PanelOptionsGrid';
+@import 'ColorPicker/ColorPicker';
+@import 'ValueMappingsEditor/ValueMappingsEditor';
+@import "FormField/FormField";
diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts
index b57b9bcfdb7..584992f8803 100644
--- a/packages/grafana-ui/src/components/index.ts
+++ b/packages/grafana-ui/src/components/index.ts
@@ -1 +1,25 @@
export { DeleteButton } from './DeleteButton/DeleteButton';
+export { Tooltip } from './Tooltip/Tooltip';
+export { Portal } from './Portal/Portal';
+export { CustomScrollbar } from './CustomScrollbar/CustomScrollbar';
+
+// Select
+export { Select, AsyncSelect, SelectOptionItem } from './Select/Select';
+export { IndicatorsContainer } from './Select/IndicatorsContainer';
+export { NoOptionsMessage } from './Select/NoOptionsMessage';
+export { default as resetSelectStyles } from './Select/resetSelectStyles';
+
+// Forms
+export { FormLabel } from './FormLabel/FormLabel';
+export { FormField } from './FormField/FormField';
+
+export { LoadingPlaceholder } from './LoadingPlaceholder/LoadingPlaceholder';
+export { ColorPicker } from './ColorPicker/ColorPicker';
+export { SeriesColorPickerPopover } from './ColorPicker/SeriesColorPickerPopover';
+export { SeriesColorPicker } from './ColorPicker/SeriesColorPicker';
+export { ThresholdsEditor } from './ThresholdsEditor/ThresholdsEditor';
+export { Graph } from './Graph/Graph';
+export { PanelOptionsGroup } from './PanelOptionsGroup/PanelOptionsGroup';
+export { PanelOptionsGrid } from './PanelOptionsGrid/PanelOptionsGrid';
+export { ValueMappingsEditor } from './ValueMappingsEditor/ValueMappingsEditor';
+export { Gauge } from './Gauge/Gauge';
diff --git a/packages/grafana-ui/src/forms/GfFormLabel/GfFormLabel.tsx b/packages/grafana-ui/src/forms/GfFormLabel/GfFormLabel.tsx
deleted file mode 100644
index 8b80de64696..00000000000
--- a/packages/grafana-ui/src/forms/GfFormLabel/GfFormLabel.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React, { SFC, ReactNode } from 'react';
-import classNames from 'classnames';
-
-interface Props {
- children: ReactNode;
- htmlFor?: string;
- className?: string;
- isFocused?: boolean;
- isInvalid?: boolean;
-}
-
-export const GfFormLabel: SFC = ({ children, isFocused, isInvalid, className, htmlFor, ...rest }) => {
- const classes = classNames('gf-form-label', className, {
- 'gf-form-label--is-focused': isFocused,
- 'gf-form-label--is-invalid': isInvalid,
- });
-
- return (
-
- );
-};
diff --git a/packages/grafana-ui/src/forms/index.ts b/packages/grafana-ui/src/forms/index.ts
deleted file mode 100644
index bb6998b0025..00000000000
--- a/packages/grafana-ui/src/forms/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { GfFormLabel } from './GfFormLabel/GfFormLabel';
diff --git a/packages/grafana-ui/src/index.scss b/packages/grafana-ui/src/index.scss
index 841415620d6..74fdcde3072 100644
--- a/packages/grafana-ui/src/index.scss
+++ b/packages/grafana-ui/src/index.scss
@@ -1 +1,3 @@
+@import 'vendor/spectrum';
@import 'components/index';
+
diff --git a/packages/grafana-ui/src/index.ts b/packages/grafana-ui/src/index.ts
index b22152497b9..974d976bbef 100644
--- a/packages/grafana-ui/src/index.ts
+++ b/packages/grafana-ui/src/index.ts
@@ -1,5 +1,3 @@
export * from './components';
-export * from './visualizations';
export * from './types';
export * from './utils';
-export * from './forms';
diff --git a/packages/grafana-ui/src/types/datasource.ts b/packages/grafana-ui/src/types/datasource.ts
new file mode 100644
index 00000000000..ffcbbb5fe64
--- /dev/null
+++ b/packages/grafana-ui/src/types/datasource.ts
@@ -0,0 +1,89 @@
+import { TimeRange, RawTimeRange } from './time';
+import { TimeSeries } from './series';
+import { PluginMeta } from './plugin';
+
+export interface DataQueryResponse {
+ data: TimeSeries[];
+}
+
+export interface DataQuery {
+ /**
+ * A - Z
+ */
+ refId: string;
+
+ /**
+ * true if query is disabled (ie not executed / sent to TSDB)
+ */
+ hide?: boolean;
+
+ /**
+ * Unique, guid like, string used in explore mode
+ */
+ key?: string;
+
+ /**
+ * For mixed data sources the selected datasource is on the query level.
+ * For non mixed scenarios this is undefined.
+ */
+ datasource?: string | null;
+}
+
+export interface DataQueryOptions {
+ timezone: string;
+ range: TimeRange;
+ rangeRaw: RawTimeRange;
+ targets: TQuery[];
+ panelId: number;
+ dashboardId: number;
+ cacheTimeout?: string;
+ interval: string;
+ intervalMs: number;
+ maxDataPoints: number;
+ scopedVars: object;
+}
+
+export interface QueryFix {
+ type: string;
+ label: string;
+ action?: QueryFixAction;
+}
+
+export interface QueryFixAction {
+ type: string;
+ query?: string;
+ preventSubmit?: boolean;
+}
+
+export interface QueryHint {
+ type: string;
+ label: string;
+ fix?: QueryFix;
+}
+
+export interface DataSourceSettings {
+ id: number;
+ orgId: number;
+ name: string;
+ typeLogoUrl: string;
+ type: string;
+ access: string;
+ url: string;
+ password: string;
+ user: string;
+ database: string;
+ basicAuth: boolean;
+ basicAuthPassword: string;
+ basicAuthUser: string;
+ isDefault: boolean;
+ jsonData: { authType: string; defaultRegion: string };
+ readOnly: boolean;
+ withCredentials: boolean;
+}
+
+export interface DataSourceSelectItem {
+ name: string;
+ value: string | null;
+ meta: PluginMeta;
+ sort: string;
+}
diff --git a/packages/grafana-ui/src/types/index.ts b/packages/grafana-ui/src/types/index.ts
index f618ce6db34..eaa39fb080b 100644
--- a/packages/grafana-ui/src/types/index.ts
+++ b/packages/grafana-ui/src/types/index.ts
@@ -1,3 +1,5 @@
export * from './series';
export * from './time';
export * from './panel';
+export * from './plugin';
+export * from './datasource';
diff --git a/packages/grafana-ui/src/types/panel.ts b/packages/grafana-ui/src/types/panel.ts
index 44336555a81..881bf920c27 100644
--- a/packages/grafana-ui/src/types/panel.ts
+++ b/packages/grafana-ui/src/types/panel.ts
@@ -1,6 +1,8 @@
import { TimeSeries, LoadingState } from './series';
import { TimeRange } from './time';
+export type InterpolateFunction = (value: string, format?: string | Function) => string;
+
export interface PanelProps {
timeSeries: TimeSeries[];
timeRange: TimeRange;
@@ -9,6 +11,7 @@ export interface PanelProps {
renderCounter: number;
width: number;
height: number;
+ onInterpolate: InterpolateFunction;
}
export interface PanelOptionsProps {
@@ -29,3 +32,44 @@ export interface PanelMenuItem {
shortcut?: string;
subMenu?: PanelMenuItem[];
}
+
+export interface Threshold {
+ index: number;
+ value: number;
+ color?: string;
+}
+
+export enum BasicGaugeColor {
+ Green = '#299c46',
+ Red = '#d44a3a',
+}
+
+export enum MappingType {
+ ValueToText = 1,
+ RangeToText = 2,
+}
+
+interface BaseMap {
+ id: number;
+ operator: string;
+ text: string;
+ type: MappingType;
+}
+
+export type ValueMapping = ValueMap | RangeMap;
+
+export interface ValueMap extends BaseMap {
+ value: string;
+}
+
+export interface RangeMap extends BaseMap {
+ from: string;
+ to: string;
+}
+
+export type ThemeName = 'dark' | 'light';
+
+export enum ThemeNames {
+ Dark = 'dark',
+ Light = 'light',
+}
diff --git a/packages/grafana-ui/src/types/plugin.ts b/packages/grafana-ui/src/types/plugin.ts
new file mode 100644
index 00000000000..420a54e5840
--- /dev/null
+++ b/packages/grafana-ui/src/types/plugin.ts
@@ -0,0 +1,118 @@
+import { ComponentClass } from 'react';
+import { PanelProps, PanelOptionsProps } from './panel';
+import { DataQueryOptions, DataQuery, DataQueryResponse, QueryHint } from './datasource';
+
+export interface DataSourceApi {
+ /**
+ * min interval range
+ */
+ interval?: string;
+
+ /**
+ * Imports queries from a different datasource
+ */
+ importQueries?(queries: TQuery[], originMeta: PluginMeta): Promise;
+
+ /**
+ * Initializes a datasource after instantiation
+ */
+ init?: () => void;
+
+ /**
+ * Main metrics / data query action
+ */
+ query(options: DataQueryOptions): Promise;
+
+ /**
+ * Test & verify datasource settings & connection details
+ */
+ testDatasource(): Promise;
+
+ /**
+ * Get hints for query improvements
+ */
+ getQueryHints?(query: TQuery, results: any[], ...rest: any): QueryHint[];
+
+ /**
+ * Set after constructor is called by Grafana
+ */
+ name?: string;
+ meta?: PluginMeta;
+ pluginExports?: PluginExports;
+}
+
+export interface QueryEditorProps {
+ datasource: DSType;
+ query: TQuery;
+ onExecuteQuery?: () => void;
+ onQueryChange?: (value: TQuery) => void;
+}
+
+export interface PluginExports {
+ Datasource?: DataSourceApi;
+ QueryCtrl?: any;
+ QueryEditor?: ComponentClass>;
+ ConfigCtrl?: any;
+ AnnotationsQueryCtrl?: any;
+ VariableQueryEditor?: any;
+ ExploreQueryField?: any;
+ ExploreStartPage?: any;
+
+ // Panel plugin
+ PanelCtrl?: any;
+ Panel?: ComponentClass;
+ PanelOptions?: ComponentClass;
+ PanelDefaults?: any;
+}
+
+export interface PluginMeta {
+ id: string;
+ name: string;
+ info: PluginMetaInfo;
+ includes: PluginInclude[];
+
+ // Datasource-specific
+ metrics?: boolean;
+ tables?: boolean;
+ logs?: boolean;
+ explore?: boolean;
+ annotations?: boolean;
+ mixed?: boolean;
+ hasQueryHelp?: boolean;
+ queryOptions?: PluginMetaQueryOptions;
+}
+
+interface PluginMetaQueryOptions {
+ cacheTimeout?: boolean;
+ maxDataPoints?: boolean;
+ minInterval?: boolean;
+}
+
+export interface PluginInclude {
+ type: string;
+ name: string;
+ path: string;
+}
+
+interface PluginMetaInfoLink {
+ name: string;
+ url: string;
+}
+
+export interface PluginMetaInfo {
+ author: {
+ name: string;
+ url?: string;
+ };
+ description: string;
+ links: PluginMetaInfoLink[];
+ logos: {
+ large: string;
+ small: string;
+ };
+ screenshots: any[];
+ updated: string;
+ version: string;
+}
+
+
diff --git a/packages/grafana-ui/src/types/series.ts b/packages/grafana-ui/src/types/series.ts
index 49662e9872d..5cad1e4a72a 100644
--- a/packages/grafana-ui/src/types/series.ts
+++ b/packages/grafana-ui/src/types/series.ts
@@ -21,9 +21,12 @@ export interface TimeSeriesVM {
color: string;
data: TimeSeriesValue[][];
stats: TimeSeriesStats;
+ allIsNull: boolean;
+ allIsZero: boolean;
}
export interface TimeSeriesStats {
+ [key: string]: number | null;
total: number | null;
max: number | null;
min: number | null;
@@ -36,8 +39,6 @@ export interface TimeSeriesStats {
range: number | null;
timeStep: number;
count: number;
- allIsNull: boolean;
- allIsZero: boolean;
}
export enum NullValueMode {
diff --git a/packages/grafana-ui/src/utils/colors.ts b/packages/grafana-ui/src/utils/colors.ts
new file mode 100644
index 00000000000..263d128aec4
--- /dev/null
+++ b/packages/grafana-ui/src/utils/colors.ts
@@ -0,0 +1,93 @@
+import _ from 'lodash';
+import tinycolor from 'tinycolor2';
+
+export const PALETTE_ROWS = 4;
+export const PALETTE_COLUMNS = 14;
+export const DEFAULT_ANNOTATION_COLOR = 'rgba(0, 211, 255, 1)';
+export const OK_COLOR = 'rgba(11, 237, 50, 1)';
+export const ALERTING_COLOR = 'rgba(237, 46, 24, 1)';
+export const NO_DATA_COLOR = 'rgba(150, 150, 150, 1)';
+export const PENDING_COLOR = 'rgba(247, 149, 32, 1)';
+export const REGION_FILL_ALPHA = 0.09;
+
+export const colors = [
+ '#7EB26D', // 0: pale green
+ '#EAB839', // 1: mustard
+ '#6ED0E0', // 2: light blue
+ '#EF843C', // 3: orange
+ '#E24D42', // 4: red
+ '#1F78C1', // 5: ocean
+ '#BA43A9', // 6: purple
+ '#705DA0', // 7: violet
+ '#508642', // 8: dark green
+ '#CCA300', // 9: dark sand
+ '#447EBC',
+ '#C15C17',
+ '#890F02',
+ '#0A437C',
+ '#6D1F62',
+ '#584477',
+ '#B7DBAB',
+ '#F4D598',
+ '#70DBED',
+ '#F9BA8F',
+ '#F29191',
+ '#82B5D8',
+ '#E5A8E2',
+ '#AEA2E0',
+ '#629E51',
+ '#E5AC0E',
+ '#64B0C8',
+ '#E0752D',
+ '#BF1B00',
+ '#0A50A1',
+ '#962D82',
+ '#614D93',
+ '#9AC48A',
+ '#F2C96D',
+ '#65C5DB',
+ '#F9934E',
+ '#EA6460',
+ '#5195CE',
+ '#D683CE',
+ '#806EB7',
+ '#3F6833',
+ '#967302',
+ '#2F575E',
+ '#99440A',
+ '#58140C',
+ '#052B51',
+ '#511749',
+ '#3F2B5B',
+ '#E0F9D7',
+ '#FCEACA',
+ '#CFFAFF',
+ '#F9E2D2',
+ '#FCE2DE',
+ '#BADFF4',
+ '#F9D9F9',
+ '#DEDAF7',
+];
+
+function sortColorsByHue(hexColors: string[]) {
+ const hslColors = _.map(hexColors, hexToHsl);
+
+ const sortedHSLColors = _.sortBy(hslColors, ['h']);
+ const chunkedHSLColors = _.chunk(sortedHSLColors, PALETTE_ROWS);
+ const sortedChunkedHSLColors = _.map(chunkedHSLColors, chunk => {
+ return _.sortBy(chunk, 'l');
+ });
+ const flattenedZippedSortedChunkedHSLColors = _.flattenDeep(_.zip(...sortedChunkedHSLColors));
+
+ return _.map(flattenedZippedSortedChunkedHSLColors, hslToHex);
+}
+
+function hexToHsl(color: string) {
+ return tinycolor(color).toHsl();
+}
+
+function hslToHex(color: any) {
+ return tinycolor(color).toHexString();
+}
+
+export let sortedColors = sortColorsByHue(colors);
diff --git a/packages/grafana-ui/src/utils/index.ts b/packages/grafana-ui/src/utils/index.ts
index 4d9b9a4b948..aeb65032067 100644
--- a/packages/grafana-ui/src/utils/index.ts
+++ b/packages/grafana-ui/src/utils/index.ts
@@ -1 +1,3 @@
export * from './processTimeSeries';
+export * from './valueFormats/valueFormats';
+export * from './colors';
diff --git a/packages/grafana-ui/src/utils/processTimeSeries.ts b/packages/grafana-ui/src/utils/processTimeSeries.ts
index e92aaf0c1a6..f5389f1b2bd 100644
--- a/packages/grafana-ui/src/utils/processTimeSeries.ts
+++ b/packages/grafana-ui/src/utils/processTimeSeries.ts
@@ -1,18 +1,19 @@
// Libraries
import _ from 'lodash';
+import { colors } from './colors';
+
// Types
import { TimeSeries, TimeSeriesVMs, NullValueMode, TimeSeriesValue } from '../types';
interface Options {
timeSeries: TimeSeries[];
nullValueMode: NullValueMode;
- colorPalette: string[];
}
-export function processTimeSeries({ timeSeries, nullValueMode, colorPalette }: Options): TimeSeriesVMs {
+export function processTimeSeries({ timeSeries, nullValueMode }: Options): TimeSeriesVMs {
const vmSeries = timeSeries.map((item, index) => {
- const colorIndex = index % colorPalette.length;
+ const colorIndex = index % colors.length;
const label = item.target;
const result = [];
@@ -49,8 +50,8 @@ export function processTimeSeries({ timeSeries, nullValueMode, colorPalette }: O
continue;
}
- if (typeof currentValue !== 'number') {
- continue;
+ if (currentValue !== null && typeof currentValue !== 'number') {
+ throw {message: 'Time series contains non number values'};
}
// Due to missing values we could have different timeStep all along the series
@@ -150,7 +151,9 @@ export function processTimeSeries({ timeSeries, nullValueMode, colorPalette }: O
return {
data: result,
label: label,
- color: colorPalette[colorIndex],
+ color: colors[colorIndex],
+ allIsZero,
+ allIsNull,
stats: {
total,
min,
@@ -164,8 +167,6 @@ export function processTimeSeries({ timeSeries, nullValueMode, colorPalette }: O
range,
count,
first,
- allIsZero,
- allIsNull,
},
};
});
diff --git a/packages/grafana-ui/src/utils/valueFormats/arithmeticFormatters.test.ts b/packages/grafana-ui/src/utils/valueFormats/arithmeticFormatters.test.ts
new file mode 100644
index 00000000000..44332a51307
--- /dev/null
+++ b/packages/grafana-ui/src/utils/valueFormats/arithmeticFormatters.test.ts
@@ -0,0 +1,40 @@
+import { toHex, toHex0x } from './arithmeticFormatters';
+
+describe('hex', () => {
+ it('positive integer', () => {
+ const str = toHex(100, 0);
+ expect(str).toBe('64');
+ });
+ it('negative integer', () => {
+ const str = toHex(-100, 0);
+ expect(str).toBe('-64');
+ });
+ it('positive float', () => {
+ const str = toHex(50.52, 1);
+ expect(str).toBe('32.8');
+ });
+ it('negative float', () => {
+ const str = toHex(-50.333, 2);
+ expect(str).toBe('-32.547AE147AE14');
+ });
+});
+
+describe('hex 0x', () => {
+ it('positive integeter', () => {
+ const str = toHex0x(7999, 0);
+ expect(str).toBe('0x1F3F');
+ });
+ it('negative integer', () => {
+ const str = toHex0x(-584, 0);
+ expect(str).toBe('-0x248');
+ });
+
+ it('positive float', () => {
+ const str = toHex0x(74.443, 3);
+ expect(str).toBe('0x4A.716872B020C4');
+ });
+ it('negative float', () => {
+ const str = toHex0x(-65.458, 1);
+ expect(str).toBe('-0x41.8');
+ });
+});
diff --git a/packages/grafana-ui/src/utils/valueFormats/arithmeticFormatters.ts b/packages/grafana-ui/src/utils/valueFormats/arithmeticFormatters.ts
new file mode 100644
index 00000000000..fa9daf0fb97
--- /dev/null
+++ b/packages/grafana-ui/src/utils/valueFormats/arithmeticFormatters.ts
@@ -0,0 +1,42 @@
+import { toFixed } from './valueFormats';
+
+export function toPercent(size: number, decimals: number) {
+ if (size === null) {
+ return '';
+ }
+ return toFixed(size, decimals) + '%';
+}
+
+export function toPercentUnit(size: number, decimals: number) {
+ if (size === null) {
+ return '';
+ }
+ return toFixed(100 * size, decimals) + '%';
+}
+
+export function toHex0x(value: number, decimals: number) {
+ if (value == null) {
+ return '';
+ }
+ const hexString = toHex(value, decimals);
+ if (hexString.substring(0, 1) === '-') {
+ return '-0x' + hexString.substring(1);
+ }
+ return '0x' + hexString;
+}
+
+export function toHex(value: number, decimals: number) {
+ if (value == null) {
+ return '';
+ }
+ return parseFloat(toFixed(value, decimals))
+ .toString(16)
+ .toUpperCase();
+}
+
+export function sci(value: number, decimals: number) {
+ if (value == null) {
+ return '';
+ }
+ return value.toExponential(decimals);
+}
diff --git a/packages/grafana-ui/src/utils/valueFormats/categories.ts b/packages/grafana-ui/src/utils/valueFormats/categories.ts
new file mode 100644
index 00000000000..d7410c22276
--- /dev/null
+++ b/packages/grafana-ui/src/utils/valueFormats/categories.ts
@@ -0,0 +1,322 @@
+import { locale, scaledUnits, simpleCountUnit, toFixed, toFixedUnit, ValueFormatCategory } from './valueFormats';
+import {
+ dateTimeAsIso,
+ dateTimeAsUS,
+ dateTimeFromNow,
+ toClockMilliseconds,
+ toClockSeconds,
+ toDays,
+ toDurationInHoursMinutesSeconds,
+ toDurationInMilliseconds,
+ toDurationInSeconds,
+ toHours,
+ toMicroSeconds,
+ toMilliSeconds,
+ toMinutes,
+ toNanoSeconds,
+ toSeconds,
+ toTimeTicks,
+} from './dateTimeFormatters';
+import { toHex, sci, toHex0x, toPercent, toPercentUnit } from './arithmeticFormatters';
+import { binarySIPrefix, currency, decimalSIPrefix } from './symbolFormatters';
+
+export const getCategories = (): ValueFormatCategory[] => [
+ {
+ name: 'Misc',
+ formats: [
+ { name: 'none', id: 'none', fn: toFixed },
+ {
+ name: 'short',
+ id: 'short',
+ fn: scaledUnits(1000, ['', ' K', ' Mil', ' Bil', ' Tri', ' Quadr', ' Quint', ' Sext', ' Sept']),
+ },
+ { name: 'percent (0-100)', id: 'percent', fn: toPercent },
+ { name: 'percent (0.0-1.0)', id: 'percentunit', fn: toPercentUnit },
+ { name: 'Humidity (%H)', id: 'humidity', fn: toFixedUnit('%H') },
+ { name: 'decibel', id: 'dB', fn: toFixedUnit('dB') },
+ { name: 'hexadecimal (0x)', id: 'hex0x', fn: toHex0x },
+ { name: 'hexadecimal', id: 'hex', fn: toHex },
+ { name: 'scientific notation', id: 'sci', fn: sci },
+ { name: 'locale format', id: 'locale', fn: locale },
+ ],
+ },
+ {
+ name: 'Acceleration',
+ formats: [
+ { name: 'Meters/sec²', id: 'accMS2', fn: toFixedUnit('m/sec²') },
+ { name: 'Feet/sec²', id: 'accFS2', fn: toFixedUnit('f/sec²') },
+ { name: 'G unit', id: 'accG', fn: toFixedUnit('g') },
+ ],
+ },
+ {
+ name: 'Angle',
+ formats: [
+ { name: 'Degrees (°)', id: 'degree', fn: toFixedUnit('°') },
+ { name: 'Radians', id: 'radian', fn: toFixedUnit('rad') },
+ { name: 'Gradian', id: 'grad', fn: toFixedUnit('grad') },
+ ],
+ },
+ {
+ name: 'Area',
+ formats: [
+ { name: 'Square Meters (m²)', id: 'areaM2', fn: toFixedUnit('m²') },
+ { name: 'Square Feet (ft²)', id: 'areaF2', fn: toFixedUnit('ft²') },
+ { name: 'Square Miles (mi²)', id: 'areaMI2', fn: toFixedUnit('mi²') },
+ ],
+ },
+ {
+ name: 'Computation',
+ formats: [
+ { name: 'FLOP/s', id: 'flops', fn: decimalSIPrefix('FLOP/s') },
+ { name: 'MFLOP/s', id: 'mflops', fn: decimalSIPrefix('FLOP/s', 2) },
+ { name: 'GFLOP/s', id: 'gflops', fn: decimalSIPrefix('FLOP/s', 3) },
+ { name: 'TFLOP/s', id: 'tflops', fn: decimalSIPrefix('FLOP/s', 4) },
+ { name: 'PFLOP/s', id: 'pflops', fn: decimalSIPrefix('FLOP/s', 5) },
+ { name: 'EFLOP/s', id: 'eflops', fn: decimalSIPrefix('FLOP/s', 6) },
+ ],
+ },
+ {
+ name: 'Concentration',
+ formats: [
+ { name: 'parts-per-million (ppm)', id: 'ppm', fn: toFixedUnit('ppm') },
+ { name: 'parts-per-billion (ppb)', id: 'conppb', fn: toFixedUnit('ppb') },
+ { name: 'nanogram per cubic meter (ng/m³)', id: 'conngm3', fn: toFixedUnit('ng/m³') },
+ { name: 'nanogram per normal cubic meter (ng/Nm³)', id: 'conngNm3', fn: toFixedUnit('ng/Nm³') },
+ { name: 'microgram per cubic meter (μg/m³)', id: 'conμgm3', fn: toFixedUnit('μg/m³') },
+ { name: 'microgram per normal cubic meter (μg/Nm³)', id: 'conμgNm3', fn: toFixedUnit('μg/Nm³') },
+ { name: 'milligram per cubic meter (mg/m³)', id: 'conmgm3', fn: toFixedUnit('mg/m³') },
+ { name: 'milligram per normal cubic meter (mg/Nm³)', id: 'conmgNm3', fn: toFixedUnit('mg/Nm³') },
+ { name: 'gram per cubic meter (g/m³)', id: 'congm3', fn: toFixedUnit('g/m³') },
+ { name: 'gram per normal cubic meter (g/Nm³)', id: 'congNm3', fn: toFixedUnit('g/Nm³') },
+ { name: 'milligrams per decilitre (mg/dL)', id: 'conmgdL', fn: toFixedUnit('mg/dL') },
+ { name: 'millimoles per litre (mmol/L)', id: 'conmmolL', fn: toFixedUnit('mmol/L') },
+ ],
+ },
+ {
+ name: 'Currency',
+ formats: [
+ { name: 'Dollars ($)', id: 'currencyUSD', fn: currency('$') },
+ { name: 'Pounds (£)', id: 'currencyGBP', fn: currency('£') },
+ { name: 'Euro (€)', id: 'currencyEUR', fn: currency('€') },
+ { name: 'Yen (Â¥)', id: 'currencyJPY', fn: currency('Â¥') },
+ { name: 'Rubles (₽)', id: 'currencyRUB', fn: currency('₽') },
+ { name: 'Hryvnias (â‚´)', id: 'currencyUAH', fn: currency('â‚´') },
+ { name: 'Real (R$)', id: 'currencyBRL', fn: currency('R$') },
+ { name: 'Danish Krone (kr)', id: 'currencyDKK', fn: currency('kr') },
+ { name: 'Icelandic Króna (kr)', id: 'currencyISK', fn: currency('kr') },
+ { name: 'Norwegian Krone (kr)', id: 'currencyNOK', fn: currency('kr') },
+ { name: 'Swedish Krona (kr)', id: 'currencySEK', fn: currency('kr') },
+ { name: 'Czech koruna (czk)', id: 'currencyCZK', fn: currency('czk') },
+ { name: 'Swiss franc (CHF)', id: 'currencyCHF', fn: currency('CHF') },
+ { name: 'Polish ZÅ‚oty (PLN)', id: 'currencyPLN', fn: currency('PLN') },
+ { name: 'Bitcoin (฿)', id: 'currencyBTC', fn: currency('฿') },
+ ],
+ },
+ {
+ name: 'Data (IEC)',
+ formats: [
+ { name: 'bits', id: 'bits', fn: binarySIPrefix('b') },
+ { name: 'bytes', id: 'bytes', fn: binarySIPrefix('B') },
+ { name: 'kibibytes', id: 'kbytes', fn: binarySIPrefix('B', 1) },
+ { name: 'mebibytes', id: 'mbytes', fn: binarySIPrefix('B', 2) },
+ { name: 'gibibytes', id: 'gbytes', fn: binarySIPrefix('B', 3) },
+ ],
+ },
+ {
+ name: 'Data (Metric)',
+ formats: [
+ { name: 'bits', id: 'decbits', fn: decimalSIPrefix('d') },
+ { name: 'bytes', id: 'decbytes', fn: decimalSIPrefix('B') },
+ { name: 'kilobytes', id: 'deckbytes', fn: decimalSIPrefix('B', 1) },
+ { name: 'megabytes', id: 'decmbytes', fn: decimalSIPrefix('B', 2) },
+ { name: 'gigabytes', id: 'decgbytes', fn: decimalSIPrefix('B', 3) },
+ ],
+ },
+ {
+ name: 'Data Rate',
+ formats: [
+ { name: 'packets/sec', id: 'pps', fn: decimalSIPrefix('pps') },
+ { name: 'bits/sec', id: 'bps', fn: decimalSIPrefix('bps') },
+ { name: 'bytes/sec', id: 'Bps', fn: decimalSIPrefix('B/s') },
+ { name: 'kilobytes/sec', id: 'KBs', fn: decimalSIPrefix('Bs', 1) },
+ { name: 'kilobits/sec', id: 'Kbits', fn: decimalSIPrefix('bps', 1) },
+ { name: 'megabytes/sec', id: 'MBs', fn: decimalSIPrefix('Bs', 2) },
+ { name: 'megabits/sec', id: 'Mbits', fn: decimalSIPrefix('bps', 2) },
+ { name: 'gigabytes/sec', id: 'GBs', fn: decimalSIPrefix('Bs', 3) },
+ { name: 'gigabits/sec', id: 'Gbits', fn: decimalSIPrefix('bps', 3) },
+ ],
+ },
+ {
+ name: 'Date & Time',
+ formats: [
+ { name: 'YYYY-MM-DD HH:mm:ss', id: 'dateTimeAsIso', fn: dateTimeAsIso },
+ { name: 'DD/MM/YYYY h:mm:ss a', id: 'dateTimeAsUS', fn: dateTimeAsUS },
+ { name: 'From Now', id: 'dateTimeFromNow', fn: dateTimeFromNow },
+ ],
+ },
+ {
+ name: 'Energy',
+ formats: [
+ { name: 'Watt (W)', id: 'watt', fn: decimalSIPrefix('W') },
+ { name: 'Kilowatt (kW)', id: 'kwatt', fn: decimalSIPrefix('W', 1) },
+ { name: 'Milliwatt (mW)', id: 'mwatt', fn: decimalSIPrefix('W', -1) },
+ { name: 'Watt per square meter (W/m²)', id: 'Wm2', fn: toFixedUnit('W/m²') },
+ { name: 'Volt-ampere (VA)', id: 'voltamp', fn: decimalSIPrefix('VA') },
+ { name: 'Kilovolt-ampere (kVA)', id: 'kvoltamp', fn: decimalSIPrefix('VA', 1) },
+ { name: 'Volt-ampere reactive (var)', id: 'voltampreact', fn: decimalSIPrefix('var') },
+ { name: 'Kilovolt-ampere reactive (kvar)', id: 'kvoltampreact', fn: decimalSIPrefix('var', 1) },
+ { name: 'Watt-hour (Wh)', id: 'watth', fn: decimalSIPrefix('Wh') },
+ { name: 'Kilowatt-hour (kWh)', id: 'kwatth', fn: decimalSIPrefix('Wh', 1) },
+ { name: 'Kilowatt-min (kWm)', id: 'kwattm', fn: decimalSIPrefix('W/Min', 1) },
+ { name: 'Joule (J)', id: 'joule', fn: decimalSIPrefix('J') },
+ { name: 'Electron volt (eV)', id: 'ev', fn: decimalSIPrefix('eV') },
+ { name: 'Ampere (A)', id: 'amp', fn: decimalSIPrefix('A') },
+ { name: 'Kiloampere (kA)', id: 'kamp', fn: decimalSIPrefix('A', 1) },
+ { name: 'Milliampere (mA)', id: 'mamp', fn: decimalSIPrefix('A', -1) },
+ { name: 'Volt (V)', id: 'volt', fn: decimalSIPrefix('V') },
+ { name: 'Kilovolt (kV)', id: 'kvolt', fn: decimalSIPrefix('V', 1) },
+ { name: 'Millivolt (mV)', id: 'mvolt', fn: decimalSIPrefix('V', -1) },
+ { name: 'Decibel-milliwatt (dBm)', id: 'dBm', fn: decimalSIPrefix('dBm') },
+ { name: 'Ohm (Ω)', id: 'ohm', fn: decimalSIPrefix('Ω') },
+ { name: 'Lumens (Lm)', id: 'lumens', fn: decimalSIPrefix('Lm') },
+ ],
+ },
+ {
+ name: 'Flow',
+ formats: [
+ { name: 'Gallons/min (gpm)', id: 'flowgpm', fn: toFixedUnit('gpm') },
+ { name: 'Cubic meters/sec (cms)', id: 'flowcms', fn: toFixedUnit('cms') },
+ { name: 'Cubic feet/sec (cfs)', id: 'flowcfs', fn: toFixedUnit('cfs') },
+ { name: 'Cubic feet/min (cfm)', id: 'flowcfm', fn: toFixedUnit('cfm') },
+ { name: 'Litre/hour', id: 'litreh', fn: toFixedUnit('l/h') },
+ { name: 'Litre/min (l/min)', id: 'flowlpm', fn: toFixedUnit('l/min') },
+ { name: 'milliLitre/min (mL/min)', id: 'flowmlpm', fn: toFixedUnit('mL/min') },
+ ],
+ },
+ {
+ name: 'Force',
+ formats: [
+ { name: 'Newton-meters (Nm)', id: 'forceNm', fn: decimalSIPrefix('Nm') },
+ { name: 'Kilonewton-meters (kNm)', id: 'forcekNm', fn: decimalSIPrefix('Nm', 1) },
+ { name: 'Newtons (N)', id: 'forceN', fn: decimalSIPrefix('N') },
+ { name: 'Kilonewtons (kN)', id: 'forcekN', fn: decimalSIPrefix('N', 1) },
+ ],
+ },
+ {
+ name: 'Hash Rate',
+ formats: [
+ { name: 'hashes/sec', id: 'Hs', fn: decimalSIPrefix('H/s') },
+ { name: 'kilohashes/sec', id: 'KHs', fn: decimalSIPrefix('H/s', 1) },
+ { name: 'megahashes/sec', id: 'MHs', fn: decimalSIPrefix('H/s', 2) },
+ { name: 'gigahashes/sec', id: 'GHs', fn: decimalSIPrefix('H/s', 3) },
+ { name: 'terahashes/sec', id: 'THs', fn: decimalSIPrefix('H/s', 4) },
+ { name: 'petahashes/sec', id: 'PHs', fn: decimalSIPrefix('H/s', 5) },
+ { name: 'exahashes/sec', id: 'EHs', fn: decimalSIPrefix('H/s', 6) },
+ ],
+ },
+ {
+ name: 'Mass',
+ formats: [
+ { name: 'milligram (mg)', id: 'massmg', fn: decimalSIPrefix('g', -1) },
+ { name: 'gram (g)', id: 'massg', fn: decimalSIPrefix('g') },
+ { name: 'kilogram (kg)', id: 'masskg', fn: decimalSIPrefix('g', 1) },
+ { name: 'metric ton (t)', id: 'masst', fn: toFixedUnit('t') },
+ ],
+ },
+ {
+ name: 'length',
+ formats: [
+ { name: 'millimetre (mm)', id: 'lengthmm', fn: decimalSIPrefix('m', -1) },
+ { name: 'feet (ft)', id: 'lengthft', fn: toFixedUnit('ft') },
+ { name: 'meter (m)', id: 'lengthm', fn: decimalSIPrefix('m') },
+ { name: 'kilometer (km)', id: 'lengthkm', fn: decimalSIPrefix('m', 1) },
+ { name: 'mile (mi)', id: 'lengthmi', fn: toFixedUnit('mi') },
+ ],
+ },
+ {
+ name: 'Pressure',
+ formats: [
+ { name: 'Millibars', id: 'pressurembar', fn: decimalSIPrefix('bar', -1) },
+ { name: 'Bars', id: 'pressurebar', fn: decimalSIPrefix('bar') },
+ { name: 'Kilobars', id: 'pressurekbar', fn: decimalSIPrefix('bar', 1) },
+ { name: 'Hectopascals', id: 'pressurehpa', fn: toFixedUnit('hPa') },
+ { name: 'Kilopascals', id: 'pressurekpa', fn: toFixedUnit('kPa') },
+ { name: 'Inches of mercury', id: 'pressurehg', fn: toFixedUnit('"Hg') },
+ { name: 'PSI', id: 'pressurepsi', fn: scaledUnits(1000, ['psi', 'ksi', 'Mpsi']) },
+ ],
+ },
+ {
+ name: 'Radiation',
+ formats: [
+ { name: 'Becquerel (Bq)', id: 'radbq', fn: decimalSIPrefix('Bq') },
+ { name: 'curie (Ci)', id: 'radci', fn: decimalSIPrefix('Ci') },
+ { name: 'Gray (Gy)', id: 'radgy', fn: decimalSIPrefix('Gy') },
+ { name: 'rad', id: 'radrad', fn: decimalSIPrefix('rad') },
+ { name: 'Sievert (Sv)', id: 'radsv', fn: decimalSIPrefix('Sv') },
+ { name: 'rem', id: 'radrem', fn: decimalSIPrefix('rem') },
+ { name: 'Exposure (C/kg)', id: 'radexpckg', fn: decimalSIPrefix('C/kg') },
+ { name: 'roentgen (R)', id: 'radr', fn: decimalSIPrefix('R') },
+ { name: 'Sievert/hour (Sv/h)', id: 'radsvh', fn: decimalSIPrefix('Sv/h') },
+ ],
+ },
+ {
+ name: 'Temperature',
+ formats: [
+ { name: 'Celsius (°C)', id: 'celsius', fn: toFixedUnit('°C') },
+ { name: 'Farenheit (°F)', id: 'farenheit', fn: toFixedUnit('°F') },
+ { name: 'Kelvin (K)', id: 'kelvin', fn: toFixedUnit('K') },
+ ],
+ },
+ {
+ name: 'Time',
+ formats: [
+ { name: 'Hertz (1/s)', id: 'hertz', fn: decimalSIPrefix('Hz') },
+ { name: 'nanoseconds (ns)', id: 'ns', fn: toNanoSeconds },
+ { name: 'microseconds (µs)', id: 'µs', fn: toMicroSeconds },
+ { name: 'milliseconds (ms)', id: 'ms', fn: toMilliSeconds },
+ { name: 'seconds (s)', id: 's', fn: toSeconds },
+ { name: 'minutes (m)', id: 'm', fn: toMinutes },
+ { name: 'hours (h)', id: 'h', fn: toHours },
+ { name: 'days (d)', id: 'd', fn: toDays },
+ { name: 'duration (ms)', id: 'dtdurationms', fn: toDurationInMilliseconds },
+ { name: 'duration (s)', id: 'dtdurations', fn: toDurationInSeconds },
+ { name: 'duration (hh:mm:ss)', id: 'dthms', fn: toDurationInHoursMinutesSeconds },
+ { name: 'Timeticks (s/100)', id: 'timeticks', fn: toTimeTicks },
+ { name: 'clock (ms)', id: 'clockms', fn: toClockMilliseconds },
+ { name: 'clock (s)', id: 'clocks', fn: toClockSeconds },
+ ],
+ },
+ {
+ name: 'Throughput',
+ formats: [
+ { name: 'ops/sec (ops)', id: 'ops', fn: simpleCountUnit('ops') },
+ { name: 'requests/sec (rps)', id: 'reqps', fn: simpleCountUnit('reqps') },
+ { name: 'reads/sec (rps)', id: 'rps', fn: simpleCountUnit('rps') },
+ { name: 'writes/sec (wps)', id: 'wps', fn: simpleCountUnit('wps') },
+ { name: 'I/O ops/sec (iops)', id: 'iops', fn: simpleCountUnit('iops') },
+ { name: 'ops/min (opm)', id: 'opm', fn: simpleCountUnit('opm') },
+ { name: 'reads/min (rpm)', id: 'rpm', fn: simpleCountUnit('rpm') },
+ { name: 'writes/min (wpm)', id: 'wpm', fn: simpleCountUnit('wpm') },
+ ],
+ },
+ {
+ name: 'Velocity',
+ formats: [
+ { name: 'metres/second (m/s)', id: 'velocityms', fn: toFixedUnit('m/s') },
+ { name: 'kilometers/hour (km/h)', id: 'velocitykmh', fn: toFixedUnit('km/h') },
+ { name: 'miles/hour (mph)', id: 'velocitymph', fn: toFixedUnit('mph') },
+ { name: 'knot (kn)', id: 'velocityknot', fn: toFixedUnit('kn') },
+ ]
+ },
+ {
+ name: 'Volume',
+ formats: [
+ { name: 'millilitre (mL)', id: 'mlitre', fn: decimalSIPrefix('L', -1) },
+ { name: 'litre (L)', id: 'litre', fn: decimalSIPrefix('L') },
+ { name: 'cubic metre', id: 'm3', fn: toFixedUnit('m³') },
+ { name: 'Normal cubic metre', id: 'Nm3', fn: toFixedUnit('Nm³') },
+ { name: 'cubic decimetre', id: 'dm3', fn: toFixedUnit('dm³') },
+ { name: 'gallons', id: 'gallons', fn: toFixedUnit('gal') },
+ ],
+ }
+];
diff --git a/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.test.ts b/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.test.ts
new file mode 100644
index 00000000000..cf69a1d433a
--- /dev/null
+++ b/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.test.ts
@@ -0,0 +1,231 @@
+import moment from 'moment';
+import {
+ dateTimeAsIso,
+ dateTimeAsUS,
+ dateTimeFromNow,
+ Interval,
+ toClock,
+ toDuration,
+ toDurationInMilliseconds,
+ toDurationInSeconds,
+} from './dateTimeFormatters';
+
+describe('date time formats', () => {
+ const epoch = 1505634997920;
+ const utcTime = moment.utc(epoch);
+ const browserTime = moment(epoch);
+
+ it('should format as iso date', () => {
+ const expected = browserTime.format('YYYY-MM-DD HH:mm:ss');
+ const actual = dateTimeAsIso(epoch, 0, 0, false);
+ expect(actual).toBe(expected);
+ });
+
+ it('should format as iso date (in UTC)', () => {
+ const expected = utcTime.format('YYYY-MM-DD HH:mm:ss');
+ const actual = dateTimeAsIso(epoch, 0, 0, true);
+ expect(actual).toBe(expected);
+ });
+
+ it('should format as iso date and skip date when today', () => {
+ const now = moment();
+ 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 expected = now.format('HH:mm:ss');
+ const actual = dateTimeAsIso(now.valueOf(), 0, 0, true);
+ expect(actual).toBe(expected);
+ });
+
+ it('should format as US date', () => {
+ const expected = browserTime.format('MM/DD/YYYY h:mm:ss a');
+ const actual = dateTimeAsUS(epoch, 0, 0, false);
+ expect(actual).toBe(expected);
+ });
+
+ it('should format as US date (in UTC)', () => {
+ const expected = utcTime.format('MM/DD/YYYY h:mm:ss a');
+ const actual = dateTimeAsUS(epoch, 0, 0, true);
+ expect(actual).toBe(expected);
+ });
+
+ it('should format as US date and skip date when today', () => {
+ const now = moment();
+ 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 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 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 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 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 expected = '2 minutes ago';
+ const actual = dateTimeFromNow(daysAgo.valueOf(), 0, 0, true);
+ expect(actual).toBe(expected);
+ });
+});
+
+describe('duration', () => {
+ it('0 milliseconds', () => {
+ const str = toDurationInMilliseconds(0, 0);
+ expect(str).toBe('0 milliseconds');
+ });
+ it('1 millisecond', () => {
+ const str = toDurationInMilliseconds(1, 0);
+ expect(str).toBe('1 millisecond');
+ });
+ it('-1 millisecond', () => {
+ const str = toDurationInMilliseconds(-1, 0);
+ expect(str).toBe('1 millisecond ago');
+ });
+ it('seconds', () => {
+ const str = toDurationInSeconds(1, 0);
+ expect(str).toBe('1 second');
+ });
+ it('minutes', () => {
+ const str = toDuration(1, 0, Interval.Minute);
+ expect(str).toBe('1 minute');
+ });
+ it('hours', () => {
+ const str = toDuration(1, 0, Interval.Hour);
+ expect(str).toBe('1 hour');
+ });
+ it('days', () => {
+ const str = toDuration(1, 0, Interval.Day);
+ expect(str).toBe('1 day');
+ });
+ it('weeks', () => {
+ const str = toDuration(1, 0, Interval.Week);
+ expect(str).toBe('1 week');
+ });
+ it('months', () => {
+ const str = toDuration(1, 0, Interval.Month);
+ expect(str).toBe('1 month');
+ });
+ it('years', () => {
+ const str = toDuration(1, 0, Interval.Year);
+ expect(str).toBe('1 year');
+ });
+ it('decimal days', () => {
+ const str = toDuration(1.5, 2, Interval.Day);
+ expect(str).toBe('1 day, 12 hours, 0 minutes');
+ });
+ it('decimal months', () => {
+ const str = toDuration(1.5, 3, Interval.Month);
+ expect(str).toBe('1 month, 2 weeks, 1 day, 0 hours');
+ });
+ it('no decimals', () => {
+ const str = toDuration(38898367008, 0, Interval.Millisecond);
+ expect(str).toBe('1 year');
+ });
+ it('1 decimal', () => {
+ const str = toDuration(38898367008, 1, Interval.Millisecond);
+ expect(str).toBe('1 year, 2 months');
+ });
+ it('too many decimals', () => {
+ const str = toDuration(38898367008, 20, Interval.Millisecond);
+ expect(str).toBe('1 year, 2 months, 3 weeks, 4 days, 5 hours, 6 minutes, 7 seconds, 8 milliseconds');
+ });
+ it('floating point error', () => {
+ const str = toDuration(36993906007, 8, Interval.Millisecond);
+ expect(str).toBe('1 year, 2 months, 0 weeks, 3 days, 4 hours, 5 minutes, 6 seconds, 7 milliseconds');
+ });
+});
+
+describe('clock', () => {
+ it('size less than 1 second', () => {
+ const str = toClock(999, 0);
+ expect(str).toBe('999ms');
+ });
+ describe('size less than 1 minute', () => {
+ it('default', () => {
+ const str = toClock(59999);
+ expect(str).toBe('59s:999ms');
+ });
+ it('decimals equals 0', () => {
+ const str = toClock(59999, 0);
+ expect(str).toBe('59s');
+ });
+ });
+ describe('size less than 1 hour', () => {
+ it('default', () => {
+ const str = toClock(3599999);
+ expect(str).toBe('59m:59s:999ms');
+ });
+ it('decimals equals 0', () => {
+ const str = toClock(3599999, 0);
+ expect(str).toBe('59m');
+ });
+ it('decimals equals 1', () => {
+ const str = toClock(3599999, 1);
+ expect(str).toBe('59m:59s');
+ });
+ });
+ describe('size greater than or equal 1 hour', () => {
+ it('default', () => {
+ const str = toClock(7199999);
+ expect(str).toBe('01h:59m:59s:999ms');
+ });
+ it('decimals equals 0', () => {
+ const str = toClock(7199999, 0);
+ expect(str).toBe('01h');
+ });
+ it('decimals equals 1', () => {
+ const str = toClock(7199999, 1);
+ expect(str).toBe('01h:59m');
+ });
+ it('decimals equals 2', () => {
+ const str = toClock(7199999, 2);
+ expect(str).toBe('01h:59m:59s');
+ });
+ });
+ describe('size greater than or equal 1 day', () => {
+ it('default', () => {
+ const str = toClock(89999999);
+ expect(str).toBe('24h:59m:59s:999ms');
+ });
+ it('decimals equals 0', () => {
+ const str = toClock(89999999, 0);
+ expect(str).toBe('24h');
+ });
+ it('decimals equals 1', () => {
+ const str = toClock(89999999, 1);
+ expect(str).toBe('24h:59m');
+ });
+ it('decimals equals 2', () => {
+ const str = toClock(89999999, 2);
+ expect(str).toBe('24h:59m:59s');
+ });
+ });
+});
diff --git a/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.ts b/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.ts
new file mode 100644
index 00000000000..1e07857eb66
--- /dev/null
+++ b/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.ts
@@ -0,0 +1,312 @@
+import { toFixed, toFixedScaled } from './valueFormats';
+import moment from 'moment';
+
+interface IntervalsInSeconds {
+ [interval: string]: number;
+}
+
+export enum Interval {
+ Year = 'year',
+ Month = 'month',
+ Week = 'week',
+ Day = 'day',
+ Hour = 'hour',
+ Minute = 'minute',
+ Second = 'second',
+ Millisecond = 'millisecond',
+}
+
+const INTERVALS_IN_SECONDS: IntervalsInSeconds = {
+ [Interval.Year]: 31536000,
+ [Interval.Month]: 2592000,
+ [Interval.Week]: 604800,
+ [Interval.Day]: 86400,
+ [Interval.Hour]: 3600,
+ [Interval.Minute]: 60,
+ [Interval.Second]: 1,
+ [Interval.Millisecond]: 0.001,
+};
+
+export function toNanoSeconds(size: number, decimals: number, scaledDecimals: number) {
+ if (size === null) {
+ return '';
+ }
+
+ if (Math.abs(size) < 1000) {
+ return toFixed(size, decimals) + ' ns';
+ } else if (Math.abs(size) < 1000000) {
+ return toFixedScaled(size / 1000, decimals, scaledDecimals, 3, ' µs');
+ } else if (Math.abs(size) < 1000000000) {
+ return toFixedScaled(size / 1000000, decimals, scaledDecimals, 6, ' ms');
+ } else if (Math.abs(size) < 60000000000) {
+ return toFixedScaled(size / 1000000000, decimals, scaledDecimals, 9, ' s');
+ } else {
+ return toFixedScaled(size / 60000000000, decimals, scaledDecimals, 12, ' min');
+ }
+}
+
+export function toMicroSeconds(size: number, decimals: number, scaledDecimals: number) {
+ if (size === null) {
+ return '';
+ }
+
+ if (Math.abs(size) < 1000) {
+ return toFixed(size, decimals) + ' µs';
+ } else if (Math.abs(size) < 1000000) {
+ return toFixedScaled(size / 1000, decimals, scaledDecimals, 3, ' ms');
+ } else {
+ return toFixedScaled(size / 1000000, decimals, scaledDecimals, 6, ' s');
+ }
+}
+
+export function toMilliSeconds(size: number, decimals: number, scaledDecimals: number) {
+ if (size === null) {
+ return '';
+ }
+
+ if (Math.abs(size) < 1000) {
+ return toFixed(size, decimals) + ' ms';
+ } else if (Math.abs(size) < 60000) {
+ // Less than 1 min
+ return toFixedScaled(size / 1000, decimals, scaledDecimals, 3, ' s');
+ } else if (Math.abs(size) < 3600000) {
+ // Less than 1 hour, divide in minutes
+ return toFixedScaled(size / 60000, decimals, scaledDecimals, 5, ' min');
+ } else if (Math.abs(size) < 86400000) {
+ // Less than one day, divide in hours
+ return toFixedScaled(size / 3600000, decimals, scaledDecimals, 7, ' hour');
+ } else if (Math.abs(size) < 31536000000) {
+ // Less than one year, divide in days
+ return toFixedScaled(size / 86400000, decimals, scaledDecimals, 8, ' day');
+ }
+
+ return toFixedScaled(size / 31536000000, decimals, scaledDecimals, 10, ' year');
+}
+
+export function toSeconds(size: number, decimals: number, scaledDecimals: number) {
+ if (size === null) {
+ return '';
+ }
+
+ // Less than 1 µs, divide in ns
+ if (Math.abs(size) < 0.000001) {
+ return toFixedScaled(size * 1e9, decimals, scaledDecimals - decimals, -9, ' ns');
+ }
+ // Less than 1 ms, divide in µs
+ if (Math.abs(size) < 0.001) {
+ return toFixedScaled(size * 1e6, decimals, scaledDecimals - decimals, -6, ' µs');
+ }
+ // Less than 1 second, divide in ms
+ if (Math.abs(size) < 1) {
+ return toFixedScaled(size * 1e3, decimals, scaledDecimals - decimals, -3, ' ms');
+ }
+
+ if (Math.abs(size) < 60) {
+ return toFixed(size, decimals) + ' s';
+ } else if (Math.abs(size) < 3600) {
+ // Less than 1 hour, divide in minutes
+ return toFixedScaled(size / 60, decimals, scaledDecimals, 1, ' min');
+ } else if (Math.abs(size) < 86400) {
+ // Less than one day, divide in hours
+ return toFixedScaled(size / 3600, decimals, scaledDecimals, 4, ' hour');
+ } else if (Math.abs(size) < 604800) {
+ // Less than one week, divide in days
+ return toFixedScaled(size / 86400, decimals, scaledDecimals, 5, ' day');
+ } else if (Math.abs(size) < 31536000) {
+ // Less than one year, divide in week
+ return toFixedScaled(size / 604800, decimals, scaledDecimals, 6, ' week');
+ }
+
+ return toFixedScaled(size / 3.15569e7, decimals, scaledDecimals, 7, ' year');
+}
+
+export function toMinutes(size: number, decimals: number, scaledDecimals: number) {
+ if (size === null) {
+ return '';
+ }
+
+ if (Math.abs(size) < 60) {
+ return toFixed(size, decimals) + ' min';
+ } else if (Math.abs(size) < 1440) {
+ return toFixedScaled(size / 60, decimals, scaledDecimals, 2, ' hour');
+ } else if (Math.abs(size) < 10080) {
+ return toFixedScaled(size / 1440, decimals, scaledDecimals, 3, ' day');
+ } else if (Math.abs(size) < 604800) {
+ return toFixedScaled(size / 10080, decimals, scaledDecimals, 4, ' week');
+ } else {
+ return toFixedScaled(size / 5.25948e5, decimals, scaledDecimals, 5, ' year');
+ }
+}
+
+export function toHours(size: number, decimals: number, scaledDecimals: number) {
+ if (size === null) {
+ return '';
+ }
+
+ if (Math.abs(size) < 24) {
+ return toFixed(size, decimals) + ' hour';
+ } else if (Math.abs(size) < 168) {
+ return toFixedScaled(size / 24, decimals, scaledDecimals, 2, ' day');
+ } else if (Math.abs(size) < 8760) {
+ return toFixedScaled(size / 168, decimals, scaledDecimals, 3, ' week');
+ } else {
+ return toFixedScaled(size / 8760, decimals, scaledDecimals, 4, ' year');
+ }
+}
+
+export function toDays(size: number, decimals: number, scaledDecimals: number) {
+ if (size === null) {
+ return '';
+ }
+
+ if (Math.abs(size) < 7) {
+ return toFixed(size, decimals) + ' day';
+ } else if (Math.abs(size) < 365) {
+ return toFixedScaled(size / 7, decimals, scaledDecimals, 2, ' week');
+ } else {
+ return toFixedScaled(size / 365, decimals, scaledDecimals, 3, ' year');
+ }
+}
+
+export function toDuration(size: number, decimals: number, timeScale: Interval): string {
+ if (size === null) {
+ return '';
+ }
+ if (size === 0) {
+ return '0 ' + timeScale + 's';
+ }
+ if (size < 0) {
+ return toDuration(-size, decimals, timeScale) + ' ago';
+ }
+
+ const units = [
+ { long: Interval.Year },
+ { long: Interval.Month },
+ { long: Interval.Week },
+ { long: Interval.Day },
+ { long: Interval.Hour },
+ { long: Interval.Minute },
+ { long: Interval.Second },
+ { long: Interval.Millisecond },
+ ];
+ // convert $size to milliseconds
+ // intervals_in_seconds uses seconds (duh), convert them to milliseconds here to minimize floating point errors
+ size *= INTERVALS_IN_SECONDS[timeScale] * 1000;
+
+ const strings = [];
+ // after first value >= 1 print only $decimals more
+ let decrementDecimals = false;
+ for (let i = 0; i < units.length && decimals >= 0; i++) {
+ const interval = INTERVALS_IN_SECONDS[units[i].long] * 1000;
+ const value = size / interval;
+ if (value >= 1 || decrementDecimals) {
+ decrementDecimals = true;
+ const floor = Math.floor(value);
+ const unit = units[i].long + (floor !== 1 ? 's' : '');
+ strings.push(floor + ' ' + unit);
+ size = size % interval;
+ decimals--;
+ }
+ }
+
+ return strings.join(', ');
+}
+
+export function toClock(size: number, decimals?: number) {
+ if (size === null) {
+ return '';
+ }
+
+ // < 1 second
+ if (size < 1000) {
+ return moment.utc(size).format('SSS\\m\\s');
+ }
+
+ // < 1 minute
+ if (size < 60000) {
+ let format = 'ss\\s:SSS\\m\\s';
+ if (decimals === 0) {
+ format = 'ss\\s';
+ }
+ return moment.utc(size).format(format);
+ }
+
+ // < 1 hour
+ if (size < 3600000) {
+ let format = 'mm\\m:ss\\s:SSS\\m\\s';
+ if (decimals === 0) {
+ format = 'mm\\m';
+ } else if (decimals === 1) {
+ format = 'mm\\m:ss\\s';
+ }
+ return moment.utc(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`;
+
+ if (decimals === 0) {
+ format = '';
+ } else if (decimals === 1) {
+ format = 'mm\\m';
+ } else if (decimals === 2) {
+ format = 'mm\\m:ss\\s';
+ }
+
+ return format ? `${hours}:${moment.utc(size).format(format)}` : hours;
+}
+
+export function toDurationInMilliseconds(size: number, decimals: number) {
+ return toDuration(size, decimals, Interval.Millisecond);
+}
+
+export function toDurationInSeconds(size: number, decimals: number) {
+ return toDuration(size, decimals, Interval.Second);
+}
+
+export function toDurationInHoursMinutesSeconds(size: number) {
+ const strings = [];
+ const numHours = Math.floor(size / 3600);
+ const numMinutes = Math.floor((size % 3600) / 60);
+ const numSeconds = Math.floor((size % 3600) % 60);
+ numHours > 9 ? strings.push('' + numHours) : strings.push('0' + numHours);
+ numMinutes > 9 ? strings.push('' + numMinutes) : strings.push('0' + numMinutes);
+ numSeconds > 9 ? strings.push('' + numSeconds) : strings.push('0' + numSeconds);
+ return strings.join(':');
+}
+
+export function toTimeTicks(size: number, decimals: number, scaledDecimals: number) {
+ return toSeconds(size, decimals, scaledDecimals);
+}
+
+export function toClockMilliseconds(size: number, decimals: number) {
+ return toClock(size, decimals);
+}
+
+export function toClockSeconds(size: number, decimals: number) {
+ return toClock(size * 1000, decimals);
+}
+
+export function dateTimeAsIso(value: number, decimals: number, scaledDecimals: number, isUtc: boolean) {
+ const time = isUtc ? moment.utc(value) : moment(value);
+
+ if (moment().isSame(value, 'day')) {
+ return time.format('HH:mm:ss');
+ }
+ return time.format('YYYY-MM-DD HH:mm:ss');
+}
+
+export function dateTimeAsUS(value: number, decimals: number, scaledDecimals: number, isUtc: boolean) {
+ const time = isUtc ? moment.utc(value) : moment(value);
+
+ if (moment().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: number, scaledDecimals: number, isUtc: boolean) {
+ const time = isUtc ? moment.utc(value) : moment(value);
+ return time.fromNow();
+}
diff --git a/packages/grafana-ui/src/utils/valueFormats/symbolFormatters.test.ts b/packages/grafana-ui/src/utils/valueFormats/symbolFormatters.test.ts
new file mode 100644
index 00000000000..49278711608
--- /dev/null
+++ b/packages/grafana-ui/src/utils/valueFormats/symbolFormatters.test.ts
@@ -0,0 +1,7 @@
+import { currency } from './symbolFormatters';
+
+describe('Currency', () => {
+ it('should format as usd', () => {
+ expect(currency('$')(1532.82, 1, -1)).toEqual('$1.53K');
+ });
+});
diff --git a/packages/grafana-ui/src/utils/valueFormats/symbolFormatters.ts b/packages/grafana-ui/src/utils/valueFormats/symbolFormatters.ts
new file mode 100644
index 00000000000..66808143daa
--- /dev/null
+++ b/packages/grafana-ui/src/utils/valueFormats/symbolFormatters.ts
@@ -0,0 +1,30 @@
+import { scaledUnits } from './valueFormats';
+
+export function currency(symbol: string) {
+ const units = ['', 'K', 'M', 'B', 'T'];
+ const scaler = scaledUnits(1000, units);
+ return (size: number, decimals: number, scaledDecimals: number) => {
+ if (size === null) {
+ return '';
+ }
+ const scaled = scaler(size, decimals, scaledDecimals);
+ return symbol + scaled;
+ };
+}
+
+export function binarySIPrefix(unit: string, offset = 0) {
+ const prefixes = ['', 'Ki', 'Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi', 'Yi'].slice(offset);
+ const units = prefixes.map(p => {
+ return ' ' + p + unit;
+ });
+ return scaledUnits(1024, units);
+}
+
+export function decimalSIPrefix(unit: string, offset = 0) {
+ let prefixes = ['n', 'µ', 'm', '', 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'];
+ prefixes = prefixes.slice(3 + (offset || 0));
+ const units = prefixes.map(p => {
+ return ' ' + p + unit;
+ });
+ return scaledUnits(1000, units);
+}
diff --git a/packages/grafana-ui/src/utils/valueFormats/valueFormats.ts b/packages/grafana-ui/src/utils/valueFormats/valueFormats.ts
new file mode 100644
index 00000000000..0a56ce58e5b
--- /dev/null
+++ b/packages/grafana-ui/src/utils/valueFormats/valueFormats.ts
@@ -0,0 +1,166 @@
+import { getCategories } from './categories';
+
+type ValueFormatter = (value: number, decimals?: number, scaledDecimals?: number, isUtc?: boolean) => string;
+
+interface ValueFormat {
+ name: string;
+ id: string;
+ fn: ValueFormatter;
+}
+
+export interface ValueFormatCategory {
+ name: string;
+ formats: ValueFormat[];
+}
+
+interface ValueFormatterIndex {
+ [id: string]: ValueFormatter;
+}
+
+// Globals & formats cache
+let categories: ValueFormatCategory[] = [];
+const index: ValueFormatterIndex = {};
+let hasBuiltIndex = false;
+
+export function toFixed(value: number, decimals?: number): string {
+ if (value === null) {
+ return '';
+ }
+
+ const factor = decimals ? Math.pow(10, Math.max(0, decimals)) : 1;
+ const formatted = String(Math.round(value * factor) / factor);
+
+ // if exponent return directly
+ if (formatted.indexOf('e') !== -1 || value === 0) {
+ return formatted;
+ }
+
+ // If tickDecimals was specified, ensure that we have exactly that
+ // much precision; otherwise default to the value's own precision.
+ if (decimals != null) {
+ const decimalPos = formatted.indexOf('.');
+ const precision = decimalPos === -1 ? 0 : formatted.length - decimalPos - 1;
+ if (precision < decimals) {
+ return (precision ? formatted : formatted + '.') + String(factor).substr(1, decimals - precision);
+ }
+ }
+
+ return formatted;
+}
+
+export function toFixedScaled(
+ value: number,
+ decimals: number,
+ scaledDecimals: number,
+ additionalDecimals: number,
+ ext: string
+) {
+ if (scaledDecimals === null) {
+ return toFixed(value, decimals) + ext;
+ } else {
+ return toFixed(value, scaledDecimals + additionalDecimals) + ext;
+ }
+}
+
+export function toFixedUnit(unit: string) {
+ return (size: number, decimals: number) => {
+ if (size === null) {
+ return '';
+ }
+ return toFixed(size, decimals) + ' ' + unit;
+ };
+}
+
+// Formatter which scales the unit string geometrically according to the given
+// numeric factor. Repeatedly scales the value down by the factor until it is
+// less than the factor in magnitude, or the end of the array is reached.
+export function scaledUnits(factor: number, extArray: string[]) {
+ return (size: number, decimals: number, scaledDecimals: number) => {
+ if (size === null) {
+ return '';
+ }
+
+ let steps = 0;
+ const limit = extArray.length;
+
+ while (Math.abs(size) >= factor) {
+ steps++;
+ size /= factor;
+
+ if (steps >= limit) {
+ return 'NA';
+ }
+ }
+
+ if (steps > 0 && scaledDecimals !== null) {
+ decimals = scaledDecimals + 3 * steps;
+ }
+
+ return toFixed(size, decimals) + extArray[steps];
+ };
+}
+
+export function locale(value: number, decimals: number) {
+ if (value == null) {
+ return '';
+ }
+ return value.toLocaleString(undefined, { maximumFractionDigits: decimals });
+}
+
+export function simpleCountUnit(symbol: string) {
+ const units = ['', 'K', 'M', 'B', 'T'];
+ const scaler = scaledUnits(1000, units);
+ return (size: number, decimals: number, scaledDecimals: number) => {
+ if (size === null) {
+ return '';
+ }
+ const scaled = scaler(size, decimals, scaledDecimals);
+ return scaled + ' ' + symbol;
+ };
+}
+
+function buildFormats() {
+ categories = getCategories();
+
+ for (const cat of categories) {
+ for (const format of cat.formats) {
+ index[format.id] = format.fn;
+ }
+ }
+
+ hasBuiltIndex = true;
+}
+
+export function getValueFormat(id: string): ValueFormatter {
+ if (!hasBuiltIndex) {
+ buildFormats();
+ }
+
+ return index[id];
+}
+
+export function getValueFormatterIndex(): ValueFormatterIndex {
+ if (!hasBuiltIndex) {
+ buildFormats();
+ }
+
+ return index;
+}
+
+export function getValueFormats() {
+ if (!hasBuiltIndex) {
+ buildFormats();
+ }
+
+ return categories.map(cat => {
+ return {
+ text: cat.name,
+ submenu: cat.formats.map(format => {
+ return {
+ text: format.name,
+ value: format.id,
+ };
+ }),
+ };
+ });
+}
diff --git a/packages/grafana-ui/src/utils/valueMappings.test.ts b/packages/grafana-ui/src/utils/valueMappings.test.ts
new file mode 100644
index 00000000000..d37e0beedab
--- /dev/null
+++ b/packages/grafana-ui/src/utils/valueMappings.test.ts
@@ -0,0 +1,81 @@
+import { getMappedValue } from './valueMappings';
+import { ValueMapping, MappingType } from '../types/panel';
+
+describe('Format value with value mappings', () => {
+ it('should return undefined with no valuemappings', () => {
+ const valueMappings: ValueMapping[] = [];
+ const value = '10';
+
+ expect(getMappedValue(valueMappings, value)).toBeUndefined();
+ });
+
+ it('should return undefined with no matching valuemappings', () => {
+ const valueMappings: ValueMapping[] = [
+ { id: 0, operator: '', text: 'elva', type: MappingType.ValueToText, value: '11' },
+ { id: 1, operator: '', text: '1-9', type: MappingType.RangeToText, from: '1', to: '9' },
+ ];
+ const value = '10';
+
+ expect(getMappedValue(valueMappings, value)).toBeUndefined();
+ });
+
+ it('should return first matching mapping with lowest id', () => {
+ const valueMappings: ValueMapping[] = [
+ { id: 0, operator: '', text: '1-20', type: MappingType.RangeToText, from: '1', to: '20' },
+ { id: 1, operator: '', text: 'tio', type: MappingType.ValueToText, value: '10' },
+ ];
+ const value = '10';
+
+ expect(getMappedValue(valueMappings, value).text).toEqual('1-20');
+ });
+
+ it('should return if value is null and value to text mapping value is null', () => {
+ const valueMappings: ValueMapping[] = [
+ { id: 0, operator: '', text: '1-20', type: MappingType.RangeToText, from: '1', to: '20' },
+ { id: 1, operator: '', text: '', type: MappingType.ValueToText, value: 'null' },
+ ];
+ const value = null;
+
+ expect(getMappedValue(valueMappings, value).text).toEqual('');
+ });
+
+ it('should return if value is null and range to text mapping from and to is null', () => {
+ const valueMappings: ValueMapping[] = [
+ { id: 0, operator: '', text: '', type: MappingType.RangeToText, from: 'null', to: 'null' },
+ { id: 1, operator: '', text: 'elva', type: MappingType.ValueToText, value: '11' },
+ ];
+ const value = null;
+
+ expect(getMappedValue(valueMappings, value).text).toEqual('');
+ });
+
+ it('should return rangeToText mapping where value equals to', () => {
+ const valueMappings: ValueMapping[] = [
+ { id: 0, operator: '', text: '1-10', type: MappingType.RangeToText, from: '1', to: '10' },
+ { id: 1, operator: '', text: 'elva', type: MappingType.ValueToText, value: '11' },
+ ];
+ const value = '10';
+
+ expect(getMappedValue(valueMappings, value).text).toEqual('1-10');
+ });
+
+ it('should return rangeToText mapping where value equals from', () => {
+ const valueMappings: ValueMapping[] = [
+ { id: 0, operator: '', text: '10-20', type: MappingType.RangeToText, from: '10', to: '20' },
+ { id: 1, operator: '', text: 'elva', type: MappingType.ValueToText, value: '11' },
+ ];
+ const value = '10';
+
+ expect(getMappedValue(valueMappings, value).text).toEqual('10-20');
+ });
+
+ it('should return rangeToText mapping where value is between from and to', () => {
+ const valueMappings: ValueMapping[] = [
+ { id: 0, operator: '', text: '1-20', type: MappingType.RangeToText, from: '1', to: '20' },
+ { id: 1, operator: '', text: 'elva', type: MappingType.ValueToText, value: '11' },
+ ];
+ const value = '10';
+
+ expect(getMappedValue(valueMappings, value).text).toEqual('1-20');
+ });
+});
diff --git a/packages/grafana-ui/src/utils/valueMappings.ts b/packages/grafana-ui/src/utils/valueMappings.ts
new file mode 100644
index 00000000000..c9b926ea0a4
--- /dev/null
+++ b/packages/grafana-ui/src/utils/valueMappings.ts
@@ -0,0 +1,89 @@
+import { ValueMapping, MappingType, ValueMap, RangeMap } from '../types';
+
+export type TimeSeriesValue = string | number | null;
+
+const addValueToTextMappingText = (
+ allValueMappings: ValueMapping[],
+ valueToTextMapping: ValueMap,
+ value: TimeSeriesValue
+) => {
+ if (valueToTextMapping.value === undefined) {
+ return allValueMappings;
+ }
+
+ if (value === null && valueToTextMapping.value && valueToTextMapping.value.toLowerCase() === 'null') {
+ return allValueMappings.concat(valueToTextMapping);
+ }
+
+ const valueAsNumber = parseFloat(value as string);
+ const valueToTextMappingAsNumber = parseFloat(valueToTextMapping.value as string);
+
+ if (isNaN(valueAsNumber) || isNaN(valueToTextMappingAsNumber)) {
+ return allValueMappings;
+ }
+
+ if (valueAsNumber !== valueToTextMappingAsNumber) {
+ return allValueMappings;
+ }
+
+ return allValueMappings.concat(valueToTextMapping);
+};
+
+const addRangeToTextMappingText = (
+ allValueMappings: ValueMapping[],
+ rangeToTextMapping: RangeMap,
+ value: TimeSeriesValue
+) => {
+ if (rangeToTextMapping.from === undefined || rangeToTextMapping.to === undefined || value === undefined) {
+ return allValueMappings;
+ }
+
+ if (
+ value === null &&
+ rangeToTextMapping.from &&
+ rangeToTextMapping.to &&
+ rangeToTextMapping.from.toLowerCase() === 'null' &&
+ rangeToTextMapping.to.toLowerCase() === 'null'
+ ) {
+ return allValueMappings.concat(rangeToTextMapping);
+ }
+
+ const valueAsNumber = parseFloat(value as string);
+ const fromAsNumber = parseFloat(rangeToTextMapping.from as string);
+ const toAsNumber = parseFloat(rangeToTextMapping.to as string);
+
+ if (isNaN(valueAsNumber) || isNaN(fromAsNumber) || isNaN(toAsNumber)) {
+ return allValueMappings;
+ }
+
+ if (valueAsNumber >= fromAsNumber && valueAsNumber <= toAsNumber) {
+ return allValueMappings.concat(rangeToTextMapping);
+ }
+
+ return allValueMappings;
+};
+
+const getAllFormattedValueMappings = (valueMappings: ValueMapping[], value: TimeSeriesValue) => {
+ const allFormattedValueMappings = valueMappings.reduce(
+ (allValueMappings, valueMapping) => {
+ if (valueMapping.type === MappingType.ValueToText) {
+ allValueMappings = addValueToTextMappingText(allValueMappings, valueMapping as ValueMap, value);
+ } else if (valueMapping.type === MappingType.RangeToText) {
+ allValueMappings = addRangeToTextMappingText(allValueMappings, valueMapping as RangeMap, value);
+ }
+
+ return allValueMappings;
+ },
+ [] as ValueMapping[]
+ );
+
+ allFormattedValueMappings.sort((t1, t2) => {
+ return t1.id - t2.id;
+ });
+
+ return allFormattedValueMappings;
+};
+
+export const getMappedValue = (valueMappings: ValueMapping[], value: TimeSeriesValue): ValueMapping => {
+ return getAllFormattedValueMappings(valueMappings, value)[0];
+};
diff --git a/public/vendor/css/spectrum.css b/packages/grafana-ui/src/vendor/spectrum.css
similarity index 100%
rename from public/vendor/css/spectrum.css
rename to packages/grafana-ui/src/vendor/spectrum.css
diff --git a/public/vendor/spectrum.js b/packages/grafana-ui/src/vendor/spectrum.js
similarity index 100%
rename from public/vendor/spectrum.js
rename to packages/grafana-ui/src/vendor/spectrum.js
diff --git a/packages/grafana-ui/src/visualizations/index.ts b/packages/grafana-ui/src/visualizations/index.ts
deleted file mode 100644
index 967432d37c9..00000000000
--- a/packages/grafana-ui/src/visualizations/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { Graph } from './Graph/Graph';
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 4d4f6539972..d4f2f2aa7a3 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:stretch-slim
+ARG BASE_IMAGE=debian:stretch-slim
+FROM ${BASE_IMAGE}
ARG GRAFANA_TGZ="grafana-latest.linux-x64.tar.gz"
@@ -10,7 +11,8 @@ COPY ${GRAFANA_TGZ} /tmp/grafana.tar.gz
RUN mkdir /tmp/grafana && tar xfvz /tmp/grafana.tar.gz --strip-components=1 -C /tmp/grafana
-FROM debian:stretch-slim
+ARG BASE_IMAGE=debian:stretch-slim
+FROM ${BASE_IMAGE}
ARG GF_UID="472"
ARG GF_GID="472"
diff --git a/packaging/docker/build-deploy.sh b/packaging/docker/build-deploy.sh
index ac3226a4a61..22655bead8c 100755
--- a/packaging/docker/build-deploy.sh
+++ b/packaging/docker/build-deploy.sh
@@ -8,6 +8,5 @@ docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
./push_to_docker_hub.sh "$_grafana_version"
if echo "$_grafana_version" | grep -q "^master-"; then
- apk add --no-cache curl
./deploy_to_k8s.sh "grafana/grafana-dev:$_grafana_version"
fi
diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh
index c303c71cd5f..a522363089b 100755
--- a/packaging/docker/build.sh
+++ b/packaging/docker/build.sh
@@ -1,25 +1,49 @@
#!/bin/sh
-_grafana_tag=$1
+_grafana_tag=${1:-}
+_docker_repo=${2:-grafana/grafana}
# If the tag starts with v, treat this as a official release
if echo "$_grafana_tag" | grep -q "^v"; then
_grafana_version=$(echo "${_grafana_tag}" | cut -d "v" -f 2)
- _docker_repo=${2:-grafana/grafana}
else
_grafana_version=$_grafana_tag
- _docker_repo=${2:-grafana/grafana-dev}
fi
echo "Building ${_docker_repo}:${_grafana_version}"
-docker build \
- --tag "${_docker_repo}:${_grafana_version}" \
- --no-cache=true .
+export DOCKER_CLI_EXPERIMENTAL=enabled
+
+# Build grafana image for a specific arch
+docker_build () {
+ base_image=$1
+ grafana_tgz=$2
+ tag=$3
+
+ docker build \
+ --build-arg BASE_IMAGE=${base_image} \
+ --build-arg GRAFANA_TGZ=${grafana_tgz} \
+ --tag "${tag}" \
+ --no-cache=true .
+}
+
+# Tag docker images of all architectures
+docker_tag_all () {
+ repo=$1
+ tag=$2
+ docker tag "${_docker_repo}:${_grafana_version}" "${repo}:${tag}"
+ docker tag "${_docker_repo}-arm32v7-linux:${_grafana_version}" "${repo}-arm32v7-linux:${tag}"
+ docker tag "${_docker_repo}-arm64v8-linux:${_grafana_version}" "${repo}-arm64v8-linux:${tag}"
+}
+
+docker_build "debian:stretch-slim" "grafana-latest.linux-x64.tar.gz" "${_docker_repo}:${_grafana_version}"
+docker_build "arm32v7/debian:stretch-slim" "grafana-latest.linux-armv7.tar.gz" "${_docker_repo}-arm32v7-linux:${_grafana_version}"
+docker_build "arm64v8/debian:stretch-slim" "grafana-latest.linux-arm64.tar.gz" "${_docker_repo}-arm64v8-linux:${_grafana_version}"
# Tag as 'latest' for official release; otherwise tag as grafana/grafana:master
if echo "$_grafana_tag" | grep -q "^v"; then
- docker tag "${_docker_repo}:${_grafana_version}" "${_docker_repo}:latest"
+ docker_tag_all "${_docker_repo}" "latest"
else
- docker tag "${_docker_repo}:${_grafana_version}" "grafana/grafana:master"
+ docker_tag_all "${_docker_repo}" "master"
+ docker tag "${_docker_repo}:${_grafana_version}" "grafana/grafana-dev:${_grafana_version}"
fi
diff --git a/packaging/docker/push_to_docker_hub.sh b/packaging/docker/push_to_docker_hub.sh
index 526c216f8fa..37b5ae0095c 100755
--- a/packaging/docker/push_to_docker_hub.sh
+++ b/packaging/docker/push_to_docker_hub.sh
@@ -1,24 +1,46 @@
#!/bin/sh
set -e
-_grafana_tag=$1
+_grafana_tag=${1:-}
+_docker_repo=${2:-grafana/grafana}
# If the tag starts with v, treat this as a official release
if echo "$_grafana_tag" | grep -q "^v"; then
_grafana_version=$(echo "${_grafana_tag}" | cut -d "v" -f 2)
- _docker_repo=${2:-grafana/grafana}
else
_grafana_version=$_grafana_tag
- _docker_repo=${2:-grafana/grafana-dev}
fi
+export DOCKER_CLI_EXPERIMENTAL=enabled
+
echo "pushing ${_docker_repo}:${_grafana_version}"
-docker push "${_docker_repo}:${_grafana_version}"
+
+
+docker_push_all () {
+ repo=$1
+ tag=$2
+
+ # Push each image individually
+ docker push "${repo}:${tag}"
+ docker push "${repo}-arm32v7-linux:${tag}"
+ docker push "${repo}-arm64v8-linux:${tag}"
+
+ # Create and push a multi-arch manifest
+ docker manifest create "${repo}:${tag}" \
+ "${repo}:${tag}" \
+ "${repo}-arm32v7-linux:${tag}" \
+ "${repo}-arm64v8-linux:${tag}"
+
+ docker manifest push "${repo}:${tag}"
+}
if echo "$_grafana_tag" | grep -q "^v" && echo "$_grafana_tag" | grep -vq "beta"; then
echo "pushing ${_docker_repo}:latest"
- docker push "${_docker_repo}:latest"
+ docker_push_all "${_docker_repo}" "latest"
+ docker_push_all "${_docker_repo}" "${_grafana_version}"
+elif echo "$_grafana_tag" | grep -q "^v" && echo "$_grafana_tag" | grep -q "beta"; then
+ docker_push_all "${_docker_repo}" "${_grafana_version}"
elif echo "$_grafana_tag" | grep -q "master"; then
- echo "pushing grafana/grafana:master"
- docker push grafana/grafana:master
+ docker_push_all "${_docker_repo}" "master"
+ docker push "grafana/grafana-dev:${_grafana_version}"
fi
diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go
index 66b3b504946..19fb4efd7e8 100644
--- a/pkg/api/alerting.go
+++ b/pkg/api/alerting.go
@@ -212,6 +212,10 @@ func GetAlertNotificationByID(c *m.ReqContext) Response {
return Error(500, "Failed to get alert notifications", err)
}
+ if query.Result == nil {
+ return Error(404, "Alert notification not found", nil)
+ }
+
return JSON(200, dtos.NewAlertNotification(query.Result))
}
diff --git a/pkg/api/alerting_test.go b/pkg/api/alerting_test.go
index 331beeef5e4..168193e377f 100644
--- a/pkg/api/alerting_test.go
+++ b/pkg/api/alerting_test.go
@@ -119,6 +119,12 @@ func TestAlertingApiEndpoint(t *testing.T) {
So(getAlertsQuery.Limit, ShouldEqual, 5)
So(getAlertsQuery.Query, ShouldEqual, "alertQuery")
})
+
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/alert-notifications/1", "/alert-notifications/:notificationId", m.ROLE_ADMIN, func(sc *scenarioContext) {
+ sc.handlerFunc = GetAlertNotificationByID
+ sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 404)
+ })
})
}
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 0526ee80afe..07cb712f794 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -23,9 +23,9 @@ func (hs *HTTPServer) registerRoutes() {
// not logged in views
r.Get("/", reqSignedIn, hs.Index)
- r.Get("/logout", Logout)
- r.Post("/login", quota("session"), bind(dtos.LoginCommand{}), Wrap(LoginPost))
- r.Get("/login/:name", quota("session"), OAuthLogin)
+ r.Get("/logout", hs.Logout)
+ r.Post("/login", quota("session"), bind(dtos.LoginCommand{}), Wrap(hs.LoginPost))
+ r.Get("/login/:name", quota("session"), hs.OAuthLogin)
r.Get("/login", hs.LoginView)
r.Get("/invite/:code", hs.Index)
@@ -84,11 +84,11 @@ func (hs *HTTPServer) registerRoutes() {
r.Get("/signup", hs.Index)
r.Get("/api/user/signup/options", Wrap(GetSignUpOptions))
r.Post("/api/user/signup", quota("user"), bind(dtos.SignUpForm{}), Wrap(SignUp))
- r.Post("/api/user/signup/step2", bind(dtos.SignUpStep2Form{}), Wrap(SignUpStep2))
+ r.Post("/api/user/signup/step2", bind(dtos.SignUpStep2Form{}), Wrap(hs.SignUpStep2))
// invited
r.Get("/api/user/invite/:code", Wrap(GetInviteInfoByCode))
- r.Post("/api/user/invite/complete", bind(dtos.CompleteInviteForm{}), Wrap(CompleteInvite))
+ r.Post("/api/user/invite/complete", bind(dtos.CompleteInviteForm{}), Wrap(hs.CompleteInvite))
// reset password
r.Get("/user/password/send-reset-email", hs.Index)
@@ -109,7 +109,7 @@ func (hs *HTTPServer) registerRoutes() {
r.Delete("/api/snapshots/:key", reqEditorRole, Wrap(DeleteDashboardSnapshot))
// api renew session based on remember cookie
- r.Get("/api/login/ping", quota("session"), LoginAPIPing)
+ r.Get("/api/login/ping", quota("session"), hs.LoginAPIPing)
// authed api
r.Group("/api", func(apiRoute routing.RouteRegister) {
diff --git a/pkg/api/common_test.go b/pkg/api/common_test.go
index 8b66a7a468b..eb1f89e3f22 100644
--- a/pkg/api/common_test.go
+++ b/pkg/api/common_test.go
@@ -5,7 +5,6 @@ import (
"net/http/httptest"
"path/filepath"
- "github.com/go-macaron/session"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
@@ -95,13 +94,14 @@ func (sc *scenarioContext) fakeReqWithParams(method, url string, queryParams map
}
type scenarioContext struct {
- m *macaron.Macaron
- context *m.ReqContext
- resp *httptest.ResponseRecorder
- handlerFunc handlerFunc
- defaultHandler macaron.Handler
- req *http.Request
- url string
+ m *macaron.Macaron
+ context *m.ReqContext
+ resp *httptest.ResponseRecorder
+ handlerFunc handlerFunc
+ defaultHandler macaron.Handler
+ req *http.Request
+ url string
+ userAuthTokenService *fakeUserAuthTokenService
}
func (sc *scenarioContext) exec() {
@@ -123,8 +123,30 @@ func setupScenarioContext(url string) *scenarioContext {
Delims: macaron.Delims{Left: "[[", Right: "]]"},
}))
- sc.m.Use(middleware.GetContextHandler())
- sc.m.Use(middleware.Sessioner(&session.Options{}, 0))
+ sc.userAuthTokenService = newFakeUserAuthTokenService()
+ sc.m.Use(middleware.GetContextHandler(sc.userAuthTokenService))
return sc
}
+
+type fakeUserAuthTokenService struct {
+ initContextWithTokenProvider func(ctx *m.ReqContext, orgID int64) bool
+}
+
+func newFakeUserAuthTokenService() *fakeUserAuthTokenService {
+ return &fakeUserAuthTokenService{
+ initContextWithTokenProvider: func(ctx *m.ReqContext, orgID int64) bool {
+ return false
+ },
+ }
+}
+
+func (s *fakeUserAuthTokenService) InitContextWithToken(ctx *m.ReqContext, orgID int64) bool {
+ return s.initContextWithTokenProvider(ctx, orgID)
+}
+
+func (s *fakeUserAuthTokenService) UserAuthenticatedHook(user *m.User, c *m.ReqContext) error {
+ return nil
+}
+
+func (s *fakeUserAuthTokenService) UserSignedOutHook(c *m.ReqContext) {}
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 8f5457cf271..ed7054050e4 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -165,6 +165,8 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
"externalUserMngInfo": setting.ExternalUserMngInfo,
"externalUserMngLinkUrl": setting.ExternalUserMngLinkUrl,
"externalUserMngLinkName": setting.ExternalUserMngLinkName,
+ "viewersCanEdit": setting.ViewersCanEdit,
+ "disableSanitizeHtml": hs.Cfg.DisableSanitizeHtml,
"buildInfo": map[string]interface{}{
"version": setting.BuildVersion,
"commit": setting.BuildCommit,
diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index d4d7b41bec5..7b7c1478a4c 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -11,14 +11,8 @@ import (
"path"
"time"
- "github.com/grafana/grafana/pkg/api/routing"
- "github.com/prometheus/client_golang/prometheus"
-
- "github.com/prometheus/client_golang/prometheus/promhttp"
-
- macaron "gopkg.in/macaron.v1"
-
"github.com/grafana/grafana/pkg/api/live"
+ "github.com/grafana/grafana/pkg/api/routing"
httpstatic "github.com/grafana/grafana/pkg/api/static"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
@@ -27,11 +21,16 @@ import (
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/registry"
+ "github.com/grafana/grafana/pkg/services/auth"
"github.com/grafana/grafana/pkg/services/cache"
"github.com/grafana/grafana/pkg/services/datasources"
"github.com/grafana/grafana/pkg/services/hooks"
"github.com/grafana/grafana/pkg/services/rendering"
+ "github.com/grafana/grafana/pkg/services/session"
"github.com/grafana/grafana/pkg/setting"
+ "github.com/prometheus/client_golang/prometheus"
+ "github.com/prometheus/client_golang/prometheus/promhttp"
+ macaron "gopkg.in/macaron.v1"
)
func init() {
@@ -49,13 +48,14 @@ type HTTPServer struct {
streamManager *live.StreamManager
httpSrv *http.Server
- RouteRegister routing.RouteRegister `inject:""`
- Bus bus.Bus `inject:""`
- RenderService rendering.Service `inject:""`
- Cfg *setting.Cfg `inject:""`
- HooksService *hooks.HooksService `inject:""`
- CacheService *cache.CacheService `inject:""`
- DatasourceCache datasources.CacheService `inject:""`
+ RouteRegister routing.RouteRegister `inject:""`
+ Bus bus.Bus `inject:""`
+ RenderService rendering.Service `inject:""`
+ Cfg *setting.Cfg `inject:""`
+ HooksService *hooks.HooksService `inject:""`
+ CacheService *cache.CacheService `inject:""`
+ DatasourceCache datasources.CacheService `inject:""`
+ AuthTokenService auth.UserAuthTokenService `inject:""`
}
func (hs *HTTPServer) Init() error {
@@ -65,6 +65,8 @@ func (hs *HTTPServer) Init() error {
hs.macaron = hs.newMacaron()
hs.registerRoutes()
+ session.Init(&setting.SessionOptions, setting.SessionConnMaxLifetime)
+
return nil
}
@@ -223,8 +225,7 @@ func (hs *HTTPServer) addMiddlewaresAndStaticRoutes() {
m.Use(hs.healthHandler)
m.Use(hs.metricsEndpoint)
- m.Use(middleware.GetContextHandler())
- m.Use(middleware.Sessioner(&setting.SessionOptions, setting.SessionConnMaxLifetime))
+ m.Use(middleware.GetContextHandler(hs.AuthTokenService))
m.Use(middleware.OrgRedirect())
// needs to be after context handler
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 2980d8a5c6b..e90db84016d 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -140,7 +140,7 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er
Children: dashboardChildNavs,
})
- if setting.ExploreEnabled && (c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR) {
+ if setting.ExploreEnabled && (c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR || setting.ViewersCanEdit) {
data.NavTree = append(data.NavTree, &dtos.NavLink{
Text: "Explore",
Id: "explore",
diff --git a/pkg/api/login.go b/pkg/api/login.go
index 05afc40e59a..50c62e0835a 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -1,6 +1,8 @@
package api
import (
+ "encoding/hex"
+ "net/http"
"net/url"
"github.com/grafana/grafana/pkg/api/dtos"
@@ -9,12 +11,13 @@ import (
"github.com/grafana/grafana/pkg/login"
"github.com/grafana/grafana/pkg/metrics"
m "github.com/grafana/grafana/pkg/models"
- "github.com/grafana/grafana/pkg/services/session"
"github.com/grafana/grafana/pkg/setting"
+ "github.com/grafana/grafana/pkg/util"
)
const (
- ViewIndex = "index"
+ ViewIndex = "index"
+ LoginErrorCookieName = "login_error"
)
func (hs *HTTPServer) LoginView(c *m.ReqContext) {
@@ -34,8 +37,8 @@ func (hs *HTTPServer) LoginView(c *m.ReqContext) {
viewData.Settings["loginHint"] = setting.LoginHint
viewData.Settings["disableLoginForm"] = setting.DisableLoginForm
- if loginError, ok := c.Session.Get("loginError").(string); ok {
- c.Session.Delete("loginError")
+ if loginError, ok := tryGetEncryptedCookie(c, LoginErrorCookieName); ok {
+ deleteCookie(c, LoginErrorCookieName)
viewData.Settings["loginError"] = loginError
}
@@ -43,7 +46,7 @@ func (hs *HTTPServer) LoginView(c *m.ReqContext) {
return
}
- if !tryLoginUsingRememberCookie(c) {
+ if !c.IsSignedIn {
c.HTML(200, ViewIndex, viewData)
return
}
@@ -75,56 +78,15 @@ func tryOAuthAutoLogin(c *m.ReqContext) bool {
return false
}
-func tryLoginUsingRememberCookie(c *m.ReqContext) bool {
- // Check auto-login.
- uname := c.GetCookie(setting.CookieUserName)
- if len(uname) == 0 {
- return false
+func (hs *HTTPServer) LoginAPIPing(c *m.ReqContext) Response {
+ if c.IsSignedIn || c.IsAnonymous {
+ return JSON(200, "Logged in")
}
- isSucceed := false
- defer func() {
- if !isSucceed {
- log.Trace("auto-login cookie cleared: %s", uname)
- c.SetCookie(setting.CookieUserName, "", -1, setting.AppSubUrl+"/")
- c.SetCookie(setting.CookieRememberName, "", -1, setting.AppSubUrl+"/")
- return
- }
- }()
-
- userQuery := m.GetUserByLoginQuery{LoginOrEmail: uname}
- if err := bus.Dispatch(&userQuery); err != nil {
- return false
- }
-
- user := userQuery.Result
-
- // validate remember me cookie
- signingKey := user.Rands + user.Password
- if len(signingKey) < 10 {
- c.Logger.Error("Invalid user signingKey")
- return false
- }
-
- if val, _ := c.GetSuperSecureCookie(signingKey, setting.CookieRememberName); val != user.Login {
- return false
- }
-
- isSucceed = true
- loginUserWithUser(user, c)
- return true
+ return Error(401, "Unauthorized", nil)
}
-func LoginAPIPing(c *m.ReqContext) {
- if !tryLoginUsingRememberCookie(c) {
- c.JsonApiErr(401, "Unauthorized", nil)
- return
- }
-
- c.JsonOK("Logged in")
-}
-
-func LoginPost(c *m.ReqContext, cmd dtos.LoginCommand) Response {
+func (hs *HTTPServer) LoginPost(c *m.ReqContext, cmd dtos.LoginCommand) Response {
if setting.DisableLoginForm {
return Error(401, "Login is disabled", nil)
}
@@ -146,7 +108,7 @@ func LoginPost(c *m.ReqContext, cmd dtos.LoginCommand) Response {
user := authQuery.User
- loginUserWithUser(user, c)
+ hs.loginUserWithUser(user, c)
result := map[string]interface{}{
"message": "Logged in",
@@ -162,30 +124,60 @@ func LoginPost(c *m.ReqContext, cmd dtos.LoginCommand) Response {
return JSON(200, result)
}
-func loginUserWithUser(user *m.User, c *m.ReqContext) {
+func (hs *HTTPServer) loginUserWithUser(user *m.User, c *m.ReqContext) {
if user == nil {
- log.Error(3, "User login with nil user")
+ hs.log.Error("User login with nil user")
}
- c.Resp.Header().Del("Set-Cookie")
-
- days := 86400 * setting.LogInRememberDays
- if days > 0 {
- c.SetCookie(setting.CookieUserName, user.Login, days, setting.AppSubUrl+"/")
- c.SetSuperSecureCookie(user.Rands+user.Password, setting.CookieRememberName, user.Login, days, setting.AppSubUrl+"/")
+ err := hs.AuthTokenService.UserAuthenticatedHook(user, c)
+ if err != nil {
+ hs.log.Error("User auth hook failed", "error", err)
}
-
- c.Session.RegenerateId(c.Context)
- c.Session.Set(session.SESS_KEY_USERID, user.Id)
}
-func Logout(c *m.ReqContext) {
- c.SetCookie(setting.CookieUserName, "", -1, setting.AppSubUrl+"/")
- c.SetCookie(setting.CookieRememberName, "", -1, setting.AppSubUrl+"/")
- c.Session.Destory(c.Context)
+func (hs *HTTPServer) Logout(c *m.ReqContext) {
+ hs.AuthTokenService.UserSignedOutHook(c)
+
if setting.SignoutRedirectUrl != "" {
c.Redirect(setting.SignoutRedirectUrl)
} else {
c.Redirect(setting.AppSubUrl + "/login")
}
}
+
+func tryGetEncryptedCookie(ctx *m.ReqContext, cookieName string) (string, bool) {
+ cookie := ctx.GetCookie(cookieName)
+ if cookie == "" {
+ return "", false
+ }
+
+ decoded, err := hex.DecodeString(cookie)
+ if err != nil {
+ return "", false
+ }
+
+ decryptedError, err := util.Decrypt([]byte(decoded), setting.SecretKey)
+ return string(decryptedError), err == nil
+}
+
+func deleteCookie(ctx *m.ReqContext, cookieName string) {
+ ctx.SetCookie(cookieName, "", -1, setting.AppSubUrl+"/")
+}
+
+func (hs *HTTPServer) trySetEncryptedCookie(ctx *m.ReqContext, cookieName string, value string, maxAge int) error {
+ encryptedError, err := util.Encrypt([]byte(value), setting.SecretKey)
+ if err != nil {
+ return err
+ }
+
+ http.SetCookie(ctx.Resp, &http.Cookie{
+ Name: cookieName,
+ MaxAge: 60,
+ Value: hex.EncodeToString(encryptedError),
+ HttpOnly: true,
+ Path: setting.AppSubUrl + "/",
+ Secure: hs.Cfg.SecurityHTTPSCookies,
+ })
+
+ return nil
+}
diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
index fe4fa93b621..4160d48733e 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -3,9 +3,11 @@ package api
import (
"context"
"crypto/rand"
+ "crypto/sha256"
"crypto/tls"
"crypto/x509"
"encoding/base64"
+ "encoding/hex"
"fmt"
"io/ioutil"
"net/http"
@@ -18,12 +20,14 @@ import (
"github.com/grafana/grafana/pkg/login"
"github.com/grafana/grafana/pkg/metrics"
m "github.com/grafana/grafana/pkg/models"
- "github.com/grafana/grafana/pkg/services/session"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/social"
)
-var oauthLogger = log.New("oauth")
+var (
+ oauthLogger = log.New("oauth")
+ OauthStateCookieName = "oauth_state"
+)
func GenStateString() string {
rnd := make([]byte, 32)
@@ -31,7 +35,7 @@ func GenStateString() string {
return base64.URLEncoding.EncodeToString(rnd)
}
-func OAuthLogin(ctx *m.ReqContext) {
+func (hs *HTTPServer) OAuthLogin(ctx *m.ReqContext) {
if setting.OAuthService == nil {
ctx.Handle(404, "OAuth not enabled", nil)
return
@@ -48,14 +52,15 @@ func OAuthLogin(ctx *m.ReqContext) {
if errorParam != "" {
errorDesc := ctx.Query("error_description")
oauthLogger.Error("failed to login ", "error", errorParam, "errorDesc", errorDesc)
- redirectWithError(ctx, login.ErrProviderDeniedRequest, "error", errorParam, "errorDesc", errorDesc)
+ hs.redirectWithError(ctx, login.ErrProviderDeniedRequest, "error", errorParam, "errorDesc", errorDesc)
return
}
code := ctx.Query("code")
if code == "" {
state := GenStateString()
- ctx.Session.Set(session.SESS_KEY_OAUTH_STATE, state)
+ hashedState := hashStatecode(state, setting.OAuthService.OAuthInfos[name].ClientSecret)
+ hs.writeCookie(ctx.Resp, OauthStateCookieName, hashedState, 60)
if setting.OAuthService.OAuthInfos[name].HostedDomain == "" {
ctx.Redirect(connect.AuthCodeURL(state, oauth2.AccessTypeOnline))
} else {
@@ -64,14 +69,20 @@ func OAuthLogin(ctx *m.ReqContext) {
return
}
- savedState, ok := ctx.Session.Get(session.SESS_KEY_OAUTH_STATE).(string)
- if !ok {
+ cookieState := ctx.GetCookie(OauthStateCookieName)
+
+ // delete cookie
+ ctx.Resp.Header().Del("Set-Cookie")
+ hs.deleteCookie(ctx.Resp, OauthStateCookieName)
+
+ if cookieState == "" {
ctx.Handle(500, "login.OAuthLogin(missing saved state)", nil)
return
}
- queryState := ctx.Query("state")
- if savedState != queryState {
+ queryState := hashStatecode(ctx.Query("state"), setting.OAuthService.OAuthInfos[name].ClientSecret)
+ oauthLogger.Info("state check", "queryState", queryState, "cookieState", cookieState)
+ if cookieState != queryState {
ctx.Handle(500, "login.OAuthLogin(state mismatch)", nil)
return
}
@@ -131,7 +142,7 @@ func OAuthLogin(ctx *m.ReqContext) {
userInfo, err := connect.UserInfo(client, token)
if err != nil {
if sErr, ok := err.(*social.Error); ok {
- redirectWithError(ctx, sErr)
+ hs.redirectWithError(ctx, sErr)
} else {
ctx.Handle(500, fmt.Sprintf("login.OAuthLogin(get info from %s)", name), err)
}
@@ -142,13 +153,13 @@ func OAuthLogin(ctx *m.ReqContext) {
// validate that we got at least an email address
if userInfo.Email == "" {
- redirectWithError(ctx, login.ErrNoEmail)
+ hs.redirectWithError(ctx, login.ErrNoEmail)
return
}
// validate that the email is allowed to login to grafana
if !connect.IsEmailAllowed(userInfo.Email) {
- redirectWithError(ctx, login.ErrEmailNotAllowed)
+ hs.redirectWithError(ctx, login.ErrEmailNotAllowed)
return
}
@@ -171,14 +182,15 @@ func OAuthLogin(ctx *m.ReqContext) {
ExternalUser: extUser,
SignupAllowed: connect.IsSignupAllowed(),
}
+
err = bus.Dispatch(cmd)
if err != nil {
- redirectWithError(ctx, err)
+ hs.redirectWithError(ctx, err)
return
}
// login
- loginUserWithUser(cmd.Result, ctx)
+ hs.loginUserWithUser(cmd.Result, ctx)
metrics.M_Api_Login_OAuth.Inc()
@@ -191,8 +203,29 @@ func OAuthLogin(ctx *m.ReqContext) {
ctx.Redirect(setting.AppSubUrl + "/")
}
-func redirectWithError(ctx *m.ReqContext, err error, v ...interface{}) {
+func (hs *HTTPServer) deleteCookie(w http.ResponseWriter, name string) {
+ hs.writeCookie(w, name, "", -1)
+}
+
+func (hs *HTTPServer) writeCookie(w http.ResponseWriter, name string, value string, maxAge int) {
+ http.SetCookie(w, &http.Cookie{
+ Name: name,
+ MaxAge: maxAge,
+ Value: value,
+ HttpOnly: true,
+ Path: setting.AppSubUrl + "/",
+ Secure: hs.Cfg.SecurityHTTPSCookies,
+ })
+}
+
+func hashStatecode(code, seed string) string {
+ hashBytes := sha256.Sum256([]byte(code + setting.SecretKey + seed))
+ return hex.EncodeToString(hashBytes[:])
+}
+
+func (hs *HTTPServer) redirectWithError(ctx *m.ReqContext, err error, v ...interface{}) {
ctx.Logger.Error(err.Error(), v...)
- ctx.Session.Set("loginError", err.Error())
+ hs.trySetEncryptedCookie(ctx, LoginErrorCookieName, err.Error(), 60)
+
ctx.Redirect(setting.AppSubUrl + "/login")
}
diff --git a/pkg/api/org_invite.go b/pkg/api/org_invite.go
index dfb2cf045ed..835b03a2cc9 100644
--- a/pkg/api/org_invite.go
+++ b/pkg/api/org_invite.go
@@ -148,7 +148,7 @@ func GetInviteInfoByCode(c *m.ReqContext) Response {
})
}
-func CompleteInvite(c *m.ReqContext, completeInvite dtos.CompleteInviteForm) Response {
+func (hs *HTTPServer) CompleteInvite(c *m.ReqContext, completeInvite dtos.CompleteInviteForm) Response {
query := m.GetTempUserByCodeQuery{Code: completeInvite.InviteCode}
if err := bus.Dispatch(&query); err != nil {
@@ -186,7 +186,7 @@ func CompleteInvite(c *m.ReqContext, completeInvite dtos.CompleteInviteForm) Res
return rsp
}
- loginUserWithUser(user, c)
+ hs.loginUserWithUser(user, c)
metrics.M_Api_User_SignUpCompleted.Inc()
metrics.M_Api_User_SignUpInvite.Inc()
diff --git a/pkg/api/pluginproxy/ds_proxy.go b/pkg/api/pluginproxy/ds_proxy.go
index 38a2fd187e3..b569b006531 100644
--- a/pkg/api/pluginproxy/ds_proxy.go
+++ b/pkg/api/pluginproxy/ds_proxy.go
@@ -54,7 +54,7 @@ func NewDataSourceProxy(ds *m.DataSource, plugin *plugins.DataSourcePlugin, ctx
func newHTTPClient() httpClient {
return &http.Client{
- Timeout: time.Second * 30,
+ Timeout: time.Duration(setting.DataProxyTimeout) * time.Second,
Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
}
}
diff --git a/pkg/api/signup.go b/pkg/api/signup.go
index 200a3ebc9d1..fe577dd9ef9 100644
--- a/pkg/api/signup.go
+++ b/pkg/api/signup.go
@@ -51,7 +51,7 @@ func SignUp(c *m.ReqContext, form dtos.SignUpForm) Response {
return JSON(200, util.DynMap{"status": "SignUpCreated"})
}
-func SignUpStep2(c *m.ReqContext, form dtos.SignUpStep2Form) Response {
+func (hs *HTTPServer) SignUpStep2(c *m.ReqContext, form dtos.SignUpStep2Form) Response {
if !setting.AllowUserSignUp {
return Error(401, "User signup is disabled", nil)
}
@@ -109,7 +109,7 @@ func SignUpStep2(c *m.ReqContext, form dtos.SignUpStep2Form) Response {
apiResponse["code"] = "redirect-to-select-org"
}
- loginUserWithUser(user, c)
+ hs.loginUserWithUser(user, c)
metrics.M_Api_User_SignUpCompleted.Inc()
return JSON(200, apiResponse)
diff --git a/pkg/components/dashdiffs/formatter_json.go b/pkg/components/dashdiffs/formatter_json.go
index 488a345d492..09dac1ae5ac 100644
--- a/pkg/components/dashdiffs/formatter_json.go
+++ b/pkg/components/dashdiffs/formatter_json.go
@@ -206,10 +206,9 @@ func (f *JSONFormatter) processObject(object map[string]interface{}, deltas []di
// Added
for _, delta := range deltas {
- switch delta.(type) {
+ switch delta := delta.(type) {
case *diff.Added:
- d := delta.(*diff.Added)
- f.printRecursive(d.Position.String(), d.Value, ChangeAdded)
+ f.printRecursive(delta.Position.String(), delta.Value, ChangeAdded)
}
}
@@ -222,9 +221,8 @@ func (f *JSONFormatter) processItem(value interface{}, deltas []diff.Delta, posi
if len(matchedDeltas) > 0 {
for _, matchedDelta := range matchedDeltas {
- switch matchedDelta.(type) {
+ switch matchedDelta := matchedDelta.(type) {
case *diff.Object:
- d := matchedDelta.(*diff.Object)
switch value.(type) {
case map[string]interface{}:
//ok
@@ -238,7 +236,7 @@ func (f *JSONFormatter) processItem(value interface{}, deltas []diff.Delta, posi
f.print("{")
f.closeLine()
f.push(positionStr, len(o), false)
- f.processObject(o, d.Deltas)
+ f.processObject(o, matchedDelta.Deltas)
f.pop()
f.newLine(ChangeNil)
f.print("}")
@@ -246,7 +244,6 @@ func (f *JSONFormatter) processItem(value interface{}, deltas []diff.Delta, posi
f.closeLine()
case *diff.Array:
- d := matchedDelta.(*diff.Array)
switch value.(type) {
case []interface{}:
//ok
@@ -260,7 +257,7 @@ func (f *JSONFormatter) processItem(value interface{}, deltas []diff.Delta, posi
f.print("[")
f.closeLine()
f.push(positionStr, len(a), true)
- f.processArray(a, d.Deltas)
+ f.processArray(a, matchedDelta.Deltas)
f.pop()
f.newLine(ChangeNil)
f.print("]")
@@ -268,27 +265,23 @@ func (f *JSONFormatter) processItem(value interface{}, deltas []diff.Delta, posi
f.closeLine()
case *diff.Added:
- d := matchedDelta.(*diff.Added)
- f.printRecursive(positionStr, d.Value, ChangeAdded)
+ f.printRecursive(positionStr, matchedDelta.Value, ChangeAdded)
f.size[len(f.size)-1]++
case *diff.Modified:
- d := matchedDelta.(*diff.Modified)
savedSize := f.size[len(f.size)-1]
- f.printRecursive(positionStr, d.OldValue, ChangeOld)
+ f.printRecursive(positionStr, matchedDelta.OldValue, ChangeOld)
f.size[len(f.size)-1] = savedSize
- f.printRecursive(positionStr, d.NewValue, ChangeNew)
+ f.printRecursive(positionStr, matchedDelta.NewValue, ChangeNew)
case *diff.TextDiff:
savedSize := f.size[len(f.size)-1]
- d := matchedDelta.(*diff.TextDiff)
- f.printRecursive(positionStr, d.OldValue, ChangeOld)
+ f.printRecursive(positionStr, matchedDelta.OldValue, ChangeOld)
f.size[len(f.size)-1] = savedSize
- f.printRecursive(positionStr, d.NewValue, ChangeNew)
+ f.printRecursive(positionStr, matchedDelta.NewValue, ChangeNew)
case *diff.Deleted:
- d := matchedDelta.(*diff.Deleted)
- f.printRecursive(positionStr, d.Value, ChangeDeleted)
+ f.printRecursive(positionStr, matchedDelta.Value, ChangeDeleted)
default:
return errors.New("Unknown Delta type detected")
@@ -305,13 +298,13 @@ func (f *JSONFormatter) processItem(value interface{}, deltas []diff.Delta, posi
func (f *JSONFormatter) searchDeltas(deltas []diff.Delta, position diff.Position) (results []diff.Delta) {
results = make([]diff.Delta, 0)
for _, delta := range deltas {
- switch delta.(type) {
+ switch typedDelta := delta.(type) {
case diff.PostDelta:
- if delta.(diff.PostDelta).PostPosition() == position {
+ if typedDelta.PostPosition() == position {
results = append(results, delta)
}
case diff.PreDelta:
- if delta.(diff.PreDelta).PrePosition() == position {
+ if typedDelta.PrePosition() == position {
results = append(results, delta)
}
default:
@@ -417,20 +410,19 @@ func (f *JSONFormatter) print(a string) {
}
func (f *JSONFormatter) printRecursive(name string, value interface{}, change ChangeType) {
- switch value.(type) {
+ switch value := value.(type) {
case map[string]interface{}:
f.newLine(change)
f.printKey(name)
f.print("{")
f.closeLine()
- m := value.(map[string]interface{})
- size := len(m)
+ size := len(value)
f.push(name, size, false)
- keys := sortKeys(m)
+ keys := sortKeys(value)
for _, key := range keys {
- f.printRecursive(key, m[key], change)
+ f.printRecursive(key, value[key], change)
}
f.pop()
@@ -445,10 +437,9 @@ func (f *JSONFormatter) printRecursive(name string, value interface{}, change Ch
f.print("[")
f.closeLine()
- s := value.([]interface{})
- size := len(s)
+ size := len(value)
f.push("", size, true)
- for _, item := range s {
+ for _, item := range value {
f.printRecursive("", item, change)
}
f.pop()
diff --git a/pkg/components/imguploader/imguploader.go b/pkg/components/imguploader/imguploader.go
index 93f69cadd46..422a03d3501 100644
--- a/pkg/components/imguploader/imguploader.go
+++ b/pkg/components/imguploader/imguploader.go
@@ -6,7 +6,6 @@ import (
"regexp"
"github.com/grafana/grafana/pkg/log"
-
"github.com/grafana/grafana/pkg/setting"
)
@@ -21,6 +20,10 @@ func (NopImageUploader) Upload(ctx context.Context, path string) (string, error)
return "", nil
}
+var (
+ logger = log.New("imguploader")
+)
+
func NewImageUploader() (ImageUploader, error) {
switch setting.ImageUploadProvider {
@@ -94,7 +97,7 @@ func NewImageUploader() (ImageUploader, error) {
}
if setting.ImageUploadProvider != "" {
- log.Error2("The external image storage configuration is invalid", "unsupported provider", setting.ImageUploadProvider)
+ logger.Error("The external image storage configuration is invalid", "unsupported provider", setting.ImageUploadProvider)
}
return NopImageUploader{}, nil
diff --git a/pkg/log/log.go b/pkg/log/log.go
index 8f0522748ef..2e3b6303a6e 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -10,13 +10,11 @@ import (
"path/filepath"
"strings"
- "gopkg.in/ini.v1"
-
"github.com/go-stack/stack"
+ "github.com/grafana/grafana/pkg/util"
"github.com/inconshreveable/log15"
isatty "github.com/mattn/go-isatty"
-
- "github.com/grafana/grafana/pkg/util"
+ "gopkg.in/ini.v1"
)
var Root log15.Logger
@@ -58,10 +56,6 @@ func Debug(format string, v ...interface{}) {
Root.Debug(message)
}
-func Debug2(message string, v ...interface{}) {
- Root.Debug(message, v...)
-}
-
func Info(format string, v ...interface{}) {
var message string
if len(v) > 0 {
@@ -73,10 +67,6 @@ func Info(format string, v ...interface{}) {
Root.Info(message)
}
-func Info2(message string, v ...interface{}) {
- Root.Info(message, v...)
-}
-
func Warn(format string, v ...interface{}) {
var message string
if len(v) > 0 {
@@ -88,18 +78,10 @@ func Warn(format string, v ...interface{}) {
Root.Warn(message)
}
-func Warn2(message string, v ...interface{}) {
- Root.Warn(message, v...)
-}
-
func Error(skip int, format string, v ...interface{}) {
Root.Error(fmt.Sprintf(format, v...))
}
-func Error2(message string, v ...interface{}) {
- Root.Error(message, v...)
-}
-
func Critical(skip int, format string, v ...interface{}) {
Root.Crit(fmt.Sprintf(format, v...))
}
diff --git a/pkg/login/ext_user.go b/pkg/login/ext_user.go
index 1262c1cc44f..42fb37ff9d0 100644
--- a/pkg/login/ext_user.go
+++ b/pkg/login/ext_user.go
@@ -11,6 +11,10 @@ func init() {
bus.AddHandler("auth", UpsertUser)
}
+var (
+ logger = log.New("login.ext_user")
+)
+
func UpsertUser(cmd *m.UpsertUserCommand) error {
extUser := cmd.ExternalUser
@@ -135,7 +139,7 @@ func updateUser(user *m.User, extUser *m.ExternalUserInfo) error {
return nil
}
- log.Debug2("Syncing user info", "id", user.Id, "update", updateCmd)
+ logger.Debug("Syncing user info", "id", user.Id, "update", updateCmd)
return bus.Dispatch(updateCmd)
}
diff --git a/pkg/middleware/auth.go b/pkg/middleware/auth.go
index 5faee1e3fa7..27248342c8d 100644
--- a/pkg/middleware/auth.go
+++ b/pkg/middleware/auth.go
@@ -7,7 +7,6 @@ import (
"gopkg.in/macaron.v1"
m "github.com/grafana/grafana/pkg/models"
- "github.com/grafana/grafana/pkg/services/session"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
)
@@ -17,16 +16,6 @@ type AuthOptions struct {
ReqSignedIn bool
}
-func getRequestUserId(c *m.ReqContext) int64 {
- userID := c.Session.Get(session.SESS_KEY_USERID)
-
- if userID != nil {
- return userID.(int64)
- }
-
- return 0
-}
-
func getApiKey(c *m.ReqContext) string {
header := c.Req.Header.Get("Authorization")
parts := strings.SplitN(header, " ", 2)
diff --git a/pkg/middleware/auth_proxy.go b/pkg/middleware/auth_proxy.go
index fc109ac707f..93ee577e3c6 100644
--- a/pkg/middleware/auth_proxy.go
+++ b/pkg/middleware/auth_proxy.go
@@ -16,7 +16,9 @@ import (
"github.com/grafana/grafana/pkg/setting"
)
-var AUTH_PROXY_SESSION_VAR = "authProxyHeaderValue"
+var (
+ AUTH_PROXY_SESSION_VAR = "authProxyHeaderValue"
+)
func initContextWithAuthProxy(ctx *m.ReqContext, orgID int64) bool {
if !setting.AuthProxyEnabled {
@@ -40,6 +42,12 @@ func initContextWithAuthProxy(ctx *m.ReqContext, orgID int64) bool {
return false
}
+ defer func() {
+ if err := ctx.Session.Release(); err != nil {
+ ctx.Logger.Error("failed to save session data", "error", err)
+ }
+ }()
+
query := &m.GetSignedInUserQuery{OrgId: orgID}
// if this session has already been authenticated by authProxy just load the user
@@ -192,6 +200,16 @@ var syncGrafanaUserWithLdapUser = func(query *m.LoginUserQuery) error {
return nil
}
+func getRequestUserId(c *m.ReqContext) int64 {
+ userID := c.Session.Get(session.SESS_KEY_USERID)
+
+ if userID != nil {
+ return userID.(int64)
+ }
+
+ return 0
+}
+
func checkAuthenticationProxy(remoteAddr string, proxyHeaderValue string) error {
if len(strings.TrimSpace(setting.AuthProxyWhitelist)) == 0 {
return nil
diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go
index ace72d998eb..3722ac3058f 100644
--- a/pkg/middleware/middleware.go
+++ b/pkg/middleware/middleware.go
@@ -3,15 +3,15 @@ package middleware
import (
"strconv"
- "gopkg.in/macaron.v1"
-
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/apikeygen"
"github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/auth"
"github.com/grafana/grafana/pkg/services/session"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
+ macaron "gopkg.in/macaron.v1"
)
var (
@@ -21,12 +21,12 @@ var (
ReqOrgAdmin = RoleAuth(m.ROLE_ADMIN)
)
-func GetContextHandler() macaron.Handler {
+func GetContextHandler(ats auth.UserAuthTokenService) macaron.Handler {
return func(c *macaron.Context) {
ctx := &m.ReqContext{
Context: c,
SignedInUser: &m.SignedInUser{},
- Session: session.GetSession(),
+ Session: session.GetSession(), // should only be used by auth_proxy
IsSignedIn: false,
AllowAnonymous: false,
SkipCache: false,
@@ -49,7 +49,7 @@ func GetContextHandler() macaron.Handler {
case initContextWithApiKey(ctx):
case initContextWithBasicAuth(ctx, orgId):
case initContextWithAuthProxy(ctx, orgId):
- case initContextWithUserSessionCookie(ctx, orgId):
+ case ats.InitContextWithToken(ctx, orgId):
case initContextWithAnonymousUser(ctx):
}
@@ -88,29 +88,6 @@ func initContextWithAnonymousUser(ctx *m.ReqContext) bool {
return true
}
-func initContextWithUserSessionCookie(ctx *m.ReqContext, orgId int64) bool {
- // initialize session
- if err := ctx.Session.Start(ctx.Context); err != nil {
- ctx.Logger.Error("Failed to start session", "error", err)
- return false
- }
-
- var userId int64
- if userId = getRequestUserId(ctx); userId == 0 {
- return false
- }
-
- query := m.GetSignedInUserQuery{UserId: userId, OrgId: orgId}
- if err := bus.Dispatch(&query); err != nil {
- ctx.Logger.Error("Failed to get user with id", "userId", userId, "error", err)
- return false
- }
-
- ctx.SignedInUser = query.Result
- ctx.IsSignedIn = true
- return true
-}
-
func initContextWithApiKey(ctx *m.ReqContext) bool {
var keyString string
if keyString = getApiKey(ctx); keyString == "" {
diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go
index b9a8afce6c6..11740574d0b 100644
--- a/pkg/middleware/middleware_test.go
+++ b/pkg/middleware/middleware_test.go
@@ -7,7 +7,7 @@ import (
"path/filepath"
"testing"
- ms "github.com/go-macaron/session"
+ msession "github.com/go-macaron/session"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/session"
@@ -43,11 +43,6 @@ func TestMiddlewareContext(t *testing.T) {
So(sc.resp.Header().Get("Cache-Control"), ShouldBeEmpty)
})
- middlewareScenario("Non api request should init session", func(sc *scenarioContext) {
- sc.fakeReq("GET", "/").exec()
- So(sc.resp.Header().Get("Set-Cookie"), ShouldContainSubstring, "grafana_sess")
- })
-
middlewareScenario("Invalid api key", func(sc *scenarioContext) {
sc.apiKey = "invalid_key_test"
sc.fakeReq("GET", "/").exec()
@@ -151,22 +146,17 @@ func TestMiddlewareContext(t *testing.T) {
})
})
- middlewareScenario("UserId in session", func(sc *scenarioContext) {
-
- sc.fakeReq("GET", "/").handler(func(c *m.ReqContext) {
- c.Session.Set(session.SESS_KEY_USERID, int64(12))
- }).exec()
-
- bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error {
- query.Result = &m.SignedInUser{OrgId: 2, UserId: 12}
- return nil
- })
+ middlewareScenario("Auth token service", func(sc *scenarioContext) {
+ var wasCalled bool
+ sc.userAuthTokenService.initContextWithTokenProvider = func(ctx *m.ReqContext, orgId int64) bool {
+ wasCalled = true
+ return false
+ }
sc.fakeReq("GET", "/").exec()
- Convey("should init context with user info", func() {
- So(sc.context.IsSignedIn, ShouldBeTrue)
- So(sc.context.UserId, ShouldEqual, 12)
+ Convey("should call middleware", func() {
+ So(wasCalled, ShouldBeTrue)
})
})
@@ -211,6 +201,7 @@ func TestMiddlewareContext(t *testing.T) {
return nil
})
+ setting.SessionOptions = msession.Options{}
sc.fakeReq("GET", "/")
sc.req.Header.Add("X-WEBAUTH-USER", "torkelo")
sc.exec()
@@ -479,6 +470,7 @@ func middlewareScenario(desc string, fn scenarioFunc) {
defer bus.ClearBusHandlers()
sc := &scenarioContext{}
+
viewsPath, _ := filepath.Abs("../../public/views")
sc.m = macaron.New()
@@ -487,10 +479,13 @@ func middlewareScenario(desc string, fn scenarioFunc) {
Delims: macaron.Delims{Left: "[[", Right: "]]"},
}))
- sc.m.Use(GetContextHandler())
+ session.Init(&msession.Options{}, 0)
+ sc.userAuthTokenService = newFakeUserAuthTokenService()
+ sc.m.Use(GetContextHandler(sc.userAuthTokenService))
// mock out gc goroutine
session.StartSessionGC = func() {}
- sc.m.Use(Sessioner(&ms.Options{}, 0))
+ setting.SessionOptions = msession.Options{}
+
sc.m.Use(OrgRedirect())
sc.m.Use(AddDefaultResponseHeaders())
@@ -508,15 +503,16 @@ func middlewareScenario(desc string, fn scenarioFunc) {
}
type scenarioContext struct {
- m *macaron.Macaron
- context *m.ReqContext
- resp *httptest.ResponseRecorder
- apiKey string
- authHeader string
- respJson map[string]interface{}
- handlerFunc handlerFunc
- defaultHandler macaron.Handler
- url string
+ m *macaron.Macaron
+ context *m.ReqContext
+ resp *httptest.ResponseRecorder
+ apiKey string
+ authHeader string
+ respJson map[string]interface{}
+ handlerFunc handlerFunc
+ defaultHandler macaron.Handler
+ url string
+ userAuthTokenService *fakeUserAuthTokenService
req *http.Request
}
@@ -585,3 +581,25 @@ func (sc *scenarioContext) exec() {
type scenarioFunc func(c *scenarioContext)
type handlerFunc func(c *m.ReqContext)
+
+type fakeUserAuthTokenService struct {
+ initContextWithTokenProvider func(ctx *m.ReqContext, orgID int64) bool
+}
+
+func newFakeUserAuthTokenService() *fakeUserAuthTokenService {
+ return &fakeUserAuthTokenService{
+ initContextWithTokenProvider: func(ctx *m.ReqContext, orgID int64) bool {
+ return false
+ },
+ }
+}
+
+func (s *fakeUserAuthTokenService) InitContextWithToken(ctx *m.ReqContext, orgID int64) bool {
+ return s.initContextWithTokenProvider(ctx, orgID)
+}
+
+func (s *fakeUserAuthTokenService) UserAuthenticatedHook(user *m.User, c *m.ReqContext) error {
+ return nil
+}
+
+func (s *fakeUserAuthTokenService) UserSignedOutHook(c *m.ReqContext) {}
diff --git a/pkg/middleware/org_redirect.go b/pkg/middleware/org_redirect.go
index db263c2a17a..ca63733946c 100644
--- a/pkg/middleware/org_redirect.go
+++ b/pkg/middleware/org_redirect.go
@@ -9,7 +9,6 @@ import (
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
-
"gopkg.in/macaron.v1"
)
diff --git a/pkg/middleware/org_redirect_test.go b/pkg/middleware/org_redirect_test.go
index fa08154b250..46b8776fdcc 100644
--- a/pkg/middleware/org_redirect_test.go
+++ b/pkg/middleware/org_redirect_test.go
@@ -7,7 +7,6 @@ import (
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
- "github.com/grafana/grafana/pkg/services/session"
. "github.com/smartystreets/goconvey/convey"
)
@@ -15,18 +14,15 @@ func TestOrgRedirectMiddleware(t *testing.T) {
Convey("Can redirect to correct org", t, func() {
middlewareScenario("when setting a correct org for the user", func(sc *scenarioContext) {
- sc.fakeReq("GET", "/").handler(func(c *m.ReqContext) {
- c.Session.Set(session.SESS_KEY_USERID, int64(12))
- }).exec()
-
bus.AddHandler("test", func(query *m.SetUsingOrgCommand) error {
return nil
})
- bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error {
- query.Result = &m.SignedInUser{OrgId: 1, UserId: 12}
- return nil
- })
+ sc.userAuthTokenService.initContextWithTokenProvider = func(ctx *m.ReqContext, orgId int64) bool {
+ ctx.SignedInUser = &m.SignedInUser{OrgId: 1, UserId: 12}
+ ctx.IsSignedIn = true
+ return true
+ }
sc.m.Get("/", sc.defaultHandler)
sc.fakeReq("GET", "/?orgId=3").exec()
@@ -37,14 +33,16 @@ func TestOrgRedirectMiddleware(t *testing.T) {
})
middlewareScenario("when setting an invalid org for user", func(sc *scenarioContext) {
- sc.fakeReq("GET", "/").handler(func(c *m.ReqContext) {
- c.Session.Set(session.SESS_KEY_USERID, int64(12))
- }).exec()
-
bus.AddHandler("test", func(query *m.SetUsingOrgCommand) error {
return fmt.Errorf("")
})
+ sc.userAuthTokenService.initContextWithTokenProvider = func(ctx *m.ReqContext, orgId int64) bool {
+ ctx.SignedInUser = &m.SignedInUser{OrgId: 1, UserId: 12}
+ ctx.IsSignedIn = true
+ return true
+ }
+
bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error {
query.Result = &m.SignedInUser{OrgId: 1, UserId: 12}
return nil
diff --git a/pkg/middleware/quota_test.go b/pkg/middleware/quota_test.go
index 92c3d62674d..4f2203a5d3d 100644
--- a/pkg/middleware/quota_test.go
+++ b/pkg/middleware/quota_test.go
@@ -74,15 +74,12 @@ func TestMiddlewareQuota(t *testing.T) {
})
middlewareScenario("with user logged in", func(sc *scenarioContext) {
- // log us in, so we have a user_id and org_id in the context
- sc.fakeReq("GET", "/").handler(func(c *m.ReqContext) {
- c.Session.Set(session.SESS_KEY_USERID, int64(12))
- }).exec()
+ sc.userAuthTokenService.initContextWithTokenProvider = func(ctx *m.ReqContext, orgId int64) bool {
+ ctx.SignedInUser = &m.SignedInUser{OrgId: 2, UserId: 12}
+ ctx.IsSignedIn = true
+ return true
+ }
- bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error {
- query.Result = &m.SignedInUser{OrgId: 2, UserId: 12}
- return nil
- })
bus.AddHandler("globalQuota", func(query *m.GetGlobalQuotaByTargetQuery) error {
query.Result = &m.GlobalQuotaDTO{
Target: query.Target,
diff --git a/pkg/middleware/recovery_test.go b/pkg/middleware/recovery_test.go
index c92150f3b7d..e041d42e56b 100644
--- a/pkg/middleware/recovery_test.go
+++ b/pkg/middleware/recovery_test.go
@@ -4,13 +4,12 @@ import (
"path/filepath"
"testing"
- ms "github.com/go-macaron/session"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/session"
"github.com/grafana/grafana/pkg/setting"
. "github.com/smartystreets/goconvey/convey"
- "gopkg.in/macaron.v1"
+ macaron "gopkg.in/macaron.v1"
)
func TestRecoveryMiddleware(t *testing.T) {
@@ -64,10 +63,10 @@ func recoveryScenario(desc string, url string, fn scenarioFunc) {
Delims: macaron.Delims{Left: "[[", Right: "]]"},
}))
- sc.m.Use(GetContextHandler())
+ sc.userAuthTokenService = newFakeUserAuthTokenService()
+ sc.m.Use(GetContextHandler(sc.userAuthTokenService))
// mock out gc goroutine
session.StartSessionGC = func() {}
- sc.m.Use(Sessioner(&ms.Options{}, 0))
sc.m.Use(OrgRedirect())
sc.m.Use(AddDefaultResponseHeaders())
diff --git a/pkg/middleware/session.go b/pkg/middleware/session.go
deleted file mode 100644
index 19cfa368b49..00000000000
--- a/pkg/middleware/session.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package middleware
-
-import (
- ms "github.com/go-macaron/session"
- "gopkg.in/macaron.v1"
-
- m "github.com/grafana/grafana/pkg/models"
- "github.com/grafana/grafana/pkg/services/session"
-)
-
-func Sessioner(options *ms.Options, sessionConnMaxLifetime int64) macaron.Handler {
- session.Init(options, sessionConnMaxLifetime)
-
- return func(ctx *m.ReqContext) {
- ctx.Next()
-
- if err := ctx.Session.Release(); err != nil {
- panic("session(release): " + err.Error())
- }
- }
-}
diff --git a/pkg/models/context.go b/pkg/models/context.go
index 7cb80a957c3..df970451304 100644
--- a/pkg/models/context.go
+++ b/pkg/models/context.go
@@ -3,18 +3,18 @@ package models
import (
"strings"
- "github.com/prometheus/client_golang/prometheus"
- "gopkg.in/macaron.v1"
-
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/services/session"
"github.com/grafana/grafana/pkg/setting"
+ "github.com/prometheus/client_golang/prometheus"
+ "gopkg.in/macaron.v1"
)
type ReqContext struct {
*macaron.Context
*SignedInUser
+ // This should only be used by the auth_proxy
Session session.SessionStore
IsSignedIn bool
diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go
index 3a8010e797b..0f3f56175fe 100644
--- a/pkg/models/dashboards.go
+++ b/pkg/models/dashboards.go
@@ -112,7 +112,7 @@ func NewDashboard(title string) *Dashboard {
func NewDashboardFolder(title string) *Dashboard {
folder := NewDashboard(title)
folder.IsFolder = true
- folder.Data.Set("schemaVersion", 16)
+ folder.Data.Set("schemaVersion", 17)
folder.Data.Set("version", 0)
folder.IsFolder = true
return folder
diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go
index 0f8e24bcef5..22cbe2456b7 100644
--- a/pkg/services/alerting/engine.go
+++ b/pkg/services/alerting/engine.go
@@ -105,8 +105,9 @@ func (e *AlertingService) runJobDispatcher(grafanaCtx context.Context) error {
var (
unfinishedWorkTimeout = time.Second * 5
// TODO: Make alertTimeout and alertMaxAttempts configurable in the config file.
- alertTimeout = time.Second * 30
- alertMaxAttempts = 3
+ alertTimeout = time.Second * 30
+ resultHandleTimeout = time.Second * 30
+ alertMaxAttempts = 3
)
func (e *AlertingService) processJobWithRetry(grafanaCtx context.Context, job *Job) error {
@@ -116,7 +117,7 @@ func (e *AlertingService) processJobWithRetry(grafanaCtx context.Context, job *J
}
}()
- cancelChan := make(chan context.CancelFunc, alertMaxAttempts)
+ cancelChan := make(chan context.CancelFunc, alertMaxAttempts*2)
attemptChan := make(chan int, 1)
// Initialize with first attemptID=1
@@ -204,6 +205,15 @@ func (e *AlertingService) processJob(attemptID int, attemptChan chan int, cancel
}
}
+ // create new context with timeout for notifications
+ resultHandleCtx, resultHandleCancelFn := context.WithTimeout(context.Background(), resultHandleTimeout)
+ cancelChan <- resultHandleCancelFn
+
+ // override the context used for evaluation with a new context for notifications.
+ // This makes it possible for notifiers to execute when datasources
+ // dont respond within the timeout limit. We should rewrite this so notifications
+ // dont reuse the evalContext and get its own context.
+ evalContext.Ctx = resultHandleCtx
evalContext.Rule.State = evalContext.GetNewState()
e.resultHandler.Handle(evalContext)
span.Finish()
diff --git a/pkg/services/alerting/engine_integration_test.go b/pkg/services/alerting/engine_integration_test.go
new file mode 100644
index 00000000000..aa518baae24
--- /dev/null
+++ b/pkg/services/alerting/engine_integration_test.go
@@ -0,0 +1,148 @@
+// +build integration
+
+package alerting
+
+import (
+ "context"
+ "errors"
+ "net"
+ "net/http"
+ "net/http/httptest"
+ "testing"
+ "time"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestEngineTimeouts(t *testing.T) {
+ Convey("Alerting engine timeout tests", t, func() {
+ engine := NewEngine()
+ engine.resultHandler = &FakeResultHandler{}
+ job := &Job{Running: true, Rule: &Rule{}}
+
+ Convey("Should trigger as many retries as needed", func() {
+ Convey("pended alert for datasource -> result handler should be worked", func() {
+ // reduce alert timeout to test quickly
+ originAlertTimeout := alertTimeout
+ alertTimeout = 2 * time.Second
+ transportTimeoutInterval := 2 * time.Second
+ serverBusySleepDuration := 1 * time.Second
+
+ evalHandler := NewFakeCommonTimeoutHandler(transportTimeoutInterval, serverBusySleepDuration)
+ resultHandler := NewFakeCommonTimeoutHandler(transportTimeoutInterval, serverBusySleepDuration)
+ engine.evalHandler = evalHandler
+ engine.resultHandler = resultHandler
+
+ engine.processJobWithRetry(context.TODO(), job)
+
+ So(evalHandler.EvalSucceed, ShouldEqual, true)
+ So(resultHandler.ResultHandleSucceed, ShouldEqual, true)
+
+ // initialize for other tests.
+ alertTimeout = originAlertTimeout
+ engine.resultHandler = &FakeResultHandler{}
+ })
+ })
+ })
+}
+
+type FakeCommonTimeoutHandler struct {
+ TransportTimeoutDuration time.Duration
+ ServerBusySleepDuration time.Duration
+ EvalSucceed bool
+ ResultHandleSucceed bool
+}
+
+func NewFakeCommonTimeoutHandler(transportTimeoutDuration time.Duration, serverBusySleepDuration time.Duration) *FakeCommonTimeoutHandler {
+ return &FakeCommonTimeoutHandler{
+ TransportTimeoutDuration: transportTimeoutDuration,
+ ServerBusySleepDuration: serverBusySleepDuration,
+ EvalSucceed: false,
+ ResultHandleSucceed: false,
+ }
+}
+
+func (handler *FakeCommonTimeoutHandler) Eval(evalContext *EvalContext) {
+ // 1. prepare mock server
+ path := "/evaltimeout"
+ srv := runBusyServer(path, handler.ServerBusySleepDuration)
+ defer srv.Close()
+
+ // 2. send requests
+ url := srv.URL + path
+ res, err := sendRequest(evalContext.Ctx, url, handler.TransportTimeoutDuration)
+ if res != nil {
+ defer res.Body.Close()
+ }
+
+ if err != nil {
+ evalContext.Error = errors.New("Fake evaluation timeout test failure")
+ return
+ }
+
+ if res.StatusCode == 200 {
+ handler.EvalSucceed = true
+ }
+
+ evalContext.Error = errors.New("Fake evaluation timeout test failure; wrong response")
+}
+
+func (handler *FakeCommonTimeoutHandler) Handle(evalContext *EvalContext) error {
+ // 1. prepare mock server
+ path := "/resulthandle"
+ srv := runBusyServer(path, handler.ServerBusySleepDuration)
+ defer srv.Close()
+
+ // 2. send requests
+ url := srv.URL + path
+ res, err := sendRequest(evalContext.Ctx, url, handler.TransportTimeoutDuration)
+ if res != nil {
+ defer res.Body.Close()
+ }
+
+ if err != nil {
+ evalContext.Error = errors.New("Fake result handle timeout test failure")
+ return evalContext.Error
+ }
+
+ if res.StatusCode == 200 {
+ handler.ResultHandleSucceed = true
+ return nil
+ }
+
+ evalContext.Error = errors.New("Fake result handle timeout test failure; wrong response")
+
+ return evalContext.Error
+}
+
+func runBusyServer(path string, serverBusySleepDuration time.Duration) *httptest.Server {
+ mux := http.NewServeMux()
+ server := httptest.NewServer(mux)
+
+ mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
+ time.Sleep(serverBusySleepDuration)
+ })
+
+ return server
+}
+
+func sendRequest(context context.Context, url string, transportTimeoutInterval time.Duration) (resp *http.Response, err error) {
+ req, err := http.NewRequest("GET", url, nil)
+ if err != nil {
+ return nil, err
+ }
+
+ req = req.WithContext(context)
+
+ transport := http.Transport{
+ Dial: (&net.Dialer{
+ Timeout: transportTimeoutInterval,
+ KeepAlive: transportTimeoutInterval,
+ }).Dial,
+ }
+ client := http.Client{
+ Transport: &transport,
+ }
+
+ return client.Do(req)
+}
diff --git a/pkg/services/alerting/extractor.go b/pkg/services/alerting/extractor.go
index e33e3dc2af3..5b911c5a9ad 100644
--- a/pkg/services/alerting/extractor.go
+++ b/pkg/services/alerting/extractor.go
@@ -112,7 +112,7 @@ func (e *DashAlertExtractor) getAlertFromPanels(jsonWithPanels *simplejson.Json,
frequency, err := getTimeDurationStringToSeconds(jsonAlert.Get("frequency").MustString())
if err != nil {
- return nil, ValidationError{Reason: "Could not parse frequency"}
+ return nil, ValidationError{Reason: err.Error()}
}
rawFor := jsonAlert.Get("for").MustString()
diff --git a/pkg/services/alerting/notifiers/telegram.go b/pkg/services/alerting/notifiers/telegram.go
index 4a4a989d873..ab43f3bce35 100644
--- a/pkg/services/alerting/notifiers/telegram.go
+++ b/pkg/services/alerting/notifiers/telegram.go
@@ -130,7 +130,7 @@ func (this *TelegramNotifier) buildMessageInlineImage(evalContext *alerting.Eval
defer func() {
err := imageFile.Close()
if err != nil {
- log.Error2("Could not close Telegram inline image.", "err", err)
+ this.log.Error("Could not close Telegram inline image.", "err", err)
}
}()
diff --git a/pkg/services/alerting/rule.go b/pkg/services/alerting/rule.go
index d2a505145ac..4423046d600 100644
--- a/pkg/services/alerting/rule.go
+++ b/pkg/services/alerting/rule.go
@@ -1,16 +1,21 @@
package alerting
import (
+ "errors"
"fmt"
"regexp"
"strconv"
"time"
"github.com/grafana/grafana/pkg/components/simplejson"
-
m "github.com/grafana/grafana/pkg/models"
)
+var (
+ ErrFrequencyCannotBeZeroOrLess = errors.New(`"evaluate every" cannot be zero or below`)
+ ErrFrequencyCouldNotBeParsed = errors.New(`"evaluate every" field could not be parsed`)
+)
+
type Rule struct {
Id int64
OrgId int64
@@ -76,7 +81,7 @@ func getTimeDurationStringToSeconds(str string) (int64, error) {
matches := ValueFormatRegex.FindAllString(str, 1)
if len(matches) <= 0 {
- return 0, fmt.Errorf("Frequency could not be parsed")
+ return 0, ErrFrequencyCouldNotBeParsed
}
value, err := strconv.Atoi(matches[0])
@@ -84,6 +89,10 @@ func getTimeDurationStringToSeconds(str string) (int64, error) {
return 0, err
}
+ if value == 0 {
+ return 0, ErrFrequencyCannotBeZeroOrLess
+ }
+
unit := UnitFormatRegex.FindAllString(str, 1)[0]
if val, ok := unitMultiplier[unit]; ok {
@@ -101,7 +110,6 @@ func NewRuleFromDBAlert(ruleDef *m.Alert) (*Rule, error) {
model.PanelId = ruleDef.PanelId
model.Name = ruleDef.Name
model.Message = ruleDef.Message
- model.Frequency = ruleDef.Frequency
model.State = ruleDef.State
model.LastStateChange = ruleDef.NewStateDate
model.For = ruleDef.For
@@ -109,6 +117,13 @@ func NewRuleFromDBAlert(ruleDef *m.Alert) (*Rule, error) {
model.ExecutionErrorState = m.ExecutionErrorOption(ruleDef.Settings.Get("executionErrorState").MustString("alerting"))
model.StateChanges = ruleDef.StateChanges
+ model.Frequency = ruleDef.Frequency
+ // frequency cannot be zero since that would not execute the alert rule.
+ // so we fallback to 60 seconds if `Freqency` is missing
+ if model.Frequency == 0 {
+ model.Frequency = 60
+ }
+
for _, v := range ruleDef.Settings.Get("notifications").MustArray() {
jsonModel := simplejson.NewFromAny(v)
id, err := jsonModel.Get("id").Int64()
diff --git a/pkg/services/alerting/rule_test.go b/pkg/services/alerting/rule_test.go
index 2a9e95e5723..cf25cc118f4 100644
--- a/pkg/services/alerting/rule_test.go
+++ b/pkg/services/alerting/rule_test.go
@@ -14,6 +14,36 @@ func (f *FakeCondition) Eval(context *EvalContext) (*ConditionResult, error) {
return &ConditionResult{}, nil
}
+func TestAlertRuleFrequencyParsing(t *testing.T) {
+ tcs := []struct {
+ input string
+ err error
+ result int64
+ }{
+ {input: "10s", result: 10},
+ {input: "10m", result: 600},
+ {input: "1h", result: 3600},
+ {input: "1o", result: 1},
+ {input: "0s", err: ErrFrequencyCannotBeZeroOrLess},
+ {input: "0m", err: ErrFrequencyCannotBeZeroOrLess},
+ {input: "0h", err: ErrFrequencyCannotBeZeroOrLess},
+ {input: "0", err: ErrFrequencyCannotBeZeroOrLess},
+ {input: "-1s", err: ErrFrequencyCouldNotBeParsed},
+ }
+
+ for _, tc := range tcs {
+ r, err := getTimeDurationStringToSeconds(tc.input)
+ if err != tc.err {
+ t.Errorf("expected error: '%v' got: '%v'", tc.err, err)
+ return
+ }
+
+ if r != tc.result {
+ t.Errorf("expected result: %d got %d", tc.result, r)
+ }
+ }
+}
+
func TestAlertRuleModel(t *testing.T) {
Convey("Testing alert rule", t, func() {
@@ -21,26 +51,6 @@ func TestAlertRuleModel(t *testing.T) {
return &FakeCondition{}, nil
})
- Convey("Can parse seconds", func() {
- seconds, _ := getTimeDurationStringToSeconds("10s")
- So(seconds, ShouldEqual, 10)
- })
-
- Convey("Can parse minutes", func() {
- seconds, _ := getTimeDurationStringToSeconds("10m")
- So(seconds, ShouldEqual, 600)
- })
-
- Convey("Can parse hours", func() {
- seconds, _ := getTimeDurationStringToSeconds("1h")
- So(seconds, ShouldEqual, 3600)
- })
-
- Convey("defaults to seconds", func() {
- seconds, _ := getTimeDurationStringToSeconds("1o")
- So(seconds, ShouldEqual, 1)
- })
-
Convey("should return err for empty string", func() {
_, err := getTimeDurationStringToSeconds("")
So(err, ShouldNotBeNil)
@@ -89,5 +99,35 @@ func TestAlertRuleModel(t *testing.T) {
So(len(alertRule.Notifications), ShouldEqual, 2)
})
})
+
+ Convey("can construct alert rule model with invalid frequency", func() {
+ json := `
+ {
+ "name": "name2",
+ "description": "desc2",
+ "noDataMode": "critical",
+ "enabled": true,
+ "frequency": "0s",
+ "conditions": [ { "type": "test", "prop": 123 } ],
+ "notifications": []
+ }`
+
+ alertJSON, jsonErr := simplejson.NewJson([]byte(json))
+ So(jsonErr, ShouldBeNil)
+
+ alert := &m.Alert{
+ Id: 1,
+ OrgId: 1,
+ DashboardId: 1,
+ PanelId: 1,
+ Frequency: 0,
+
+ Settings: alertJSON,
+ }
+
+ alertRule, err := NewRuleFromDBAlert(alert)
+ So(err, ShouldBeNil)
+ So(alertRule.Frequency, ShouldEqual, 60)
+ })
})
}
diff --git a/pkg/services/alerting/test_notification.go b/pkg/services/alerting/test_notification.go
index b6e59f694c8..5ffc8dc58fc 100644
--- a/pkg/services/alerting/test_notification.go
+++ b/pkg/services/alerting/test_notification.go
@@ -18,9 +18,12 @@ type NotificationTestCommand struct {
Settings *simplejson.Json
}
+var (
+ logger = log.New("alerting.testnotification")
+)
+
func init() {
bus.AddHandler("alerting", handleNotificationTestCommand)
-
}
func handleNotificationTestCommand(cmd *NotificationTestCommand) error {
@@ -35,7 +38,7 @@ func handleNotificationTestCommand(cmd *NotificationTestCommand) error {
notifiers, err := InitNotifier(model)
if err != nil {
- log.Error2("Failed to create notifier", "error", err.Error())
+ logger.Error("Failed to create notifier", "error", err.Error())
return err
}
diff --git a/pkg/services/auth/auth_token.go b/pkg/services/auth/auth_token.go
new file mode 100644
index 00000000000..7e9433c2d70
--- /dev/null
+++ b/pkg/services/auth/auth_token.go
@@ -0,0 +1,266 @@
+package auth
+
+import (
+ "crypto/sha256"
+ "encoding/hex"
+ "net/http"
+ "net/url"
+ "time"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/infra/serverlock"
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/registry"
+ "github.com/grafana/grafana/pkg/services/sqlstore"
+ "github.com/grafana/grafana/pkg/setting"
+ "github.com/grafana/grafana/pkg/util"
+)
+
+func init() {
+ registry.RegisterService(&UserAuthTokenServiceImpl{})
+}
+
+var (
+ getTime = time.Now
+ UrgentRotateTime = 1 * time.Minute
+ oneYearInSeconds = 31557600 //used as default maxage for session cookies. We validate/rotate them more often.
+)
+
+// UserAuthTokenService are used for generating and validating user auth tokens
+type UserAuthTokenService interface {
+ InitContextWithToken(ctx *models.ReqContext, orgID int64) bool
+ UserAuthenticatedHook(user *models.User, c *models.ReqContext) error
+ UserSignedOutHook(c *models.ReqContext)
+}
+
+type UserAuthTokenServiceImpl struct {
+ SQLStore *sqlstore.SqlStore `inject:""`
+ ServerLockService *serverlock.ServerLockService `inject:""`
+ Cfg *setting.Cfg `inject:""`
+ log log.Logger
+}
+
+// Init this service
+func (s *UserAuthTokenServiceImpl) Init() error {
+ s.log = log.New("auth")
+ return nil
+}
+
+func (s *UserAuthTokenServiceImpl) InitContextWithToken(ctx *models.ReqContext, orgID int64) bool {
+ //auth User
+ unhashedToken := ctx.GetCookie(s.Cfg.LoginCookieName)
+ if unhashedToken == "" {
+ return false
+ }
+
+ userToken, err := s.LookupToken(unhashedToken)
+ if err != nil {
+ ctx.Logger.Info("failed to look up user based on cookie", "error", err)
+ return false
+ }
+
+ query := models.GetSignedInUserQuery{UserId: userToken.UserId, OrgId: orgID}
+ if err := bus.Dispatch(&query); err != nil {
+ ctx.Logger.Error("Failed to get user with id", "userId", userToken.UserId, "error", err)
+ return false
+ }
+
+ ctx.SignedInUser = query.Result
+ ctx.IsSignedIn = true
+
+ //rotate session token if needed.
+ rotated, err := s.RefreshToken(userToken, ctx.RemoteAddr(), ctx.Req.UserAgent())
+ if err != nil {
+ ctx.Logger.Error("failed to rotate token", "error", err, "userId", userToken.UserId, "tokenId", userToken.Id)
+ return true
+ }
+
+ if rotated {
+ s.writeSessionCookie(ctx, userToken.UnhashedToken, oneYearInSeconds)
+ }
+
+ return true
+}
+
+func (s *UserAuthTokenServiceImpl) writeSessionCookie(ctx *models.ReqContext, value string, maxAge int) {
+ if setting.Env == setting.DEV {
+ ctx.Logger.Info("new token", "unhashed token", value)
+ }
+
+ ctx.Resp.Header().Del("Set-Cookie")
+ cookie := http.Cookie{
+ Name: s.Cfg.LoginCookieName,
+ Value: url.QueryEscape(value),
+ HttpOnly: true,
+ Path: setting.AppSubUrl + "/",
+ Secure: s.Cfg.SecurityHTTPSCookies,
+ MaxAge: maxAge,
+ }
+
+ http.SetCookie(ctx.Resp, &cookie)
+}
+
+func (s *UserAuthTokenServiceImpl) UserAuthenticatedHook(user *models.User, c *models.ReqContext) error {
+ userToken, err := s.CreateToken(user.Id, c.RemoteAddr(), c.Req.UserAgent())
+ if err != nil {
+ return err
+ }
+
+ s.writeSessionCookie(c, userToken.UnhashedToken, oneYearInSeconds)
+ return nil
+}
+
+func (s *UserAuthTokenServiceImpl) UserSignedOutHook(c *models.ReqContext) {
+ s.writeSessionCookie(c, "", -1)
+}
+
+func (s *UserAuthTokenServiceImpl) CreateToken(userId int64, clientIP, userAgent string) (*userAuthToken, error) {
+ clientIP = util.ParseIPAddress(clientIP)
+ token, err := util.RandomHex(16)
+ if err != nil {
+ return nil, err
+ }
+
+ hashedToken := hashToken(token)
+
+ now := getTime().Unix()
+
+ userToken := userAuthToken{
+ UserId: userId,
+ AuthToken: hashedToken,
+ PrevAuthToken: hashedToken,
+ ClientIp: clientIP,
+ UserAgent: userAgent,
+ RotatedAt: now,
+ CreatedAt: now,
+ UpdatedAt: now,
+ SeenAt: 0,
+ AuthTokenSeen: false,
+ }
+ _, err = s.SQLStore.NewSession().Insert(&userToken)
+ if err != nil {
+ return nil, err
+ }
+
+ userToken.UnhashedToken = token
+
+ return &userToken, nil
+}
+
+func (s *UserAuthTokenServiceImpl) LookupToken(unhashedToken string) (*userAuthToken, error) {
+ hashedToken := hashToken(unhashedToken)
+ if setting.Env == setting.DEV {
+ s.log.Info("looking up token", "unhashed", unhashedToken, "hashed", hashedToken)
+ }
+
+ expireBefore := getTime().Add(time.Duration(-86400*s.Cfg.LoginCookieMaxDays) * time.Second).Unix()
+
+ var userToken userAuthToken
+ exists, err := s.SQLStore.NewSession().Where("(auth_token = ? OR prev_auth_token = ?) AND created_at > ?", hashedToken, hashedToken, expireBefore).Get(&userToken)
+ if err != nil {
+ return nil, err
+ }
+
+ if !exists {
+ return nil, ErrAuthTokenNotFound
+ }
+
+ if userToken.AuthToken != hashedToken && userToken.PrevAuthToken == hashedToken && userToken.AuthTokenSeen {
+ userTokenCopy := userToken
+ userTokenCopy.AuthTokenSeen = false
+ expireBefore := getTime().Add(-UrgentRotateTime).Unix()
+ affectedRows, err := s.SQLStore.NewSession().Where("id = ? AND prev_auth_token = ? AND rotated_at < ?", userTokenCopy.Id, userTokenCopy.PrevAuthToken, expireBefore).AllCols().Update(&userTokenCopy)
+ if err != nil {
+ return nil, err
+ }
+
+ if affectedRows == 0 {
+ s.log.Debug("prev seen token unchanged", "userTokenId", userToken.Id, "userId", userToken.UserId, "authToken", userToken.AuthToken, "clientIP", userToken.ClientIp, "userAgent", userToken.UserAgent)
+ } else {
+ s.log.Debug("prev seen token", "userTokenId", userToken.Id, "userId", userToken.UserId, "authToken", userToken.AuthToken, "clientIP", userToken.ClientIp, "userAgent", userToken.UserAgent)
+ }
+ }
+
+ if !userToken.AuthTokenSeen && userToken.AuthToken == hashedToken {
+ userTokenCopy := userToken
+ userTokenCopy.AuthTokenSeen = true
+ userTokenCopy.SeenAt = getTime().Unix()
+ affectedRows, err := s.SQLStore.NewSession().Where("id = ? AND auth_token = ?", userTokenCopy.Id, userTokenCopy.AuthToken).AllCols().Update(&userTokenCopy)
+ if err != nil {
+ return nil, err
+ }
+
+ if affectedRows == 1 {
+ userToken = userTokenCopy
+ }
+
+ if affectedRows == 0 {
+ s.log.Debug("seen wrong token", "userTokenId", userToken.Id, "userId", userToken.UserId, "authToken", userToken.AuthToken, "clientIP", userToken.ClientIp, "userAgent", userToken.UserAgent)
+ } else {
+ s.log.Debug("seen token", "userTokenId", userToken.Id, "userId", userToken.UserId, "authToken", userToken.AuthToken, "clientIP", userToken.ClientIp, "userAgent", userToken.UserAgent)
+ }
+ }
+
+ userToken.UnhashedToken = unhashedToken
+
+ return &userToken, nil
+}
+
+func (s *UserAuthTokenServiceImpl) RefreshToken(token *userAuthToken, clientIP, userAgent string) (bool, error) {
+ if token == nil {
+ return false, nil
+ }
+
+ now := getTime()
+
+ needsRotation := false
+ rotatedAt := time.Unix(token.RotatedAt, 0)
+ if token.AuthTokenSeen {
+ needsRotation = rotatedAt.Before(now.Add(-time.Duration(s.Cfg.LoginCookieRotation) * time.Minute))
+ } else {
+ needsRotation = rotatedAt.Before(now.Add(-UrgentRotateTime))
+ }
+
+ if !needsRotation {
+ return false, nil
+ }
+
+ s.log.Debug("refresh token needs rotation?", "auth_token_seen", token.AuthTokenSeen, "rotated_at", rotatedAt, "token.Id", token.Id)
+
+ clientIP = util.ParseIPAddress(clientIP)
+ newToken, _ := util.RandomHex(16)
+ hashedToken := hashToken(newToken)
+
+ // very important that auth_token_seen is set after the prev_auth_token = case when ... for mysql to function correctly
+ sql := `
+ UPDATE user_auth_token
+ SET
+ seen_at = 0,
+ user_agent = ?,
+ client_ip = ?,
+ prev_auth_token = case when auth_token_seen = ? then auth_token else prev_auth_token end,
+ auth_token = ?,
+ auth_token_seen = ?,
+ rotated_at = ?
+ WHERE id = ? AND (auth_token_seen = ? OR rotated_at < ?)`
+
+ res, err := s.SQLStore.NewSession().Exec(sql, userAgent, clientIP, s.SQLStore.Dialect.BooleanStr(true), hashedToken, s.SQLStore.Dialect.BooleanStr(false), now.Unix(), token.Id, s.SQLStore.Dialect.BooleanStr(true), now.Add(-30*time.Second).Unix())
+ if err != nil {
+ return false, err
+ }
+
+ affected, _ := res.RowsAffected()
+ s.log.Debug("rotated", "affected", affected, "auth_token_id", token.Id, "userId", token.UserId)
+ if affected > 0 {
+ token.UnhashedToken = newToken
+ return true, nil
+ }
+
+ return false, nil
+}
+
+func hashToken(token string) string {
+ hashBytes := sha256.Sum256([]byte(token + setting.SecretKey))
+ return hex.EncodeToString(hashBytes[:])
+}
diff --git a/pkg/services/auth/auth_token_test.go b/pkg/services/auth/auth_token_test.go
new file mode 100644
index 00000000000..2f75c660d9d
--- /dev/null
+++ b/pkg/services/auth/auth_token_test.go
@@ -0,0 +1,339 @@
+package auth
+
+import (
+ "testing"
+ "time"
+
+ "github.com/grafana/grafana/pkg/setting"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/services/sqlstore"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestUserAuthToken(t *testing.T) {
+ Convey("Test user auth token", t, func() {
+ ctx := createTestContext(t)
+ userAuthTokenService := ctx.tokenService
+ userID := int64(10)
+
+ t := time.Date(2018, 12, 13, 13, 45, 0, 0, time.UTC)
+ getTime = func() time.Time {
+ return t
+ }
+
+ Convey("When creating token", func() {
+ token, err := userAuthTokenService.CreateToken(userID, "192.168.10.11:1234", "some user agent")
+ So(err, ShouldBeNil)
+ So(token, ShouldNotBeNil)
+ So(token.AuthTokenSeen, ShouldBeFalse)
+
+ Convey("When lookup unhashed token should return user auth token", func() {
+ LookupToken, err := userAuthTokenService.LookupToken(token.UnhashedToken)
+ So(err, ShouldBeNil)
+ So(LookupToken, ShouldNotBeNil)
+ So(LookupToken.UserId, ShouldEqual, userID)
+ So(LookupToken.AuthTokenSeen, ShouldBeTrue)
+
+ storedAuthToken, err := ctx.getAuthTokenByID(LookupToken.Id)
+ So(err, ShouldBeNil)
+ So(storedAuthToken, ShouldNotBeNil)
+ So(storedAuthToken.AuthTokenSeen, ShouldBeTrue)
+ })
+
+ Convey("When lookup hashed token should return user auth token not found error", func() {
+ LookupToken, err := userAuthTokenService.LookupToken(token.AuthToken)
+ So(err, ShouldEqual, ErrAuthTokenNotFound)
+ So(LookupToken, ShouldBeNil)
+ })
+ })
+
+ Convey("expires correctly", func() {
+ token, err := userAuthTokenService.CreateToken(userID, "192.168.10.11:1234", "some user agent")
+ So(err, ShouldBeNil)
+ So(token, ShouldNotBeNil)
+
+ _, err = userAuthTokenService.LookupToken(token.UnhashedToken)
+ So(err, ShouldBeNil)
+
+ token, err = ctx.getAuthTokenByID(token.Id)
+ So(err, ShouldBeNil)
+
+ getTime = func() time.Time {
+ return t.Add(time.Hour)
+ }
+
+ refreshed, err := userAuthTokenService.RefreshToken(token, "192.168.10.11:1234", "some user agent")
+ So(err, ShouldBeNil)
+ So(refreshed, ShouldBeTrue)
+
+ _, err = userAuthTokenService.LookupToken(token.UnhashedToken)
+ So(err, ShouldBeNil)
+
+ stillGood, err := userAuthTokenService.LookupToken(token.UnhashedToken)
+ So(err, ShouldBeNil)
+ So(stillGood, ShouldNotBeNil)
+
+ getTime = func() time.Time {
+ return t.Add(24 * 7 * time.Hour)
+ }
+ notGood, err := userAuthTokenService.LookupToken(token.UnhashedToken)
+ So(err, ShouldEqual, ErrAuthTokenNotFound)
+ So(notGood, ShouldBeNil)
+ })
+
+ Convey("can properly rotate tokens", func() {
+ token, err := userAuthTokenService.CreateToken(userID, "192.168.10.11:1234", "some user agent")
+ So(err, ShouldBeNil)
+ So(token, ShouldNotBeNil)
+
+ prevToken := token.AuthToken
+ unhashedPrev := token.UnhashedToken
+
+ refreshed, err := userAuthTokenService.RefreshToken(token, "192.168.10.12:1234", "a new user agent")
+ So(err, ShouldBeNil)
+ So(refreshed, ShouldBeFalse)
+
+ updated, err := ctx.markAuthTokenAsSeen(token.Id)
+ So(err, ShouldBeNil)
+ So(updated, ShouldBeTrue)
+
+ token, err = ctx.getAuthTokenByID(token.Id)
+ So(err, ShouldBeNil)
+
+ getTime = func() time.Time {
+ return t.Add(time.Hour)
+ }
+
+ refreshed, err = userAuthTokenService.RefreshToken(token, "192.168.10.12:1234", "a new user agent")
+ So(err, ShouldBeNil)
+ So(refreshed, ShouldBeTrue)
+
+ unhashedToken := token.UnhashedToken
+
+ token, err = ctx.getAuthTokenByID(token.Id)
+ So(err, ShouldBeNil)
+ token.UnhashedToken = unhashedToken
+
+ So(token.RotatedAt, ShouldEqual, getTime().Unix())
+ So(token.ClientIp, ShouldEqual, "192.168.10.12")
+ So(token.UserAgent, ShouldEqual, "a new user agent")
+ So(token.AuthTokenSeen, ShouldBeFalse)
+ So(token.SeenAt, ShouldEqual, 0)
+ So(token.PrevAuthToken, ShouldEqual, prevToken)
+
+ // ability to auth using an old token
+
+ lookedUp, err := userAuthTokenService.LookupToken(token.UnhashedToken)
+ So(err, ShouldBeNil)
+ So(lookedUp, ShouldNotBeNil)
+ So(lookedUp.AuthTokenSeen, ShouldBeTrue)
+ So(lookedUp.SeenAt, ShouldEqual, getTime().Unix())
+
+ lookedUp, err = userAuthTokenService.LookupToken(unhashedPrev)
+ So(err, ShouldBeNil)
+ So(lookedUp, ShouldNotBeNil)
+ So(lookedUp.Id, ShouldEqual, token.Id)
+ So(lookedUp.AuthTokenSeen, ShouldBeTrue)
+
+ getTime = func() time.Time {
+ return t.Add(time.Hour + (2 * time.Minute))
+ }
+
+ lookedUp, err = userAuthTokenService.LookupToken(unhashedPrev)
+ So(err, ShouldBeNil)
+ So(lookedUp, ShouldNotBeNil)
+ So(lookedUp.AuthTokenSeen, ShouldBeTrue)
+
+ lookedUp, err = ctx.getAuthTokenByID(lookedUp.Id)
+ So(err, ShouldBeNil)
+ So(lookedUp, ShouldNotBeNil)
+ So(lookedUp.AuthTokenSeen, ShouldBeFalse)
+
+ refreshed, err = userAuthTokenService.RefreshToken(token, "192.168.10.12:1234", "a new user agent")
+ So(err, ShouldBeNil)
+ So(refreshed, ShouldBeTrue)
+
+ token, err = ctx.getAuthTokenByID(token.Id)
+ So(err, ShouldBeNil)
+ So(token, ShouldNotBeNil)
+ So(token.SeenAt, ShouldEqual, 0)
+ })
+
+ Convey("keeps prev token valid for 1 minute after it is confirmed", func() {
+ token, err := userAuthTokenService.CreateToken(userID, "192.168.10.11:1234", "some user agent")
+ So(err, ShouldBeNil)
+ So(token, ShouldNotBeNil)
+
+ lookedUp, err := userAuthTokenService.LookupToken(token.UnhashedToken)
+ So(err, ShouldBeNil)
+ So(lookedUp, ShouldNotBeNil)
+
+ getTime = func() time.Time {
+ return t.Add(10 * time.Minute)
+ }
+
+ prevToken := token.UnhashedToken
+ refreshed, err := userAuthTokenService.RefreshToken(token, "1.1.1.1", "firefox")
+ So(err, ShouldBeNil)
+ So(refreshed, ShouldBeTrue)
+
+ getTime = func() time.Time {
+ return t.Add(20 * time.Minute)
+ }
+
+ current, err := userAuthTokenService.LookupToken(token.UnhashedToken)
+ So(err, ShouldBeNil)
+ So(current, ShouldNotBeNil)
+
+ prev, err := userAuthTokenService.LookupToken(prevToken)
+ So(err, ShouldBeNil)
+ So(prev, ShouldNotBeNil)
+ })
+
+ Convey("will not mark token unseen when prev and current are the same", func() {
+ token, err := userAuthTokenService.CreateToken(userID, "192.168.10.11:1234", "some user agent")
+ So(err, ShouldBeNil)
+ So(token, ShouldNotBeNil)
+
+ lookedUp, err := userAuthTokenService.LookupToken(token.UnhashedToken)
+ So(err, ShouldBeNil)
+ So(lookedUp, ShouldNotBeNil)
+
+ lookedUp, err = userAuthTokenService.LookupToken(token.UnhashedToken)
+ So(err, ShouldBeNil)
+ So(lookedUp, ShouldNotBeNil)
+
+ lookedUp, err = ctx.getAuthTokenByID(lookedUp.Id)
+ So(err, ShouldBeNil)
+ So(lookedUp, ShouldNotBeNil)
+ So(lookedUp.AuthTokenSeen, ShouldBeTrue)
+ })
+
+ Convey("Rotate token", func() {
+ token, err := userAuthTokenService.CreateToken(userID, "192.168.10.11:1234", "some user agent")
+ So(err, ShouldBeNil)
+ So(token, ShouldNotBeNil)
+
+ prevToken := token.AuthToken
+
+ Convey("Should rotate current token and previous token when auth token seen", func() {
+ updated, err := ctx.markAuthTokenAsSeen(token.Id)
+ So(err, ShouldBeNil)
+ So(updated, ShouldBeTrue)
+
+ getTime = func() time.Time {
+ return t.Add(10 * time.Minute)
+ }
+
+ refreshed, err := userAuthTokenService.RefreshToken(token, "1.1.1.1", "firefox")
+ So(err, ShouldBeNil)
+ So(refreshed, ShouldBeTrue)
+
+ storedToken, err := ctx.getAuthTokenByID(token.Id)
+ So(err, ShouldBeNil)
+ So(storedToken, ShouldNotBeNil)
+ So(storedToken.AuthTokenSeen, ShouldBeFalse)
+ So(storedToken.PrevAuthToken, ShouldEqual, prevToken)
+ So(storedToken.AuthToken, ShouldNotEqual, prevToken)
+
+ prevToken = storedToken.AuthToken
+
+ updated, err = ctx.markAuthTokenAsSeen(token.Id)
+ So(err, ShouldBeNil)
+ So(updated, ShouldBeTrue)
+
+ getTime = func() time.Time {
+ return t.Add(20 * time.Minute)
+ }
+
+ refreshed, err = userAuthTokenService.RefreshToken(token, "1.1.1.1", "firefox")
+ So(err, ShouldBeNil)
+ So(refreshed, ShouldBeTrue)
+
+ storedToken, err = ctx.getAuthTokenByID(token.Id)
+ So(err, ShouldBeNil)
+ So(storedToken, ShouldNotBeNil)
+ So(storedToken.AuthTokenSeen, ShouldBeFalse)
+ So(storedToken.PrevAuthToken, ShouldEqual, prevToken)
+ So(storedToken.AuthToken, ShouldNotEqual, prevToken)
+ })
+
+ Convey("Should rotate current token, but keep previous token when auth token not seen", func() {
+ token.RotatedAt = getTime().Add(-2 * time.Minute).Unix()
+
+ getTime = func() time.Time {
+ return t.Add(2 * time.Minute)
+ }
+
+ refreshed, err := userAuthTokenService.RefreshToken(token, "1.1.1.1", "firefox")
+ So(err, ShouldBeNil)
+ So(refreshed, ShouldBeTrue)
+
+ storedToken, err := ctx.getAuthTokenByID(token.Id)
+ So(err, ShouldBeNil)
+ So(storedToken, ShouldNotBeNil)
+ So(storedToken.AuthTokenSeen, ShouldBeFalse)
+ So(storedToken.PrevAuthToken, ShouldEqual, prevToken)
+ So(storedToken.AuthToken, ShouldNotEqual, prevToken)
+ })
+ })
+
+ Reset(func() {
+ getTime = time.Now
+ })
+ })
+}
+
+func createTestContext(t *testing.T) *testContext {
+ t.Helper()
+
+ sqlstore := sqlstore.InitTestDB(t)
+ tokenService := &UserAuthTokenServiceImpl{
+ SQLStore: sqlstore,
+ Cfg: &setting.Cfg{
+ LoginCookieName: "grafana_session",
+ LoginCookieMaxDays: 7,
+ LoginDeleteExpiredTokensAfterDays: 30,
+ LoginCookieRotation: 10,
+ },
+ log: log.New("test-logger"),
+ }
+
+ UrgentRotateTime = time.Minute
+
+ return &testContext{
+ sqlstore: sqlstore,
+ tokenService: tokenService,
+ }
+}
+
+type testContext struct {
+ sqlstore *sqlstore.SqlStore
+ tokenService *UserAuthTokenServiceImpl
+}
+
+func (c *testContext) getAuthTokenByID(id int64) (*userAuthToken, error) {
+ sess := c.sqlstore.NewSession()
+ var t userAuthToken
+ found, err := sess.ID(id).Get(&t)
+ if err != nil || !found {
+ return nil, err
+ }
+
+ return &t, nil
+}
+
+func (c *testContext) markAuthTokenAsSeen(id int64) (bool, error) {
+ sess := c.sqlstore.NewSession()
+ res, err := sess.Exec("UPDATE user_auth_token SET auth_token_seen = ? WHERE id = ?", c.sqlstore.Dialect.BooleanStr(true), id)
+ if err != nil {
+ return false, err
+ }
+
+ rowsAffected, err := res.RowsAffected()
+ if err != nil {
+ return false, err
+ }
+ return rowsAffected == 1, nil
+}
diff --git a/pkg/services/auth/model.go b/pkg/services/auth/model.go
new file mode 100644
index 00000000000..7a0f49539f2
--- /dev/null
+++ b/pkg/services/auth/model.go
@@ -0,0 +1,25 @@
+package auth
+
+import (
+ "errors"
+)
+
+// Typed errors
+var (
+ ErrAuthTokenNotFound = errors.New("User auth token not found")
+)
+
+type userAuthToken struct {
+ Id int64
+ UserId int64
+ AuthToken string
+ PrevAuthToken string
+ UserAgent string
+ ClientIp string
+ AuthTokenSeen bool
+ SeenAt int64
+ RotatedAt int64
+ CreatedAt int64
+ UpdatedAt int64
+ UnhashedToken string `xorm:"-"`
+}
diff --git a/pkg/services/auth/session_cleanup.go b/pkg/services/auth/session_cleanup.go
new file mode 100644
index 00000000000..7e523181a7b
--- /dev/null
+++ b/pkg/services/auth/session_cleanup.go
@@ -0,0 +1,38 @@
+package auth
+
+import (
+ "context"
+ "time"
+)
+
+func (srv *UserAuthTokenServiceImpl) Run(ctx context.Context) error {
+ ticker := time.NewTicker(time.Hour * 12)
+ deleteSessionAfter := time.Hour * 24 * time.Duration(srv.Cfg.LoginDeleteExpiredTokensAfterDays)
+
+ for {
+ select {
+ case <-ticker.C:
+ srv.ServerLockService.LockAndExecute(ctx, "delete old sessions", time.Hour*12, func() {
+ srv.deleteOldSession(deleteSessionAfter)
+ })
+
+ case <-ctx.Done():
+ return ctx.Err()
+ }
+ }
+}
+
+func (srv *UserAuthTokenServiceImpl) deleteOldSession(deleteSessionAfter time.Duration) (int64, error) {
+ sql := `DELETE from user_auth_token WHERE rotated_at < ?`
+
+ deleteBefore := getTime().Add(-deleteSessionAfter)
+ res, err := srv.SQLStore.NewSession().Exec(sql, deleteBefore.Unix())
+ if err != nil {
+ return 0, err
+ }
+
+ affected, err := res.RowsAffected()
+ srv.log.Info("deleted old sessions", "count", affected)
+
+ return affected, err
+}
diff --git a/pkg/services/auth/session_cleanup_test.go b/pkg/services/auth/session_cleanup_test.go
new file mode 100644
index 00000000000..eef2cd74d04
--- /dev/null
+++ b/pkg/services/auth/session_cleanup_test.go
@@ -0,0 +1,36 @@
+package auth
+
+import (
+ "fmt"
+ "testing"
+ "time"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestUserAuthTokenCleanup(t *testing.T) {
+
+ Convey("Test user auth token cleanup", t, func() {
+ ctx := createTestContext(t)
+
+ insertToken := func(token string, prev string, rotatedAt int64) {
+ ut := userAuthToken{AuthToken: token, PrevAuthToken: prev, RotatedAt: rotatedAt, UserAgent: "", ClientIp: ""}
+ _, err := ctx.sqlstore.NewSession().Insert(&ut)
+ So(err, ShouldBeNil)
+ }
+
+ // insert three old tokens that should be deleted
+ for i := 0; i < 3; i++ {
+ insertToken(fmt.Sprintf("oldA%d", i), fmt.Sprintf("oldB%d", i), int64(i))
+ }
+
+ // insert three active tokens that should not be deleted
+ for i := 0; i < 3; i++ {
+ insertToken(fmt.Sprintf("newA%d", i), fmt.Sprintf("newB%d", i), getTime().Unix())
+ }
+
+ affected, err := ctx.tokenService.deleteOldSession(time.Hour)
+ So(err, ShouldBeNil)
+ So(affected, ShouldEqual, 3)
+ })
+}
diff --git a/pkg/services/dashboards/dashboard_service.go b/pkg/services/dashboards/dashboard_service.go
index 59ceefa0be5..33f418cbee3 100644
--- a/pkg/services/dashboards/dashboard_service.go
+++ b/pkg/services/dashboards/dashboard_service.go
@@ -164,11 +164,7 @@ func (dr *dashboardServiceImpl) updateAlerting(cmd *models.SaveDashboardCommand,
User: dto.User,
}
- if err := bus.Dispatch(&alertCmd); err != nil {
- return err
- }
-
- return nil
+ return bus.Dispatch(&alertCmd)
}
func (dr *dashboardServiceImpl) SaveProvisionedDashboard(dto *SaveDashboardDTO, provisioning *models.DashboardProvisioning) (*models.Dashboard, error) {
diff --git a/pkg/services/notifications/webhook.go b/pkg/services/notifications/webhook.go
index dbe441c915e..2be3b145372 100644
--- a/pkg/services/notifications/webhook.go
+++ b/pkg/services/notifications/webhook.go
@@ -3,6 +3,7 @@ package notifications
import (
"bytes"
"context"
+ "crypto/tls"
"fmt"
"io"
"io/ioutil"
@@ -26,6 +27,9 @@ type Webhook struct {
}
var netTransport = &http.Transport{
+ TLSClientConfig: &tls.Config{
+ Renegotiation: tls.RenegotiateFreelyAsClient,
+ },
Proxy: http.ProxyFromEnvironment,
Dial: (&net.Dialer{
Timeout: 30 * time.Second,
diff --git a/pkg/services/provisioning/dashboards/config_reader.go b/pkg/services/provisioning/dashboards/config_reader.go
index bfef06b558e..fa08972961d 100644
--- a/pkg/services/provisioning/dashboards/config_reader.go
+++ b/pkg/services/provisioning/dashboards/config_reader.go
@@ -1,6 +1,7 @@
package dashboards
import (
+ "fmt"
"io/ioutil"
"os"
"path/filepath"
@@ -69,7 +70,7 @@ func (cr *configReader) readConfig() ([]*DashboardsAsConfig, error) {
parsedDashboards, err := cr.parseConfigs(file)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("could not parse provisioning config file: %s error: %v", file.Name(), err)
}
if len(parsedDashboards) > 0 {
diff --git a/pkg/services/provisioning/dashboards/file_reader.go b/pkg/services/provisioning/dashboards/file_reader.go
index f9590b01bf1..1c1819df8a9 100644
--- a/pkg/services/provisioning/dashboards/file_reader.go
+++ b/pkg/services/provisioning/dashboards/file_reader.go
@@ -118,6 +118,7 @@ func (fr *fileReader) startWalkingDisk() error {
return nil
}
+
func (fr *fileReader) deleteDashboardIfFileIsMissing(provisionedDashboardRefs map[string]*models.DashboardProvisioning, filesFoundOnDisk map[string]os.FileInfo) {
if fr.Cfg.DisableDeletion {
return
@@ -180,7 +181,7 @@ func (fr *fileReader) saveDashboard(path string, folderId int64, fileInfo os.Fil
dash.Dashboard.SetId(provisionedData.DashboardId)
}
- fr.log.Debug("saving new dashboard", "file", path)
+ fr.log.Debug("saving new dashboard", "provisoner", fr.Cfg.Name, "file", path, "folderId", dash.Dashboard.FolderId)
dp := &models.DashboardProvisioning{
ExternalId: path,
Name: fr.Cfg.Name,
diff --git a/pkg/services/provisioning/dashboards/file_reader_test.go b/pkg/services/provisioning/dashboards/file_reader_test.go
index fe849816553..1a9d2216e7a 100644
--- a/pkg/services/provisioning/dashboards/file_reader_test.go
+++ b/pkg/services/provisioning/dashboards/file_reader_test.go
@@ -166,6 +166,36 @@ func TestDashboardFileReader(t *testing.T) {
_, err := NewDashboardFileReader(cfg, logger)
So(err, ShouldBeNil)
})
+
+ Convey("Two dashboard providers should be able to provisioned the same dashboard without uid", func() {
+ cfg1 := &DashboardsAsConfig{Name: "1", Type: "file", OrgId: 1, Folder: "f1", Options: map[string]interface{}{"path": containingId}}
+ cfg2 := &DashboardsAsConfig{Name: "2", Type: "file", OrgId: 1, Folder: "f2", Options: map[string]interface{}{"path": containingId}}
+
+ reader1, err := NewDashboardFileReader(cfg1, logger)
+ So(err, ShouldBeNil)
+
+ err = reader1.startWalkingDisk()
+ So(err, ShouldBeNil)
+
+ reader2, err := NewDashboardFileReader(cfg2, logger)
+ So(err, ShouldBeNil)
+
+ err = reader2.startWalkingDisk()
+ So(err, ShouldBeNil)
+
+ var folderCount int
+ var dashCount int
+ for _, o := range fakeService.inserted {
+ if o.Dashboard.IsFolder {
+ folderCount++
+ } else {
+ dashCount++
+ }
+ }
+
+ So(folderCount, ShouldEqual, 2)
+ So(dashCount, ShouldEqual, 2)
+ })
})
Convey("Should not create new folder if folder name is missing", func() {
@@ -256,7 +286,9 @@ func (ffi FakeFileInfo) Sys() interface{} {
}
func mockDashboardProvisioningService() *fakeDashboardProvisioningService {
- mock := fakeDashboardProvisioningService{}
+ mock := fakeDashboardProvisioningService{
+ provisioned: map[string][]*models.DashboardProvisioning{},
+ }
dashboards.NewProvisioningService = func() dashboards.DashboardProvisioningService {
return &mock
}
@@ -265,17 +297,26 @@ func mockDashboardProvisioningService() *fakeDashboardProvisioningService {
type fakeDashboardProvisioningService struct {
inserted []*dashboards.SaveDashboardDTO
- provisioned []*models.DashboardProvisioning
+ provisioned map[string][]*models.DashboardProvisioning
getDashboard []*models.Dashboard
}
func (s *fakeDashboardProvisioningService) GetProvisionedDashboardData(name string) ([]*models.DashboardProvisioning, error) {
- return s.provisioned, nil
+ if _, ok := s.provisioned[name]; !ok {
+ s.provisioned[name] = []*models.DashboardProvisioning{}
+ }
+
+ return s.provisioned[name], nil
}
func (s *fakeDashboardProvisioningService) SaveProvisionedDashboard(dto *dashboards.SaveDashboardDTO, provisioning *models.DashboardProvisioning) (*models.Dashboard, error) {
s.inserted = append(s.inserted, dto)
- s.provisioned = append(s.provisioned, provisioning)
+
+ if _, ok := s.provisioned[provisioning.Name]; !ok {
+ s.provisioned[provisioning.Name] = []*models.DashboardProvisioning{}
+ }
+
+ s.provisioned[provisioning.Name] = append(s.provisioned[provisioning.Name], provisioning)
return dto.Dashboard, nil
}
diff --git a/pkg/services/session/session.go b/pkg/services/session/session.go
index 5873a6a5b72..2e60b8a25d7 100644
--- a/pkg/services/session/session.go
+++ b/pkg/services/session/session.go
@@ -14,8 +14,6 @@ import (
const (
SESS_KEY_USERID = "uid"
- SESS_KEY_OAUTH_STATE = "state"
- SESS_KEY_APIKEY = "apikey_id" // used for render requests with api keys
SESS_KEY_LASTLDAPSYNC = "last_ldap_sync"
)
diff --git a/pkg/services/sqlstore/dashboard_provisioning.go b/pkg/services/sqlstore/dashboard_provisioning.go
index 33fbb01c5b7..9b180662278 100644
--- a/pkg/services/sqlstore/dashboard_provisioning.go
+++ b/pkg/services/sqlstore/dashboard_provisioning.go
@@ -51,7 +51,7 @@ func SaveProvisionedDashboard(cmd *models.SaveProvisionedDashboardCommand) error
func saveProvionedData(sess *DBSession, cmd *models.DashboardProvisioning, dashboard *models.Dashboard) error {
result := &models.DashboardProvisioning{}
- exist, err := sess.Where("dashboard_id=?", dashboard.Id).Get(result)
+ exist, err := sess.Where("dashboard_id=? AND name = ?", dashboard.Id, cmd.Name).Get(result)
if err != nil {
return err
}
diff --git a/pkg/services/sqlstore/login_attempt.go b/pkg/services/sqlstore/login_attempt.go
index 78da198e8e7..ceff2394dce 100644
--- a/pkg/services/sqlstore/login_attempt.go
+++ b/pkg/services/sqlstore/login_attempt.go
@@ -78,14 +78,14 @@ func GetUserLoginAttemptCount(query *m.GetUserLoginAttemptCountQuery) error {
}
func toInt64(i interface{}) int64 {
- switch i.(type) {
+ switch i := i.(type) {
case []byte:
- n, _ := strconv.ParseInt(string(i.([]byte)), 10, 64)
+ n, _ := strconv.ParseInt(string(i), 10, 64)
return n
case int:
- return int64(i.(int))
+ return int64(i)
case int64:
- return i.(int64)
+ return i
}
return 0
}
diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go
index 36cd8e5ed62..931259ec3ed 100644
--- a/pkg/services/sqlstore/migrations/migrations.go
+++ b/pkg/services/sqlstore/migrations/migrations.go
@@ -32,6 +32,7 @@ func AddMigrations(mg *Migrator) {
addLoginAttemptMigrations(mg)
addUserAuthMigrations(mg)
addServerlockMigrations(mg)
+ addUserAuthTokenMigrations(mg)
}
func addMigrationLogMigrations(mg *Migrator) {
diff --git a/pkg/services/sqlstore/migrations/user_auth_token_mig.go b/pkg/services/sqlstore/migrations/user_auth_token_mig.go
new file mode 100644
index 00000000000..9794b7a78c7
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/user_auth_token_mig.go
@@ -0,0 +1,32 @@
+package migrations
+
+import (
+ . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+)
+
+func addUserAuthTokenMigrations(mg *Migrator) {
+ userAuthTokenV1 := Table{
+ Name: "user_auth_token",
+ Columns: []*Column{
+ {Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+ {Name: "user_id", Type: DB_BigInt, Nullable: false},
+ {Name: "auth_token", Type: DB_NVarchar, Length: 100, Nullable: false},
+ {Name: "prev_auth_token", Type: DB_NVarchar, Length: 100, Nullable: false},
+ {Name: "user_agent", Type: DB_NVarchar, Length: 255, Nullable: false},
+ {Name: "client_ip", Type: DB_NVarchar, Length: 255, Nullable: false},
+ {Name: "auth_token_seen", Type: DB_Bool, Nullable: false},
+ {Name: "seen_at", Type: DB_Int, Nullable: true},
+ {Name: "rotated_at", Type: DB_Int, Nullable: false},
+ {Name: "created_at", Type: DB_Int, Nullable: false},
+ {Name: "updated_at", Type: DB_Int, Nullable: false},
+ },
+ Indices: []*Index{
+ {Cols: []string{"auth_token"}, Type: UniqueIndex},
+ {Cols: []string{"prev_auth_token"}, Type: UniqueIndex},
+ },
+ }
+
+ mg.AddMigration("create user auth token table", NewAddTableMigration(userAuthTokenV1))
+ mg.AddMigration("add unique index user_auth_token.auth_token", NewAddIndexMigration(userAuthTokenV1, userAuthTokenV1.Indices[0]))
+ mg.AddMigration("add unique index user_auth_token.prev_auth_token", NewAddIndexMigration(userAuthTokenV1, userAuthTokenV1.Indices[1]))
+}
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index d0e93177d8b..7673d80ea91 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -21,6 +21,7 @@ import (
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
"github.com/grafana/grafana/pkg/setting"
+ "github.com/grafana/grafana/pkg/util"
"github.com/go-sql-driver/mysql"
"github.com/go-xorm/xorm"
@@ -222,13 +223,9 @@ func (ss *SqlStore) buildConnectionString() (string, error) {
cnnstr += "&tls=custom"
}
case migrator.POSTGRES:
- var host, port = "127.0.0.1", "5432"
- fields := strings.Split(ss.dbCfg.Host, ":")
- if len(fields) > 0 && len(strings.TrimSpace(fields[0])) > 0 {
- host = fields[0]
- }
- if len(fields) > 1 && len(strings.TrimSpace(fields[1])) > 0 {
- port = fields[1]
+ host, port, err := util.SplitIpPort(ss.dbCfg.Host, "5432")
+ if err != nil {
+ return "", err
}
if ss.dbCfg.Pwd == "" {
ss.dbCfg.Pwd = "''"
diff --git a/pkg/services/sqlstore/sqlstore_test.go b/pkg/services/sqlstore/sqlstore_test.go
new file mode 100644
index 00000000000..76402d6a50d
--- /dev/null
+++ b/pkg/services/sqlstore/sqlstore_test.go
@@ -0,0 +1,101 @@
+package sqlstore
+
+import (
+ "testing"
+
+ . "github.com/smartystreets/goconvey/convey"
+
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+type sqlStoreTest struct {
+ name string
+ dbType string
+ dbHost string
+ connStrValues []string
+}
+
+var sqlStoreTestCases = []sqlStoreTest{
+ {
+ name: "MySQL IPv4",
+ dbType: "mysql",
+ dbHost: "1.2.3.4:5678",
+ connStrValues: []string{"tcp(1.2.3.4:5678)"},
+ },
+ {
+ name: "Postgres IPv4",
+ dbType: "postgres",
+ dbHost: "1.2.3.4:5678",
+ connStrValues: []string{"host=1.2.3.4", "port=5678"},
+ },
+ {
+ name: "Postgres IPv4 (Default Port)",
+ dbType: "postgres",
+ dbHost: "1.2.3.4",
+ connStrValues: []string{"host=1.2.3.4", "port=5432"},
+ },
+ {
+ name: "MySQL IPv4 (Default Port)",
+ dbType: "mysql",
+ dbHost: "1.2.3.4",
+ connStrValues: []string{"tcp(1.2.3.4)"},
+ },
+ {
+ name: "MySQL IPv6",
+ dbType: "mysql",
+ dbHost: "[fe80::24e8:31b2:91df:b177]:1234",
+ connStrValues: []string{"tcp([fe80::24e8:31b2:91df:b177]:1234)"},
+ },
+ {
+ name: "Postgres IPv6",
+ dbType: "postgres",
+ dbHost: "[fe80::24e8:31b2:91df:b177]:1234",
+ connStrValues: []string{"host=fe80::24e8:31b2:91df:b177", "port=1234"},
+ },
+ {
+ name: "MySQL IPv6 (Default Port)",
+ dbType: "mysql",
+ dbHost: "::1",
+ connStrValues: []string{"tcp(::1)"},
+ },
+ {
+ name: "Postgres IPv6 (Default Port)",
+ dbType: "postgres",
+ dbHost: "::1",
+ connStrValues: []string{"host=::1", "port=5432"},
+ },
+}
+
+func TestSqlConnectionString(t *testing.T) {
+ Convey("Testing SQL Connection Strings", t, func() {
+ t.Helper()
+
+ for _, testCase := range sqlStoreTestCases {
+ Convey(testCase.name, func() {
+ sqlstore := &SqlStore{}
+ sqlstore.Cfg = makeSqlStoreTestConfig(testCase.dbType, testCase.dbHost)
+ sqlstore.readConfig()
+
+ connStr, err := sqlstore.buildConnectionString()
+
+ So(err, ShouldBeNil)
+ for _, connSubStr := range testCase.connStrValues {
+ So(connStr, ShouldContainSubstring, connSubStr)
+ }
+ })
+ }
+ })
+}
+
+func makeSqlStoreTestConfig(dbType string, host string) *setting.Cfg {
+ cfg := setting.NewCfg()
+
+ sec, _ := cfg.Raw.NewSection("database")
+ sec.NewKey("type", dbType)
+ sec.NewKey("host", host)
+ sec.NewKey("user", "user")
+ sec.NewKey("name", "test_db")
+ sec.NewKey("password", "pass")
+
+ return cfg
+}
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 1417392fdf8..cf486a228ab 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -18,7 +18,7 @@ import (
"github.com/go-macaron/session"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/util"
- "gopkg.in/ini.v1"
+ ini "gopkg.in/ini.v1"
)
type Scheme string
@@ -77,15 +77,13 @@ var (
SocketPath string
RouterLogging bool
DataProxyLogging bool
+ DataProxyTimeout int
StaticRootPath string
EnableGzip bool
EnforceDomain bool
// Security settings.
SecretKey string
- LogInRememberDays int
- CookieUserName string
- CookieRememberName string
DisableGravatar bool
EmailCodeValidMinutes int
DataProxyWhiteList map[string]bool
@@ -222,7 +220,15 @@ type Cfg struct {
MetricsEndpointBasicAuthUsername string
MetricsEndpointBasicAuthPassword string
EnableAlphaPanels bool
+ DisableSanitizeHtml bool
EnterpriseLicensePath string
+
+ LoginCookieName string
+ LoginCookieMaxDays int
+ LoginCookieRotation int
+ LoginDeleteExpiredTokensAfterDays int
+
+ SecurityHTTPSCookies bool
}
type CommandLineArgs struct {
@@ -546,6 +552,16 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
ApplicationName = APP_NAME_ENTERPRISE
}
+ //login
+ login := iniFile.Section("login")
+ cfg.LoginCookieName = login.Key("cookie_name").MustString("grafana_session")
+ cfg.LoginCookieMaxDays = login.Key("login_remember_days").MustInt(7)
+ cfg.LoginDeleteExpiredTokensAfterDays = login.Key("delete_expired_token_after_days").MustInt(30)
+ cfg.LoginCookieRotation = login.Key("rotate_token_minutes").MustInt(10)
+ if cfg.LoginCookieRotation < 2 {
+ cfg.LoginCookieRotation = 2
+ }
+
Env = iniFile.Section("").Key("app_mode").MustString("development")
InstanceName = iniFile.Section("").Key("instance_name").MustString("unknown_instance_name")
PluginsPath = makeAbsolute(iniFile.Section("paths").Key("plugins").String(), HomePath)
@@ -582,15 +598,14 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
// read data proxy settings
dataproxy := iniFile.Section("dataproxy")
DataProxyLogging = dataproxy.Key("logging").MustBool(false)
+ DataProxyTimeout = dataproxy.Key("timeout").MustInt(30)
// read security settings
security := iniFile.Section("security")
SecretKey = security.Key("secret_key").String()
- LogInRememberDays = security.Key("login_remember_days").MustInt()
- CookieUserName = security.Key("cookie_username").String()
- CookieRememberName = security.Key("cookie_remember_name").String()
DisableGravatar = security.Key("disable_gravatar").MustBool(true)
cfg.DisableBruteForceLoginProtection = security.Key("disable_brute_force_login_protection").MustBool(false)
+ cfg.SecurityHTTPSCookies = security.Key("https_flag_cookies").MustBool(false)
DisableBruteForceLoginProtection = cfg.DisableBruteForceLoginProtection
// read snapshots settings
@@ -705,10 +720,11 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
AlertingNoDataOrNullValues = alerting.Key("nodata_or_nullvalues").MustString("no_data")
explore := iniFile.Section("explore")
- ExploreEnabled = explore.Key("enabled").MustBool(false)
+ ExploreEnabled = explore.Key("enabled").MustBool(true)
panels := iniFile.Section("panels")
cfg.EnableAlphaPanels = panels.Key("enable_alpha").MustBool(false)
+ cfg.DisableSanitizeHtml = panels.Key("disable_sanitize_html").MustBool(false)
cfg.readSessionConfig()
cfg.readSmtpSettings()
diff --git a/pkg/tsdb/cloudwatch/credentials.go b/pkg/tsdb/cloudwatch/credentials.go
index 165f8fdbe97..fb92c827f7c 100644
--- a/pkg/tsdb/cloudwatch/credentials.go
+++ b/pkg/tsdb/cloudwatch/credentials.go
@@ -3,7 +3,6 @@ package cloudwatch
import (
"fmt"
"os"
- "strings"
"sync"
"time"
@@ -43,7 +42,7 @@ func GetCredentials(dsInfo *DatasourceInfo) (*credentials.Credentials, error) {
secretAccessKey := ""
sessionToken := ""
var expiration *time.Time = nil
- if dsInfo.AuthType == "arn" && strings.Index(dsInfo.AssumeRoleArn, "arn:aws:iam:") == 0 {
+ if dsInfo.AuthType == "arn" {
params := &sts.AssumeRoleInput{
RoleArn: aws.String(dsInfo.AssumeRoleArn),
RoleSessionName: aws.String("GrafanaSession"),
diff --git a/pkg/tsdb/elasticsearch/client/models.go b/pkg/tsdb/elasticsearch/client/models.go
index 5307dc34b27..fcc96aeba93 100644
--- a/pkg/tsdb/elasticsearch/client/models.go
+++ b/pkg/tsdb/elasticsearch/client/models.go
@@ -292,7 +292,7 @@ func (a *MetricAggregation) MarshalJSON() ([]byte, error) {
// PipelineAggregation represents a metric aggregation
type PipelineAggregation struct {
- BucketPath string
+ BucketPath interface{}
Settings map[string]interface{}
}
diff --git a/pkg/tsdb/elasticsearch/client/search_request.go b/pkg/tsdb/elasticsearch/client/search_request.go
index d89a98cbadb..b8c9232f97b 100644
--- a/pkg/tsdb/elasticsearch/client/search_request.go
+++ b/pkg/tsdb/elasticsearch/client/search_request.go
@@ -268,7 +268,7 @@ type AggBuilder interface {
Filters(key string, fn func(a *FiltersAggregation, b AggBuilder)) AggBuilder
GeoHashGrid(key, field string, fn func(a *GeoHashGridAggregation, b AggBuilder)) AggBuilder
Metric(key, metricType, field string, fn func(a *MetricAggregation)) AggBuilder
- Pipeline(key, pipelineType, bucketPath string, fn func(a *PipelineAggregation)) AggBuilder
+ Pipeline(key, pipelineType string, bucketPath interface{}, fn func(a *PipelineAggregation)) AggBuilder
Build() (AggArray, error)
}
@@ -438,7 +438,7 @@ func (b *aggBuilderImpl) Metric(key, metricType, field string, fn func(a *Metric
return b
}
-func (b *aggBuilderImpl) Pipeline(key, pipelineType, bucketPath string, fn func(a *PipelineAggregation)) AggBuilder {
+func (b *aggBuilderImpl) Pipeline(key, pipelineType string, bucketPath interface{}, fn func(a *PipelineAggregation)) AggBuilder {
innerAgg := &PipelineAggregation{
BucketPath: bucketPath,
Settings: make(map[string]interface{}),
diff --git a/pkg/tsdb/elasticsearch/models.go b/pkg/tsdb/elasticsearch/models.go
index 46af5e4b745..d38e21c3ebc 100644
--- a/pkg/tsdb/elasticsearch/models.go
+++ b/pkg/tsdb/elasticsearch/models.go
@@ -25,13 +25,14 @@ type BucketAgg struct {
// MetricAgg represents a metric aggregation of the time series query model of the datasource
type MetricAgg struct {
- Field string `json:"field"`
- Hide bool `json:"hide"`
- ID string `json:"id"`
- PipelineAggregate string `json:"pipelineAgg"`
- Settings *simplejson.Json `json:"settings"`
- Meta *simplejson.Json `json:"meta"`
- Type string `json:"type"`
+ Field string `json:"field"`
+ Hide bool `json:"hide"`
+ ID string `json:"id"`
+ PipelineAggregate string `json:"pipelineAgg"`
+ PipelineVariables map[string]string `json:"pipelineVariables"`
+ Settings *simplejson.Json `json:"settings"`
+ Meta *simplejson.Json `json:"meta"`
+ Type string `json:"type"`
}
var metricAggType = map[string]string{
@@ -45,6 +46,7 @@ var metricAggType = map[string]string{
"cardinality": "Unique Count",
"moving_avg": "Moving Average",
"derivative": "Derivative",
+ "bucket_script": "Bucket Script",
"raw_document": "Raw Document",
}
@@ -60,8 +62,13 @@ var extendedStats = map[string]string{
}
var pipelineAggType = map[string]string{
- "moving_avg": "moving_avg",
- "derivative": "derivative",
+ "moving_avg": "moving_avg",
+ "derivative": "derivative",
+ "bucket_script": "bucket_script",
+}
+
+var pipelineAggWithMultipleBucketPathsType = map[string]string{
+ "bucket_script": "bucket_script",
}
func isPipelineAgg(metricType string) bool {
@@ -71,6 +78,13 @@ func isPipelineAgg(metricType string) bool {
return false
}
+func isPipelineAggWithMultipleBucketPaths(metricType string) bool {
+ if _, ok := pipelineAggWithMultipleBucketPathsType[metricType]; ok {
+ return true
+ }
+ return false
+}
+
func describeMetric(metricType, field string) string {
text := metricAggType[metricType]
if metricType == countType {
diff --git a/pkg/tsdb/elasticsearch/response_parser.go b/pkg/tsdb/elasticsearch/response_parser.go
index b2c724a9b93..6bbaa3df34b 100644
--- a/pkg/tsdb/elasticsearch/response_parser.go
+++ b/pkg/tsdb/elasticsearch/response_parser.go
@@ -260,6 +260,7 @@ func (rp *responseParser) processMetrics(esAgg *simplejson.Json, target *Query,
newSeries.Tags["metric"] = metric.Type
newSeries.Tags["field"] = metric.Field
+ newSeries.Tags["metricId"] = metric.ID
for _, v := range esAgg.Get("buckets").MustArray() {
bucket := simplejson.NewFromAny(v)
key := castToNullFloat(bucket.Get("key"))
@@ -459,20 +460,42 @@ func (rp *responseParser) getSeriesName(series *tsdb.TimeSeries, target *Query,
}
// todo, if field and pipelineAgg
if field != "" && isPipelineAgg(metricType) {
- found := false
- for _, metric := range target.Metrics {
- if metric.ID == field {
- metricName += " " + describeMetric(metric.Type, field)
- found = true
+ if isPipelineAggWithMultipleBucketPaths(metricType) {
+ metricID := ""
+ if v, ok := series.Tags["metricId"]; ok {
+ metricID = v
+ }
+
+ for _, metric := range target.Metrics {
+ if metric.ID == metricID {
+ metricName = metric.Settings.Get("script").MustString()
+ for name, pipelineAgg := range metric.PipelineVariables {
+ for _, m := range target.Metrics {
+ if m.ID == pipelineAgg {
+ metricName = strings.Replace(metricName, "params."+name, describeMetric(m.Type, m.Field), -1)
+ }
+ }
+ }
+ }
+ }
+ } else {
+ found := false
+ for _, metric := range target.Metrics {
+ if metric.ID == field {
+ metricName += " " + describeMetric(metric.Type, field)
+ found = true
+ }
+ }
+ if !found {
+ metricName = "Unset"
}
- }
- if !found {
- metricName = "Unset"
}
} else if field != "" {
metricName += " " + field
}
+ delete(series.Tags, "metricId")
+
if len(series.Tags) == 0 {
return metricName
}
diff --git a/pkg/tsdb/elasticsearch/response_parser_test.go b/pkg/tsdb/elasticsearch/response_parser_test.go
index b00c14cf946..e9cd8ad0980 100644
--- a/pkg/tsdb/elasticsearch/response_parser_test.go
+++ b/pkg/tsdb/elasticsearch/response_parser_test.go
@@ -787,6 +787,84 @@ func TestResponseParser(t *testing.T) {
So(rows[0][2].(null.Float).Float64, ShouldEqual, 3000)
})
+ Convey("With bucket_script", func() {
+ targets := map[string]string{
+ "A": `{
+ "timeField": "@timestamp",
+ "metrics": [
+ { "id": "1", "type": "sum", "field": "@value" },
+ { "id": "3", "type": "max", "field": "@value" },
+ {
+ "id": "4",
+ "field": "select field",
+ "pipelineVariables": [{ "name": "var1", "pipelineAgg": "1" }, { "name": "var2", "pipelineAgg": "3" }],
+ "settings": { "script": "params.var1 * params.var2" },
+ "type": "bucket_script"
+ }
+ ],
+ "bucketAggs": [{ "type": "date_histogram", "field": "@timestamp", "id": "2" }]
+ }`,
+ }
+ response := `{
+ "responses": [
+ {
+ "aggregations": {
+ "2": {
+ "buckets": [
+ {
+ "1": { "value": 2 },
+ "3": { "value": 3 },
+ "4": { "value": 6 },
+ "doc_count": 60,
+ "key": 1000
+ },
+ {
+ "1": { "value": 3 },
+ "3": { "value": 4 },
+ "4": { "value": 12 },
+ "doc_count": 60,
+ "key": 2000
+ }
+ ]
+ }
+ }
+ }
+ ]
+ }`
+ rp, err := newResponseParserForTest(targets, response)
+ So(err, ShouldBeNil)
+ result, err := rp.getTimeSeries()
+ So(err, ShouldBeNil)
+ So(result.Results, ShouldHaveLength, 1)
+
+ queryRes := result.Results["A"]
+ So(queryRes, ShouldNotBeNil)
+ So(queryRes.Series, ShouldHaveLength, 3)
+ seriesOne := queryRes.Series[0]
+ So(seriesOne.Name, ShouldEqual, "Sum @value")
+ So(seriesOne.Points, ShouldHaveLength, 2)
+ So(seriesOne.Points[0][0].Float64, ShouldEqual, 2)
+ So(seriesOne.Points[0][1].Float64, ShouldEqual, 1000)
+ So(seriesOne.Points[1][0].Float64, ShouldEqual, 3)
+ So(seriesOne.Points[1][1].Float64, ShouldEqual, 2000)
+
+ seriesTwo := queryRes.Series[1]
+ So(seriesTwo.Name, ShouldEqual, "Max @value")
+ So(seriesTwo.Points, ShouldHaveLength, 2)
+ So(seriesTwo.Points[0][0].Float64, ShouldEqual, 3)
+ So(seriesTwo.Points[0][1].Float64, ShouldEqual, 1000)
+ So(seriesTwo.Points[1][0].Float64, ShouldEqual, 4)
+ So(seriesTwo.Points[1][1].Float64, ShouldEqual, 2000)
+
+ seriesThree := queryRes.Series[2]
+ So(seriesThree.Name, ShouldEqual, "Sum @value * Max @value")
+ So(seriesThree.Points, ShouldHaveLength, 2)
+ So(seriesThree.Points[0][0].Float64, ShouldEqual, 6)
+ So(seriesThree.Points[0][1].Float64, ShouldEqual, 1000)
+ So(seriesThree.Points[1][0].Float64, ShouldEqual, 12)
+ So(seriesThree.Points[1][1].Float64, ShouldEqual, 2000)
+ })
+
// Convey("Raw documents query", func() {
// targets := map[string]string{
// "A": `{
diff --git a/pkg/tsdb/elasticsearch/time_series_query.go b/pkg/tsdb/elasticsearch/time_series_query.go
index 28a930df3a2..e1cd466275e 100644
--- a/pkg/tsdb/elasticsearch/time_series_query.go
+++ b/pkg/tsdb/elasticsearch/time_series_query.go
@@ -94,26 +94,56 @@ func (e *timeSeriesQuery) execute() (*tsdb.Response, error) {
}
if isPipelineAgg(m.Type) {
- if _, err := strconv.Atoi(m.PipelineAggregate); err == nil {
- var appliedAgg *MetricAgg
- for _, pipelineMetric := range q.Metrics {
- if pipelineMetric.ID == m.PipelineAggregate {
- appliedAgg = pipelineMetric
- break
- }
- }
- if appliedAgg != nil {
- bucketPath := m.PipelineAggregate
- if appliedAgg.Type == countType {
- bucketPath = "_count"
+ if isPipelineAggWithMultipleBucketPaths(m.Type) {
+ if len(m.PipelineVariables) > 0 {
+ bucketPaths := map[string]interface{}{}
+ for name, pipelineAgg := range m.PipelineVariables {
+ if _, err := strconv.Atoi(pipelineAgg); err == nil {
+ var appliedAgg *MetricAgg
+ for _, pipelineMetric := range q.Metrics {
+ if pipelineMetric.ID == pipelineAgg {
+ appliedAgg = pipelineMetric
+ break
+ }
+ }
+ if appliedAgg != nil {
+ if appliedAgg.Type == countType {
+ bucketPaths[name] = "_count"
+ } else {
+ bucketPaths[name] = pipelineAgg
+ }
+ }
+ }
}
- aggBuilder.Pipeline(m.ID, m.Type, bucketPath, func(a *es.PipelineAggregation) {
+ aggBuilder.Pipeline(m.ID, m.Type, bucketPaths, func(a *es.PipelineAggregation) {
a.Settings = m.Settings.MustMap()
})
+ } else {
+ continue
}
} else {
- continue
+ if _, err := strconv.Atoi(m.PipelineAggregate); err == nil {
+ var appliedAgg *MetricAgg
+ for _, pipelineMetric := range q.Metrics {
+ if pipelineMetric.ID == m.PipelineAggregate {
+ appliedAgg = pipelineMetric
+ break
+ }
+ }
+ if appliedAgg != nil {
+ bucketPath := m.PipelineAggregate
+ if appliedAgg.Type == countType {
+ bucketPath = "_count"
+ }
+
+ aggBuilder.Pipeline(m.ID, m.Type, bucketPath, func(a *es.PipelineAggregation) {
+ a.Settings = m.Settings.MustMap()
+ })
+ }
+ } else {
+ continue
+ }
}
} else {
aggBuilder.Metric(m.ID, m.Type, m.Field, func(a *es.MetricAggregation) {
@@ -328,12 +358,20 @@ func (p *timeSeriesQueryParser) parseMetrics(model *simplejson.Json) ([]*MetricA
metric.PipelineAggregate = metricJSON.Get("pipelineAgg").MustString()
metric.Settings = simplejson.NewFromAny(metricJSON.Get("settings").MustMap())
metric.Meta = simplejson.NewFromAny(metricJSON.Get("meta").MustMap())
-
metric.Type, err = metricJSON.Get("type").String()
if err != nil {
return nil, err
}
+ if isPipelineAggWithMultipleBucketPaths(metric.Type) {
+ metric.PipelineVariables = map[string]string{}
+ pvArr := metricJSON.Get("pipelineVariables").MustArray()
+ for _, v := range pvArr {
+ kv := v.(map[string]interface{})
+ metric.PipelineVariables[kv["name"].(string)] = kv["pipelineAgg"].(string)
+ }
+ }
+
result = append(result, metric)
}
return result, nil
diff --git a/pkg/tsdb/elasticsearch/time_series_query_test.go b/pkg/tsdb/elasticsearch/time_series_query_test.go
index a4f305242fa..3a558c32782 100644
--- a/pkg/tsdb/elasticsearch/time_series_query_test.go
+++ b/pkg/tsdb/elasticsearch/time_series_query_test.go
@@ -543,6 +543,77 @@ func TestExecuteTimeSeriesQuery(t *testing.T) {
plAgg := derivativeAgg.Aggregation.Aggregation.(*es.PipelineAggregation)
So(plAgg.BucketPath, ShouldEqual, "_count")
})
+
+ Convey("With bucket_script", func() {
+ c := newFakeClient(5)
+ _, err := executeTsdbQuery(c, `{
+ "timeField": "@timestamp",
+ "bucketAggs": [
+ { "type": "date_histogram", "field": "@timestamp", "id": "4" }
+ ],
+ "metrics": [
+ { "id": "3", "type": "sum", "field": "@value" },
+ { "id": "5", "type": "max", "field": "@value" },
+ {
+ "id": "2",
+ "type": "bucket_script",
+ "pipelineVariables": [
+ { "name": "var1", "pipelineAgg": "3" },
+ { "name": "var2", "pipelineAgg": "5" }
+ ],
+ "settings": { "script": "params.var1 * params.var2" }
+ }
+ ]
+ }`, from, to, 15*time.Second)
+ So(err, ShouldBeNil)
+ sr := c.multisearchRequests[0].Requests[0]
+
+ firstLevel := sr.Aggs[0]
+ So(firstLevel.Key, ShouldEqual, "4")
+ So(firstLevel.Aggregation.Type, ShouldEqual, "date_histogram")
+
+ bucketScriptAgg := firstLevel.Aggregation.Aggs[2]
+ So(bucketScriptAgg.Key, ShouldEqual, "2")
+ plAgg := bucketScriptAgg.Aggregation.Aggregation.(*es.PipelineAggregation)
+ So(plAgg.BucketPath.(map[string]interface{}), ShouldResemble, map[string]interface{}{
+ "var1": "3",
+ "var2": "5",
+ })
+ })
+
+ Convey("With bucket_script doc count", func() {
+ c := newFakeClient(5)
+ _, err := executeTsdbQuery(c, `{
+ "timeField": "@timestamp",
+ "bucketAggs": [
+ { "type": "date_histogram", "field": "@timestamp", "id": "4" }
+ ],
+ "metrics": [
+ { "id": "3", "type": "count", "field": "select field" },
+ {
+ "id": "2",
+ "type": "bucket_script",
+ "pipelineVariables": [
+ { "name": "var1", "pipelineAgg": "3" }
+ ],
+ "settings": { "script": "params.var1 * 1000" }
+ }
+ ]
+ }`, from, to, 15*time.Second)
+ So(err, ShouldBeNil)
+ sr := c.multisearchRequests[0].Requests[0]
+
+ firstLevel := sr.Aggs[0]
+ So(firstLevel.Key, ShouldEqual, "4")
+ So(firstLevel.Aggregation.Type, ShouldEqual, "date_histogram")
+
+ bucketScriptAgg := firstLevel.Aggregation.Aggs[0]
+ So(bucketScriptAgg.Key, ShouldEqual, "2")
+ plAgg := bucketScriptAgg.Aggregation.Aggregation.(*es.PipelineAggregation)
+ So(plAgg.BucketPath.(map[string]interface{}), ShouldResemble, map[string]interface{}{
+ "var1": "_count",
+ })
+ })
})
}
diff --git a/pkg/tsdb/mssql/mssql.go b/pkg/tsdb/mssql/mssql.go
index 469d6baa5de..bb2e06ed673 100644
--- a/pkg/tsdb/mssql/mssql.go
+++ b/pkg/tsdb/mssql/mssql.go
@@ -4,13 +4,13 @@ import (
"database/sql"
"fmt"
"strconv"
- "strings"
_ "github.com/denisenkom/go-mssqldb"
"github.com/go-xorm/core"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/tsdb"
+ "github.com/grafana/grafana/pkg/util"
)
func init() {
@@ -20,7 +20,10 @@ func init() {
func newMssqlQueryEndpoint(datasource *models.DataSource) (tsdb.TsdbQueryEndpoint, error) {
logger := log.New("tsdb.mssql")
- cnnstr := generateConnectionString(datasource)
+ cnnstr, err := generateConnectionString(datasource)
+ if err != nil {
+ return nil, err
+ }
logger.Debug("getEngine", "connection", cnnstr)
config := tsdb.SqlQueryEndpointConfiguration{
@@ -37,7 +40,7 @@ func newMssqlQueryEndpoint(datasource *models.DataSource) (tsdb.TsdbQueryEndpoin
return tsdb.NewSqlQueryEndpoint(&config, &rowTransformer, newMssqlMacroEngine(), logger)
}
-func generateConnectionString(datasource *models.DataSource) string {
+func generateConnectionString(datasource *models.DataSource) (string, error) {
password := ""
for key, value := range datasource.SecureJsonData.Decrypt() {
if key == "password" {
@@ -46,12 +49,11 @@ func generateConnectionString(datasource *models.DataSource) string {
}
}
- hostParts := strings.Split(datasource.Url, ":")
- if len(hostParts) < 2 {
- hostParts = append(hostParts, "1433")
+ server, port, err := util.SplitIpPort(datasource.Url, "1433")
+ if err != nil {
+ return "", err
}
- server, port := hostParts[0], hostParts[1]
encrypt := datasource.JsonData.Get("encrypt").MustString("false")
connStr := fmt.Sprintf("server=%s;port=%s;database=%s;user id=%s;password=%s;",
server,
@@ -63,7 +65,7 @@ func generateConnectionString(datasource *models.DataSource) string {
if encrypt != "false" {
connStr += fmt.Sprintf("encrypt=%s;", encrypt)
}
- return connStr
+ return connStr, nil
}
type mssqlRowTransformer struct {
diff --git a/pkg/util/encoding.go b/pkg/util/encoding.go
index 0edb721e422..e82344d73f9 100644
--- a/pkg/util/encoding.go
+++ b/pkg/util/encoding.go
@@ -101,3 +101,11 @@ func DecodeBasicAuthHeader(header string) (string, string, error) {
return userAndPass[0], userAndPass[1], nil
}
+
+func RandomHex(n int) (string, error) {
+ bytes := make([]byte, n)
+ if _, err := rand.Read(bytes); err != nil {
+ return "", err
+ }
+ return hex.EncodeToString(bytes), nil
+}
diff --git a/pkg/util/ip.go b/pkg/util/ip.go
new file mode 100644
index 00000000000..351abd7a03b
--- /dev/null
+++ b/pkg/util/ip.go
@@ -0,0 +1,24 @@
+package util
+
+import (
+ "net"
+)
+
+func SplitIpPort(ipStr string, portDefault string) (ip string, port string, err error) {
+ ipAddr := net.ParseIP(ipStr)
+
+ if ipAddr == nil {
+ // Port was included
+ ip, port, err = net.SplitHostPort(ipStr)
+
+ if err != nil {
+ return "", "", err
+ }
+ } else {
+ // No port was included
+ ip = ipAddr.String()
+ port = portDefault
+ }
+
+ return ip, port, nil
+}
diff --git a/pkg/util/ip_address.go b/pkg/util/ip_address.go
new file mode 100644
index 00000000000..d8d95ef3acd
--- /dev/null
+++ b/pkg/util/ip_address.go
@@ -0,0 +1,29 @@
+package util
+
+import (
+ "net"
+ "strings"
+)
+
+// ParseIPAddress parses an IP address and removes port and/or IPV6 format
+func ParseIPAddress(input string) string {
+ s := input
+ lastIndex := strings.LastIndex(input, ":")
+
+ if lastIndex != -1 {
+ if lastIndex > 0 && input[lastIndex-1:lastIndex] != ":" {
+ s = input[:lastIndex]
+ }
+ }
+
+ s = strings.Replace(s, "[", "", -1)
+ s = strings.Replace(s, "]", "", -1)
+
+ ip := net.ParseIP(s)
+
+ if ip.IsLoopback() {
+ return "127.0.0.1"
+ }
+
+ return ip.String()
+}
diff --git a/pkg/util/ip_address_test.go b/pkg/util/ip_address_test.go
new file mode 100644
index 00000000000..fd3e3ea8587
--- /dev/null
+++ b/pkg/util/ip_address_test.go
@@ -0,0 +1,16 @@
+package util
+
+import (
+ "testing"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestParseIPAddress(t *testing.T) {
+ Convey("Test parse ip address", t, func() {
+ So(ParseIPAddress("192.168.0.140:456"), ShouldEqual, "192.168.0.140")
+ So(ParseIPAddress("[::1:456]"), ShouldEqual, "127.0.0.1")
+ So(ParseIPAddress("[::1]"), ShouldEqual, "127.0.0.1")
+ So(ParseIPAddress("192.168.0.140"), ShouldEqual, "192.168.0.140")
+ })
+}
diff --git a/pkg/util/ip_test.go b/pkg/util/ip_test.go
new file mode 100644
index 00000000000..f938c182b02
--- /dev/null
+++ b/pkg/util/ip_test.go
@@ -0,0 +1,43 @@
+package util
+
+import (
+ "testing"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestSplitIpPort(t *testing.T) {
+
+ Convey("When parsing an IPv4 without explicit port", t, func() {
+ ip, port, err := SplitIpPort("1.2.3.4", "5678")
+
+ So(err, ShouldEqual, nil)
+ So(ip, ShouldEqual, "1.2.3.4")
+ So(port, ShouldEqual, "5678")
+ })
+
+ Convey("When parsing an IPv6 without explicit port", t, func() {
+ ip, port, err := SplitIpPort("::1", "5678")
+
+ So(err, ShouldEqual, nil)
+ So(ip, ShouldEqual, "::1")
+ So(port, ShouldEqual, "5678")
+ })
+
+ Convey("When parsing an IPv4 with explicit port", t, func() {
+ ip, port, err := SplitIpPort("1.2.3.4:56", "78")
+
+ So(err, ShouldEqual, nil)
+ So(ip, ShouldEqual, "1.2.3.4")
+ So(port, ShouldEqual, "56")
+ })
+
+ Convey("When parsing an IPv6 with explicit port", t, func() {
+ ip, port, err := SplitIpPort("[::1]:56", "78")
+
+ So(err, ShouldEqual, nil)
+ So(ip, ShouldEqual, "::1")
+ So(port, ShouldEqual, "56")
+ })
+
+}
diff --git a/public/app/app.ts b/public/app/app.ts
index 2b94ec0fe33..03f332e357b 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -19,6 +19,7 @@ import angular from 'angular';
import config from 'app/core/config';
import _ from 'lodash';
import moment from 'moment';
+import { addClassIfNoOverlayScrollbar } from 'app/core/utils/scrollbar';
// add move to lodash for backward compatabiltiy
_.move = (array, fromIndex, toIndex) => {
@@ -45,6 +46,7 @@ export class GrafanaApp {
preBootModules: any[];
constructor() {
+ addClassIfNoOverlayScrollbar('no-overlay-scrollbar');
this.preBootModules = [];
this.registerFunctions = {};
this.ngModuleDependencies = [];
diff --git a/public/app/core/actions/location.ts b/public/app/core/actions/location.ts
index 6f7ac67363e..8669788fa16 100644
--- a/public/app/core/actions/location.ts
+++ b/public/app/core/actions/location.ts
@@ -1,13 +1,17 @@
import { LocationUpdate } from 'app/types';
+export enum CoreActionTypes {
+ UpdateLocation = 'UPDATE_LOCATION',
+}
+
export type Action = UpdateLocationAction;
export interface UpdateLocationAction {
- type: 'UPDATE_LOCATION';
+ type: CoreActionTypes.UpdateLocation;
payload: LocationUpdate;
}
export const updateLocation = (location: LocationUpdate): UpdateLocationAction => ({
- type: 'UPDATE_LOCATION',
+ type: CoreActionTypes.UpdateLocation,
payload: location,
});
diff --git a/public/app/core/angular_wrappers.ts b/public/app/core/angular_wrappers.ts
index 5609c058a27..65eb68966ff 100644
--- a/public/app/core/angular_wrappers.ts
+++ b/public/app/core/angular_wrappers.ts
@@ -1,11 +1,15 @@
import { react2AngularDirective } from 'app/core/utils/react2angular';
+import { QueryEditor as StackdriverQueryEditor } from 'app/plugins/datasource/stackdriver/components/QueryEditor';
+import { AnnotationQueryEditor as StackdriverAnnotationQueryEditor } from 'app/plugins/datasource/stackdriver/components/AnnotationQueryEditor';
import { PasswordStrength } from './components/PasswordStrength';
import PageHeader from './components/PageHeader/PageHeader';
import EmptyListCTA from './components/EmptyListCTA/EmptyListCTA';
import { SearchResult } from './components/search/SearchResult';
import { TagFilter } from './components/TagFilter/TagFilter';
import { SideMenu } from './components/sidemenu/SideMenu';
+import { MetricSelect } from './components/Select/MetricSelect';
import AppNotificationList from './components/AppNotifications/AppNotificationList';
+import { ColorPicker, SeriesColorPickerPopover } from '@grafana/ui';
export function registerAngularDirectives() {
react2AngularDirective('passwordStrength', PasswordStrength, ['password']);
@@ -19,4 +23,37 @@ export function registerAngularDirectives() {
['onChange', { watchDepth: 'reference' }],
['tagOptions', { watchDepth: 'reference' }],
]);
+ react2AngularDirective('colorPicker', ColorPicker, [
+ 'color',
+ ['onChange', { watchDepth: 'reference', wrapApply: true }],
+ ]);
+ react2AngularDirective('seriesColorPickerPopover', SeriesColorPickerPopover, [
+ 'series',
+ 'onColorChange',
+ 'onToggleAxis',
+ ]);
+ react2AngularDirective('metricSelect', MetricSelect, [
+ 'options',
+ 'onChange',
+ 'value',
+ 'isSearchable',
+ 'className',
+ 'placeholder',
+ ['variables', { watchDepth: 'reference' }],
+ ]);
+ react2AngularDirective('stackdriverQueryEditor', StackdriverQueryEditor, [
+ 'target',
+ 'onQueryChange',
+ 'onExecuteQuery',
+ ['events', { watchDepth: 'reference' }],
+ ['datasource', { watchDepth: 'reference' }],
+ ['templateSrv', { watchDepth: 'reference' }],
+ ]);
+ react2AngularDirective('stackdriverAnnotationQueryEditor', StackdriverAnnotationQueryEditor, [
+ 'target',
+ 'onQueryChange',
+ 'onExecuteQuery',
+ ['datasource', { watchDepth: 'reference' }],
+ ['templateSrv', { watchDepth: 'reference' }],
+ ]);
}
diff --git a/public/app/core/components/Animations/FadeIn.tsx b/public/app/core/components/Animations/FadeIn.tsx
index e12f22486f1..ea9a92d5f0f 100644
--- a/public/app/core/components/Animations/FadeIn.tsx
+++ b/public/app/core/components/Animations/FadeIn.tsx
@@ -1,4 +1,4 @@
-import React, { SFC } from 'react';
+import React, { FC } from 'react';
import Transition from 'react-transition-group/Transition';
interface Props {
@@ -8,7 +8,7 @@ interface Props {
unmountOnExit?: boolean;
}
-export const FadeIn: SFC = props => {
+export const FadeIn: FC = props => {
const defaultStyle = {
transition: `opacity ${props.duration}ms linear`,
opacity: 0,
diff --git a/public/app/core/components/CustomScrollbar/CustomScrollbar.tsx b/public/app/core/components/CustomScrollbar/CustomScrollbar.tsx
deleted file mode 100644
index 590c11c0615..00000000000
--- a/public/app/core/components/CustomScrollbar/CustomScrollbar.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React, { PureComponent } from 'react';
-import Scrollbars from 'react-custom-scrollbars';
-
-interface Props {
- customClassName?: string;
- autoHide?: boolean;
- autoHideTimeout?: number;
- autoHideDuration?: number;
- hideTracksWhenNotNeeded?: boolean;
-}
-
-/**
- * Wraps component into component from `react-custom-scrollbars`
- */
-class CustomScrollbar extends PureComponent {
- static defaultProps: Partial = {
- customClassName: 'custom-scrollbars',
- autoHide: true,
- autoHideTimeout: 200,
- autoHideDuration: 200,
- hideTracksWhenNotNeeded: false,
- };
-
- render() {
- const { customClassName, children, ...scrollProps } = this.props;
-
- return (
- }
- renderTrackVertical={props => }
- renderThumbHorizontal={props => }
- renderThumbVertical={props => }
- renderView={props => }
- {...scrollProps}
- >
- {children}
-
- );
- }
-}
-
-export default CustomScrollbar;
diff --git a/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx b/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx
index ae0e39cc26d..d63af72ae4d 100644
--- a/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx
+++ b/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx
@@ -24,12 +24,14 @@ class EmptyListCTA extends Component {
{buttonTitle}
-
+ {proTip && (
+
+ )}
);
}
diff --git a/public/app/core/components/ErrorBoundary/ErrorBoundary.tsx b/public/app/core/components/ErrorBoundary/ErrorBoundary.tsx
new file mode 100644
index 00000000000..188750b0fef
--- /dev/null
+++ b/public/app/core/components/ErrorBoundary/ErrorBoundary.tsx
@@ -0,0 +1,44 @@
+import { Component } from 'react';
+
+interface ErrorInfo {
+ componentStack: string;
+}
+
+interface RenderProps {
+ error: Error;
+ errorInfo: ErrorInfo;
+}
+
+interface Props {
+ children: (r: RenderProps) => JSX.Element;
+}
+
+interface State {
+ error: Error;
+ errorInfo: ErrorInfo;
+}
+
+class ErrorBoundary extends Component
{
+ readonly state: State = {
+ error: null,
+ errorInfo: null,
+ };
+
+ componentDidCatch(error: Error, errorInfo: ErrorInfo) {
+ this.setState({
+ error: error,
+ errorInfo: errorInfo
+ });
+ }
+
+ render() {
+ const { children } = this.props;
+ const { error, errorInfo } = this.state;
+ return children({
+ error,
+ errorInfo,
+ });
+ }
+}
+
+export default ErrorBoundary;
diff --git a/public/app/core/components/Footer/Footer.tsx b/public/app/core/components/Footer/Footer.tsx
new file mode 100644
index 00000000000..101168beb66
--- /dev/null
+++ b/public/app/core/components/Footer/Footer.tsx
@@ -0,0 +1,50 @@
+import React, { FC } from 'react';
+import { Tooltip } from '@grafana/ui';
+
+interface Props {
+ appName: string;
+ buildVersion: string;
+ buildCommit: string;
+ newGrafanaVersionExists: boolean;
+ newGrafanaVersion: string;
+}
+
+export const Footer: FC = React.memo(({appName, buildVersion, buildCommit, newGrafanaVersionExists, newGrafanaVersion}) => {
+ return (
+
+ );
+});
+
+export default Footer;
diff --git a/public/app/core/components/Label/Label.tsx b/public/app/core/components/Label/Label.tsx
deleted file mode 100644
index 362c3c577f7..00000000000
--- a/public/app/core/components/Label/Label.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React, { SFC, ReactNode } from 'react';
-import Tooltip from '../Tooltip/Tooltip';
-
-interface Props {
- tooltip?: string;
- for?: string;
- children: ReactNode;
- width?: number;
- className?: string;
-}
-
-export const Label: SFC = props => {
- return (
-
- {props.children}
- {props.tooltip && (
-
-
-
- )}
-
- );
-};
diff --git a/public/app/core/components/LayoutSelector/LayoutSelector.tsx b/public/app/core/components/LayoutSelector/LayoutSelector.tsx
index d9e00102438..3afa1f931f2 100644
--- a/public/app/core/components/LayoutSelector/LayoutSelector.tsx
+++ b/public/app/core/components/LayoutSelector/LayoutSelector.tsx
@@ -1,4 +1,4 @@
-import React, { SFC } from 'react';
+import React, { FC } from 'react';
export type LayoutMode = LayoutModes.Grid | LayoutModes.List;
@@ -12,7 +12,7 @@ interface Props {
onLayoutModeChanged: (mode: LayoutMode) => {};
}
-const LayoutSelector: SFC = props => {
+const LayoutSelector: FC = props => {
const { mode, onLayoutModeChanged } = props;
return (
diff --git a/public/app/core/components/Page/Page.tsx b/public/app/core/components/Page/Page.tsx
new file mode 100644
index 00000000000..8c9a5595cb7
--- /dev/null
+++ b/public/app/core/components/Page/Page.tsx
@@ -0,0 +1,75 @@
+// Libraries
+import React, { Component } from 'react';
+import config from 'app/core/config';
+import { NavModel } from 'app/types';
+import { getTitleFromNavModel } from 'app/core/selectors/navModel';
+
+// Components
+import PageHeader from '../PageHeader/PageHeader';
+import Footer from '../Footer/Footer';
+import PageContents from './PageContents';
+import { CustomScrollbar } from '@grafana/ui';
+
+interface Props {
+ title?: string;
+ children: JSX.Element[] | JSX.Element;
+ navModel: NavModel;
+}
+
+class Page extends Component
{
+ private bodyClass = 'is-react';
+ private body = document.body;
+ static Header = PageHeader;
+ static Contents = PageContents;
+
+ componentDidMount() {
+ this.body.classList.add(this.bodyClass);
+ this.updateTitle();
+ }
+
+ componentDidUpdate(prevProps: Props) {
+ if (prevProps.title !== this.props.title) {
+ this.updateTitle();
+ }
+ }
+
+ componentWillUnmount() {
+ this.body.classList.remove(this.bodyClass);
+ }
+
+ updateTitle = () => {
+ const title = this.getPageTitle;
+ document.title = title ? title + ' - Grafana' : 'Grafana';
+ }
+
+ get getPageTitle () {
+ const { navModel } = this.props;
+ if (navModel) {
+ return getTitleFromNavModel(navModel) || undefined;
+ }
+ return undefined;
+ }
+
+ render() {
+ const { navModel } = this.props;
+ const { buildInfo } = config;
+ return (
+
+
+
+
+ {this.props.children}
+
+
+
+ {isLoading &&
}
+ {this.props.children}
+
diff --git a/public/app/core/components/PermissionList/AddPermission.tsx b/public/app/core/components/PermissionList/AddPermission.tsx
index 749bef680bf..30219371257 100644
--- a/public/app/core/components/PermissionList/AddPermission.tsx
+++ b/public/app/core/components/PermissionList/AddPermission.tsx
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import { UserPicker } from 'app/core/components/Select/UserPicker';
import { TeamPicker, Team } from 'app/core/components/Select/TeamPicker';
-import { Select, SelectOptionItem } from 'app/core/components/Select/Select';
+import { Select, SelectOptionItem } from '@grafana/ui';
import { User } from 'app/types';
import {
dashboardPermissionLevels,
diff --git a/public/app/core/components/PermissionList/DisabledPermissionListItem.tsx b/public/app/core/components/PermissionList/DisabledPermissionListItem.tsx
index d3f9ddbb1fb..ebf3cbad1bc 100644
--- a/public/app/core/components/PermissionList/DisabledPermissionListItem.tsx
+++ b/public/app/core/components/PermissionList/DisabledPermissionListItem.tsx
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
-import Select from 'app/core/components/Select/Select';
+import { Select } from '@grafana/ui';
import { dashboardPermissionLevels } from 'app/types/acl';
export interface Props {
diff --git a/public/app/core/components/PermissionList/PermissionListItem.tsx b/public/app/core/components/PermissionList/PermissionListItem.tsx
index e726667cfbb..c33b564154a 100644
--- a/public/app/core/components/PermissionList/PermissionListItem.tsx
+++ b/public/app/core/components/PermissionList/PermissionListItem.tsx
@@ -1,5 +1,5 @@
import React, { PureComponent } from 'react';
-import { Select } from 'app/core/components/Select/Select';
+import { Select } from '@grafana/ui';
import { dashboardPermissionLevels, DashboardAcl, PermissionLevel } from 'app/types/acl';
import { FolderInfo } from 'app/types';
diff --git a/public/app/core/components/ScrollBar/ScrollBar.tsx b/public/app/core/components/ScrollBar/ScrollBar.tsx
deleted file mode 100644
index 24d17f67367..00000000000
--- a/public/app/core/components/ScrollBar/ScrollBar.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import React from 'react';
-import baron from 'baron';
-
-export interface Props {
- children: any;
- className: string;
-}
-
-export default class ScrollBar extends React.Component
{
- private container: any;
- private scrollbar: baron;
-
- constructor(props) {
- super(props);
- }
-
- componentDidMount() {
- this.scrollbar = baron({
- root: this.container.parentElement,
- scroller: this.container,
- bar: '.baron__bar',
- barOnCls: '_scrollbar',
- scrollingCls: '_scrolling',
- track: '.baron__track',
- });
- }
-
- componentDidUpdate() {
- this.scrollbar.update();
- }
-
- componentWillUnmount() {
- this.scrollbar.dispose();
- }
-
- // methods can be invoked by outside
- setScrollTop(top) {
- if (this.container) {
- this.container.scrollTop = top;
- this.scrollbar.update();
-
- return true;
- }
- return false;
- }
-
- setScrollLeft(left) {
- if (this.container) {
- this.container.scrollLeft = left;
- this.scrollbar.update();
-
- return true;
- }
- return false;
- }
-
- update() {
- this.scrollbar.update();
- }
-
- handleRef = ref => {
- this.container = ref;
- };
-
- render() {
- return (
-
-
- {this.props.children}
-
-
-
-
-
+
-
+
+
+
-
-
+
diff --git a/public/sass/components/_panel_add_panel.scss b/public/app/features/dashboard/components/AddPanelWidget/_AddPanelWidget.scss
similarity index 81%
rename from public/sass/components/_panel_add_panel.scss
rename to public/app/features/dashboard/components/AddPanelWidget/_AddPanelWidget.scss
index 86921fb43f3..5a1cbee4b44 100644
--- a/public/sass/components/_panel_add_panel.scss
+++ b/public/app/features/dashboard/components/AddPanelWidget/_AddPanelWidget.scss
@@ -1,12 +1,12 @@
-.add-panel-container {
+.add-panel-widget-container {
height: 100%;
}
-.add-panel {
+.add-panel-widget {
height: 100%;
}
-.add-panel__header {
+.add-panel-widget__header {
top: 0;
position: absolute;
padding: 0 15px;
@@ -26,7 +26,7 @@
}
}
-.add-panel__close {
+.add-panel-widget__close {
margin-left: auto;
background-color: transparent;
border: 0;
@@ -34,7 +34,7 @@
margin-right: -10px;
}
-.add-panel-btn-container {
+.add-panel-widget__btn-container {
display: flex;
justify-content: center;
align-items: center;
diff --git a/public/app/features/dashboard/components/AddPanelWidget/index.ts b/public/app/features/dashboard/components/AddPanelWidget/index.ts
new file mode 100644
index 00000000000..b96948ab1c0
--- /dev/null
+++ b/public/app/features/dashboard/components/AddPanelWidget/index.ts
@@ -0,0 +1 @@
+export { AddPanelWidget } from './AddPanelWidget';
diff --git a/public/app/features/dashboard/export/export_modal.ts b/public/app/features/dashboard/components/DashExportModal/DashExportCtrl.ts
similarity index 92%
rename from public/app/features/dashboard/export/export_modal.ts
rename to public/app/features/dashboard/components/DashExportModal/DashExportCtrl.ts
index 8136c77cd8f..7769bdf114a 100644
--- a/public/app/features/dashboard/export/export_modal.ts
+++ b/public/app/features/dashboard/components/DashExportModal/DashExportCtrl.ts
@@ -2,7 +2,7 @@ import angular from 'angular';
import { saveAs } from 'file-saver';
import coreModule from 'app/core/core_module';
-import { DashboardExporter } from './exporter';
+import { DashboardExporter } from './DashboardExporter';
export class DashExportCtrl {
dash: any;
@@ -66,7 +66,7 @@ export class DashExportCtrl {
export function dashExportDirective() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/export/export_modal.html',
+ templateUrl: 'public/app/features/dashboard/components/DashExportModal/template.html',
controller: DashExportCtrl,
bindToController: true,
controllerAs: 'ctrl',
diff --git a/public/app/features/dashboard/specs/exporter.test.ts b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
similarity index 98%
rename from public/app/features/dashboard/specs/exporter.test.ts
rename to public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
index eac6b0b272a..20ab21541a5 100644
--- a/public/app/features/dashboard/specs/exporter.test.ts
+++ b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
@@ -6,8 +6,8 @@ jest.mock('app/core/store', () => {
import _ from 'lodash';
import config from 'app/core/config';
-import { DashboardExporter } from '../export/exporter';
-import { DashboardModel } from '../dashboard_model';
+import { DashboardExporter } from './DashboardExporter';
+import { DashboardModel } from '../../dashboard_model';
describe('given dashboard with repeated panels', () => {
let dash, exported;
diff --git a/public/app/features/dashboard/export/exporter.ts b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
similarity index 98%
rename from public/app/features/dashboard/export/exporter.ts
rename to public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
index 7aecb5c384f..22b93b767d6 100644
--- a/public/app/features/dashboard/export/exporter.ts
+++ b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
@@ -1,6 +1,6 @@
import config from 'app/core/config';
import _ from 'lodash';
-import { DashboardModel } from '../dashboard_model';
+import { DashboardModel } from '../../dashboard_model';
export class DashboardExporter {
constructor(private datasourceSrv) {}
diff --git a/public/app/features/dashboard/components/DashExportModal/index.ts b/public/app/features/dashboard/components/DashExportModal/index.ts
new file mode 100644
index 00000000000..6529cf07ad9
--- /dev/null
+++ b/public/app/features/dashboard/components/DashExportModal/index.ts
@@ -0,0 +1,2 @@
+export { DashboardExporter } from './DashboardExporter';
+export { DashExportCtrl } from './DashExportCtrl';
diff --git a/public/app/features/dashboard/export/export_modal.html b/public/app/features/dashboard/components/DashExportModal/template.html
similarity index 100%
rename from public/app/features/dashboard/export/export_modal.html
rename to public/app/features/dashboard/components/DashExportModal/template.html
diff --git a/public/app/features/dashboard/dashlinks/module.ts b/public/app/features/dashboard/components/DashLinks/DashLinksContainerCtrl.ts
similarity index 99%
rename from public/app/features/dashboard/dashlinks/module.ts
rename to public/app/features/dashboard/components/DashLinks/DashLinksContainerCtrl.ts
index c951538d45d..a08e438a46c 100644
--- a/public/app/features/dashboard/dashlinks/module.ts
+++ b/public/app/features/dashboard/components/DashLinks/DashLinksContainerCtrl.ts
@@ -1,6 +1,6 @@
import angular from 'angular';
import _ from 'lodash';
-import { iconMap } from './editor';
+import { iconMap } from './DashLinksEditorCtrl';
function dashLinksContainer() {
return {
diff --git a/public/app/features/dashboard/dashlinks/editor.ts b/public/app/features/dashboard/components/DashLinks/DashLinksEditorCtrl.ts
similarity index 90%
rename from public/app/features/dashboard/dashlinks/editor.ts
rename to public/app/features/dashboard/components/DashLinks/DashLinksEditorCtrl.ts
index 482052469db..398ad757bf3 100644
--- a/public/app/features/dashboard/dashlinks/editor.ts
+++ b/public/app/features/dashboard/components/DashLinks/DashLinksEditorCtrl.ts
@@ -11,7 +11,7 @@ export let iconMap = {
cloud: 'fa-cloud',
};
-export class DashLinkEditorCtrl {
+export class DashLinksEditorCtrl {
dashboard: any;
iconMap: any;
mode: any;
@@ -65,8 +65,8 @@ export class DashLinkEditorCtrl {
function dashLinksEditor() {
return {
restrict: 'E',
- controller: DashLinkEditorCtrl,
- templateUrl: 'public/app/features/dashboard/dashlinks/editor.html',
+ controller: DashLinksEditorCtrl,
+ templateUrl: 'public/app/features/dashboard/components/DashLinks/editor.html',
bindToController: true,
controllerAs: 'ctrl',
scope: {
diff --git a/public/app/features/dashboard/dashlinks/editor.html b/public/app/features/dashboard/components/DashLinks/editor.html
similarity index 100%
rename from public/app/features/dashboard/dashlinks/editor.html
rename to public/app/features/dashboard/components/DashLinks/editor.html
diff --git a/public/app/features/dashboard/components/DashLinks/index.ts b/public/app/features/dashboard/components/DashLinks/index.ts
new file mode 100644
index 00000000000..ef118d4a84c
--- /dev/null
+++ b/public/app/features/dashboard/components/DashLinks/index.ts
@@ -0,0 +1,2 @@
+export { DashLinksContainerCtrl } from './DashLinksContainerCtrl';
+export { DashLinksEditorCtrl } from './DashLinksEditorCtrl';
diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/components/DashNav/DashNavCtrl.ts
similarity index 92%
rename from public/app/features/dashboard/dashnav/dashnav.ts
rename to public/app/features/dashboard/components/DashNav/DashNavCtrl.ts
index 1c83b2d0bdb..d7305b948dc 100644
--- a/public/app/features/dashboard/dashnav/dashnav.ts
+++ b/public/app/features/dashboard/components/DashNav/DashNavCtrl.ts
@@ -1,7 +1,7 @@
import moment from 'moment';
import angular from 'angular';
import { appEvents, NavModel } from 'app/core/core';
-import { DashboardModel } from '../dashboard_model';
+import { DashboardModel } from '../../dashboard_model';
export class DashNavCtrl {
dashboard: DashboardModel;
@@ -60,7 +60,7 @@ export class DashNavCtrl {
modalScope.dashboard = this.dashboard;
appEvents.emit('show-modal', {
- src: 'public/app/features/dashboard/partials/shareModal.html',
+ src: 'public/app/features/dashboard/components/ShareModal/template.html',
scope: modalScope,
});
}
@@ -107,7 +107,7 @@ export class DashNavCtrl {
export function dashNavDirective() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/dashnav/dashnav.html',
+ templateUrl: 'public/app/features/dashboard/components/DashNav/template.html',
controller: DashNavCtrl,
bindToController: true,
controllerAs: 'ctrl',
diff --git a/public/app/features/dashboard/components/DashNav/index.ts b/public/app/features/dashboard/components/DashNav/index.ts
new file mode 100644
index 00000000000..854e32b24d2
--- /dev/null
+++ b/public/app/features/dashboard/components/DashNav/index.ts
@@ -0,0 +1 @@
+export { DashNavCtrl } from './DashNavCtrl';
diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/components/DashNav/template.html
similarity index 100%
rename from public/app/features/dashboard/dashnav/dashnav.html
rename to public/app/features/dashboard/components/DashNav/template.html
diff --git a/public/app/features/dashboard/permissions/DashboardPermissions.tsx b/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
similarity index 89%
rename from public/app/features/dashboard/permissions/DashboardPermissions.tsx
rename to public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
index c07bef42930..506709fad75 100644
--- a/public/app/features/dashboard/permissions/DashboardPermissions.tsx
+++ b/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
@@ -1,5 +1,5 @@
import React, { PureComponent } from 'react';
-import Tooltip from 'app/core/components/Tooltip/Tooltip';
+import { Tooltip } from '@grafana/ui';
import SlideDown from 'app/core/components/Animations/SlideDown';
import { StoreState, FolderInfo } from 'app/types';
import { DashboardAcl, PermissionLevel, NewDashboardAclItem } from 'app/types/acl';
@@ -8,11 +8,11 @@ import {
addDashboardPermission,
removeDashboardPermission,
updateDashboardPermission,
-} from '../state/actions';
+} from '../../state/actions';
import PermissionList from 'app/core/components/PermissionList/PermissionList';
import AddPermission from 'app/core/components/PermissionList/AddPermission';
import PermissionsInfo from 'app/core/components/PermissionList/PermissionsInfo';
-import { connectWithStore } from '../../../core/utils/connectWithReduxStore';
+import { connectWithStore } from 'app/core/utils/connectWithReduxStore';
export interface Props {
dashboardId: number;
@@ -70,8 +70,10 @@ export class DashboardPermissions extends PureComponent
{
Permissions
-
-
+
+
+
+
diff --git a/public/app/features/dashboard/specs/save_modal.test.ts b/public/app/features/dashboard/components/SaveModals/SaveDashboardModalCtrl.test.ts
similarity index 97%
rename from public/app/features/dashboard/specs/save_modal.test.ts
rename to public/app/features/dashboard/components/SaveModals/SaveDashboardModalCtrl.test.ts
index 669ae43a0ff..f973c1b8e63 100644
--- a/public/app/features/dashboard/specs/save_modal.test.ts
+++ b/public/app/features/dashboard/components/SaveModals/SaveDashboardModalCtrl.test.ts
@@ -1,4 +1,4 @@
-import { SaveDashboardModalCtrl } from '../save_modal';
+import { SaveDashboardModalCtrl } from './SaveDashboardModalCtrl';
const setup = (timeChanged, variableValuesChanged, cb) => {
const dash = {
diff --git a/public/app/features/dashboard/save_modal.ts b/public/app/features/dashboard/components/SaveModals/SaveDashboardModalCtrl.ts
similarity index 100%
rename from public/app/features/dashboard/save_modal.ts
rename to public/app/features/dashboard/components/SaveModals/SaveDashboardModalCtrl.ts
diff --git a/public/app/features/dashboard/specs/save_provisioned_modal.test.ts b/public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.test.ts
similarity index 87%
rename from public/app/features/dashboard/specs/save_provisioned_modal.test.ts
rename to public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.test.ts
index a3ab27a984f..86048e861bd 100644
--- a/public/app/features/dashboard/specs/save_provisioned_modal.test.ts
+++ b/public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.test.ts
@@ -1,4 +1,4 @@
-import { SaveProvisionedDashboardModalCtrl } from '../save_provisioned_modal';
+import { SaveProvisionedDashboardModalCtrl } from './SaveProvisionedDashboardModalCtrl';
describe('SaveProvisionedDashboardModalCtrl', () => {
const json = {
diff --git a/public/app/features/dashboard/save_provisioned_modal.ts b/public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.ts
similarity index 100%
rename from public/app/features/dashboard/save_provisioned_modal.ts
rename to public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.ts
diff --git a/public/app/features/dashboard/components/SaveModals/index.ts b/public/app/features/dashboard/components/SaveModals/index.ts
new file mode 100644
index 00000000000..afab0796d28
--- /dev/null
+++ b/public/app/features/dashboard/components/SaveModals/index.ts
@@ -0,0 +1,2 @@
+export { SaveDashboardAsModalCtrl } from './SaveDashboardAsModalCtrl';
+export { SaveDashboardModalCtrl } from './SaveDashboardModalCtrl';
diff --git a/public/app/features/dashboard/specs/share_modal_ctrl.test.ts b/public/app/features/dashboard/components/ShareModal/ShareModalCtrl.test.ts
similarity index 96%
rename from public/app/features/dashboard/specs/share_modal_ctrl.test.ts
rename to public/app/features/dashboard/components/ShareModal/ShareModalCtrl.test.ts
index 70d301ed5ff..3181231cb53 100644
--- a/public/app/features/dashboard/specs/share_modal_ctrl.test.ts
+++ b/public/app/features/dashboard/components/ShareModal/ShareModalCtrl.test.ts
@@ -1,7 +1,6 @@
-import '../shareModalCtrl';
-import { ShareModalCtrl } from '../shareModalCtrl';
import config from 'app/core/config';
-import { LinkSrv } from 'app/features/dashboard/panellinks/link_srv';
+import { LinkSrv } from 'app/features/panel/panellinks/link_srv';
+import { ShareModalCtrl } from './ShareModalCtrl';
describe('ShareModalCtrl', () => {
const ctx = {
diff --git a/public/app/features/dashboard/shareModalCtrl.ts b/public/app/features/dashboard/components/ShareModal/ShareModalCtrl.ts
similarity index 100%
rename from public/app/features/dashboard/shareModalCtrl.ts
rename to public/app/features/dashboard/components/ShareModal/ShareModalCtrl.ts
diff --git a/public/app/features/dashboard/share_snapshot_ctrl.ts b/public/app/features/dashboard/components/ShareModal/ShareSnapshotCtrl.ts
similarity index 100%
rename from public/app/features/dashboard/share_snapshot_ctrl.ts
rename to public/app/features/dashboard/components/ShareModal/ShareSnapshotCtrl.ts
diff --git a/public/app/features/dashboard/components/ShareModal/index.ts b/public/app/features/dashboard/components/ShareModal/index.ts
new file mode 100644
index 00000000000..3f27d5a1ba3
--- /dev/null
+++ b/public/app/features/dashboard/components/ShareModal/index.ts
@@ -0,0 +1,2 @@
+export { ShareModalCtrl } from './ShareModalCtrl';
+export { ShareSnapshotCtrl } from './ShareSnapshotCtrl';
diff --git a/public/app/features/dashboard/partials/shareModal.html b/public/app/features/dashboard/components/ShareModal/template.html
similarity index 100%
rename from public/app/features/dashboard/partials/shareModal.html
rename to public/app/features/dashboard/components/ShareModal/template.html
diff --git a/public/app/features/dashboard/submenu/submenu.ts b/public/app/features/dashboard/components/SubMenu/SubMenuCtrl.ts
similarity index 86%
rename from public/app/features/dashboard/submenu/submenu.ts
rename to public/app/features/dashboard/components/SubMenu/SubMenuCtrl.ts
index 184d29facee..502e467ad2b 100644
--- a/public/app/features/dashboard/submenu/submenu.ts
+++ b/public/app/features/dashboard/components/SubMenu/SubMenuCtrl.ts
@@ -1,7 +1,7 @@
import angular from 'angular';
import _ from 'lodash';
-export class SubmenuCtrl {
+export class SubMenuCtrl {
annotations: any;
variables: any;
dashboard: any;
@@ -29,8 +29,8 @@ export class SubmenuCtrl {
export function submenuDirective() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/submenu/submenu.html',
- controller: SubmenuCtrl,
+ templateUrl: 'public/app/features/dashboard/components/SubMenu/template.html',
+ controller: SubMenuCtrl,
bindToController: true,
controllerAs: 'ctrl',
scope: {
diff --git a/public/app/features/dashboard/components/SubMenu/index.ts b/public/app/features/dashboard/components/SubMenu/index.ts
new file mode 100644
index 00000000000..1790aa66782
--- /dev/null
+++ b/public/app/features/dashboard/components/SubMenu/index.ts
@@ -0,0 +1 @@
+export { SubMenuCtrl } from './SubMenuCtrl';
diff --git a/public/app/features/dashboard/submenu/submenu.html b/public/app/features/dashboard/components/SubMenu/template.html
similarity index 100%
rename from public/app/features/dashboard/submenu/submenu.html
rename to public/app/features/dashboard/components/SubMenu/template.html
diff --git a/public/app/features/dashboard/timepicker/timepicker.ts b/public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts
similarity index 95%
rename from public/app/features/dashboard/timepicker/timepicker.ts
rename to public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts
index c89e49b54b3..0c388c27f8d 100644
--- a/public/app/features/dashboard/timepicker/timepicker.ts
+++ b/public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts
@@ -159,7 +159,7 @@ export class TimePickerCtrl {
export function settingsDirective() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/timepicker/settings.html',
+ templateUrl: 'public/app/features/dashboard/components/TimePicker/settings.html',
controller: TimePickerCtrl,
bindToController: true,
controllerAs: 'ctrl',
@@ -172,7 +172,7 @@ export function settingsDirective() {
export function timePickerDirective() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/timepicker/timepicker.html',
+ templateUrl: 'public/app/features/dashboard/components/TimePicker/template.html',
controller: TimePickerCtrl,
bindToController: true,
controllerAs: 'ctrl',
@@ -185,5 +185,5 @@ export function timePickerDirective() {
angular.module('grafana.directives').directive('gfTimePickerSettings', settingsDirective);
angular.module('grafana.directives').directive('gfTimePicker', timePickerDirective);
-import { inputDateDirective } from './input_date';
+import { inputDateDirective } from './validation';
angular.module('grafana.directives').directive('inputDatetime', inputDateDirective);
diff --git a/public/app/features/dashboard/components/TimePicker/index.ts b/public/app/features/dashboard/components/TimePicker/index.ts
new file mode 100644
index 00000000000..ca6e2792c43
--- /dev/null
+++ b/public/app/features/dashboard/components/TimePicker/index.ts
@@ -0,0 +1 @@
+export { TimePickerCtrl } from './TimePickerCtrl';
diff --git a/public/app/features/dashboard/timepicker/settings.html b/public/app/features/dashboard/components/TimePicker/settings.html
similarity index 100%
rename from public/app/features/dashboard/timepicker/settings.html
rename to public/app/features/dashboard/components/TimePicker/settings.html
diff --git a/public/app/features/dashboard/timepicker/timepicker.html b/public/app/features/dashboard/components/TimePicker/template.html
similarity index 100%
rename from public/app/features/dashboard/timepicker/timepicker.html
rename to public/app/features/dashboard/components/TimePicker/template.html
diff --git a/public/app/features/dashboard/timepicker/input_date.ts b/public/app/features/dashboard/components/TimePicker/validation.ts
similarity index 100%
rename from public/app/features/dashboard/timepicker/input_date.ts
rename to public/app/features/dashboard/components/TimePicker/validation.ts
diff --git a/public/app/features/dashboard/unsaved_changes_modal.ts b/public/app/features/dashboard/components/UnsavedChangesModal/UnsavedChangesModalCtrl.ts
similarity index 100%
rename from public/app/features/dashboard/unsaved_changes_modal.ts
rename to public/app/features/dashboard/components/UnsavedChangesModal/UnsavedChangesModalCtrl.ts
diff --git a/public/app/features/dashboard/components/UnsavedChangesModal/index.ts b/public/app/features/dashboard/components/UnsavedChangesModal/index.ts
new file mode 100644
index 00000000000..43943f06694
--- /dev/null
+++ b/public/app/features/dashboard/components/UnsavedChangesModal/index.ts
@@ -0,0 +1 @@
+export { UnsavedChangesModalCtrl } from './UnsavedChangesModalCtrl';
diff --git a/public/app/features/dashboard/specs/history_ctrl.test.ts b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.test.ts
similarity index 98%
rename from public/app/features/dashboard/specs/history_ctrl.test.ts
rename to public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.test.ts
index 632f3489dae..2b257e148f5 100644
--- a/public/app/features/dashboard/specs/history_ctrl.test.ts
+++ b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.test.ts
@@ -1,6 +1,6 @@
import _ from 'lodash';
-import { HistoryListCtrl } from 'app/features/dashboard/history/history';
-import { versions, compare, restore } from './history_mocks';
+import { HistoryListCtrl } from './HistoryListCtrl';
+import { versions, compare, restore } from './__mocks__/history';
import $q from 'q';
describe('HistoryListCtrl', () => {
diff --git a/public/app/features/dashboard/history/history.ts b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts
similarity index 96%
rename from public/app/features/dashboard/history/history.ts
rename to public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts
index 3563ccc7766..b8632e2eeae 100644
--- a/public/app/features/dashboard/history/history.ts
+++ b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts
@@ -1,12 +1,10 @@
-import './history_srv';
-
import _ from 'lodash';
import angular from 'angular';
import moment from 'moment';
import locationUtil from 'app/core/utils/location_util';
-import { DashboardModel } from '../dashboard_model';
-import { HistoryListOpts, RevisionsModel, CalculateDiffOptions, HistorySrv } from './history_srv';
+import { DashboardModel } from '../../dashboard_model';
+import { HistoryListOpts, RevisionsModel, CalculateDiffOptions, HistorySrv } from './HistorySrv';
export class HistoryListCtrl {
appending: boolean;
@@ -200,7 +198,7 @@ export class HistoryListCtrl {
export function dashboardHistoryDirective() {
return {
restrict: 'E',
- templateUrl: 'public/app/features/dashboard/history/history.html',
+ templateUrl: 'public/app/features/dashboard/components/VersionHistory/template.html',
controller: HistoryListCtrl,
bindToController: true,
controllerAs: 'ctrl',
diff --git a/public/app/features/dashboard/specs/history_srv.test.ts b/public/app/features/dashboard/components/VersionHistory/HistorySrv.test.ts
similarity index 90%
rename from public/app/features/dashboard/specs/history_srv.test.ts
rename to public/app/features/dashboard/components/VersionHistory/HistorySrv.test.ts
index 1e2bd57a221..75766060e7f 100644
--- a/public/app/features/dashboard/specs/history_srv.test.ts
+++ b/public/app/features/dashboard/components/VersionHistory/HistorySrv.test.ts
@@ -1,7 +1,6 @@
-import '../history/history_srv';
-import { versions, restore } from './history_mocks';
-import { HistorySrv } from '../history/history_srv';
-import { DashboardModel } from '../dashboard_model';
+import { versions, restore } from './__mocks__/history';
+import { HistorySrv } from './HistorySrv';
+import { DashboardModel } from '../../dashboard_model';
jest.mock('app/core/store');
describe('historySrv', () => {
diff --git a/public/app/features/dashboard/history/history_srv.ts b/public/app/features/dashboard/components/VersionHistory/HistorySrv.ts
similarity index 96%
rename from public/app/features/dashboard/history/history_srv.ts
rename to public/app/features/dashboard/components/VersionHistory/HistorySrv.ts
index 7f7dc950de3..d52f3ab879c 100644
--- a/public/app/features/dashboard/history/history_srv.ts
+++ b/public/app/features/dashboard/components/VersionHistory/HistorySrv.ts
@@ -1,6 +1,6 @@
import _ from 'lodash';
import coreModule from 'app/core/core_module';
-import { DashboardModel } from '../dashboard_model';
+import { DashboardModel } from '../../dashboard_model';
export interface HistoryListOpts {
limit: number;
diff --git a/public/app/features/dashboard/specs/history_mocks.ts b/public/app/features/dashboard/components/VersionHistory/__mocks__/history.ts
similarity index 100%
rename from public/app/features/dashboard/specs/history_mocks.ts
rename to public/app/features/dashboard/components/VersionHistory/__mocks__/history.ts
diff --git a/public/app/features/dashboard/components/VersionHistory/index.ts b/public/app/features/dashboard/components/VersionHistory/index.ts
new file mode 100644
index 00000000000..138de434bf3
--- /dev/null
+++ b/public/app/features/dashboard/components/VersionHistory/index.ts
@@ -0,0 +1,2 @@
+export { HistoryListCtrl } from './HistoryListCtrl';
+export { HistorySrv } from './HistorySrv';
diff --git a/public/app/features/dashboard/history/history.html b/public/app/features/dashboard/components/VersionHistory/template.html
similarity index 100%
rename from public/app/features/dashboard/history/history.html
rename to public/app/features/dashboard/components/VersionHistory/template.html
diff --git a/public/app/features/dashboard/dashboard_ctrl.ts b/public/app/features/dashboard/dashboard_ctrl.ts
index 6611a728803..5c4480dbad5 100644
--- a/public/app/features/dashboard/dashboard_ctrl.ts
+++ b/public/app/features/dashboard/dashboard_ctrl.ts
@@ -22,7 +22,6 @@ export class DashboardCtrl {
private keybindingSrv,
private timeSrv,
private variableSrv,
- private alertingSrv,
private dashboardSrv,
private unsavedChangesSrv,
private dashboardViewStateSrv,
@@ -54,7 +53,6 @@ export class DashboardCtrl {
// init services
this.timeSrv.init(dashboard);
- this.alertingSrv.init(dashboard, data.alerts);
this.annotationsSrv.init(dashboard);
// template values service needs to initialize completely before
diff --git a/public/app/features/dashboard/dashboard_migration.ts b/public/app/features/dashboard/dashboard_migration.ts
index abd12ab4b13..2dbeb6c6e80 100644
--- a/public/app/features/dashboard/dashboard_migration.ts
+++ b/public/app/features/dashboard/dashboard_migration.ts
@@ -9,6 +9,7 @@ import {
} from 'app/core/constants';
import { PanelModel } from './panel_model';
import { DashboardModel } from './dashboard_model';
+import getFactors from 'app/core/utils/factors';
export class DashboardMigrator {
dashboard: DashboardModel;
@@ -21,7 +22,7 @@ export class DashboardMigrator {
let i, j, k, n;
const oldVersion = this.dashboard.schemaVersion;
const panelUpgrades = [];
- this.dashboard.schemaVersion = 16;
+ this.dashboard.schemaVersion = 17;
if (oldVersion === this.dashboard.schemaVersion) {
return;
@@ -368,6 +369,24 @@ export class DashboardMigrator {
this.upgradeToGridLayout(old);
}
+ if (oldVersion < 17) {
+ panelUpgrades.push(panel => {
+ if (panel.minSpan) {
+ const max = GRID_COLUMN_COUNT / panel.minSpan;
+ const factors = getFactors(GRID_COLUMN_COUNT);
+ // find the best match compared to factors
+ // (ie. [1,2,3,4,6,12,24] for 24 columns)
+ panel.maxPerRow =
+ factors[
+ _.findIndex(factors, o => {
+ return o > max;
+ }) - 1
+ ];
+ }
+ delete panel.minSpan;
+ });
+ }
+
if (panelUpgrades.length === 0) {
return;
}
diff --git a/public/app/features/dashboard/dashboard_model.ts b/public/app/features/dashboard/dashboard_model.ts
index 6f98bc5a17a..2ae2df0124b 100644
--- a/public/app/features/dashboard/dashboard_model.ts
+++ b/public/app/features/dashboard/dashboard_model.ts
@@ -1,8 +1,8 @@
import moment from 'moment';
import _ from 'lodash';
+import { DEFAULT_ANNOTATION_COLOR } from '@grafana/ui';
import { GRID_COLUMN_COUNT, REPEAT_DIR_VERTICAL, GRID_CELL_HEIGHT, GRID_CELL_VMARGIN } from 'app/core/constants';
-import { DEFAULT_ANNOTATION_COLOR } from 'app/core/utils/colors';
import { Emitter } from 'app/core/utils/emitter';
import { contextSrv } from 'app/core/services/context_srv';
import sortByKeys from 'app/core/utils/sort_by_keys';
@@ -442,7 +442,7 @@ export class DashboardModel {
}
const selectedOptions = this.getSelectedVariableOptions(variable);
- const minWidth = panel.minSpan || 6;
+ const maxPerRow = panel.maxPerRow || 4;
let xPos = 0;
let yPos = panel.gridPos.y;
@@ -462,7 +462,7 @@ export class DashboardModel {
} else {
// set width based on how many are selected
// assumed the repeated panels should take up full row width
- copy.gridPos.w = Math.max(GRID_COLUMN_COUNT / selectedOptions.length, minWidth);
+ copy.gridPos.w = Math.max(GRID_COLUMN_COUNT / selectedOptions.length, GRID_COLUMN_COUNT / maxPerRow);
copy.gridPos.x = xPos;
copy.gridPos.y = yPos;
diff --git a/public/app/features/dashboard/dashgrid/AlertTab.tsx b/public/app/features/dashboard/dashgrid/AlertTab.tsx
deleted file mode 100644
index 7df7864c758..00000000000
--- a/public/app/features/dashboard/dashgrid/AlertTab.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import React, { PureComponent } from 'react';
-
-import { getAngularLoader, AngularComponent } from 'app/core/services/AngularLoader';
-import { EditorTabBody } from './EditorTabBody';
-import 'app/features/alerting/AlertTabCtrl';
-
-interface Props {
- angularPanel?: AngularComponent;
-}
-
-export class AlertTab extends PureComponent {
- element: any;
- component: AngularComponent;
-
- constructor(props) {
- super(props);
- }
-
- componentDidMount() {
- if (this.shouldLoadAlertTab()) {
- this.loadAlertTab();
- }
- }
-
- componentDidUpdate(prevProps: Props) {
- if (this.shouldLoadAlertTab()) {
- this.loadAlertTab();
- }
- }
-
- shouldLoadAlertTab() {
- return this.props.angularPanel && this.element;
- }
-
- componentWillUnmount() {
- if (this.component) {
- this.component.destroy();
- }
- }
-
- loadAlertTab() {
- const { angularPanel } = this.props;
-
- const scope = angularPanel.getScope();
-
- // When full page reloading in edit mode the angular panel has on fully compiled & instantiated yet
- if (!scope.$$childHead) {
- setTimeout(() => {
- this.forceUpdate();
- });
- return;
- }
-
- const panelCtrl = scope.$$childHead.ctrl;
- const loader = getAngularLoader();
- const template = '';
-
- const scopeProps = {
- ctrl: panelCtrl,
- };
-
- this.component = loader.load(this.element, scopeProps, template);
- }
-
- render() {
- return (
-
- (this.element = element)} />
-
- );
- }
-}
diff --git a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
index 9de298e0799..cfff64cb042 100644
--- a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
@@ -5,11 +5,11 @@ import classNames from 'classnames';
import { getAngularLoader, AngularComponent } from 'app/core/services/AngularLoader';
import { importPluginModule } from 'app/features/plugins/plugin_loader';
-import { AddPanelPanel } from './AddPanelPanel';
+import { AddPanelWidget } from '../components/AddPanelWidget';
import { getPanelPluginNotFound } from './PanelPluginNotFound';
import { DashboardRow } from './DashboardRow';
import { PanelChrome } from './PanelChrome';
-import { PanelEditor } from './PanelEditor';
+import { PanelEditor } from '../panel_editor/PanelEditor';
import { PanelModel } from '../panel_model';
import { DashboardModel } from '../dashboard_model';
@@ -53,7 +53,7 @@ export class DashboardPanel extends PureComponent
{
}
renderAddPanel() {
- return ;
+ return ;
}
onPluginTypeChanged = (plugin: PanelPlugin) => {
diff --git a/public/app/features/dashboard/dashgrid/DataPanel.tsx b/public/app/features/dashboard/dashgrid/DataPanel.tsx
index 30a939b50aa..d4f6859f1b6 100644
--- a/public/app/features/dashboard/dashgrid/DataPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/DataPanel.tsx
@@ -1,5 +1,9 @@
// Library
import React, { Component } from 'react';
+import { Tooltip } from '@grafana/ui';
+import { Themes } from '@grafana/ui/src/components/Tooltip/Popper';
+
+import ErrorBoundary from 'app/core/components/ErrorBoundary/ErrorBoundary';
// Services
import { getDatasourceSrv, DatasourceSrv } from 'app/features/plugins/datasource_srv';
@@ -8,8 +12,9 @@ import { getDatasourceSrv, DatasourceSrv } from 'app/features/plugins/datasource
import kbn from 'app/core/utils/kbn';
// Types
-import { DataQueryOptions, DataQueryResponse } from 'app/types';
-import { TimeRange, TimeSeries, LoadingState } from '@grafana/ui';
+import { TimeRange, TimeSeries, LoadingState, DataQueryResponse, DataQueryOptions } from '@grafana/ui/src/types';
+
+const DEFAULT_PLUGIN_ERROR = 'Error in plugin';
interface RenderProps {
loading: LoadingState;
@@ -33,6 +38,7 @@ export interface Props {
export interface State {
isFirstLoad: boolean;
loading: LoadingState;
+ errorMessage: string;
response: DataQueryResponse;
}
@@ -51,6 +57,7 @@ export class DataPanel extends Component {
this.state = {
loading: LoadingState.NotStarted,
+ errorMessage: '',
response: {
data: [],
},
@@ -90,7 +97,7 @@ export class DataPanel extends Component {
return;
}
- this.setState({ loading: LoadingState.Loading });
+ this.setState({ loading: LoadingState.Loading, errorMessage: '' });
try {
const ds = await this.dataSourceSrv.get(datasource);
@@ -128,7 +135,17 @@ export class DataPanel extends Component {
});
} catch (err) {
console.log('Loading error', err);
- this.setState({ loading: LoadingState.Error, isFirstLoad: false });
+ this.onError('Request Error');
+ }
+ };
+
+ onError = (errorMessage: string) => {
+ if (this.state.loading !== LoadingState.Error || this.state.errorMessage !== errorMessage) {
+ this.setState({
+ loading: LoadingState.Error,
+ isFirstLoad: false,
+ errorMessage: errorMessage,
+ });
}
};
@@ -139,7 +156,7 @@ export class DataPanel extends Component {
const timeSeries = response.data;
if (isFirstLoad && loading === LoadingState.Loading) {
- return this.renderLoadingSpinner();
+ return this.renderLoadingStates();
}
if (!queries.length) {
@@ -152,24 +169,44 @@ export class DataPanel extends Component {
return (
<>
- {this.renderLoadingSpinner()}
- {this.props.children({
- timeSeries,
- loading,
- })}
+ {this.renderLoadingStates()}
+
+ {({ error, errorInfo }) => {
+ if (errorInfo) {
+ this.onError(error.message || DEFAULT_PLUGIN_ERROR);
+ return null;
+ }
+ return (
+ <>
+ {this.props.children({
+ timeSeries,
+ loading,
+ })}
+
+ );
+ }}
+
);
}
- private renderLoadingSpinner(): JSX.Element {
- const { loading } = this.state;
-
+ private renderLoadingStates(): JSX.Element {
+ const { loading, errorMessage } = this.state;
if (loading === LoadingState.Loading) {
return (
);
+ } else if (loading === LoadingState.Error) {
+ return (
+
+
+
+
+
+
+ );
}
return null;
diff --git a/public/app/features/dashboard/dashgrid/KeyboardNavigation.tsx b/public/app/features/dashboard/dashgrid/KeyboardNavigation.tsx
deleted file mode 100644
index dab8371c925..00000000000
--- a/public/app/features/dashboard/dashgrid/KeyboardNavigation.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import React, { KeyboardEvent, Component } from 'react';
-
-interface State {
- selected: number;
-}
-
-export interface KeyboardNavigationProps {
- onKeyDown: (evt: KeyboardEvent, maxSelectedIndex: number, onEnterAction: () => void) => void;
- onMouseEnter: (select: number) => void;
- selected: number;
-}
-
-interface Props {
- render: (injectProps: any) => void;
-}
-
-class KeyboardNavigation extends Component {
- constructor(props) {
- super(props);
-
- this.state = {
- selected: 0,
- };
- }
-
- goToNext = (maxSelectedIndex: number) => {
- const nextIndex = this.state.selected >= maxSelectedIndex ? 0 : this.state.selected + 1;
- this.setState({
- selected: nextIndex,
- });
- };
-
- goToPrev = (maxSelectedIndex: number) => {
- const nextIndex = this.state.selected <= 0 ? maxSelectedIndex : this.state.selected - 1;
- this.setState({
- selected: nextIndex,
- });
- };
-
- onKeyDown = (evt: KeyboardEvent, maxSelectedIndex: number, onEnterAction: any) => {
- if (evt.key === 'ArrowDown') {
- evt.preventDefault();
- this.goToNext(maxSelectedIndex);
- }
- if (evt.key === 'ArrowUp') {
- evt.preventDefault();
- this.goToPrev(maxSelectedIndex);
- }
- if (evt.key === 'Enter' && onEnterAction) {
- onEnterAction();
- }
- };
-
- onMouseEnter = (mouseEnterIndex: number) => {
- this.setState({
- selected: mouseEnterIndex,
- });
- };
-
- render() {
- const injectProps = {
- onKeyDown: this.onKeyDown,
- onMouseEnter: this.onMouseEnter,
- selected: this.state.selected,
- };
-
- return <>{this.props.render({ ...injectProps })};
- }
-}
-
-export default KeyboardNavigation;
diff --git a/public/app/features/dashboard/dashgrid/PanelChrome.tsx b/public/app/features/dashboard/dashgrid/PanelChrome.tsx
index 94719dfe6e0..6b4ef48c32e 100644
--- a/public/app/features/dashboard/dashgrid/PanelChrome.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelChrome.tsx
@@ -19,6 +19,9 @@ import { DashboardModel } from '../dashboard_model';
import { PanelPlugin } from 'app/types';
import { TimeRange } from '@grafana/ui';
+import variables from 'sass/_variables.scss';
+import templateSrv from 'app/features/templating/template_srv';
+
export interface Props {
panel: PanelModel;
dashboard: DashboardModel;
@@ -76,6 +79,10 @@ export class PanelChrome extends PureComponent {
});
};
+ onInterpolate = (value: string, format?: string) => {
+ return templateSrv.replace(value, this.props.panel.scopedVars, format);
+ };
+
get isVisible() {
return !this.props.dashboard.otherPanelInFullscreen(this.props.panel);
}
@@ -87,7 +94,6 @@ export class PanelChrome extends PureComponent {
const { datasource, targets, transparent } = panel;
const PanelComponent = plugin.exports.Panel;
const containerClassNames = `panel-container panel-container--absolute ${transparent ? 'panel-transparent' : ''}`;
-
return (
{({ width, height }) => {
@@ -123,9 +129,10 @@ export class PanelChrome extends PureComponent {
timeSeries={timeSeries}
timeRange={timeRange}
options={panel.getOptions(plugin.exports.PanelDefaults)}
- width={width}
- height={height - PANEL_HEADER_HEIGHT}
+ width={width - 2 * variables.panelHorizontalPadding}
+ height={height - PANEL_HEADER_HEIGHT - variables.panelVerticalPadding}
renderCounter={renderCounter}
+ onInterpolate={this.onInterpolate}
/>
- {panel.title}
+ {title}
{this.state.panelMenuOpen && (
diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx
index 331e469a60d..01f790f73ee 100644
--- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx
@@ -1,10 +1,10 @@
import React, { Component } from 'react';
-import { PanelModel } from 'app/features/dashboard/panel_model';
-import Tooltip from 'app/core/components/Tooltip/Tooltip';
-import templateSrv from 'app/features/templating/template_srv';
-import { LinkSrv } from 'app/features/dashboard/panellinks/link_srv';
-import { getTimeSrv, TimeSrv } from 'app/features/dashboard/time_srv';
import Remarkable from 'remarkable';
+import { Tooltip } from '@grafana/ui';
+import { PanelModel } from 'app/features/dashboard/panel_model';
+import templateSrv from 'app/features/templating/template_srv';
+import { LinkSrv } from 'app/features/panel/panellinks/link_srv';
+import { getTimeSrv, TimeSrv } from 'app/features/dashboard/time_srv';
enum InfoModes {
Error = 'Error',
@@ -78,12 +78,14 @@ export class PanelHeaderCorner extends Component
{
{infoMode === InfoModes.Info || infoMode === InfoModes.Links ? (
-
-
+
+
+
+
) : null}
diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx
index d42b48fe1d6..66a942f0afc 100644
--- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx
@@ -1,11 +1,11 @@
-import React, { SFC } from 'react';
+import React, { FC } from 'react';
import { PanelMenuItem } from '@grafana/ui';
interface Props {
children: any;
}
-export const PanelHeaderMenuItem: SFC = props => {
+export const PanelHeaderMenuItem: FC = props => {
const isSubMenu = props.type === 'submenu';
const isDivider = props.type === 'divider';
return isDivider ? (
diff --git a/public/app/features/dashboard/dashgrid/PanelLoader.ts b/public/app/features/dashboard/dashgrid/PanelLoader.ts
deleted file mode 100644
index c654b756085..00000000000
--- a/public/app/features/dashboard/dashgrid/PanelLoader.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import angular from 'angular';
-import coreModule from 'app/core/core_module';
-
-export interface AttachedPanel {
- destroy();
-}
-
-export class PanelLoader {
- /** @ngInject */
- constructor(private $compile, private $rootScope) {}
-
- load(elem, panel, dashboard): AttachedPanel {
- const template = '';
- const panelScope = this.$rootScope.$new();
- panelScope.panel = panel;
- panelScope.dashboard = dashboard;
-
- const compiledElem = this.$compile(template)(panelScope);
- const rootNode = angular.element(elem);
- rootNode.append(compiledElem);
-
- return {
- destroy: () => {
- panelScope.$destroy();
- compiledElem.remove();
- },
- };
- }
-}
-
-coreModule.service('panelLoader', PanelLoader);
diff --git a/public/app/features/dashboard/dashgrid/PanelResizer.tsx b/public/app/features/dashboard/dashgrid/PanelResizer.tsx
index 2a4bf8379a6..ca8abd0d1e3 100644
--- a/public/app/features/dashboard/dashgrid/PanelResizer.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelResizer.tsx
@@ -15,7 +15,7 @@ interface State {
}
export class PanelResizer extends PureComponent {
- initialHeight: number = Math.floor(document.documentElement.scrollHeight * 0.4);
+ initialHeight: number = Math.floor(document.documentElement.scrollHeight * 0.3);
prevEditorHeight: number;
throttledChangeHeight: (height: number) => void;
throttledResizeDone: () => void;
diff --git a/public/app/features/dashboard/folder_permissions_ctrl.ts b/public/app/features/dashboard/folder_permissions_ctrl.ts
deleted file mode 100644
index 4ab91acb3d9..00000000000
--- a/public/app/features/dashboard/folder_permissions_ctrl.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { FolderPageLoader } from './folder_page_loader';
-
-export class FolderPermissionsCtrl {
- navModel: any;
- folderId: number;
- uid: string;
- dashboard: any;
- meta: any;
-
- /** @ngInject */
- constructor(private backendSrv, navModelSrv, private $routeParams, $location) {
- if (this.$routeParams.uid) {
- this.uid = $routeParams.uid;
-
- new FolderPageLoader(this.backendSrv).load(this, this.uid, 'manage-folder-permissions').then(folder => {
- if ($location.path() !== folder.meta.url) {
- $location.path(`${folder.meta.url}/permissions`).replace();
- }
-
- this.dashboard = folder.dashboard;
- this.meta = folder.meta;
- });
- }
- }
-}
diff --git a/public/app/features/dashboard/index.ts b/public/app/features/dashboard/index.ts
new file mode 100644
index 00000000000..efa54f0ee07
--- /dev/null
+++ b/public/app/features/dashboard/index.ts
@@ -0,0 +1,33 @@
+import './dashboard_ctrl';
+import './time_srv';
+import './dashgrid/DashboardGridDirective';
+
+// Services
+import './services/DashboardViewStateSrv';
+import './services/UnsavedChangesSrv';
+import './services/DashboardLoaderSrv';
+import './services/DashboardSrv';
+
+// Components
+import './components/DashLinks';
+import './components/DashExportModal';
+import './components/DashNav';
+import './components/ExportDataModal';
+import './components/FolderPicker';
+import './components/VersionHistory';
+import './components/DashboardSettings';
+import './components/SubMenu';
+import './components/TimePicker';
+import './components/UnsavedChangesModal';
+import './components/SaveModals';
+import './components/ShareModal';
+import './components/AdHocFilters';
+import './components/RowOptions';
+
+import DashboardPermissions from './components/DashboardPermissions/DashboardPermissions';
+
+// angular wrappers
+import { react2AngularDirective } from 'app/core/utils/react2angular';
+
+react2AngularDirective('dashboardPermissions', DashboardPermissions, ['dashboardId', 'folder']);
+
diff --git a/public/app/features/dashboard/dashgrid/DataSourceOption.tsx b/public/app/features/dashboard/panel_editor/DataSourceOption.tsx
similarity index 75%
rename from public/app/features/dashboard/dashgrid/DataSourceOption.tsx
rename to public/app/features/dashboard/panel_editor/DataSourceOption.tsx
index 0adfc4abe16..e4bbcfffe1d 100644
--- a/public/app/features/dashboard/dashgrid/DataSourceOption.tsx
+++ b/public/app/features/dashboard/panel_editor/DataSourceOption.tsx
@@ -1,5 +1,5 @@
-import React, { SFC } from 'react';
-import Tooltip from 'app/core/components/Tooltip/Tooltip';
+import React, { FC } from 'react';
+import { Tooltip } from '@grafana/ui';
interface Props {
label: string;
@@ -10,7 +10,7 @@ interface Props {
tooltipInfo?: any;
}
-export const DataSourceOptions: SFC = ({ label, placeholder, name, value, onChange, tooltipInfo }) => {
+export const DataSourceOptions: FC = ({ label, placeholder, name, value, onChange, tooltipInfo }) => {
const dsOption = (
diff --git a/public/app/features/dashboard/dashgrid/EditorTabBody.tsx b/public/app/features/dashboard/panel_editor/EditorTabBody.tsx
similarity index 65%
rename from public/app/features/dashboard/dashgrid/EditorTabBody.tsx
rename to public/app/features/dashboard/panel_editor/EditorTabBody.tsx
index 7606d327405..0413cae8a7b 100644
--- a/public/app/features/dashboard/dashgrid/EditorTabBody.tsx
+++ b/public/app/features/dashboard/panel_editor/EditorTabBody.tsx
@@ -2,29 +2,31 @@
import React, { PureComponent } from 'react';
// Components
-import CustomScrollbar from 'app/core/components/CustomScrollbar/CustomScrollbar';
+import { CustomScrollbar, PanelOptionsGroup } from '@grafana/ui';
import { FadeIn } from 'app/core/components/Animations/FadeIn';
-import { PanelOptionSection } from './PanelOptionSection';
interface Props {
children: JSX.Element;
heading: string;
renderToolbar?: () => JSX.Element;
- toolbarItems?: EditorToolBarView[];
+ toolbarItems?: EditorToolbarView[];
+ scrollTop?: number;
+ setScrollTop?: (value: React.MouseEvent
) => void;
}
-export interface EditorToolBarView {
+export interface EditorToolbarView {
title?: string;
heading?: string;
- imgSrc?: string;
icon?: string;
disabled?: boolean;
onClick?: () => void;
- render: (closeFunction?: any) => JSX.Element | JSX.Element[];
+ render?: () => JSX.Element;
+ action?: () => void;
+ btnType?: 'danger';
}
interface State {
- openView?: EditorToolBarView;
+ openView?: EditorToolbarView;
isOpen: boolean;
fadeIn: boolean;
}
@@ -48,10 +50,10 @@ export class EditorTabBody extends PureComponent {
this.setState({ fadeIn: true });
}
- onToggleToolBarView = (item: EditorToolBarView) => {
+ onToggleToolBarView = (item: EditorToolbarView) => {
this.setState({
openView: item,
- isOpen: !this.state.isOpen,
+ isOpen: this.state.openView !== item || !this.state.isOpen,
});
};
@@ -74,12 +76,15 @@ export class EditorTabBody extends PureComponent {
return state;
}
- renderButton(view: EditorToolBarView) {
+ renderButton(view: EditorToolbarView) {
const onClick = () => {
if (view.onClick) {
view.onClick();
}
- this.onToggleToolBarView(view);
+
+ if (view.render) {
+ this.onToggleToolBarView(view);
+ }
};
return (
@@ -91,32 +96,29 @@ export class EditorTabBody extends PureComponent {
);
}
- renderOpenView(view: EditorToolBarView) {
+ renderOpenView(view: EditorToolbarView) {
return (
-
+
{view.render()}
-
+
);
}
render() {
- const { children, renderToolbar, heading, toolbarItems } = this.props;
+ const { children, renderToolbar, heading, toolbarItems, scrollTop, setScrollTop } = this.props;
const { openView, fadeIn, isOpen } = this.state;
return (
<>
-
{heading}
- {renderToolbar && renderToolbar()}
- {toolbarItems.length > 0 && (
- <>
-
- {toolbarItems.map(item => this.renderButton(item))}
-
- )}
+
+
{heading}
+ {renderToolbar && renderToolbar()}
+
+ {toolbarItems.map(item => this.renderButton(item))}
-
+
{openView && this.renderOpenView(openView)}
diff --git a/public/app/features/dashboard/dashgrid/GeneralTab.tsx b/public/app/features/dashboard/panel_editor/GeneralTab.tsx
similarity index 100%
rename from public/app/features/dashboard/dashgrid/GeneralTab.tsx
rename to public/app/features/dashboard/panel_editor/GeneralTab.tsx
diff --git a/public/app/features/dashboard/dashgrid/PanelEditor.tsx b/public/app/features/dashboard/panel_editor/PanelEditor.tsx
similarity index 92%
rename from public/app/features/dashboard/dashgrid/PanelEditor.tsx
rename to public/app/features/dashboard/panel_editor/PanelEditor.tsx
index a746d6c4b91..a09ff66f114 100644
--- a/public/app/features/dashboard/dashgrid/PanelEditor.tsx
+++ b/public/app/features/dashboard/panel_editor/PanelEditor.tsx
@@ -4,7 +4,7 @@ import classNames from 'classnames';
import { QueriesTab } from './QueriesTab';
import { VisualizationTab } from './VisualizationTab';
import { GeneralTab } from './GeneralTab';
-import { AlertTab } from './AlertTab';
+import { AlertTab } from '../../alerting/AlertTab';
import config from 'app/core/config';
import { store } from 'app/store/store';
@@ -15,7 +15,8 @@ import { PanelModel } from '../panel_model';
import { DashboardModel } from '../dashboard_model';
import { PanelPlugin } from 'app/types/plugins';
-import Tooltip from 'app/core/components/Tooltip/Tooltip';
+import { Tooltip } from '@grafana/ui';
+import { Themes } from '@grafana/ui/src/components/Tooltip/Popper';
interface PanelEditorProps {
panel: PanelModel;
@@ -54,7 +55,7 @@ export class PanelEditor extends PureComponent {
case 'queries':
return ;
case 'alert':
- return ;
+ return ;
case 'visualization':
return (
onClick(tab)}>
-
+
diff --git a/public/app/features/dashboard/dashgrid/QueriesTab.tsx b/public/app/features/dashboard/panel_editor/QueriesTab.tsx
similarity index 50%
rename from public/app/features/dashboard/dashgrid/QueriesTab.tsx
rename to public/app/features/dashboard/panel_editor/QueriesTab.tsx
index 9ad0bb3cadd..28d822e3ad5 100644
--- a/public/app/features/dashboard/dashgrid/QueriesTab.tsx
+++ b/public/app/features/dashboard/panel_editor/QueriesTab.tsx
@@ -1,26 +1,24 @@
// Libraries
-import React, { SFC, PureComponent } from 'react';
+import React, { PureComponent } from 'react';
import _ from 'lodash';
// Components
-import './../../panel/metrics_tab';
-import { EditorTabBody } from './EditorTabBody';
+import { EditorTabBody, EditorToolbarView } from './EditorTabBody';
import { DataSourcePicker } from 'app/core/components/Select/DataSourcePicker';
import { QueryInspector } from './QueryInspector';
import { QueryOptions } from './QueryOptions';
-import { AngularQueryComponentScope } from 'app/features/panel/metrics_tab';
-import { PanelOptionSection } from './PanelOptionSection';
+import { PanelOptionsGroup } from '@grafana/ui';
+import { QueryEditorRow } from './QueryEditorRow';
// Services
import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
-import { getBackendSrv, BackendSrv } from 'app/core/services/backend_srv';
-import { getAngularLoader, AngularComponent } from 'app/core/services/AngularLoader';
+import { BackendSrv, getBackendSrv } from 'app/core/services/backend_srv';
import config from 'app/core/config';
// Types
import { PanelModel } from '../panel_model';
import { DashboardModel } from '../dashboard_model';
-import { DataSourceSelectItem, DataQuery } from 'app/types';
+import { DataQuery, DataSourceSelectItem } from '@grafana/ui/src/types';
import { PluginHelp } from 'app/core/components/PluginHelp/PluginHelp';
interface Props {
@@ -34,66 +32,25 @@ interface State {
isLoadingHelp: boolean;
isPickerOpen: boolean;
isAddingMixed: boolean;
+ scrollTop: number;
}
-interface LoadingPlaceholderProps {
- text: string;
-}
-
-const LoadingPlaceholder: SFC = ({ text }) => {text}
;
-
export class QueriesTab extends PureComponent {
- element: HTMLElement;
- component: AngularComponent;
datasources: DataSourceSelectItem[] = getDatasourceSrv().getMetricSources();
backendSrv: BackendSrv = getBackendSrv();
- constructor(props) {
- super(props);
- const { panel } = props;
+ state: State = {
+ isLoadingHelp: false,
+ currentDS: this.findCurrentDataSource(),
+ helpContent: null,
+ isPickerOpen: false,
+ isAddingMixed: false,
+ scrollTop: 0,
+ };
- this.state = {
- currentDS: this.datasources.find(datasource => datasource.value === panel.datasource),
- isLoadingHelp: false,
- helpContent: null,
- isPickerOpen: false,
- isAddingMixed: false,
- };
- }
-
- getAngularQueryComponentScope(): AngularQueryComponentScope {
- const { panel, dashboard } = this.props;
-
- return {
- panel: panel,
- dashboard: dashboard,
- refresh: () => panel.refresh(),
- render: () => panel.render,
- addQuery: this.onAddQuery,
- moveQuery: this.onMoveQuery,
- removeQuery: this.onRemoveQuery,
- events: panel.events,
- };
- }
-
- componentDidMount() {
- if (!this.element) {
- return;
- }
-
- const loader = getAngularLoader();
- const template = '';
- const scopeProps = {
- ctrl: this.getAngularQueryComponentScope(),
- };
-
- this.component = loader.load(this.element, scopeProps, template);
- }
-
- componentWillUnmount() {
- if (this.component) {
- this.component.destroy();
- }
+ findCurrentDataSource(): DataSourceSelectItem {
+ const { panel } = this.props;
+ return this.datasources.find(datasource => datasource.value === panel.datasource) || this.datasources[0];
}
onChangeDataSource = datasource => {
@@ -130,7 +87,7 @@ export class QueriesTab extends PureComponent {
renderQueryInspector = () => {
const { panel } = this.props;
- return ;
+ return ;
};
renderHelp = () => {
@@ -139,7 +96,7 @@ export class QueriesTab extends PureComponent {
onAddQuery = (query?: Partial) => {
this.props.panel.addQuery(query);
- this.forceUpdate();
+ this.setState({ scrollTop: this.state.scrollTop + 100000 });
};
onAddQueryClick = () => {
@@ -148,9 +105,7 @@ export class QueriesTab extends PureComponent {
return;
}
- this.props.panel.addQuery();
- this.component.digest();
- this.forceUpdate();
+ this.onAddQuery();
};
onRemoveQuery = (query: DataQuery) => {
@@ -173,9 +128,20 @@ export class QueriesTab extends PureComponent {
};
renderToolbar = () => {
- const { currentDS } = this.state;
+ const { currentDS, isAddingMixed } = this.state;
- return ;
+ return (
+ <>
+
+
+ {!isAddingMixed && (
+
+ )}
+ {isAddingMixed && this.renderMixedPicker()}
+
+ );
};
renderMixedPicker = () => {
@@ -192,59 +158,59 @@ export class QueriesTab extends PureComponent {
onAddMixedQuery = datasource => {
this.onAddQuery({ datasource: datasource.name });
- this.component.digest();
- this.setState({ isAddingMixed: false });
+ this.setState({ isAddingMixed: false, scrollTop: this.state.scrollTop + 10000 });
};
onMixedPickerBlur = () => {
this.setState({ isAddingMixed: false });
};
+ setScrollTop = (event: React.MouseEvent) => {
+ const target = event.target as HTMLElement;
+ this.setState({ scrollTop: target.scrollTop });
+ };
+
render() {
const { panel } = this.props;
- const { currentDS, isAddingMixed } = this.state;
+ const { currentDS, scrollTop } = this.state;
- const queryInspector = {
+ const queryInspector: EditorToolbarView = {
title: 'Query Inspector',
render: this.renderQueryInspector,
};
- const dsHelp = {
+ const dsHelp: EditorToolbarView = {
heading: 'Help',
icon: 'fa fa-question',
render: this.renderHelp,
};
return (
-
+
<>
-
-
-
(this.element = element)} />
-
-
-
-
-
-
- {!isAddingMixed && (
-
- )}
- {isAddingMixed && this.renderMixedPicker()}
-
-
-
-
-
+
+ {panel.targets.map((query, index) => (
+
+ ))}
+
+
-
+
);
diff --git a/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx b/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx
new file mode 100644
index 00000000000..2651ab0608c
--- /dev/null
+++ b/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx
@@ -0,0 +1,257 @@
+// Libraries
+import React, { PureComponent } from 'react';
+import classNames from 'classnames';
+import _ from 'lodash';
+
+// Utils & Services
+import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
+import { AngularComponent, getAngularLoader } from 'app/core/services/AngularLoader';
+import { Emitter } from 'app/core/utils/emitter';
+
+// Types
+import { PanelModel } from '../panel_model';
+import { DataQuery, DataSourceApi } from '@grafana/ui';
+
+interface Props {
+ panel: PanelModel;
+ query: DataQuery;
+ onAddQuery: (query?: DataQuery) => void;
+ onRemoveQuery: (query: DataQuery) => void;
+ onMoveQuery: (query: DataQuery, direction: number) => void;
+ dataSourceValue: string | null;
+ inMixedMode: boolean;
+}
+
+interface State {
+ loadedDataSourceValue: string | null | undefined;
+ datasource: DataSourceApi | null;
+ isCollapsed: boolean;
+ angularScope: AngularQueryComponentScope | null;
+}
+
+export class QueryEditorRow extends PureComponent
{
+ element: HTMLElement | null = null;
+ angularQueryEditor: AngularComponent | null = null;
+
+ state: State = {
+ datasource: null,
+ isCollapsed: false,
+ angularScope: null,
+ loadedDataSourceValue: undefined,
+ };
+
+ componentDidMount() {
+ this.loadDatasource();
+ }
+
+ getAngularQueryComponentScope(): AngularQueryComponentScope {
+ const { panel, query } = this.props;
+ const { datasource } = this.state;
+
+ return {
+ datasource: datasource,
+ target: query,
+ panel: panel,
+ refresh: () => panel.refresh(),
+ render: () => panel.render(),
+ events: panel.events,
+ };
+ }
+
+ async loadDatasource() {
+ const { query, panel } = this.props;
+ const dataSourceSrv = getDatasourceSrv();
+ const datasource = await dataSourceSrv.get(query.datasource || panel.datasource);
+
+ this.setState({ datasource, loadedDataSourceValue: this.props.dataSourceValue });
+ }
+
+ componentDidUpdate() {
+ const { loadedDataSourceValue } = this.state;
+
+ // check if we need to load another datasource
+ if (loadedDataSourceValue !== this.props.dataSourceValue) {
+ if (this.angularQueryEditor) {
+ this.angularQueryEditor.destroy();
+ this.angularQueryEditor = null;
+ }
+ this.loadDatasource();
+ return;
+ }
+
+ if (!this.element || this.angularQueryEditor) {
+ return;
+ }
+
+ const loader = getAngularLoader();
+ const template = '';
+ const scopeProps = { ctrl: this.getAngularQueryComponentScope() };
+
+ this.angularQueryEditor = loader.load(this.element, scopeProps, template);
+
+ // give angular time to compile
+ setTimeout(() => {
+ this.setState({ angularScope: scopeProps.ctrl });
+ }, 10);
+ }
+
+ componentWillUnmount() {
+ if (this.angularQueryEditor) {
+ this.angularQueryEditor.destroy();
+ }
+ }
+
+ onToggleCollapse = () => {
+ this.setState({ isCollapsed: !this.state.isCollapsed });
+ };
+
+ onQueryChange = (query: DataQuery) => {
+ Object.assign(this.props.query, query);
+ this.onExecuteQuery();
+ };
+
+ onExecuteQuery = () => {
+ this.props.panel.refresh();
+ };
+
+ renderPluginEditor() {
+ const { query } = this.props;
+ const { datasource } = this.state;
+
+ if (datasource.pluginExports.QueryCtrl) {
+ return (this.element = element)} />;
+ }
+
+ if (datasource.pluginExports.QueryEditor) {
+ const QueryEditor = datasource.pluginExports.QueryEditor;
+ return (
+
+ );
+ }
+
+ return
Data source plugin does not export any Query Editor component
;
+ }
+
+ onToggleEditMode = () => {
+ const { angularScope } = this.state;
+
+ if (angularScope && angularScope.toggleEditorMode) {
+ angularScope.toggleEditorMode();
+ this.angularQueryEditor.digest();
+ }
+
+ if (this.state.isCollapsed) {
+ this.setState({ isCollapsed: false });
+ }
+ };
+
+ get hasTextEditMode() {
+ const { angularScope } = this.state;
+ return angularScope && angularScope.toggleEditorMode;
+ }
+
+ onRemoveQuery = () => {
+ this.props.onRemoveQuery(this.props.query);
+ };
+
+ onCopyQuery = () => {
+ const copy = _.cloneDeep(this.props.query);
+ this.props.onAddQuery(copy);
+ };
+
+ onDisableQuery = () => {
+ this.props.query.hide = !this.props.query.hide;
+ this.onExecuteQuery();
+ this.forceUpdate();
+ };
+
+ renderCollapsedText(): string | null {
+ const { angularScope } = this.state;
+
+ if (angularScope && angularScope.getCollapsedText) {
+ return angularScope.getCollapsedText();
+ }
+
+ return null;
+ }
+
+ render() {
+ const { query, inMixedMode } = this.props;
+ const { datasource, isCollapsed } = this.state;
+ const isDisabled = query.hide;
+
+ const bodyClasses = classNames('query-editor-row__body gf-form-query', {
+ 'query-editor-row__body--collapsed': isCollapsed,
+ });
+
+ const rowClasses = classNames('query-editor-row', {
+ 'query-editor-row--disabled': isDisabled,
+ 'gf-form-disabled': isDisabled,
+ });
+
+ if (!datasource) {
+ return null;
+ }
+
+ return (
+
+
+
+ {isCollapsed && }
+ {!isCollapsed && }
+ {query.refId}
+ {inMixedMode && ({datasource.name})}
+ {isDisabled && Disabled}
+
+
+ {isCollapsed &&
{this.renderCollapsedText()}
}
+
+
+ {this.hasTextEditMode && (
+
+ )}
+
+
+
+
+
+
+
+
{this.renderPluginEditor()}
+
+ );
+ }
+}
+
+export interface AngularQueryComponentScope {
+ target: DataQuery;
+ panel: PanelModel;
+ events: Emitter;
+ refresh: () => void;
+ render: () => void;
+ datasource: DataSourceApi;
+ toggleEditorMode?: () => void;
+ getCollapsedText?: () => string;
+}
diff --git a/public/app/features/dashboard/dashgrid/QueryInspector.tsx b/public/app/features/dashboard/panel_editor/QueryInspector.tsx
similarity index 88%
rename from public/app/features/dashboard/dashgrid/QueryInspector.tsx
rename to public/app/features/dashboard/panel_editor/QueryInspector.tsx
index 090bc220bc0..25c3c68e21e 100644
--- a/public/app/features/dashboard/dashgrid/QueryInspector.tsx
+++ b/public/app/features/dashboard/panel_editor/QueryInspector.tsx
@@ -2,6 +2,7 @@ import React, { PureComponent } from 'react';
import { JSONFormatter } from 'app/core/components/JSONFormatter/JSONFormatter';
import appEvents from 'app/core/app_events';
import { CopyToClipboard } from 'app/core/components/CopyToClipboard/CopyToClipboard';
+import { LoadingPlaceholder } from '@grafana/ui';
interface DsQuery {
isLoading: boolean;
@@ -10,7 +11,6 @@ interface DsQuery {
interface Props {
panel: any;
- LoadingPlaceholder: any;
}
interface State {
@@ -177,8 +177,6 @@ export class QueryInspector extends PureComponent
{
render() {
const { response, isLoading } = this.state.dsQuery;
- const { LoadingPlaceholder } = this.props;
- const { isMocking } = this.state;
const openNodes = this.getNrOfOpenNodes();
if (isLoading) {
@@ -200,20 +198,7 @@ export class QueryInspector extends PureComponent {
-
Relative time
+
Relative time
{
@@ -40,6 +40,7 @@ export class VisualizationTab extends PureComponent
{
this.state = {
isVizPickerOpen: false,
searchQuery: '',
+ scrollTop: 0,
};
}
@@ -62,13 +63,13 @@ export class VisualizationTab extends PureComponent {
}
return (
-
+ <>
{PanelOptions ? (
) : (
Visualization has no options
)}
-
+
);
}
@@ -112,9 +113,9 @@ export class VisualizationTab extends PureComponent {
for (let i = 0; i < panelCtrl.editorTabs.length; i++) {
template +=
`
- ` +
- (i > 0 ? `` : '') +
- `
+
` +
+ (i > 0 ? `` : '') +
+ `
@@ -144,7 +145,7 @@ export class VisualizationTab extends PureComponent
{
};
onOpenVizPicker = () => {
- this.setState({ isVizPickerOpen: true });
+ this.setState({ isVizPickerOpen: true, scrollTop: 0 });
};
onCloseVizPicker = () => {
@@ -202,18 +203,24 @@ export class VisualizationTab extends PureComponent {
renderHelp = () => ;
+ setScrollTop = (event: React.MouseEvent) => {
+ const target = event.target as HTMLElement;
+ this.setState({ scrollTop: target.scrollTop });
+ };
+
render() {
const { plugin } = this.props;
- const { isVizPickerOpen, searchQuery } = this.state;
+ const { isVizPickerOpen, searchQuery, scrollTop } = this.state;
- const pluginHelp = {
+ const pluginHelp: EditorToolbarView = {
heading: 'Help',
icon: 'fa fa-question',
render: this.renderHelp,
};
return (
-
+
<>
) {
query = query || { refId: 'A' };
query.refId = this.getNextQueryLetter();
- query.isNew = true;
-
- this.targets.push(query);
+ this.targets.push(query as DataQuery);
}
getNextQueryLetter(): string {
diff --git a/public/app/features/dashboard/partials/folder_permissions.html b/public/app/features/dashboard/partials/folder_permissions.html
deleted file mode 100644
index be44c1051f2..00000000000
--- a/public/app/features/dashboard/partials/folder_permissions.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/public/app/features/dashboard/partials/folder_settings.html b/public/app/features/dashboard/partials/folder_settings.html
deleted file mode 100644
index 8e819be5fe8..00000000000
--- a/public/app/features/dashboard/partials/folder_settings.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
diff --git a/public/app/features/dashboard/partials/inspector.html b/public/app/features/dashboard/partials/inspector.html
deleted file mode 100644
index b30bce3c5fe..00000000000
--- a/public/app/features/dashboard/partials/inspector.html
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
-
-
-
-
Request details
-
-
-
Request parameters
-
-
- |
- {{param.key}}
- |
-
- {{param.value}}
- |
-
-
-
-
-
-
{{message}}
-
-{{response}}
-
-
-
-
-
-
-
-{{message}}
-
-
-
-
-{{stack_trace}}
-
-
-
-
-
-
-
-
- {!hasFetched &&
}
- {hasFetched && dataSourcesCount === 0 &&
}
- {hasFetched &&
- dataSourcesCount > 0 && [
-
setDataSourcesLayoutMode(mode)}
- setSearchQuery={query => setDataSourcesSearchQuery(query)}
- linkButton={linkButton}
- key="action-bar"
- />,
- ,
- ]}
-
-
-
+
void;
}
-const ButtonRow: SFC
= ({ isReadOnly, onDelete, onSubmit }) => {
+const ButtonRow: FC = ({ isReadOnly, onDelete, onSubmit }) => {
return (