diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 00000000000..b7a33870ddd
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,8 @@
+.git
+.github
+dist/
+pkg/
+node_modules
+public/vendor/
+vendor/
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a82fc7050b4..7b97da0e81c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
-# 6.0.0-beta2 (unreleased)
+# 6.0.0-beta3 (unreleased)
+
+# 6.0.0-beta2 (2019-02-11)
 
 ### New Features
 * **AzureMonitor**: Enable alerting by converting Azure Monitor API to Go [#14623](https://github.com/grafana/grafana/issues/14623)
@@ -19,6 +21,10 @@
 * **AzureMonitor**: improve autocomplete for Log Analytics and App Insights editor [#15131](https://github.com/grafana/grafana/issues/15131)
 * **LDAP**: Fix IPA/FreeIPA v4.6.4 does not allow LDAP searches with empty attributes [#14432](https://github.com/grafana/grafana/issues/14432)
 
+### Breaking changes
+
+* **Internal Metrics** Edition has been added to the build_info metric. This will break any Graphite queries using this metric. Edition will be a new label for the Prometheus metric. [#15363](https://github.com/grafana/grafana/pull/15363)
+
 ### 6.0.0-beta1 fixes
 
 * **Postgres**: Fix default port not added when port not configured [#15189](https://github.com/grafana/grafana/issues/15189)
diff --git a/devenv/docker/blocks/elastic5/docker-compose.yaml b/devenv/docker/blocks/elastic5/docker-compose.yaml
index 33a7d9855b0..3a2ef39faba 100644
--- a/devenv/docker/blocks/elastic5/docker-compose.yaml
+++ b/devenv/docker/blocks/elastic5/docker-compose.yaml
@@ -1,6 +1,3 @@
-# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
-version: '2'
-services:
   elasticsearch5:
     image: elasticsearch:5
     command: elasticsearch
diff --git a/package.json b/package.json
index 0829caff783..19939528425 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "html-loader": "^0.5.1",
     "html-webpack-harddisk-plugin": "^0.2.0",
     "html-webpack-plugin": "^3.2.0",
-    "husky": "^0.14.3",
+    "husky": "^1.3.1",
     "jest": "^23.6.0",
     "jest-date-mock": "^1.0.6",
     "lint-staged": "^8.1.3",
@@ -120,8 +120,8 @@
     "typecheck": "tsc --noEmit",
     "jest": "jest --notify --watch",
     "api-tests": "jest --notify --watch --config=tests/api/jest.js",
-    "precommit": "grunt precommit",
-    "storybook": "cd packages/grafana-ui && yarn storybook"
+    "storybook": "cd packages/grafana-ui && yarn storybook",
+    "prettier:check": "prettier -- --list-different \"**/*.{ts,tsx,scss}\""
   },
   "husky": {
     "hooks": {
@@ -129,11 +129,7 @@
     }
   },
   "lint-staged": {
-    "*.{ts,tsx}": [
-      "prettier --write",
-      "git add"
-    ],
-    "*.scss": [
+    "*.{ts,tsx,json,scss}": [
       "prettier --write",
       "git add"
     ],
@@ -151,6 +147,7 @@
   "dependencies": {
     "@babel/polyfill": "^7.0.0",
     "@torkelo/react-select": "2.1.1",
+    "@types/reselect": "^2.2.0",
     "angular": "1.6.6",
     "angular-bindonce": "0.3.1",
     "angular-native-dragdrop": "1.2.2",
@@ -187,6 +184,7 @@
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.3.0",
     "remarkable": "^1.7.1",
+    "reselect": "^4.0.0",
     "rst2html": "github:thoward/rst2html#990cb89",
     "rxjs": "^6.3.3",
     "slate": "^0.33.4",
diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx
index 1fb31e86d72..f7fa71391ae 100644
--- a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import {  boolean } from '@storybook/addon-knobs';
+import { boolean } from '@storybook/addon-knobs';
 import { SeriesColorPicker, ColorPicker } from './ColorPicker';
 import { action } from '@storybook/addon-actions';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx
index a48ecc44c45..27371d5515f 100644
--- a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx
@@ -30,7 +30,7 @@ export const warnAboutColorPickerPropsDeprecation = (componentName: string, prop
 
 export const colorPickerFactory = <T extends ColorPickerProps>(
   popover: React.ComponentType<T>,
-  displayName = 'ColorPicker',
+  displayName = 'ColorPicker'
 ) => {
   return class ColorPicker extends Component<T, any> {
     static displayName = displayName;
diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.test.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.test.tsx
index 444f0e658c8..7a5000653d4 100644
--- a/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.test.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.test.tsx
@@ -15,7 +15,7 @@ describe('ColorPickerPopover', () => {
 
   describe('rendering', () => {
     it('should render provided color as selected if color provided by name', () => {
-      const wrapper = mount(<ColorPickerPopover color={BasicGreen.name} onChange={() => {}} theme={getTheme()}/>);
+      const wrapper = mount(<ColorPickerPopover color={BasicGreen.name} onChange={() => {}} theme={getTheme()} />);
       const selectedSwatch = wrapper.find(ColorSwatch).findWhere(node => node.key() === BasicGreen.name);
       const notSelectedSwatches = wrapper.find(ColorSwatch).filterWhere(node => node.prop('isSelected') === false);
 
@@ -25,7 +25,9 @@ describe('ColorPickerPopover', () => {
     });
 
     it('should render provided color as selected if color provided by hex', () => {
-      const wrapper = mount(<ColorPickerPopover color={BasicGreen.variants.dark} onChange={() => {}} theme={getTheme()} />);
+      const wrapper = mount(
+        <ColorPickerPopover color={BasicGreen.variants.dark} onChange={() => {}} theme={getTheme()} />
+      );
       const selectedSwatch = wrapper.find(ColorSwatch).findWhere(node => node.key() === BasicGreen.name);
       const notSelectedSwatches = wrapper.find(ColorSwatch).filterWhere(node => node.prop('isSelected') === false);
 
@@ -46,7 +48,11 @@ describe('ColorPickerPopover', () => {
 
     it('should pass hex color value to onChange prop by default', () => {
       wrapper = mount(
-        <ColorPickerPopover color={BasicGreen.variants.dark} onChange={onChangeSpy} theme={getTheme(GrafanaThemeType.Light)} />
+        <ColorPickerPopover
+          color={BasicGreen.variants.dark}
+          onChange={onChangeSpy}
+          theme={getTheme(GrafanaThemeType.Light)}
+        />
       );
       const basicBlueSwatch = wrapper.find(ColorSwatch).findWhere(node => node.key() === BasicBlue.name);
 
diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.tsx
index b4c77a5e373..d3d70175c4b 100644
--- a/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.tsx
@@ -119,4 +119,3 @@ export class ColorPickerPopover<T extends CustomPickersDescriptor> extends React
     );
   }
 }
-
diff --git a/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.test.tsx b/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.test.tsx
index 7a1ba95e81d..1f2ce33d235 100644
--- a/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.test.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.test.tsx
@@ -7,7 +7,6 @@ import { getTheme } from '../../themes';
 import { GrafanaThemeType } from '../../types';
 
 describe('NamedColorsPalette', () => {
-
   const BasicGreen = getColorDefinitionByName('green');
 
   describe('theme support for named colors', () => {
@@ -23,13 +22,15 @@ describe('NamedColorsPalette', () => {
       expect(selectedSwatch.prop('color')).toBe(BasicGreen.variants.dark);
 
       wrapper.unmount();
-      wrapper = mount(<NamedColorsPalette color={BasicGreen.name} theme={getTheme(GrafanaThemeType.Light)} onChange={() => {}} />);
+      wrapper = mount(
+        <NamedColorsPalette color={BasicGreen.name} theme={getTheme(GrafanaThemeType.Light)} onChange={() => {}} />
+      );
       selectedSwatch = wrapper.find(ColorSwatch).findWhere(node => node.key() === BasicGreen.name);
       expect(selectedSwatch.prop('color')).toBe(BasicGreen.variants.light);
     });
 
     it('should render dar variant of provided color when theme not provided', () => {
-      wrapper = mount(<NamedColorsPalette color={BasicGreen.name} onChange={() => {}} theme={getTheme()}/>);
+      wrapper = mount(<NamedColorsPalette color={BasicGreen.name} onChange={() => {}} theme={getTheme()} />);
       selectedSwatch = wrapper.find(ColorSwatch).findWhere(node => node.key() === BasicGreen.name);
       expect(selectedSwatch.prop('color')).toBe(BasicGreen.variants.dark);
     });
diff --git a/packages/grafana-ui/src/components/ColorPicker/SpectrumPalettePointer.tsx b/packages/grafana-ui/src/components/ColorPicker/SpectrumPalettePointer.tsx
index 7e3b2cf06a3..5790de86e29 100644
--- a/packages/grafana-ui/src/components/ColorPicker/SpectrumPalettePointer.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/SpectrumPalettePointer.tsx
@@ -15,7 +15,6 @@ const SpectrumPalettePointer: React.FunctionComponent<SpectrumPalettePointerProp
     },
   };
 
-
   const pointerColor = selectThemeVariant(
     {
       light: theme.colors.dark3,
diff --git a/packages/grafana-ui/src/components/CustomScrollbar/_CustomScrollbar.scss b/packages/grafana-ui/src/components/CustomScrollbar/_CustomScrollbar.scss
index c0a8077fb63..f5adcedf0fe 100644
--- a/packages/grafana-ui/src/components/CustomScrollbar/_CustomScrollbar.scss
+++ b/packages/grafana-ui/src/components/CustomScrollbar/_CustomScrollbar.scss
@@ -37,4 +37,4 @@
     @include gradient-horizontal($scrollbarBackground, $scrollbarBackground2);
     border-radius: 6px;
   }
-}
\ No newline at end of file
+}
diff --git a/packages/grafana-ui/src/components/FormLabel/FormLabel.tsx b/packages/grafana-ui/src/components/FormLabel/FormLabel.tsx
index 0cf7857b0d9..eceaa064808 100644
--- a/packages/grafana-ui/src/components/FormLabel/FormLabel.tsx
+++ b/packages/grafana-ui/src/components/FormLabel/FormLabel.tsx
@@ -31,7 +31,7 @@ export const FormLabel: FunctionComponent<Props> = ({
     <label className={classes} {...rest} htmlFor={htmlFor}>
       {children}
       {tooltip && (
-        <Tooltip placement="top" content={tooltip} theme={"info"}>
+        <Tooltip placement="top" content={tooltip} theme={'info'}>
           <div className="gf-form-help-icon gf-form-help-icon--right-normal">
             <i className="fa fa-info-circle" />
           </div>
diff --git a/packages/grafana-ui/src/components/Gauge/Gauge.test.tsx b/packages/grafana-ui/src/components/Gauge/Gauge.test.tsx
index 2a75c89225e..5e5f477a733 100644
--- a/packages/grafana-ui/src/components/Gauge/Gauge.test.tsx
+++ b/packages/grafana-ui/src/components/Gauge/Gauge.test.tsx
@@ -25,7 +25,7 @@ const setup = (propOverrides?: object) => {
     width: 300,
     value: 25,
     decimals: 0,
-    theme: getTheme()
+    theme: getTheme(),
   };
 
   Object.assign(props, propOverrides);
diff --git a/packages/grafana-ui/src/components/PanelOptionsGrid/PanelOptionsGrid.tsx b/packages/grafana-ui/src/components/PanelOptionsGrid/PanelOptionsGrid.tsx
index 0636ec4a9da..166bd6c055f 100644
--- a/packages/grafana-ui/src/components/PanelOptionsGrid/PanelOptionsGrid.tsx
+++ b/packages/grafana-ui/src/components/PanelOptionsGrid/PanelOptionsGrid.tsx
@@ -6,10 +6,5 @@ interface Props {
 }
 
 export const PanelOptionsGrid: SFC<Props> = ({ children }) => {
-
-  return (
-    <div className="panel-options-grid">
-      {children}
-    </div>
-  );
+  return <div className="panel-options-grid">{children}</div>;
 };
diff --git a/packages/grafana-ui/src/components/Select/Select.tsx b/packages/grafana-ui/src/components/Select/Select.tsx
index 6d83968d546..06973dc08e8 100644
--- a/packages/grafana-ui/src/components/Select/Select.tsx
+++ b/packages/grafana-ui/src/components/Select/Select.tsx
@@ -61,7 +61,9 @@ interface AsyncProps {
 export const MenuList = (props: any) => {
   return (
     <components.MenuList {...props}>
-      <CustomScrollbar autoHide={false} autoHeightMax="inherit">{props.children}</CustomScrollbar>
+      <CustomScrollbar autoHide={false} autoHeightMax="inherit">
+        {props.children}
+      </CustomScrollbar>
     </components.MenuList>
   );
 };
diff --git a/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.test.tsx b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.test.tsx
index 845ff5f6bf4..2b6af67df22 100644
--- a/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.test.tsx
+++ b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.test.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ChangeEvent } from 'react';
 import { shallow } from 'enzyme';
 
 import { ThresholdsEditor, Props } from './ThresholdsEditor';
@@ -118,7 +118,7 @@ describe('change threshold value', () => {
     ];
     const instance = setup({ thresholds });
 
-    const mockEvent = { target: { value: 12 } };
+    const mockEvent = ({ target: { value: '12' } } as any) as ChangeEvent<HTMLInputElement>;
 
     instance.onChangeThresholdValue(mockEvent, thresholds[0]);
 
@@ -137,7 +137,7 @@ describe('change threshold value', () => {
       thresholds,
     };
 
-    const mockEvent = { target: { value: 78 } };
+    const mockEvent = ({ target: { value: '78' } } as any) as ChangeEvent<HTMLInputElement>;
 
     instance.onChangeThresholdValue(mockEvent, thresholds[1]);
 
diff --git a/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
index b2a2e07c58d..f4db23d6656 100644
--- a/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
+++ b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { PureComponent, ChangeEvent } from 'react';
 import { Threshold } from '../../types';
 import { ColorPicker } from '../ColorPicker/ColorPicker';
 import { PanelOptionsGroup } from '../PanelOptionsGroup/PanelOptionsGroup';
@@ -94,14 +94,15 @@ export class ThresholdsEditor extends PureComponent<Props, State> {
     );
   };
 
-  onChangeThresholdValue = (event: any, threshold: Threshold) => {
+  onChangeThresholdValue = (event: ChangeEvent<HTMLInputElement>, 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 cleanValue = event.target.value.replace(/,/g, '.');
+    const parsedValue = parseFloat(cleanValue);
+    const value = isNaN(parsedValue) ? '' : parsedValue;
 
     const newThresholds = thresholds.map(t => {
       if (t === threshold && t.index !== 0) {
@@ -164,16 +165,14 @@ export class ThresholdsEditor extends PureComponent<Props, State> {
         <div className="thresholds-row-input-inner-color">
           {threshold.color && (
             <div className="thresholds-row-input-inner-color-colorpicker">
-              <ColorPicker
-                color={threshold.color}
-                onChange={color => this.onChangeThresholdColor(threshold, color)}
-              />
+              <ColorPicker color={threshold.color} onChange={color => this.onChangeThresholdColor(threshold, color)} />
             </div>
           )}
         </div>
         <div className="thresholds-row-input-inner-value">
           <input
-            type="text"
+            type="number"
+            step="0.0001"
             onChange={event => this.onChangeThresholdValue(event, threshold)}
             value={value}
             onBlur={this.onBlur}
diff --git a/packages/grafana-ui/src/components/Tooltip/Tooltip.tsx b/packages/grafana-ui/src/components/Tooltip/Tooltip.tsx
index 9acc166ad5d..28987f272cc 100644
--- a/packages/grafana-ui/src/components/Tooltip/Tooltip.tsx
+++ b/packages/grafana-ui/src/components/Tooltip/Tooltip.tsx
@@ -21,7 +21,7 @@ export const Tooltip = ({ children, theme, ...controllerProps }: TooltipProps) =
                 onMouseEnter={showPopper}
                 onMouseLeave={hidePopper}
                 referenceElement={tooltipTriggerRef.current}
-                wrapperClassName='popper'
+                wrapperClassName="popper"
                 className={popperBackgroundClassName}
                 renderArrow={({ arrowProps, placement }) => (
                   <div className="popper__arrow" data-placement={placement} {...arrowProps} />
diff --git a/packages/grafana-ui/src/components/Tooltip/_Tooltip.scss b/packages/grafana-ui/src/components/Tooltip/_Tooltip.scss
index 503b977bbf0..a33724b3460 100644
--- a/packages/grafana-ui/src/components/Tooltip/_Tooltip.scss
+++ b/packages/grafana-ui/src/components/Tooltip/_Tooltip.scss
@@ -31,7 +31,7 @@ $popper-margin-from-ref: 5px;
 
   // Themes
   &.popper__background--error {
-    @include popper-theme($tooltipBackgroundError, $tooltipBackgroundError);
+    @include popper-theme($tooltipBackgroundError, $white);
   }
 
   &.popper__background--info {
diff --git a/packages/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.tsx b/packages/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.tsx
index f9646781048..c07369fa283 100644
--- a/packages/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.tsx
+++ b/packages/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.tsx
@@ -82,15 +82,15 @@ export class ValueMappingsEditor extends PureComponent<Props, State> {
 
     return (
       <PanelOptionsGroup title="Add value mapping" onAdd={this.addMapping}>
-          {valueMappings.length > 0 &&
-            valueMappings.map((valueMapping, index) => (
-              <MappingRow
-                key={`${valueMapping.text}-${index}`}
-                valueMapping={valueMapping}
-                updateValueMapping={this.updateGauge}
-                removeValueMapping={() => this.onRemoveMapping(valueMapping.id)}
-              />
-            ))}
+        {valueMappings.length > 0 &&
+          valueMappings.map((valueMapping, index) => (
+            <MappingRow
+              key={`${valueMapping.text}-${index}`}
+              valueMapping={valueMapping}
+              updateValueMapping={this.updateGauge}
+              removeValueMapping={() => this.onRemoveMapping(valueMapping.id)}
+            />
+          ))}
       </PanelOptionsGroup>
     );
   }
diff --git a/packages/grafana-ui/src/components/index.scss b/packages/grafana-ui/src/components/index.scss
index 4f5cbf9a51b..225303722d8 100644
--- a/packages/grafana-ui/src/components/index.scss
+++ b/packages/grafana-ui/src/components/index.scss
@@ -7,4 +7,4 @@
 @import 'PanelOptionsGrid/PanelOptionsGrid';
 @import 'ColorPicker/ColorPicker';
 @import 'ValueMappingsEditor/ValueMappingsEditor';
-@import "FormField/FormField";
+@import 'FormField/FormField';
diff --git a/packages/grafana-ui/src/themes/dark.ts b/packages/grafana-ui/src/themes/dark.ts
index deae022f63a..17b4ea63575 100644
--- a/packages/grafana-ui/src/themes/dark.ts
+++ b/packages/grafana-ui/src/themes/dark.ts
@@ -1,4 +1,4 @@
-import tinycolor  from 'tinycolor2';
+import tinycolor from 'tinycolor2';
 import defaultTheme from './default';
 import { GrafanaTheme, GrafanaThemeType } from '../types/theme';
 
diff --git a/packages/grafana-ui/src/themes/default.ts b/packages/grafana-ui/src/themes/default.ts
index bf318f526e7..6cb05199ae5 100644
--- a/packages/grafana-ui/src/themes/default.ts
+++ b/packages/grafana-ui/src/themes/default.ts
@@ -1,12 +1,10 @@
-
-
 const theme = {
   name: 'Grafana Default',
   typography: {
     fontFamily: {
       sansSerif: "'Roboto', Helvetica, Arial, sans-serif;",
       serif: "Georgia, 'Times New Roman', Times, serif;",
-      monospace: "Menlo, Monaco, Consolas, 'Courier New', monospace;"
+      monospace: "Menlo, Monaco, Consolas, 'Courier New', monospace;",
     },
     size: {
       base: '13px',
@@ -31,16 +29,16 @@ const theme = {
     lineHeight: {
       xs: 1,
       s: 1.1,
-      m: 4/3,
-      l: 1.5
-    }
+      m: 4 / 3,
+      l: 1.5,
+    },
   },
   brakpoints: {
     xs: '0',
     s: '544px',
     m: '768px',
     l: '992px',
-    xl: '1200px'
+    xl: '1200px',
   },
   spacing: {
     xs: '0',
@@ -55,8 +53,8 @@ const theme = {
       xs: '2px',
       s: '3px',
       m: '5px',
-    }
-  }
+    },
+  },
 };
 
 export default theme;
diff --git a/packages/grafana-ui/src/themes/selectThemeVariant.test.ts b/packages/grafana-ui/src/themes/selectThemeVariant.test.ts
index 66cb02a2372..7c929f909d3 100644
--- a/packages/grafana-ui/src/themes/selectThemeVariant.test.ts
+++ b/packages/grafana-ui/src/themes/selectThemeVariant.test.ts
@@ -40,12 +40,10 @@ describe('Theme variable variant selector', () => {
   it('return dark theme variant if no theme given', () => {
     const theme = lightThemeMock;
 
-    const selectedValue = selectThemeVariant(
-      {
-        dark: theme.color.red,
-        light: theme.color.green,
-      }
-    );
+    const selectedValue = selectThemeVariant({
+      dark: theme.color.red,
+      light: theme.color.green,
+    });
 
     expect(selectedValue).toBe(lightThemeMock.color.red);
   });
diff --git a/packages/grafana-ui/src/themes/selectThemeVariant.ts b/packages/grafana-ui/src/themes/selectThemeVariant.ts
index e7e8e780222..82cc1f0e0e7 100644
--- a/packages/grafana-ui/src/themes/selectThemeVariant.ts
+++ b/packages/grafana-ui/src/themes/selectThemeVariant.ts
@@ -1,8 +1,6 @@
-import {  GrafanaThemeType } from '../types/theme';
+import { GrafanaThemeType } from '../types/theme';
 
-type VariantDescriptor = {
-  [key in GrafanaThemeType]: string | number;
-};
+type VariantDescriptor = { [key in GrafanaThemeType]: string | number };
 
 export const selectThemeVariant = (variants: VariantDescriptor, currentTheme?: GrafanaThemeType) => {
   return variants[currentTheme || GrafanaThemeType.Dark];
diff --git a/packages/grafana-ui/src/types/index.ts b/packages/grafana-ui/src/types/index.ts
index 81bdf741f30..263b1de4287 100644
--- a/packages/grafana-ui/src/types/index.ts
+++ b/packages/grafana-ui/src/types/index.ts
@@ -1,4 +1,3 @@
-
 export * from './data';
 export * from './time';
 export * from './panel';
diff --git a/packages/grafana-ui/src/utils/namedColorsPalette.test.ts b/packages/grafana-ui/src/utils/namedColorsPalette.test.ts
index aa57b46636c..3edc71c94ae 100644
--- a/packages/grafana-ui/src/utils/namedColorsPalette.test.ts
+++ b/packages/grafana-ui/src/utils/namedColorsPalette.test.ts
@@ -44,8 +44,8 @@ describe('colors', () => {
   });
 
   describe('getColorFromHexRgbOrName', () => {
-    it('returns undefined for unknown color', () => {
-      expect(() => getColorFromHexRgbOrName('aruba-sunshine')).toThrow();
+    it('returns black for unknown color', () => {
+      expect(getColorFromHexRgbOrName('aruba-sunshine')).toBe('#000000');
     });
 
     it('returns dark hex variant for known color if theme not specified', () => {
@@ -64,5 +64,9 @@ describe('colors', () => {
       expect(getColorFromHexRgbOrName('rgb(0,0,0)')).toBe('rgb(0,0,0)');
       expect(getColorFromHexRgbOrName('rgba(0,0,0,1)')).toBe('rgba(0,0,0,1)');
     });
+
+    it('returns hex for named color that is not a part of named colors palette', () => {
+      expect(getColorFromHexRgbOrName('lime')).toBe('#00ff00');
+    });
   });
 });
diff --git a/packages/grafana-ui/src/utils/namedColorsPalette.ts b/packages/grafana-ui/src/utils/namedColorsPalette.ts
index ee5741e794e..ac1c1be6fa5 100644
--- a/packages/grafana-ui/src/utils/namedColorsPalette.ts
+++ b/packages/grafana-ui/src/utils/namedColorsPalette.ts
@@ -1,5 +1,6 @@
 import { flatten } from 'lodash';
 import { GrafanaThemeType } from '../types';
+import tinycolor from 'tinycolor2';
 
 type Hue = 'green' | 'yellow' | 'red' | 'blue' | 'orange' | 'purple';
 
@@ -69,7 +70,9 @@ export const getColorDefinitionByName = (name: Color): ColorDefinition => {
 };
 
 export const getColorDefinition = (hex: string, theme: GrafanaThemeType): ColorDefinition | undefined => {
-  return flatten(Array.from(getNamedColorPalette().values())).filter(definition => definition.variants[theme] === hex)[0];
+  return flatten(Array.from(getNamedColorPalette().values())).filter(
+    definition => definition.variants[theme] === hex
+  )[0];
 };
 
 const isHex = (color: string) => {
@@ -94,7 +97,9 @@ export const getColorName = (color?: string, theme?: GrafanaThemeType): Color |
 };
 
 export const getColorByName = (colorName: string) => {
-  const definition = flatten(Array.from(getNamedColorPalette().values())).filter(definition => definition.name === colorName);
+  const definition = flatten(Array.from(getNamedColorPalette().values())).filter(
+    definition => definition.name === colorName
+  );
   return definition.length > 0 ? definition[0] : undefined;
 };
 
@@ -106,7 +111,7 @@ export const getColorFromHexRgbOrName = (color: string, theme?: GrafanaThemeType
   const colorDefinition = getColorByName(color);
 
   if (!colorDefinition) {
-    throw new Error('Unknown color');
+    return new tinycolor(color).toHexString();
   }
 
   return theme ? colorDefinition.variants[theme] : colorDefinition.variants.dark;
diff --git a/packages/grafana-ui/src/utils/processTimeSeries.ts b/packages/grafana-ui/src/utils/processTimeSeries.ts
index f5389f1b2bd..9a18b85fe18 100644
--- a/packages/grafana-ui/src/utils/processTimeSeries.ts
+++ b/packages/grafana-ui/src/utils/processTimeSeries.ts
@@ -51,7 +51,7 @@ export function processTimeSeries({ timeSeries, nullValueMode }: Options): TimeS
       }
 
       if (currentValue !== null && typeof currentValue !== 'number') {
-        throw {message: 'Time series contains non number values'};
+        throw { message: 'Time series contains non number values' };
       }
 
       // Due to missing values we could have different timeStep all along the series
diff --git a/packages/grafana-ui/src/utils/storybook/withTheme.tsx b/packages/grafana-ui/src/utils/storybook/withTheme.tsx
index 5417af1de05..af6d63c6542 100644
--- a/packages/grafana-ui/src/utils/storybook/withTheme.tsx
+++ b/packages/grafana-ui/src/utils/storybook/withTheme.tsx
@@ -15,12 +15,7 @@ const ThemableStory: React.FunctionComponent<{}> = ({ children }) => {
     GrafanaThemeType.Dark
   );
 
-  return (
-    <ThemeContext.Provider value={getTheme(themeKnob)}>
-      {children}
-    </ThemeContext.Provider>
-
-  );
+  return <ThemeContext.Provider value={getTheme(themeKnob)}>{children}</ThemeContext.Provider>;
 };
 
 // Temporary solution. When we update to Storybook V5 we will be able to pass data from decorator to story
diff --git a/packages/grafana-ui/src/utils/valueFormats/categories.ts b/packages/grafana-ui/src/utils/valueFormats/categories.ts
index d7410c22276..efba2cc5b79 100644
--- a/packages/grafana-ui/src/utils/valueFormats/categories.ts
+++ b/packages/grafana-ui/src/utils/valueFormats/categories.ts
@@ -306,7 +306,7 @@ export const getCategories = (): ValueFormatCategory[] => [
       { 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',
@@ -318,5 +318,5 @@ export const getCategories = (): ValueFormatCategory[] => [
       { name: 'cubic decimetre', id: 'dm3', fn: toFixedUnit('dm³') },
       { name: 'gallons', id: 'gallons', fn: toFixedUnit('gal') },
     ],
-  }
+  },
 ];
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 0685ef3814d..6da127fb550 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -16,7 +16,7 @@ func (hs *HTTPServer) registerRoutes() {
 	reqOrgAdmin := middleware.ReqOrgAdmin
 	redirectFromLegacyDashboardURL := middleware.RedirectFromLegacyDashboardURL()
 	redirectFromLegacyDashboardSoloURL := middleware.RedirectFromLegacyDashboardSoloURL()
-	quota := middleware.Quota
+	quota := middleware.Quota(hs.QuotaService)
 	bind := binding.Bind
 
 	r := hs.RouteRegister
@@ -286,7 +286,7 @@ func (hs *HTTPServer) registerRoutes() {
 
 			dashboardRoute.Post("/calculate-diff", bind(dtos.CalculateDiffOptions{}), Wrap(CalculateDashboardDiff))
 
-			dashboardRoute.Post("/db", bind(m.SaveDashboardCommand{}), Wrap(PostDashboard))
+			dashboardRoute.Post("/db", bind(m.SaveDashboardCommand{}), Wrap(hs.PostDashboard))
 			dashboardRoute.Get("/home", Wrap(GetHomeDashboard))
 			dashboardRoute.Get("/tags", GetDashboardTags)
 			dashboardRoute.Post("/import", bind(dtos.ImportDashboardCommand{}), Wrap(ImportDashboard))
@@ -294,7 +294,7 @@ func (hs *HTTPServer) registerRoutes() {
 			dashboardRoute.Group("/id/:dashboardId", func(dashIdRoute routing.RouteRegister) {
 				dashIdRoute.Get("/versions", Wrap(GetDashboardVersions))
 				dashIdRoute.Get("/versions/:id", Wrap(GetDashboardVersion))
-				dashIdRoute.Post("/restore", bind(dtos.RestoreDashboardVersionCommand{}), Wrap(RestoreDashboardVersion))
+				dashIdRoute.Post("/restore", bind(dtos.RestoreDashboardVersionCommand{}), Wrap(hs.RestoreDashboardVersion))
 
 				dashIdRoute.Group("/permissions", func(dashboardPermissionRoute routing.RouteRegister) {
 					dashboardPermissionRoute.Get("/", Wrap(GetDashboardPermissionList))
diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index 2789b0bf51e..20d717ef8fa 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -18,7 +18,6 @@ import (
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/guardian"
-	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -208,14 +207,14 @@ func DeleteDashboardByUID(c *m.ReqContext) Response {
 	})
 }
 
-func PostDashboard(c *m.ReqContext, cmd m.SaveDashboardCommand) Response {
+func (hs *HTTPServer) PostDashboard(c *m.ReqContext, cmd m.SaveDashboardCommand) Response {
 	cmd.OrgId = c.OrgId
 	cmd.UserId = c.UserId
 
 	dash := cmd.GetDashboardModel()
 
 	if dash.Id == 0 && dash.Uid == "" {
-		limitReached, err := quota.QuotaReached(c, "dashboard")
+		limitReached, err := hs.QuotaService.QuotaReached(c, "dashboard")
 		if err != nil {
 			return Error(500, "failed to get quota", err)
 		}
@@ -463,7 +462,7 @@ func CalculateDashboardDiff(c *m.ReqContext, apiOptions dtos.CalculateDiffOption
 }
 
 // RestoreDashboardVersion restores a dashboard to the given version.
-func RestoreDashboardVersion(c *m.ReqContext, apiCmd dtos.RestoreDashboardVersionCommand) Response {
+func (hs *HTTPServer) RestoreDashboardVersion(c *m.ReqContext, apiCmd dtos.RestoreDashboardVersionCommand) Response {
 	dash, rsp := getDashboardHelper(c.OrgId, "", c.ParamsInt64(":dashboardId"), "")
 	if rsp != nil {
 		return rsp
@@ -490,7 +489,7 @@ func RestoreDashboardVersion(c *m.ReqContext, apiCmd dtos.RestoreDashboardVersio
 	saveCmd.Dashboard.Set("uid", dash.Uid)
 	saveCmd.Message = fmt.Sprintf("Restored from version %d", version.Version)
 
-	return PostDashboard(c, saveCmd)
+	return hs.PostDashboard(c, saveCmd)
 }
 
 func GetDashboardTags(c *m.ReqContext) {
diff --git a/pkg/api/dashboard_test.go b/pkg/api/dashboard_test.go
index 8ee40920cbc..44d5cd32430 100644
--- a/pkg/api/dashboard_test.go
+++ b/pkg/api/dashboard_test.go
@@ -881,12 +881,16 @@ func postDashboardScenario(desc string, url string, routePattern string, mock *d
 	Convey(desc+" "+url, func() {
 		defer bus.ClearBusHandlers()
 
+		hs := HTTPServer{
+			Bus: bus.GetBus(),
+		}
+
 		sc := setupScenarioContext(url)
 		sc.defaultHandler = Wrap(func(c *m.ReqContext) Response {
 			sc.context = c
 			sc.context.SignedInUser = &m.SignedInUser{OrgId: cmd.OrgId, UserId: cmd.UserId}
 
-			return PostDashboard(c, cmd)
+			return hs.PostDashboard(c, cmd)
 		})
 
 		origNewDashboardService := dashboards.NewService
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index ed7054050e4..d13f0a26ab0 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -145,6 +145,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
 			"info":         panel.Info,
 			"hideFromList": panel.HideFromList,
 			"sort":         getPanelSort(panel.Id),
+			"dataFormats":  panel.DataFormats,
 		}
 	}
 
diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index cadf6896bf4..2a430147b55 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -24,6 +24,7 @@ import (
 	"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/quota"
 	"github.com/grafana/grafana/pkg/services/rendering"
 	"github.com/grafana/grafana/pkg/services/session"
 	"github.com/grafana/grafana/pkg/setting"
@@ -55,6 +56,7 @@ type HTTPServer struct {
 	CacheService     *cache.CacheService      `inject:""`
 	DatasourceCache  datasources.CacheService `inject:""`
 	AuthTokenService models.UserTokenService  `inject:""`
+	QuotaService     *quota.QuotaService      `inject:""`
 }
 
 func (hs *HTTPServer) Init() error {
diff --git a/pkg/login/ext_user.go b/pkg/login/ext_user.go
index 42fb37ff9d0..f217f9fe33c 100644
--- a/pkg/login/ext_user.go
+++ b/pkg/login/ext_user.go
@@ -4,18 +4,30 @@ import (
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/log"
 	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/quota"
 )
 
 func init() {
-	bus.AddHandler("auth", UpsertUser)
+	registry.RegisterService(&LoginService{})
 }
 
 var (
 	logger = log.New("login.ext_user")
 )
 
-func UpsertUser(cmd *m.UpsertUserCommand) error {
+type LoginService struct {
+	Bus          bus.Bus             `inject:""`
+	QuotaService *quota.QuotaService `inject:""`
+}
+
+func (ls *LoginService) Init() error {
+	ls.Bus.AddHandler(ls.UpsertUser)
+
+	return nil
+}
+
+func (ls *LoginService) UpsertUser(cmd *m.UpsertUserCommand) error {
 	extUser := cmd.ExternalUser
 
 	userQuery := &m.GetUserByAuthInfoQuery{
@@ -37,7 +49,7 @@ func UpsertUser(cmd *m.UpsertUserCommand) error {
 			return ErrInvalidCredentials
 		}
 
-		limitReached, err := quota.QuotaReached(cmd.ReqContext, "user")
+		limitReached, err := ls.QuotaService.QuotaReached(cmd.ReqContext, "user")
 		if err != nil {
 			log.Warn("Error getting user quota. error: %v", err)
 			return ErrGettingUserQuota
@@ -57,7 +69,7 @@ func UpsertUser(cmd *m.UpsertUserCommand) error {
 				AuthModule: extUser.AuthModule,
 				AuthId:     extUser.AuthId,
 			}
-			if err := bus.Dispatch(cmd2); err != nil {
+			if err := ls.Bus.Dispatch(cmd2); err != nil {
 				return err
 			}
 		}
@@ -78,12 +90,12 @@ func UpsertUser(cmd *m.UpsertUserCommand) error {
 
 	// Sync isGrafanaAdmin permission
 	if extUser.IsGrafanaAdmin != nil && *extUser.IsGrafanaAdmin != cmd.Result.IsAdmin {
-		if err := bus.Dispatch(&m.UpdateUserPermissionsCommand{UserId: cmd.Result.Id, IsGrafanaAdmin: *extUser.IsGrafanaAdmin}); err != nil {
+		if err := ls.Bus.Dispatch(&m.UpdateUserPermissionsCommand{UserId: cmd.Result.Id, IsGrafanaAdmin: *extUser.IsGrafanaAdmin}); err != nil {
 			return err
 		}
 	}
 
-	err = bus.Dispatch(&m.SyncTeamsCommand{
+	err = ls.Bus.Dispatch(&m.SyncTeamsCommand{
 		User:         cmd.Result,
 		ExternalUser: extUser,
 	})
diff --git a/pkg/login/ldap_test.go b/pkg/login/ldap_test.go
index c02fa02e030..ef20feb1373 100644
--- a/pkg/login/ldap_test.go
+++ b/pkg/login/ldap_test.go
@@ -395,8 +395,11 @@ func ldapAutherScenario(desc string, fn scenarioFunc) {
 		defer bus.ClearBusHandlers()
 
 		sc := &scenarioContext{}
+		loginService := &LoginService{
+			Bus: bus.GetBus(),
+		}
 
-		bus.AddHandler("test", UpsertUser)
+		bus.AddHandler("test", loginService.UpsertUser)
 
 		bus.AddHandlerCtx("test", func(ctx context.Context, cmd *m.SyncTeamsCommand) error {
 			return nil
diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go
index 8545c3856c9..1fbd303bebd 100644
--- a/pkg/middleware/middleware_test.go
+++ b/pkg/middleware/middleware_test.go
@@ -682,6 +682,7 @@ type fakeUserAuthTokenService struct {
 	tryRotateTokenProvider func(token *m.UserToken, clientIP, userAgent string) (bool, error)
 	lookupTokenProvider    func(unhashedToken string) (*m.UserToken, error)
 	revokeTokenProvider    func(token *m.UserToken) error
+	activeAuthTokenCount   func() (int64, error)
 }
 
 func newFakeUserAuthTokenService() *fakeUserAuthTokenService {
@@ -704,6 +705,9 @@ func newFakeUserAuthTokenService() *fakeUserAuthTokenService {
 		revokeTokenProvider: func(token *m.UserToken) error {
 			return nil
 		},
+		activeAuthTokenCount: func() (int64, error) {
+			return 10, nil
+		},
 	}
 }
 
@@ -722,3 +726,7 @@ func (s *fakeUserAuthTokenService) TryRotateToken(token *m.UserToken, clientIP,
 func (s *fakeUserAuthTokenService) RevokeToken(token *m.UserToken) error {
 	return s.revokeTokenProvider(token)
 }
+
+func (s *fakeUserAuthTokenService) ActiveTokenCount() (int64, error) {
+	return s.activeAuthTokenCount()
+}
diff --git a/pkg/middleware/quota.go b/pkg/middleware/quota.go
index 43efca43485..51f906e2c92 100644
--- a/pkg/middleware/quota.go
+++ b/pkg/middleware/quota.go
@@ -9,16 +9,20 @@ import (
 	"github.com/grafana/grafana/pkg/services/quota"
 )
 
-func Quota(target string) macaron.Handler {
-	return func(c *m.ReqContext) {
-		limitReached, err := quota.QuotaReached(c, target)
-		if err != nil {
-			c.JsonApiErr(500, "failed to get quota", err)
-			return
-		}
-		if limitReached {
-			c.JsonApiErr(403, fmt.Sprintf("%s Quota reached", target), nil)
-			return
+// Quota returns a function that returns a function used to call quotaservice based on target name
+func Quota(quotaService *quota.QuotaService) func(target string) macaron.Handler {
+	//https://open.spotify.com/track/7bZSoBEAEEUsGEuLOf94Jm?si=T1Tdju5qRSmmR0zph_6RBw fuuuuunky
+	return func(target string) macaron.Handler {
+		return func(c *m.ReqContext) {
+			limitReached, err := quotaService.QuotaReached(c, target)
+			if err != nil {
+				c.JsonApiErr(500, "failed to get quota", err)
+				return
+			}
+			if limitReached {
+				c.JsonApiErr(403, fmt.Sprintf("%s Quota reached", target), nil)
+				return
+			}
 		}
 	}
 }
diff --git a/pkg/middleware/quota_test.go b/pkg/middleware/quota_test.go
index e2a6ef63377..52b696cf037 100644
--- a/pkg/middleware/quota_test.go
+++ b/pkg/middleware/quota_test.go
@@ -3,9 +3,10 @@ package middleware
 import (
 	"testing"
 
+	"github.com/grafana/grafana/pkg/services/quota"
+
 	"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"
 )
@@ -13,10 +14,6 @@ import (
 func TestMiddlewareQuota(t *testing.T) {
 
 	Convey("Given the grafana quota middleware", t, func() {
-		session.GetSessionCount = func() int {
-			return 4
-		}
-
 		setting.AnonymousEnabled = false
 		setting.Quota = setting.QuotaSettings{
 			Enabled: true,
@@ -39,6 +36,12 @@ func TestMiddlewareQuota(t *testing.T) {
 			},
 		}
 
+		fakeAuthTokenService := newFakeUserAuthTokenService()
+		qs := &quota.QuotaService{
+			AuthTokenService: fakeAuthTokenService,
+		}
+		QuotaFn := Quota(qs)
+
 		middlewareScenario("with user not logged in", func(sc *scenarioContext) {
 			bus.AddHandler("globalQuota", func(query *m.GetGlobalQuotaByTargetQuery) error {
 				query.Result = &m.GlobalQuotaDTO{
@@ -48,26 +51,30 @@ func TestMiddlewareQuota(t *testing.T) {
 				}
 				return nil
 			})
+
 			Convey("global quota not reached", func() {
-				sc.m.Get("/user", Quota("user"), sc.defaultHandler)
+				sc.m.Get("/user", QuotaFn("user"), sc.defaultHandler)
 				sc.fakeReq("GET", "/user").exec()
 				So(sc.resp.Code, ShouldEqual, 200)
 			})
+
 			Convey("global quota reached", func() {
 				setting.Quota.Global.User = 4
-				sc.m.Get("/user", Quota("user"), sc.defaultHandler)
+				sc.m.Get("/user", QuotaFn("user"), sc.defaultHandler)
 				sc.fakeReq("GET", "/user").exec()
 				So(sc.resp.Code, ShouldEqual, 403)
 			})
+
 			Convey("global session quota not reached", func() {
 				setting.Quota.Global.Session = 10
-				sc.m.Get("/user", Quota("session"), sc.defaultHandler)
+				sc.m.Get("/user", QuotaFn("session"), sc.defaultHandler)
 				sc.fakeReq("GET", "/user").exec()
 				So(sc.resp.Code, ShouldEqual, 200)
 			})
+
 			Convey("global session quota reached", func() {
 				setting.Quota.Global.Session = 1
-				sc.m.Get("/user", Quota("session"), sc.defaultHandler)
+				sc.m.Get("/user", QuotaFn("session"), sc.defaultHandler)
 				sc.fakeReq("GET", "/user").exec()
 				So(sc.resp.Code, ShouldEqual, 403)
 			})
@@ -95,6 +102,7 @@ func TestMiddlewareQuota(t *testing.T) {
 				}
 				return nil
 			})
+
 			bus.AddHandler("userQuota", func(query *m.GetUserQuotaByTargetQuery) error {
 				query.Result = &m.UserQuotaDTO{
 					Target: query.Target,
@@ -103,6 +111,7 @@ func TestMiddlewareQuota(t *testing.T) {
 				}
 				return nil
 			})
+
 			bus.AddHandler("orgQuota", func(query *m.GetOrgQuotaByTargetQuery) error {
 				query.Result = &m.OrgQuotaDTO{
 					Target: query.Target,
@@ -111,45 +120,49 @@ func TestMiddlewareQuota(t *testing.T) {
 				}
 				return nil
 			})
+
 			Convey("global datasource quota reached", func() {
 				setting.Quota.Global.DataSource = 4
-				sc.m.Get("/ds", Quota("data_source"), sc.defaultHandler)
+				sc.m.Get("/ds", QuotaFn("data_source"), sc.defaultHandler)
 				sc.fakeReq("GET", "/ds").exec()
 				So(sc.resp.Code, ShouldEqual, 403)
 			})
+
 			Convey("user Org quota not reached", func() {
 				setting.Quota.User.Org = 5
-				sc.m.Get("/org", Quota("org"), sc.defaultHandler)
+				sc.m.Get("/org", QuotaFn("org"), sc.defaultHandler)
 				sc.fakeReq("GET", "/org").exec()
 				So(sc.resp.Code, ShouldEqual, 200)
 			})
+
 			Convey("user Org quota reached", func() {
 				setting.Quota.User.Org = 4
-				sc.m.Get("/org", Quota("org"), sc.defaultHandler)
+				sc.m.Get("/org", QuotaFn("org"), sc.defaultHandler)
 				sc.fakeReq("GET", "/org").exec()
 				So(sc.resp.Code, ShouldEqual, 403)
 			})
+
 			Convey("org dashboard quota not reached", func() {
 				setting.Quota.Org.Dashboard = 10
-				sc.m.Get("/dashboard", Quota("dashboard"), sc.defaultHandler)
+				sc.m.Get("/dashboard", QuotaFn("dashboard"), sc.defaultHandler)
 				sc.fakeReq("GET", "/dashboard").exec()
 				So(sc.resp.Code, ShouldEqual, 200)
 			})
+
 			Convey("org dashboard quota reached", func() {
 				setting.Quota.Org.Dashboard = 4
-				sc.m.Get("/dashboard", Quota("dashboard"), sc.defaultHandler)
+				sc.m.Get("/dashboard", QuotaFn("dashboard"), sc.defaultHandler)
 				sc.fakeReq("GET", "/dashboard").exec()
 				So(sc.resp.Code, ShouldEqual, 403)
 			})
+
 			Convey("org dashboard quota reached but quotas disabled", func() {
 				setting.Quota.Org.Dashboard = 4
 				setting.Quota.Enabled = false
-				sc.m.Get("/dashboard", Quota("dashboard"), sc.defaultHandler)
+				sc.m.Get("/dashboard", QuotaFn("dashboard"), sc.defaultHandler)
 				sc.fakeReq("GET", "/dashboard").exec()
 				So(sc.resp.Code, ShouldEqual, 200)
 			})
-
 		})
-
 	})
 }
diff --git a/pkg/middleware/recovery_test.go b/pkg/middleware/recovery_test.go
index e041d42e56b..6736d699a39 100644
--- a/pkg/middleware/recovery_test.go
+++ b/pkg/middleware/recovery_test.go
@@ -6,7 +6,6 @@ import (
 
 	"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"
 	macaron "gopkg.in/macaron.v1"
@@ -66,7 +65,6 @@ func recoveryScenario(desc string, url string, fn scenarioFunc) {
 		sc.userAuthTokenService = newFakeUserAuthTokenService()
 		sc.m.Use(GetContextHandler(sc.userAuthTokenService))
 		// mock out gc goroutine
-		session.StartSessionGC = func() {}
 		sc.m.Use(OrgRedirect())
 		sc.m.Use(AddDefaultResponseHeaders())
 
diff --git a/pkg/models/user_token.go b/pkg/models/user_token.go
index c8084cf1eba..388bc2dd4a2 100644
--- a/pkg/models/user_token.go
+++ b/pkg/models/user_token.go
@@ -29,4 +29,5 @@ type UserTokenService interface {
 	LookupToken(unhashedToken string) (*UserToken, error)
 	TryRotateToken(token *UserToken, clientIP, userAgent string) (bool, error)
 	RevokeToken(token *UserToken) error
+	ActiveTokenCount() (int64, error)
 }
diff --git a/pkg/plugins/panel_plugin.go b/pkg/plugins/panel_plugin.go
index 49cbfb19fc6..b90fd41e465 100644
--- a/pkg/plugins/panel_plugin.go
+++ b/pkg/plugins/panel_plugin.go
@@ -4,6 +4,7 @@ import "encoding/json"
 
 type PanelPlugin struct {
 	FrontendPluginBase
+	DataFormats []string `json:"dataFormats"`
 }
 
 func (p *PanelPlugin) Load(decoder *json.Decoder, pluginDir string) error {
@@ -15,6 +16,10 @@ func (p *PanelPlugin) Load(decoder *json.Decoder, pluginDir string) error {
 		return err
 	}
 
+	if p.DataFormats == nil {
+		p.DataFormats = []string{"time_series", "table"}
+	}
+
 	Panels[p.Id] = p
 	return nil
 }
diff --git a/pkg/services/auth/auth_token.go b/pkg/services/auth/auth_token.go
index ef5dccd779f..648575d54cd 100644
--- a/pkg/services/auth/auth_token.go
+++ b/pkg/services/auth/auth_token.go
@@ -35,6 +35,13 @@ func (s *UserAuthTokenService) Init() error {
 	return nil
 }
 
+func (s *UserAuthTokenService) ActiveTokenCount() (int64, error) {
+	var model userAuthToken
+	count, err := s.SQLStore.NewSession().Where(`created_at > ? AND rotated_at > ?`, s.createdAfterParam(), s.rotatedAfterParam()).Count(&model)
+
+	return count, err
+}
+
 func (s *UserAuthTokenService) CreateToken(userId int64, clientIP, userAgent string) (*models.UserToken, error) {
 	clientIP = util.ParseIPAddress(clientIP)
 	token, err := util.RandomHex(16)
@@ -79,13 +86,8 @@ func (s *UserAuthTokenService) LookupToken(unhashedToken string) (*models.UserTo
 		s.log.Debug("looking up token", "unhashed", unhashedToken, "hashed", hashedToken)
 	}
 
-	tokenMaxLifetime := time.Duration(s.Cfg.LoginMaxLifetimeDays) * 24 * time.Hour
-	tokenMaxInactiveLifetime := time.Duration(s.Cfg.LoginMaxInactiveLifetimeDays) * 24 * time.Hour
-	createdAfter := getTime().Add(-tokenMaxLifetime).Unix()
-	rotatedAfter := getTime().Add(-tokenMaxInactiveLifetime).Unix()
-
 	var model userAuthToken
-	exists, err := s.SQLStore.NewSession().Where("(auth_token = ? OR prev_auth_token = ?) AND created_at > ? AND rotated_at > ?", hashedToken, hashedToken, createdAfter, rotatedAfter).Get(&model)
+	exists, err := s.SQLStore.NewSession().Where("(auth_token = ? OR prev_auth_token = ?) AND created_at > ? AND rotated_at > ?", hashedToken, hashedToken, s.createdAfterParam(), s.rotatedAfterParam()).Get(&model)
 	if err != nil {
 		return nil, err
 	}
@@ -219,6 +221,16 @@ func (s *UserAuthTokenService) RevokeToken(token *models.UserToken) error {
 	return nil
 }
 
+func (s *UserAuthTokenService) createdAfterParam() int64 {
+	tokenMaxLifetime := time.Duration(s.Cfg.LoginMaxLifetimeDays) * 24 * time.Hour
+	return getTime().Add(-tokenMaxLifetime).Unix()
+}
+
+func (s *UserAuthTokenService) rotatedAfterParam() int64 {
+	tokenMaxInactiveLifetime := time.Duration(s.Cfg.LoginMaxInactiveLifetimeDays) * 24 * time.Hour
+	return getTime().Add(-tokenMaxInactiveLifetime).Unix()
+}
+
 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
index 26dcbc5c868..49e7acc3a5b 100644
--- a/pkg/services/auth/auth_token_test.go
+++ b/pkg/services/auth/auth_token_test.go
@@ -31,6 +31,12 @@ func TestUserAuthToken(t *testing.T) {
 			So(userToken, ShouldNotBeNil)
 			So(userToken.AuthTokenSeen, ShouldBeFalse)
 
+			Convey("Can count active tokens", func() {
+				count, err := userAuthTokenService.ActiveTokenCount()
+				So(err, ShouldBeNil)
+				So(count, ShouldEqual, 1)
+			})
+
 			Convey("When lookup unhashed token should return user auth token", func() {
 				userToken, err := userAuthTokenService.LookupToken(userToken.UnhashedToken)
 				So(err, ShouldBeNil)
@@ -114,6 +120,12 @@ func TestUserAuthToken(t *testing.T) {
 				notGood, err := userAuthTokenService.LookupToken(userToken.UnhashedToken)
 				So(err, ShouldEqual, models.ErrUserTokenNotFound)
 				So(notGood, ShouldBeNil)
+
+				Convey("should not find active token when expired", func() {
+					count, err := userAuthTokenService.ActiveTokenCount()
+					So(err, ShouldBeNil)
+					So(count, ShouldEqual, 0)
+				})
 			})
 
 			Convey("when rotated_at is 5 days ago and created_at is 29 days and 23:59:59 ago should not find token", func() {
diff --git a/pkg/services/quota/quota.go b/pkg/services/quota/quota.go
index 2ec399437e6..ff2528e31e8 100644
--- a/pkg/services/quota/quota.go
+++ b/pkg/services/quota/quota.go
@@ -3,11 +3,23 @@ package quota
 import (
 	"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/registry"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-func QuotaReached(c *m.ReqContext, target string) (bool, error) {
+func init() {
+	registry.RegisterService(&QuotaService{})
+}
+
+type QuotaService struct {
+	AuthTokenService m.UserTokenService `inject:""`
+}
+
+func (qs *QuotaService) Init() error {
+	return nil
+}
+
+func (qs *QuotaService) QuotaReached(c *m.ReqContext, target string) (bool, error) {
 	if !setting.Quota.Enabled {
 		return false, nil
 	}
@@ -30,7 +42,12 @@ func QuotaReached(c *m.ReqContext, target string) (bool, error) {
 				return true, nil
 			}
 			if target == "session" {
-				usedSessions := session.GetSessionCount()
+
+				usedSessions, err := qs.AuthTokenService.ActiveTokenCount()
+				if err != nil {
+					return false, err
+				}
+
 				if int64(usedSessions) > scope.DefaultLimit {
 					c.Logger.Debug("Sessions limit reached", "active", usedSessions, "limit", scope.DefaultLimit)
 					return true, nil
diff --git a/pkg/services/session/session.go b/pkg/services/session/session.go
index 2e60b8a25d7..3481c99ce58 100644
--- a/pkg/services/session/session.go
+++ b/pkg/services/session/session.go
@@ -19,7 +19,7 @@ const (
 
 var sessionManager *ms.Manager
 var sessionOptions *ms.Options
-var StartSessionGC func()
+var StartSessionGC func() = func() {}
 var GetSessionCount func() int
 var sessionLogger = log.New("session")
 var sessionConnMaxLifetime int64
diff --git a/public/app/core/components/ErrorBoundary/ErrorBoundary.tsx b/public/app/core/components/ErrorBoundary/ErrorBoundary.tsx
index 188750b0fef..aa4276e742f 100644
--- a/public/app/core/components/ErrorBoundary/ErrorBoundary.tsx
+++ b/public/app/core/components/ErrorBoundary/ErrorBoundary.tsx
@@ -27,7 +27,7 @@ class ErrorBoundary extends Component<Props, State> {
   componentDidCatch(error: Error, errorInfo: ErrorInfo) {
     this.setState({
       error: error,
-      errorInfo: errorInfo
+      errorInfo: errorInfo,
     });
   }
 
diff --git a/public/app/core/components/FilterInput/FilterInput.tsx b/public/app/core/components/FilterInput/FilterInput.tsx
new file mode 100644
index 00000000000..b69f7d9651d
--- /dev/null
+++ b/public/app/core/components/FilterInput/FilterInput.tsx
@@ -0,0 +1,51 @@
+import React, { forwardRef } from 'react';
+
+const specialChars = ['(', '[', '{', '}', ']', ')', '|', '*', '+', '-', '.', '?', '<', '>', '#', '&', '^', '$'];
+
+export const escapeStringForRegex = (value: string) => {
+  if (!value) {
+    return value;
+  }
+
+  const newValue = specialChars.reduce(
+    (escaped, currentChar) => escaped.replace(currentChar, '\\' + currentChar),
+    value
+  );
+
+  return newValue;
+};
+
+export const unEscapeStringFromRegex = (value: string) => {
+  if (!value) {
+    return value;
+  }
+
+  const newValue = specialChars.reduce(
+    (escaped, currentChar) => escaped.replace('\\' + currentChar, currentChar),
+    value
+  );
+
+  return newValue;
+};
+
+export interface Props {
+  value: string | undefined;
+  placeholder?: string;
+  labelClassName?: string;
+  inputClassName?: string;
+  onChange: (value: string) => void;
+}
+
+export const FilterInput = forwardRef<HTMLInputElement, Props>((props, ref) => (
+  <label className={props.labelClassName}>
+    <input
+      ref={ref}
+      type="text"
+      className={props.inputClassName}
+      value={unEscapeStringFromRegex(props.value)}
+      onChange={event => props.onChange(escapeStringForRegex(event.target.value))}
+      placeholder={props.placeholder ? props.placeholder : null}
+    />
+    <i className="gf-form-input-icon fa fa-search" />
+  </label>
+));
diff --git a/public/app/core/components/Footer/Footer.tsx b/public/app/core/components/Footer/Footer.tsx
index 101168beb66..45f7cc71131 100644
--- a/public/app/core/components/Footer/Footer.tsx
+++ b/public/app/core/components/Footer/Footer.tsx
@@ -9,42 +9,49 @@ interface Props {
   newGrafanaVersion: string;
 }
 
-export const Footer: FC<Props> = React.memo(({appName, buildVersion, buildCommit, newGrafanaVersionExists, newGrafanaVersion}) => {
-  return (
-    <footer className="footer">
-      <div className="text-center">
-        <ul>
-          <li>
-            <a href="http://docs.grafana.org" target="_blank">
-              <i className="fa fa-file-code-o" /> Docs
-            </a>
-          </li>
-          <li>
-            <a href="https://grafana.com/services/support" target="_blank">
-              <i className="fa fa-support" /> Support Plans
-            </a>
-          </li>
-          <li>
-            <a href="https://community.grafana.com/" target="_blank">
-              <i className="fa fa-comments-o" /> Community
-            </a>
-          </li>
-          <li>
-            <a href="https://grafana.com" target="_blank">{appName}</a> <span>v{buildVersion} (commit: {buildCommit})</span>
-          </li>
-          {newGrafanaVersionExists && (
+export const Footer: FC<Props> = React.memo(
+  ({ appName, buildVersion, buildCommit, newGrafanaVersionExists, newGrafanaVersion }) => {
+    return (
+      <footer className="footer">
+        <div className="text-center">
+          <ul>
             <li>
-              <Tooltip placement="auto" content={newGrafanaVersion}>
-                <a href="https://grafana.com/get" target="_blank">
-                  New version available!
-                </a>
-              </Tooltip>
+              <a href="http://docs.grafana.org" target="_blank">
+                <i className="fa fa-file-code-o" /> Docs
+              </a>
             </li>
-          )}
-        </ul>
-      </div>
-    </footer>
-  );
-});
+            <li>
+              <a href="https://grafana.com/services/support" target="_blank">
+                <i className="fa fa-support" /> Support Plans
+              </a>
+            </li>
+            <li>
+              <a href="https://community.grafana.com/" target="_blank">
+                <i className="fa fa-comments-o" /> Community
+              </a>
+            </li>
+            <li>
+              <a href="https://grafana.com" target="_blank">
+                {appName}
+              </a>{' '}
+              <span>
+                v{buildVersion} (commit: {buildCommit})
+              </span>
+            </li>
+            {newGrafanaVersionExists && (
+              <li>
+                <Tooltip placement="auto" content={newGrafanaVersion}>
+                  <a href="https://grafana.com/get" target="_blank">
+                    New version available!
+                  </a>
+                </Tooltip>
+              </li>
+            )}
+          </ul>
+        </div>
+      </footer>
+    );
+  }
+);
 
 export default Footer;
diff --git a/public/app/core/components/OrgActionBar/OrgActionBar.tsx b/public/app/core/components/OrgActionBar/OrgActionBar.tsx
index b6b2046736f..f83d5c957f7 100644
--- a/public/app/core/components/OrgActionBar/OrgActionBar.tsx
+++ b/public/app/core/components/OrgActionBar/OrgActionBar.tsx
@@ -1,5 +1,6 @@
 import React, { PureComponent } from 'react';
 import LayoutSelector, { LayoutMode } from '../LayoutSelector/LayoutSelector';
+import { FilterInput } from '../FilterInput/FilterInput';
 
 export interface Props {
   searchQuery: string;
@@ -22,16 +23,13 @@ export default class OrgActionBar extends PureComponent<Props> {
     return (
       <div className="page-action-bar">
         <div className="gf-form gf-form--grow">
-          <label className="gf-form--has-input-icon">
-            <input
-              type="text"
-              className="gf-form-input width-20"
-              value={searchQuery}
-              onChange={event => setSearchQuery(event.target.value)}
-              placeholder="Filter by name or type"
-            />
-            <i className="gf-form-input-icon fa fa-search" />
-          </label>
+          <FilterInput
+            labelClassName="gf-form--has-input-icon"
+            inputClassName="gf-form-input width-20"
+            value={searchQuery}
+            onChange={setSearchQuery}
+            placeholder={'Filter by name or type'}
+          />
           <LayoutSelector mode={layoutMode} onLayoutModeChanged={(mode: LayoutMode) => onSetLayoutMode(mode)} />
         </div>
         <div className="page-action-bar__spacer" />
diff --git a/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap b/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap
index 25de037930a..3a75f9192b2 100644
--- a/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap
+++ b/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap
@@ -7,20 +7,13 @@ exports[`Render should render component 1`] = `
   <div
     className="gf-form gf-form--grow"
   >
-    <label
-      className="gf-form--has-input-icon"
-    >
-      <input
-        className="gf-form-input width-20"
-        onChange={[Function]}
-        placeholder="Filter by name or type"
-        type="text"
-        value=""
-      />
-      <i
-        className="gf-form-input-icon fa fa-search"
-      />
-    </label>
+    <ForwardRef
+      inputClassName="gf-form-input width-20"
+      labelClassName="gf-form--has-input-icon"
+      onChange={[MockFunction]}
+      placeholder="Filter by name or type"
+      value=""
+    />
     <LayoutSelector
       onLayoutModeChanged={[Function]}
     />
diff --git a/public/app/core/components/Page/Page.tsx b/public/app/core/components/Page/Page.tsx
index 997f02b700c..fe518d8f891 100644
--- a/public/app/core/components/Page/Page.tsx
+++ b/public/app/core/components/Page/Page.tsx
@@ -33,9 +33,9 @@ class Page extends Component<Props> {
   updateTitle = () => {
     const title = this.getPageTitle;
     document.title = title ? title + ' - Grafana' : 'Grafana';
-  }
+  };
 
-  get getPageTitle () {
+  get getPageTitle() {
     const { navModel } = this.props;
     if (navModel) {
       return getTitleFromNavModel(navModel) || undefined;
@@ -47,20 +47,21 @@ class Page extends Component<Props> {
     const { navModel } = this.props;
     const { buildInfo } = config;
     return (
-        <div className="page-scrollbar-wrapper">
-          <CustomScrollbar autoHeightMin={'100%'}>
-            <div className="page-scrollbar-content">
-              <PageHeader model={navModel} />
-              {this.props.children}
-              <Footer
-                appName="Grafana"
-                buildCommit={buildInfo.commit}
-                buildVersion={buildInfo.version}
-                newGrafanaVersion={buildInfo.latestVersion}
-                newGrafanaVersionExists={buildInfo.hasUpdate} />
-            </div>
-          </CustomScrollbar>
-        </div>
+      <div className="page-scrollbar-wrapper">
+        <CustomScrollbar autoHeightMin={'100%'}>
+          <div className="page-scrollbar-content">
+            <PageHeader model={navModel} />
+            {this.props.children}
+            <Footer
+              appName="Grafana"
+              buildCommit={buildInfo.commit}
+              buildVersion={buildInfo.version}
+              newGrafanaVersion={buildInfo.latestVersion}
+              newGrafanaVersionExists={buildInfo.hasUpdate}
+            />
+          </div>
+        </CustomScrollbar>
+      </div>
     );
   }
 }
diff --git a/public/app/core/components/Page/PageContents.tsx b/public/app/core/components/Page/PageContents.tsx
index 6970857d383..0db32a1ff01 100644
--- a/public/app/core/components/Page/PageContents.tsx
+++ b/public/app/core/components/Page/PageContents.tsx
@@ -10,7 +10,6 @@ interface Props {
 }
 
 class PageContents extends Component<Props> {
-
   render() {
     const { isLoading } = this.props;
 
diff --git a/public/app/core/components/TagFilter/TagFilter.tsx b/public/app/core/components/TagFilter/TagFilter.tsx
index 7e8bc9c6fd2..967792a9f7b 100644
--- a/public/app/core/components/TagFilter/TagFilter.tsx
+++ b/public/app/core/components/TagFilter/TagFilter.tsx
@@ -5,6 +5,7 @@ import AsyncSelect from '@torkelo/react-select/lib/Async';
 import { TagOption } from './TagOption';
 import { TagBadge } from './TagBadge';
 import { components } from '@torkelo/react-select';
+import { escapeStringForRegex } from '../FilterInput/FilterInput';
 
 export interface Props {
   tags: string[];
@@ -51,7 +52,7 @@ export class TagFilter extends React.Component<Props, any> {
       value: tags,
       styles: resetSelectStyles(),
       filterOption: (option, searchQuery) => {
-        const regex = RegExp(searchQuery, 'i');
+        const regex = RegExp(escapeStringForRegex(searchQuery), 'i');
         return regex.test(option.value);
       },
       components: {
diff --git a/public/app/core/components/sidemenu/SideMenu.test.tsx b/public/app/core/components/sidemenu/SideMenu.test.tsx
index 2286787d777..f7b7df69cfc 100644
--- a/public/app/core/components/sidemenu/SideMenu.test.tsx
+++ b/public/app/core/components/sidemenu/SideMenu.test.tsx
@@ -13,9 +13,9 @@ jest.mock('app/store/store', () => ({
     getState: jest.fn().mockReturnValue({
       location: {
         lastUpdated: 0,
-      }
-    })
-  }
+      },
+    }),
+  },
 }));
 
 jest.mock('app/core/services/context_srv', () => ({
diff --git a/public/app/core/config.ts b/public/app/core/config.ts
index f4254ac251a..8839a6f7942 100644
--- a/public/app/core/config.ts
+++ b/public/app/core/config.ts
@@ -57,7 +57,7 @@ export class Settings {
         isEnterprise: false,
       },
       viewersCanEdit: false,
-      disableSanitizeHtml: false
+      disableSanitizeHtml: false,
     };
 
     _.extend(this, defaults, options);
diff --git a/public/app/core/directives/autofill_event_fix.ts b/public/app/core/directives/autofill_event_fix.ts
index 51d278fe7c9..4aaa63e276f 100644
--- a/public/app/core/directives/autofill_event_fix.ts
+++ b/public/app/core/directives/autofill_event_fix.ts
@@ -28,7 +28,7 @@ export function autofillEventFix($compile) {
         input.removeEventListener('animationstart', onAnimationStart);
         // input.removeEventListener('change', onChange);
       });
-    }
+    },
   };
 }
 
diff --git a/public/app/core/directives/dropdown_typeahead.ts b/public/app/core/directives/dropdown_typeahead.ts
index dfc3eddbcbb..8bd2d4a3af6 100644
--- a/public/app/core/directives/dropdown_typeahead.ts
+++ b/public/app/core/directives/dropdown_typeahead.ts
@@ -142,7 +142,7 @@ export function dropdownTypeahead2($compile) {
       const $input = $(inputTemplate);
       const $button = $(buttonTemplate);
       const timeoutId = {
-        blur: null
+        blur: null,
       };
       $input.appendTo(elem);
       $button.appendTo(elem);
diff --git a/public/app/core/logs_model.ts b/public/app/core/logs_model.ts
index 2cde5379448..f4ad11e1b0e 100644
--- a/public/app/core/logs_model.ts
+++ b/public/app/core/logs_model.ts
@@ -344,7 +344,7 @@ export function makeSeriesForLogs(rows: LogRowModel[], intervalMs: number): Time
       datapoints: series.datapoints,
       target: series.alias,
       alias: series.alias,
-      color: series.color
+      color: series.color,
     };
   });
 }
diff --git a/public/app/core/profiler.ts b/public/app/core/profiler.ts
index 19c67039c41..2284401803c 100644
--- a/public/app/core/profiler.ts
+++ b/public/app/core/profiler.ts
@@ -1,4 +1,3 @@
-
 export class Profiler {
   panelsRendered: number;
   enabled: boolean;
diff --git a/public/app/core/selectors/navModel.ts b/public/app/core/selectors/navModel.ts
index 7d745b58002..849ee364e25 100644
--- a/public/app/core/selectors/navModel.ts
+++ b/public/app/core/selectors/navModel.ts
@@ -43,5 +43,5 @@ export function getNavModel(navIndex: NavIndex, id: string, fallback?: NavModel)
 }
 
 export const getTitleFromNavModel = (navModel: NavModel) => {
-  return `${navModel.main.text}${navModel.node.text ? ': ' + navModel.node.text : '' }`;
+  return `${navModel.main.text}${navModel.node.text ? ': ' + navModel.node.text : ''}`;
 };
diff --git a/public/app/core/services/__mocks__/backend_srv.ts b/public/app/core/services/__mocks__/backend_srv.ts
index cbb04ebf9df..5ac31f718c0 100644
--- a/public/app/core/services/__mocks__/backend_srv.ts
+++ b/public/app/core/services/__mocks__/backend_srv.ts
@@ -1,4 +1,3 @@
-
 const backendSrv = {
   get: jest.fn(),
   getDashboard: jest.fn(),
@@ -10,5 +9,3 @@ const backendSrv = {
 export function getBackendSrv() {
   return backendSrv;
 }
-
-
diff --git a/public/app/core/specs/PasswordStrength.test.tsx b/public/app/core/specs/PasswordStrength.test.tsx
index a0a2df69029..1bd52ee6d50 100644
--- a/public/app/core/specs/PasswordStrength.test.tsx
+++ b/public/app/core/specs/PasswordStrength.test.tsx
@@ -1,24 +1,21 @@
 import React from 'react';
-import {shallow} from 'enzyme';
+import { shallow } from 'enzyme';
 
-import {PasswordStrength} from '../components/PasswordStrength';
+import { PasswordStrength } from '../components/PasswordStrength';
 
 describe('PasswordStrength', () => {
-
   it('should have class bad if length below 4', () => {
     const wrapper = shallow(<PasswordStrength password="asd" />);
-    expect(wrapper.find(".password-strength-bad")).toHaveLength(1);
+    expect(wrapper.find('.password-strength-bad')).toHaveLength(1);
   });
 
   it('should have class ok if length below 8', () => {
     const wrapper = shallow(<PasswordStrength password="asdasd" />);
-    expect(wrapper.find(".password-strength-ok")).toHaveLength(1);
+    expect(wrapper.find('.password-strength-ok')).toHaveLength(1);
   });
 
   it('should have class good if length above 8', () => {
     const wrapper = shallow(<PasswordStrength password="asdaasdda" />);
-    expect(wrapper.find(".password-strength-good")).toHaveLength(1);
+    expect(wrapper.find('.password-strength-good')).toHaveLength(1);
   });
-
 });
-
diff --git a/public/app/core/utils/explore.test.ts b/public/app/core/utils/explore.test.ts
index 1c00142c3b8..a8872bcc53d 100644
--- a/public/app/core/utils/explore.test.ts
+++ b/public/app/core/utils/explore.test.ts
@@ -8,6 +8,7 @@ import {
 } from './explore';
 import { ExploreUrlState } from 'app/types/explore';
 import store from 'app/core/store';
+import { LogsDedupStrategy } from 'app/core/logs_model';
 
 const DEFAULT_EXPLORE_STATE: ExploreUrlState = {
   datasource: null,
@@ -17,7 +18,8 @@ const DEFAULT_EXPLORE_STATE: ExploreUrlState = {
     showingGraph: true,
     showingTable: true,
     showingLogs: true,
-  }
+    dedupStrategy: LogsDedupStrategy.none,
+  },
 };
 
 describe('state functions', () => {
@@ -78,7 +80,7 @@ describe('state functions', () => {
       expect(serializeStateToUrlParam(state)).toBe(
         '{"datasource":"foo","queries":[{"expr":"metric{test=\\"a/b\\"}"},' +
           '{"expr":"super{foo=\\"x/z\\"}"}],"range":{"from":"now-5h","to":"now"},' +
-          '"ui":{"showingGraph":true,"showingTable":true,"showingLogs":true}}'
+          '"ui":{"showingGraph":true,"showingTable":true,"showingLogs":true,"dedupStrategy":"none"}}'
       );
     });
 
@@ -100,7 +102,7 @@ describe('state functions', () => {
         },
       };
       expect(serializeStateToUrlParam(state, true)).toBe(
-        '["now-5h","now","foo",{"expr":"metric{test=\\"a/b\\"}"},{"expr":"super{foo=\\"x/z\\"}"},{"ui":[true,true,true]}]'
+        '["now-5h","now","foo",{"expr":"metric{test=\\"a/b\\"}"},{"expr":"super{foo=\\"x/z\\"}"},{"ui":[true,true,true,"none"]}]'
       );
     });
   });
diff --git a/public/app/core/utils/explore.ts b/public/app/core/utils/explore.ts
index 107f411353c..913d8d1704f 100644
--- a/public/app/core/utils/explore.ts
+++ b/public/app/core/utils/explore.ts
@@ -21,6 +21,7 @@ import {
   QueryIntervals,
   QueryOptions,
 } from 'app/types/explore';
+import { LogsDedupStrategy } from 'app/core/logs_model';
 
 export const DEFAULT_RANGE = {
   from: 'now-6h',
@@ -31,6 +32,7 @@ export const DEFAULT_UI_STATE = {
   showingTable: true,
   showingGraph: true,
   showingLogs: true,
+  dedupStrategy: LogsDedupStrategy.none,
 };
 
 const MAX_HISTORY_ITEMS = 100;
@@ -183,6 +185,7 @@ export function parseUrlState(initial: string | undefined): ExploreUrlState {
               showingGraph: segment.ui[0],
               showingLogs: segment.ui[1],
               showingTable: segment.ui[2],
+              dedupStrategy: segment.ui[3],
             };
           }
         });
@@ -204,7 +207,14 @@ export function serializeStateToUrlParam(urlState: ExploreUrlState, compact?: bo
       urlState.range.to,
       urlState.datasource,
       ...urlState.queries,
-      { ui: [!!urlState.ui.showingGraph, !!urlState.ui.showingLogs, !!urlState.ui.showingTable] },
+      {
+        ui: [
+          !!urlState.ui.showingGraph,
+          !!urlState.ui.showingLogs,
+          !!urlState.ui.showingTable,
+          urlState.ui.dedupStrategy,
+        ],
+      },
     ]);
   }
   return JSON.stringify(urlState);
diff --git a/public/app/core/utils/kbn.ts b/public/app/core/utils/kbn.ts
index a3a96f8afc3..91a57c84090 100644
--- a/public/app/core/utils/kbn.ts
+++ b/public/app/core/utils/kbn.ts
@@ -289,21 +289,21 @@ kbn.getUnitFormats = () => {
 //
 // Backward compatible layer for value formats to support old plugins
 //
-if (typeof Proxy !== "undefined") {
+if (typeof Proxy !== 'undefined') {
   kbn.valueFormats = new Proxy(kbn.valueFormats, {
     get(target, name, receiver) {
       if (typeof name !== 'string') {
-        throw {message: `Value format ${String(name)} is not a string` };
+        throw { message: `Value format ${String(name)} is not a string` };
       }
 
       const formatter = getValueFormat(name);
-      if  (formatter) {
+      if (formatter) {
         return formatter;
       }
 
       // default to look here
       return Reflect.get(target, name, receiver);
-    }
+    },
   });
 } else {
   kbn.valueFormats = getValueFormatterIndex();
diff --git a/public/app/core/utils/reselect.ts b/public/app/core/utils/reselect.ts
new file mode 100644
index 00000000000..7c8fc7727b0
--- /dev/null
+++ b/public/app/core/utils/reselect.ts
@@ -0,0 +1,5 @@
+import { memoize } from 'lodash';
+import { createSelectorCreator } from 'reselect';
+
+const hashFn = (...args) => args.reduce((acc, val) => acc + '-' + JSON.stringify(val), '');
+export const createLodashMemoizedSelector = createSelectorCreator(memoize, hashFn);
diff --git a/public/app/core/utils/scrollbar.ts b/public/app/core/utils/scrollbar.ts
index b1b098156ef..b2d77c89335 100644
--- a/public/app/core/utils/scrollbar.ts
+++ b/public/app/core/utils/scrollbar.ts
@@ -15,7 +15,7 @@ export default function getScrollbarWidth() {
       position: 'absolute',
       top: '-9999px',
       overflow: 'scroll',
-      MsOverflowStyle: 'scrollbar'
+      MsOverflowStyle: 'scrollbar',
     };
 
     Object.keys(newStyles).map(style => {
@@ -23,7 +23,7 @@ export default function getScrollbarWidth() {
     });
 
     document.body.appendChild(div);
-    scrollbarWidth = (div.offsetWidth - div.clientWidth);
+    scrollbarWidth = div.offsetWidth - div.clientWidth;
     document.body.removeChild(div);
   } else {
     scrollbarWidth = 0;
diff --git a/public/app/core/utils/text.ts b/public/app/core/utils/text.ts
index 427b0102c95..31a6c4759fd 100644
--- a/public/app/core/utils/text.ts
+++ b/public/app/core/utils/text.ts
@@ -50,7 +50,7 @@ const XSSWL = Object.keys(xss.whiteList).reduce((acc, element) => {
 }, {});
 
 const sanitizeXSS = new xss.FilterXSS({
-  whiteList: XSSWL
+  whiteList: XSSWL,
 });
 
 /**
@@ -60,7 +60,7 @@ const sanitizeXSS = new xss.FilterXSS({
  * Info: https://github.com/leizongmin/js-xss#customize-css-filter
  * Whitelist: https://github.com/leizongmin/js-css-filter/blob/master/lib/default.js
  */
-export function sanitize (unsanitizedString: string): string {
+export function sanitize(unsanitizedString: string): string {
   try {
     return sanitizeXSS.process(unsanitizedString);
   } catch (error) {
diff --git a/public/app/core/utils/url.ts b/public/app/core/utils/url.ts
index 824e0e4e9c9..b0994eb0103 100644
--- a/public/app/core/utils/url.ts
+++ b/public/app/core/utils/url.ts
@@ -12,13 +12,13 @@ export function renderUrl(path: string, query: UrlQueryMap | undefined): string
 }
 
 export function encodeURIComponentAsAngularJS(val, pctEncodeSpaces) {
-  return encodeURIComponent(val).
-             replace(/%40/gi, '@').
-             replace(/%3A/gi, ':').
-             replace(/%24/g, '$').
-             replace(/%2C/gi, ',').
-             replace(/%3B/gi, ';').
-             replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
+  return encodeURIComponent(val)
+    .replace(/%40/gi, '@')
+    .replace(/%3A/gi, ':')
+    .replace(/%24/g, '$')
+    .replace(/%2C/gi, ',')
+    .replace(/%3B/gi, ';')
+    .replace(/%20/g, pctEncodeSpaces ? '%20' : '+');
 }
 
 export function toUrlParams(a) {
diff --git a/public/app/features/admin/AdminEditOrgCtrl.ts b/public/app/features/admin/AdminEditOrgCtrl.ts
index 3117c5f0f9b..60514a86392 100644
--- a/public/app/features/admin/AdminEditOrgCtrl.ts
+++ b/public/app/features/admin/AdminEditOrgCtrl.ts
@@ -1,4 +1,3 @@
-
 export default class AdminEditOrgCtrl {
   /** @ngInject */
   constructor($scope, $routeParams, backendSrv, $location, navModelSrv) {
@@ -46,4 +45,3 @@ export default class AdminEditOrgCtrl {
     $scope.init();
   }
 }
-
diff --git a/public/app/features/admin/AdminListOrgsCtrl.ts b/public/app/features/admin/AdminListOrgsCtrl.ts
index 9190f7f494e..8783efc182c 100644
--- a/public/app/features/admin/AdminListOrgsCtrl.ts
+++ b/public/app/features/admin/AdminListOrgsCtrl.ts
@@ -1,4 +1,3 @@
-
 export default class AdminListOrgsCtrl {
   /** @ngInject */
   constructor($scope, backendSrv, navModelSrv) {
@@ -31,4 +30,3 @@ export default class AdminListOrgsCtrl {
     $scope.init();
   }
 }
-
diff --git a/public/app/features/admin/ServerStats.tsx b/public/app/features/admin/ServerStats.tsx
index 5247e48515e..92e7da6e831 100644
--- a/public/app/features/admin/ServerStats.tsx
+++ b/public/app/features/admin/ServerStats.tsx
@@ -22,7 +22,7 @@ export class ServerStats extends PureComponent<Props, State> {
 
     this.state = {
       stats: [],
-      isLoading: false
+      isLoading: false,
     };
   }
 
diff --git a/public/app/features/admin/StyleGuideCtrl.ts b/public/app/features/admin/StyleGuideCtrl.ts
index 7be3009634d..e38e1a3344d 100644
--- a/public/app/features/admin/StyleGuideCtrl.ts
+++ b/public/app/features/admin/StyleGuideCtrl.ts
@@ -25,4 +25,3 @@ export default class StyleGuideCtrl {
     });
   }
 }
-
diff --git a/public/app/features/admin/partials/orgs.html b/public/app/features/admin/partials/orgs.html
index b40aed6faab..792ac38680b 100644
--- a/public/app/features/admin/partials/orgs.html
+++ b/public/app/features/admin/partials/orgs.html
@@ -4,8 +4,7 @@
   <div class="page-action-bar">
     <div class="page-action-bar__spacer"></div>
     <a class="page-header__cta btn btn-primary" href="org/new">
-      <i class="fa fa-plus"></i>
-      New Org
+      New org
     </a>
   </div>
 
diff --git a/public/app/features/admin/partials/users.html b/public/app/features/admin/partials/users.html
index 08704dc0459..dd8c8c2c2ad 100644
--- a/public/app/features/admin/partials/users.html
+++ b/public/app/features/admin/partials/users.html
@@ -8,8 +8,7 @@
     </label>
     <div class="page-action-bar__spacer"></div>
     <a class="btn btn-primary" href="admin/users/create">
-      <i class="fa fa-plus"></i>
-      Add new user
+      New user
     </a>
   </div>
 
diff --git a/public/app/features/alerting/AlertRuleList.test.tsx b/public/app/features/alerting/AlertRuleList.test.tsx
index ce3b8d47142..e1db5c77839 100644
--- a/public/app/features/alerting/AlertRuleList.test.tsx
+++ b/public/app/features/alerting/AlertRuleList.test.tsx
@@ -18,7 +18,7 @@ const setup = (propOverrides?: object) => {
     togglePauseAlertRule: jest.fn(),
     stateFilter: '',
     search: '',
-    isLoading: false
+    isLoading: false,
   };
 
   Object.assign(props, propOverrides);
@@ -147,9 +147,8 @@ describe('Functions', () => {
   describe('Search query change', () => {
     it('should set search query', () => {
       const { instance } = setup();
-      const mockEvent = { target: { value: 'dashboard' } } as React.ChangeEvent<HTMLInputElement>;
 
-      instance.onSearchQueryChange(mockEvent);
+      instance.onSearchQueryChange('dashboard');
 
       expect(instance.props.setSearchQuery).toHaveBeenCalledWith('dashboard');
     });
diff --git a/public/app/features/alerting/AlertRuleList.tsx b/public/app/features/alerting/AlertRuleList.tsx
index 3a16703ef54..d20c977273c 100644
--- a/public/app/features/alerting/AlertRuleList.tsx
+++ b/public/app/features/alerting/AlertRuleList.tsx
@@ -9,6 +9,7 @@ import { getNavModel } from 'app/core/selectors/navModel';
 import { NavModel, StoreState, AlertRule } from 'app/types';
 import { getAlertRulesAsync, setSearchQuery, togglePauseAlertRule } from './state/actions';
 import { getAlertRuleItems, getSearchQuery } from './state/selectors';
+import { FilterInput } from 'app/core/components/FilterInput/FilterInput';
 
 export interface Props {
   navModel: NavModel;
@@ -69,8 +70,7 @@ export class AlertRuleList extends PureComponent<Props, any> {
     });
   };
 
-  onSearchQueryChange = (evt: React.ChangeEvent<HTMLInputElement>) => {
-    const { value } = evt.target;
+  onSearchQueryChange = (value: string) => {
     this.props.setSearchQuery(value);
   };
 
@@ -78,7 +78,7 @@ export class AlertRuleList extends PureComponent<Props, any> {
     this.props.togglePauseAlertRule(rule.id, { paused: rule.state !== 'paused' });
   };
 
-  alertStateFilterOption = ({ text, value }: { text: string; value: string; }) => {
+  alertStateFilterOption = ({ text, value }: { text: string; value: string }) => {
     return (
       <option key={value} value={value}>
         {text}
@@ -94,16 +94,13 @@ export class AlertRuleList extends PureComponent<Props, any> {
         <Page.Contents isLoading={isLoading}>
           <div className="page-action-bar">
             <div className="gf-form gf-form--grow">
-              <label className="gf-form--has-input-icon gf-form--grow">
-                <input
-                  type="text"
-                  className="gf-form-input"
-                  placeholder="Search alerts"
-                  value={search}
-                  onChange={this.onSearchQueryChange}
-                />
-                <i className="gf-form-input-icon fa fa-search" />
-              </label>
+              <FilterInput
+                labelClassName="gf-form--has-input-icon gf-form--grow"
+                inputClassName="gf-form-input"
+                placeholder="Search alerts"
+                value={search}
+                onChange={this.onSearchQueryChange}
+              />
             </div>
             <div className="gf-form">
               <label className="gf-form-label">States</label>
@@ -142,7 +139,7 @@ const mapStateToProps = (state: StoreState) => ({
   alertRules: getAlertRuleItems(state.alertRules),
   stateFilter: state.location.query.state,
   search: getSearchQuery(state.alertRules),
-  isLoading: state.alertRules.isLoading
+  isLoading: state.alertRules.isLoading,
 });
 
 const mapDispatchToProps = {
diff --git a/public/app/features/alerting/AlertTabCtrl.ts b/public/app/features/alerting/AlertTabCtrl.ts
index 12943805c2c..e46303f10a4 100644
--- a/public/app/features/alerting/AlertTabCtrl.ts
+++ b/public/app/features/alerting/AlertTabCtrl.ts
@@ -140,7 +140,7 @@ export class AlertTabCtrl {
       name: model.name,
       iconClass: this.getNotificationIcon(model.type),
       isDefault: false,
-      uid: model.uid
+      uid: model.uid,
     });
 
     // avoid duplicates using both id and uid to be backwards compatible.
@@ -157,8 +157,8 @@ export class AlertTabCtrl {
   removeNotification(an) {
     // remove notifiers refeered to by id and uid to support notifiers added
     // before and after we added support for uid
-    _.remove(this.alert.notifications, n =>  n.uid === an.uid || n.id === an.id);
-    _.remove(this.alertNotifications, n =>  n.uid === an.uid || n.id === an.id);
+    _.remove(this.alert.notifications, n => n.uid === an.uid || n.id === an.id);
+    _.remove(this.alertNotifications, n => n.uid === an.uid || n.id === an.id);
   }
 
   initModel() {
diff --git a/public/app/features/alerting/__snapshots__/AlertRuleList.test.tsx.snap b/public/app/features/alerting/__snapshots__/AlertRuleList.test.tsx.snap
index 9270cda93e3..dbc8945a1e7 100644
--- a/public/app/features/alerting/__snapshots__/AlertRuleList.test.tsx.snap
+++ b/public/app/features/alerting/__snapshots__/AlertRuleList.test.tsx.snap
@@ -13,20 +13,13 @@ exports[`Render should render alert rules 1`] = `
       <div
         className="gf-form gf-form--grow"
       >
-        <label
-          className="gf-form--has-input-icon gf-form--grow"
-        >
-          <input
-            className="gf-form-input"
-            onChange={[Function]}
-            placeholder="Search alerts"
-            type="text"
-            value=""
-          />
-          <i
-            className="gf-form-input-icon fa fa-search"
-          />
-        </label>
+        <ForwardRef
+          inputClassName="gf-form-input"
+          labelClassName="gf-form--has-input-icon gf-form--grow"
+          onChange={[Function]}
+          placeholder="Search alerts"
+          value=""
+        />
       </div>
       <div
         className="gf-form"
@@ -167,20 +160,13 @@ exports[`Render should render component 1`] = `
       <div
         className="gf-form gf-form--grow"
       >
-        <label
-          className="gf-form--has-input-icon gf-form--grow"
-        >
-          <input
-            className="gf-form-input"
-            onChange={[Function]}
-            placeholder="Search alerts"
-            type="text"
-            value=""
-          />
-          <i
-            className="gf-form-input-icon fa fa-search"
-          />
-        </label>
+        <ForwardRef
+          inputClassName="gf-form-input"
+          labelClassName="gf-form--has-input-icon gf-form--grow"
+          onChange={[Function]}
+          placeholder="Search alerts"
+          value=""
+        />
       </div>
       <div
         className="gf-form"
diff --git a/public/app/features/alerting/partials/notifications_list.html b/public/app/features/alerting/partials/notifications_list.html
index ce4fea9ff49..66afa2513fa 100644
--- a/public/app/features/alerting/partials/notifications_list.html
+++ b/public/app/features/alerting/partials/notifications_list.html
@@ -8,7 +8,7 @@
       </div>
 
       <a href="alerting/notification/new" class="btn btn-primary">
-        New Channel
+        New channel
       </a>
     </div>
 
diff --git a/public/app/features/api-keys/ApiKeysPage.test.tsx b/public/app/features/api-keys/ApiKeysPage.test.tsx
index cd640b5a357..23def68728e 100644
--- a/public/app/features/api-keys/ApiKeysPage.test.tsx
+++ b/public/app/features/api-keys/ApiKeysPage.test.tsx
@@ -8,11 +8,11 @@ const setup = (propOverrides?: object) => {
   const props: Props = {
     navModel: {
       main: {
-        text: 'Configuration'
+        text: 'Configuration',
       },
       node: {
-        text: 'Api Keys'
-      }
+        text: 'Api Keys',
+      },
     } as NavModel,
     apiKeys: [] as ApiKey[],
     searchQuery: '',
@@ -78,9 +78,8 @@ describe('Functions', () => {
   describe('on search query change', () => {
     it('should call setSearchQuery', () => {
       const { instance } = setup();
-      const mockEvent = { target: { value: 'test' } };
 
-      instance.onSearchQueryChange(mockEvent);
+      instance.onSearchQueryChange('test');
 
       expect(instance.props.setSearchQuery).toHaveBeenCalledWith('test');
     });
diff --git a/public/app/features/api-keys/ApiKeysPage.tsx b/public/app/features/api-keys/ApiKeysPage.tsx
index 2627b1a6862..e249fdeb7a8 100644
--- a/public/app/features/api-keys/ApiKeysPage.tsx
+++ b/public/app/features/api-keys/ApiKeysPage.tsx
@@ -13,6 +13,7 @@ import config from 'app/core/config';
 import appEvents from 'app/core/app_events';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
 import { DeleteButton } from '@grafana/ui';
+import { FilterInput } from 'app/core/components/FilterInput/FilterInput';
 
 export interface Props {
   navModel: NavModel;
@@ -59,8 +60,8 @@ export class ApiKeysPage extends PureComponent<Props, any> {
     this.props.deleteApiKey(key.id);
   }
 
-  onSearchQueryChange = evt => {
-    this.props.setSearchQuery(evt.target.value);
+  onSearchQueryChange = (value: string) => {
+    this.props.setSearchQuery(value);
   };
 
   onToggleAdding = () => {
@@ -186,21 +187,18 @@ export class ApiKeysPage extends PureComponent<Props, any> {
       <>
         <div className="page-action-bar">
           <div className="gf-form gf-form--grow">
-            <label className="gf-form--has-input-icon gf-form--grow">
-              <input
-                type="text"
-                className="gf-form-input"
-                placeholder="Search keys"
-                value={searchQuery}
-                onChange={this.onSearchQueryChange}
-              />
-              <i className="gf-form-input-icon fa fa-search" />
-            </label>
+            <FilterInput
+              labelClassName="gf-form--has-input-icon gf-form--grow"
+              inputClassName="gf-form-input"
+              placeholder="Search keys"
+              value={searchQuery}
+              onChange={this.onSearchQueryChange}
+            />
           </div>
 
           <div className="page-action-bar__spacer" />
           <button className="btn btn-primary pull-right" onClick={this.onToggleAdding} disabled={isAdding}>
-            Add API Key
+            Add API key
           </button>
         </div>
 
@@ -241,13 +239,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
     return (
       <Page navModel={navModel}>
         <Page.Contents isLoading={!hasFetched}>
-          {hasFetched && (
-            apiKeysCount > 0 ? (
-              this.renderApiKeyList()
-            ) : (
-              this.renderEmptyList()
-            )
-          )}
+          {hasFetched && (apiKeysCount > 0 ? this.renderApiKeyList() : this.renderEmptyList())}
         </Page.Contents>
       </Page>
     );
diff --git a/public/app/features/dashboard/components/AdHocFilters/AdHocFiltersCtrl.ts b/public/app/features/dashboard/components/AdHocFilters/AdHocFiltersCtrl.ts
index a7616e0e513..21d91bbf7a7 100644
--- a/public/app/features/dashboard/components/AdHocFilters/AdHocFiltersCtrl.ts
+++ b/public/app/features/dashboard/components/AdHocFilters/AdHocFiltersCtrl.ts
@@ -10,13 +10,7 @@ export class AdHocFiltersCtrl {
   removeTagFilterSegment: any;
 
   /** @ngInject */
-  constructor(
-    private uiSegmentSrv,
-    private datasourceSrv,
-    private $q,
-    private variableSrv,
-    $scope,
-  ) {
+  constructor(private uiSegmentSrv, private datasourceSrv, private $q, private variableSrv, $scope) {
     this.removeTagFilterSegment = uiSegmentSrv.newSegment({
       fake: true,
       value: '-- remove filter --',
diff --git a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
index 135b04a8ac5..fe04248524a 100644
--- a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
+++ b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
@@ -87,7 +87,7 @@ export class AddPanelWidget extends React.Component<Props, State> {
 
     if (tab === 'visualization') {
       location.query.tab = 'visualization';
-      location.query.openVizPicker  = true;
+      location.query.openVizPicker = true;
     }
 
     reduxStore.dispatch(updateLocation(location));
@@ -161,7 +161,9 @@ export class AddPanelWidget extends React.Component<Props, State> {
               )}
             </div>
             <div className="add-panel-widget__actions">
-              <button className="btn btn-inverse add-panel-widget__action" onClick={this.onCreateNewRow}>Convert to row</button>
+              <button className="btn btn-inverse add-panel-widget__action" onClick={this.onCreateNewRow}>
+                Convert to row
+              </button>
               {copiedPanelPlugins.length === 1 && (
                 <button
                   className="btn btn-inverse add-panel-widget__action"
diff --git a/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx b/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
index e5fb0da71fc..f358281e018 100644
--- a/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
+++ b/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
@@ -76,7 +76,9 @@ export class DashboardPermissions extends PureComponent<Props, State> {
               </div>
             </Tooltip>
             <div className="page-action-bar__spacer" />
-            <button className="btn btn-primary pull-right" onClick={this.onOpenAddPermissions} disabled={isAdding}>Add Permission</button>
+            <button className="btn btn-primary pull-right" onClick={this.onOpenAddPermissions} disabled={isAdding}>
+              Add Permission
+            </button>
           </div>
         </div>
         <SlideDown in={isAdding}>
diff --git a/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx b/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx
index bb63cea90ea..6eda6846c29 100644
--- a/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx
+++ b/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx
@@ -27,7 +27,7 @@ export class DashboardRow extends React.Component<DashboardRowProps, any> {
 
   onVariableUpdated = () => {
     this.forceUpdate();
-  }
+  };
 
   onToggle = () => {
     this.props.dashboard.toggleRow(this.props.panel);
@@ -35,12 +35,12 @@ export class DashboardRow extends React.Component<DashboardRowProps, any> {
     this.setState(prevState => {
       return { collapsed: !prevState.collapsed };
     });
-  }
+  };
 
   onUpdate = () => {
     this.props.dashboard.processRepeats();
     this.forceUpdate();
-  }
+  };
 
   onOpenSettings = () => {
     appEvents.emit('show-modal', {
@@ -51,7 +51,7 @@ export class DashboardRow extends React.Component<DashboardRowProps, any> {
         onUpdated: this.onUpdate,
       },
     });
-  }
+  };
 
   onDelete = () => {
     appEvents.emit('confirm-modal', {
@@ -66,7 +66,7 @@ export class DashboardRow extends React.Component<DashboardRowProps, any> {
         this.props.dashboard.removeRow(this.props.panel, false);
       },
     });
-  }
+  };
 
   render() {
     const classes = classNames({
diff --git a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
index 8a92c0d69eb..a043bc3e0da 100644
--- a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
@@ -31,6 +31,6 @@ export class DashboardSettings extends PureComponent<Props> {
   }
 
   render() {
-    return <div className="panel-height-helper" ref={element => this.element = element} />;
+    return <div className="panel-height-helper" ref={element => (this.element = element)} />;
   }
 }
diff --git a/public/app/features/dashboard/components/DashboardSettings/SettingsCtrl.ts b/public/app/features/dashboard/components/DashboardSettings/SettingsCtrl.ts
index e5cfac97d5f..fc3b98b4848 100755
--- a/public/app/features/dashboard/components/DashboardSettings/SettingsCtrl.ts
+++ b/public/app/features/dashboard/components/DashboardSettings/SettingsCtrl.ts
@@ -38,7 +38,7 @@ export class SettingsCtrl {
       });
     });
 
-    this.canSaveAs = this.dashboard.meta.canEdit && contextSrv.hasEditPermissionInFolders;
+    this.canSaveAs = contextSrv.hasEditPermissionInFolders;
     this.canSave = this.dashboard.meta.canSave;
     this.canDelete = this.dashboard.meta.canSave;
 
diff --git a/public/app/features/dashboard/components/DashboardSettings/template.html b/public/app/features/dashboard/components/DashboardSettings/template.html
index 99edc035bd5..4db390dc47a 100644
--- a/public/app/features/dashboard/components/DashboardSettings/template.html
+++ b/public/app/features/dashboard/components/DashboardSettings/template.html
@@ -11,14 +11,12 @@
 
 	<div class="dashboard-settings__aside-actions">
     <button class="btn btn-primary" ng-click="ctrl.saveDashboard()" ng-show="ctrl.canSave">
-			<i class="fa fa-save"></i> Save
+			Save
 		</button>
 		<button class="btn btn-inverse" ng-click="ctrl.openSaveAsModal()" ng-show="ctrl.canSaveAs">
-			<i class="fa fa-copy"></i>
 			Save As...
 		</button>
 		<button class="btn btn-danger" ng-click="ctrl.deleteDashboard()" ng-show="ctrl.canDelete">
-			<i class="fa fa-trash"></i>
 			Delete
 		</button>
 	</div>
@@ -101,7 +99,7 @@
 
   <div class="gf-form-button-row">
     <button class="btn btn-primary" ng-click="ctrl.saveDashboardJson()" ng-show="ctrl.canSave">
-      <i class="fa fa-save"></i> Save Changes
+      Save Changes
     </button>
   </div>
 </div>
diff --git a/public/app/features/dashboard/components/SubMenu/SubMenu.tsx b/public/app/features/dashboard/components/SubMenu/SubMenu.tsx
index caef8f2de38..bb18481d51a 100644
--- a/public/app/features/dashboard/components/SubMenu/SubMenu.tsx
+++ b/public/app/features/dashboard/components/SubMenu/SubMenu.tsx
@@ -31,6 +31,6 @@ export class SubMenu extends PureComponent<Props> {
   }
 
   render() {
-    return <div ref={element => this.element = element} />;
+    return <div ref={element => (this.element = element)} />;
   }
 }
diff --git a/public/app/features/dashboard/containers/DashboardPage.test.tsx b/public/app/features/dashboard/containers/DashboardPage.test.tsx
index 1e6f8bd888e..4d331226986 100644
--- a/public/app/features/dashboard/containers/DashboardPage.test.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.test.tsx
@@ -3,7 +3,7 @@ import { shallow, ShallowWrapper } from 'enzyme';
 import { DashboardPage, Props, State } from './DashboardPage';
 import { DashboardModel } from '../state';
 import { cleanUpDashboard } from '../state/actions';
-import { getNoPayloadActionCreatorMock, NoPayloadActionCreatorMock  } from 'app/core/redux';
+import { getNoPayloadActionCreatorMock, NoPayloadActionCreatorMock } from 'app/core/redux';
 import { DashboardRouteInfo, DashboardInitPhase } from 'app/types';
 
 jest.mock('sass/_variables.scss', () => ({
@@ -23,17 +23,20 @@ interface ScenarioContext {
 }
 
 function getTestDashboard(overrides?: any, metaOverrides?: any): DashboardModel {
-  const data = Object.assign({
-    title: 'My dashboard',
-    panels: [
-      {
-        id: 1,
-        type: 'graph',
-        title: 'My graph',
-        gridPos: { x: 0, y: 0, w: 1, h: 1 },
-      },
-    ],
-  }, overrides);
+  const data = Object.assign(
+    {
+      title: 'My dashboard',
+      panels: [
+        {
+          id: 1,
+          type: 'graph',
+          title: 'My graph',
+          gridPos: { x: 0, y: 0, w: 1, h: 1 },
+        },
+      ],
+    },
+    overrides
+  );
 
   const meta = Object.assign({ canSave: true, canEdit: true }, metaOverrides);
   return new DashboardModel(data, meta);
@@ -74,7 +77,7 @@ function dashboardPageScenario(description, scenarioFn: (ctx: ScenarioContext) =
 
         ctx.dashboard = props.dashboard;
         ctx.wrapper = shallow(<DashboardPage {...props} />);
-      }
+      },
     };
 
     beforeEach(() => {
@@ -86,8 +89,7 @@ function dashboardPageScenario(description, scenarioFn: (ctx: ScenarioContext) =
 }
 
 describe('DashboardPage', () => {
-
-  dashboardPageScenario("Given initial state", (ctx) => {
+  dashboardPageScenario('Given initial state', ctx => {
     ctx.setup(() => {
       ctx.mount();
     });
@@ -97,7 +99,7 @@ describe('DashboardPage', () => {
     });
   });
 
-  dashboardPageScenario("Dashboard is fetching slowly", (ctx) => {
+  dashboardPageScenario('Dashboard is fetching slowly', ctx => {
     ctx.setup(() => {
       ctx.mount();
       ctx.wrapper.setProps({
@@ -111,7 +113,7 @@ describe('DashboardPage', () => {
     });
   });
 
-  dashboardPageScenario("Dashboard init completed ", (ctx) => {
+  dashboardPageScenario('Dashboard init completed ', ctx => {
     ctx.setup(() => {
       ctx.mount();
       ctx.setDashboardProp();
@@ -126,7 +128,7 @@ describe('DashboardPage', () => {
     });
   });
 
-  dashboardPageScenario("When user goes into panel edit", (ctx) => {
+  dashboardPageScenario('When user goes into panel edit', ctx => {
     ctx.setup(() => {
       ctx.mount();
       ctx.setDashboardProp();
@@ -149,7 +151,7 @@ describe('DashboardPage', () => {
     });
   });
 
-  dashboardPageScenario("When user goes back to dashboard from panel edit", (ctx) => {
+  dashboardPageScenario('When user goes back to dashboard from panel edit', ctx => {
     ctx.setup(() => {
       ctx.mount();
       ctx.setDashboardProp();
@@ -179,7 +181,7 @@ describe('DashboardPage', () => {
     });
   });
 
-  dashboardPageScenario("When dashboard has editview url state", (ctx) => {
+  dashboardPageScenario('When dashboard has editview url state', ctx => {
     ctx.setup(() => {
       ctx.mount();
       ctx.setDashboardProp();
@@ -197,7 +199,7 @@ describe('DashboardPage', () => {
     });
   });
 
-  dashboardPageScenario("When adding panel", (ctx) => {
+  dashboardPageScenario('When adding panel', ctx => {
     ctx.setup(() => {
       ctx.mount();
       ctx.setDashboardProp();
@@ -214,37 +216,37 @@ describe('DashboardPage', () => {
     });
   });
 
-  dashboardPageScenario("Given panel with id 0", (ctx) => {
+  dashboardPageScenario('Given panel with id 0', ctx => {
     ctx.setup(() => {
       ctx.mount();
       ctx.setDashboardProp({
-        panels: [{ id: 0, type: 'graph'}],
+        panels: [{ id: 0, type: 'graph' }],
         schemaVersion: 17,
       });
       ctx.wrapper.setProps({
         urlEdit: true,
         urlFullscreen: true,
-        urlPanelId: '0'
+        urlPanelId: '0',
       });
     });
 
-    it('Should go into edit mode' , () => {
+    it('Should go into edit mode', () => {
       expect(ctx.wrapper.state().isEditing).toBe(true);
       expect(ctx.wrapper.state().fullscreenPanel.id).toBe(0);
     });
   });
 
-  dashboardPageScenario("When dashboard unmounts", (ctx) => {
+  dashboardPageScenario('When dashboard unmounts', ctx => {
     ctx.setup(() => {
       ctx.mount();
       ctx.setDashboardProp({
-        panels: [{ id: 0, type: 'graph'}],
+        panels: [{ id: 0, type: 'graph' }],
         schemaVersion: 17,
       });
       ctx.wrapper.unmount();
     });
 
-    it('Should call clean up action' , () => {
+    it('Should call clean up action', () => {
       expect(ctx.cleanUpDashboardMock.calls).toBe(1);
     });
   });
diff --git a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
index 27f699ff3e6..601341d2657 100644
--- a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
@@ -14,7 +14,7 @@ let lastGridWidth = 1200;
 let ignoreNextWidthChange = false;
 
 interface GridWrapperProps {
-  size: { width: number; };
+  size: { width: number };
   layout: ReactGridLayout.Layout[];
   onLayoutChange: (layout: ReactGridLayout.Layout[]) => void;
   children: JSX.Element | JSX.Element[];
@@ -41,7 +41,7 @@ function GridWrapper({
   isResizable,
   isDraggable,
   isFullscreen,
-}: GridWrapperProps)  {
+}: GridWrapperProps) {
   const width = size.width > 0 ? size.width : lastGridWidth;
 
   // logic to ignore width changes (optimization)
@@ -149,21 +149,21 @@ export class DashboardGrid extends PureComponent<Props> {
     }
 
     this.props.dashboard.sortPanelsByGridPos();
-  }
+  };
 
   triggerForceUpdate = () => {
     this.forceUpdate();
-  }
+  };
 
   onWidthChange = () => {
     for (const panel of this.props.dashboard.panels) {
       panel.resizeDone();
     }
-  }
+  };
 
   onViewModeChanged = () => {
     ignoreNextWidthChange = true;
-  }
+  };
 
   updateGridPos = (item: ReactGridLayout.Layout, layout: ReactGridLayout.Layout[]) => {
     this.panelMap[item.i].updateGridPos(item);
@@ -171,21 +171,21 @@ export class DashboardGrid extends PureComponent<Props> {
     // react-grid-layout has a bug (#670), and onLayoutChange() is only called when the component is mounted.
     // So it's required to call it explicitly when panel resized or moved to save layout changes.
     this.onLayoutChange(layout);
-  }
+  };
 
   onResize: ItemCallback = (layout, oldItem, newItem) => {
     console.log();
     this.panelMap[newItem.i].updateGridPos(newItem);
-  }
+  };
 
   onResizeStop: ItemCallback = (layout, oldItem, newItem) => {
     this.updateGridPos(newItem, layout);
     this.panelMap[newItem.i].resizeDone();
-  }
+  };
 
   onDragStop: ItemCallback = (layout, oldItem, newItem) => {
     this.updateGridPos(newItem, layout);
-  }
+  };
 
   renderPanels() {
     const panelElements = [];
diff --git a/public/app/features/dashboard/dashgrid/DataPanel.tsx b/public/app/features/dashboard/dashgrid/DataPanel.tsx
index 2183548000b..b81d66fa7f5 100644
--- a/public/app/features/dashboard/dashgrid/DataPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/DataPanel.tsx
@@ -28,7 +28,7 @@ interface RenderProps {
 export interface Props {
   datasource: string | null;
   queries: any[];
-  panelId?: number;
+  panelId: number;
   dashboardId?: number;
   isVisible?: boolean;
   timeRange?: TimeRange;
@@ -50,7 +50,6 @@ export interface State {
 export class DataPanel extends Component<Props, State> {
   static defaultProps = {
     isVisible: true,
-    panelId: 1,
     dashboardId: 1,
   };
 
diff --git a/public/app/features/dashboard/dashgrid/PanelChrome.tsx b/public/app/features/dashboard/dashgrid/PanelChrome.tsx
index b02d9479dcc..b050b1ff5e1 100644
--- a/public/app/features/dashboard/dashgrid/PanelChrome.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelChrome.tsx
@@ -10,14 +10,14 @@ import { PanelHeader } from './PanelHeader/PanelHeader';
 import { DataPanel } from './DataPanel';
 
 // Utils
-import { applyPanelTimeOverrides } from 'app/features/dashboard/utils/panel';
+import { applyPanelTimeOverrides, snapshotDataToPanelData } from 'app/features/dashboard/utils/panel';
 import { PANEL_HEADER_HEIGHT } from 'app/core/constants';
 import { profiler } from 'app/core/profiler';
 
 // Types
 import { DashboardModel, PanelModel } from '../state';
 import { PanelPlugin } from 'app/types';
-import { TimeRange, LoadingState } from '@grafana/ui';
+import { TimeRange, LoadingState, PanelData } from '@grafana/ui';
 
 import variables from 'sass/_variables.scss';
 import templateSrv from 'app/features/templating/template_srv';
@@ -94,7 +94,20 @@ export class PanelChrome extends PureComponent<Props, State> {
     return !this.props.dashboard.otherPanelInFullscreen(this.props.panel);
   }
 
-  renderPanel(loading, panelData, width, height): JSX.Element {
+  get hasPanelSnapshot() {
+    const { panel } = this.props;
+    return panel.snapshotData && panel.snapshotData.length;
+  }
+
+  get needsQueryExecution() {
+    return this.hasPanelSnapshot || this.props.plugin.dataFormats.length > 0;
+  }
+
+  get getDataForPanel() {
+    return this.hasPanelSnapshot ? snapshotDataToPanelData(this.props.panel) : null;
+  }
+
+  renderPanelPlugin(loading: LoadingState, panelData: PanelData, width: number, height: number): JSX.Element {
     const { panel, plugin } = this.props;
     const { timeRange, renderCounter } = this.state;
     const PanelComponent = plugin.exports.Panel;
@@ -121,11 +134,39 @@ export class PanelChrome extends PureComponent<Props, State> {
     );
   }
 
+  renderPanelBody = (width: number, height: number): JSX.Element => {
+    const { panel } = this.props;
+    const { refreshCounter, timeRange } = this.state;
+    const { datasource, targets } = panel;
+    return (
+      <>
+        {this.needsQueryExecution ? (
+          <DataPanel
+            panelId={panel.id}
+            datasource={datasource}
+            queries={targets}
+            timeRange={timeRange}
+            isVisible={this.isVisible}
+            widthPixels={width}
+            refreshCounter={refreshCounter}
+            onDataResponse={this.onDataResponse}
+          >
+            {({ loading, panelData }) => {
+              return this.renderPanelPlugin(loading, panelData, width, height);
+            }}
+          </DataPanel>
+        ) : (
+          this.renderPanelPlugin(LoadingState.Done, this.getDataForPanel, width, height)
+        )}
+      </>
+    );
+  };
+
   render() {
-    const { panel, dashboard } = this.props;
-    const { refreshCounter, timeRange, timeInfo } = this.state;
+    const { dashboard, panel } = this.props;
+    const { timeInfo } = this.state;
+    const { transparent } = panel;
 
-    const { datasource, targets, transparent } = panel;
     const containerClassNames = `panel-container panel-container--absolute ${transparent ? 'panel-transparent' : ''}`;
     return (
       <AutoSizer>
@@ -145,23 +186,7 @@ export class PanelChrome extends PureComponent<Props, State> {
                 scopedVars={panel.scopedVars}
                 links={panel.links}
               />
-              {panel.snapshotData ? (
-                this.renderPanel(false, panel.snapshotData, width, height)
-              ) : (
-                <DataPanel
-                  datasource={datasource}
-                  queries={targets}
-                  timeRange={timeRange}
-                  isVisible={this.isVisible}
-                  widthPixels={width}
-                  refreshCounter={refreshCounter}
-                  onDataResponse={this.onDataResponse}
-                >
-                  {({ loading, panelData }) => {
-                    return this.renderPanel(loading, panelData, width, height);
-                  }}
-                </DataPanel>
-              )}
+              {this.renderPanelBody(width, height)}
             </div>
           );
         }}
diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
index ebc89673387..22766b4c8e6 100644
--- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
@@ -30,18 +30,18 @@ interface State {
 }
 
 export class PanelHeader extends Component<Props, State> {
-  clickCoordinates: ClickCoordinates = {x: 0, y: 0};
+  clickCoordinates: ClickCoordinates = { x: 0, y: 0 };
   state = {
     panelMenuOpen: false,
-    clickCoordinates: {x: 0, y: 0}
+    clickCoordinates: { x: 0, y: 0 },
   };
 
   eventToClickCoordinates = (event: React.MouseEvent<HTMLDivElement>) => {
     return {
       x: event.clientX,
-      y: event.clientY
+      y: event.clientY,
     };
-  }
+  };
 
   onMouseDown = (event: React.MouseEvent<HTMLDivElement>) => {
     this.clickCoordinates = this.eventToClickCoordinates(event);
@@ -49,7 +49,7 @@ export class PanelHeader extends Component<Props, State> {
 
   isClick = (clickCoordinates: ClickCoordinates) => {
     return isEqual(clickCoordinates, this.clickCoordinates);
-  }
+  };
 
   onMenuToggle = (event: React.MouseEvent<HTMLDivElement>) => {
     if (this.isClick(this.eventToClickCoordinates(event))) {
diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx
index 159c9d92914..e1c21315bd2 100644
--- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx
@@ -76,13 +76,8 @@ export class PanelHeaderCorner extends Component<Props> {
     return (
       <>
         {infoMode === InfoModes.Info || infoMode === InfoModes.Links ? (
-          <Tooltip
-            content={this.getInfoContent()}
-            placement="bottom-start"
-          >
-            <div
-              className={`panel-info-corner panel-info-corner--${infoMode.toLowerCase()}`}
-            >
+          <Tooltip content={this.getInfoContent()} placement="bottom-start">
+            <div className={`panel-info-corner panel-info-corner--${infoMode.toLowerCase()}`}>
               <i className="fa" />
               <span className="panel-info-corner-inner" />
             </div>
diff --git a/public/app/features/dashboard/dashgrid/PanelPluginNotFound.tsx b/public/app/features/dashboard/dashgrid/PanelPluginNotFound.tsx
index 18b307b5ea5..3f835bdbac2 100644
--- a/public/app/features/dashboard/dashgrid/PanelPluginNotFound.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelPluginNotFound.tsx
@@ -46,6 +46,7 @@ export function getPanelPluginNotFound(id: string): PanelPlugin {
     sort: 100,
     module: '',
     baseUrl: '',
+    dataFormats: [],
     info: {
       author: {
         name: '',
diff --git a/public/app/features/dashboard/dashgrid/PanelResizer.tsx b/public/app/features/dashboard/dashgrid/PanelResizer.tsx
index 4571b5bcbf5..ad36f78ac3d 100644
--- a/public/app/features/dashboard/dashgrid/PanelResizer.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelResizer.tsx
@@ -66,7 +66,7 @@ export class PanelResizer extends PureComponent<Props, State> {
 
     return (
       <>
-        {render(isEditing ? {height: editorHeight} : this.noStyles)}
+        {render(isEditing ? { height: editorHeight } : this.noStyles)}
         {isEditing && (
           <div className="panel-editor-container__resizer">
             <Draggable axis="y" grid={[100, 1]} onDrag={this.onDrag} position={{ x: 0, y: 0 }}>
diff --git a/public/app/features/dashboard/index.ts b/public/app/features/dashboard/index.ts
index d9a03b0aad6..5e31a49f40f 100644
--- a/public/app/features/dashboard/index.ts
+++ b/public/app/features/dashboard/index.ts
@@ -27,4 +27,3 @@ import DashboardPermissions from './components/DashboardPermissions/DashboardPer
 import { react2AngularDirective } from 'app/core/utils/react2angular';
 
 react2AngularDirective('dashboardPermissions', DashboardPermissions, ['dashboardId', 'folder']);
-
diff --git a/public/app/features/dashboard/panel_editor/PanelEditor.tsx b/public/app/features/dashboard/panel_editor/PanelEditor.tsx
index bfdc13bc8f2..74870b25f07 100644
--- a/public/app/features/dashboard/panel_editor/PanelEditor.tsx
+++ b/public/app/features/dashboard/panel_editor/PanelEditor.tsx
@@ -30,6 +30,32 @@ interface PanelEditorTab {
   text: string;
 }
 
+enum PanelEditorTabIds {
+  Queries = 'queries',
+  Visualization = 'visualization',
+  Advanced = 'advanced',
+  Alert = 'alert',
+}
+
+interface PanelEditorTab {
+  id: string;
+  text: string;
+}
+
+const panelEditorTabTexts = {
+  [PanelEditorTabIds.Queries]: 'Queries',
+  [PanelEditorTabIds.Visualization]: 'Visualization',
+  [PanelEditorTabIds.Advanced]: 'Panel Options',
+  [PanelEditorTabIds.Alert]: 'Alert',
+};
+
+const getPanelEditorTab = (tabId: PanelEditorTabIds): PanelEditorTab => {
+  return {
+    id: tabId,
+    text: panelEditorTabTexts[tabId],
+  };
+};
+
 export class PanelEditor extends PureComponent<PanelEditorProps> {
   constructor(props) {
     super(props);
@@ -72,31 +98,26 @@ export class PanelEditor extends PureComponent<PanelEditorProps> {
 
   render() {
     const { plugin } = this.props;
-    let activeTab = store.getState().location.query.tab || 'queries';
+    let activeTab: PanelEditorTabIds = store.getState().location.query.tab || PanelEditorTabIds.Queries;
 
     const tabs: PanelEditorTab[] = [
-      { id: 'queries', text: 'Queries' },
-      { id: 'visualization', text: 'Visualization' },
-      { id: 'advanced', text: 'Panel Options' },
+      getPanelEditorTab(PanelEditorTabIds.Queries),
+      getPanelEditorTab(PanelEditorTabIds.Visualization),
+      getPanelEditorTab(PanelEditorTabIds.Advanced),
     ];
 
     // handle panels that do not have queries tab
-    if (plugin.exports.PanelCtrl) {
-      if (!plugin.exports.PanelCtrl.prototype.onDataReceived) {
-        // remove queries tab
-        tabs.shift();
-        // switch tab
-        if (activeTab === 'queries') {
-          activeTab = 'visualization';
-        }
+    if (plugin.dataFormats.length === 0) {
+      // remove queries tab
+      tabs.shift();
+      // switch tab
+      if (activeTab === PanelEditorTabIds.Queries) {
+        activeTab = PanelEditorTabIds.Visualization;
       }
     }
 
     if (config.alertingEnabled && plugin.id === 'graph') {
-      tabs.push({
-        id: 'alert',
-        text: 'Alert',
-      });
+      tabs.push(getPanelEditorTab(PanelEditorTabIds.Alert));
     }
 
     return (
diff --git a/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx b/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx
index 83ef70f62e7..cf89175a5ee 100644
--- a/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx
+++ b/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx
@@ -131,14 +131,7 @@ export class QueryEditorRow extends PureComponent<Props, State> {
 
     if (datasource.pluginExports.QueryEditor) {
       const QueryEditor = datasource.pluginExports.QueryEditor;
-      return (
-        <QueryEditor
-          query={query}
-          datasource={datasource}
-          onChange={onChange}
-          onRunQuery={this.onRunQuery}
-        />
-      );
+      return <QueryEditor query={query} datasource={datasource} onChange={onChange} onRunQuery={this.onRunQuery} />;
     }
 
     return <div>Data source plugin does not export any Query Editor component</div>;
diff --git a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
index 37f109250a7..f9d8b3df607 100644
--- a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
+++ b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
@@ -17,6 +17,7 @@ import { FadeIn } from 'app/core/components/Animations/FadeIn';
 import { PanelModel } from '../state/PanelModel';
 import { DashboardModel } from '../state/DashboardModel';
 import { PanelPlugin } from 'app/types/plugins';
+import { FilterInput } from 'app/core/components/FilterInput/FilterInput';
 
 interface Props {
   panel: PanelModel;
@@ -170,8 +171,7 @@ export class VisualizationTab extends PureComponent<Props, State> {
     this.setState({ isVizPickerOpen: false });
   };
 
-  onSearchQueryChange = evt => {
-    const value = evt.target.value;
+  onSearchQueryChange = (value: string) => {
     this.setState({
       searchQuery: value,
     });
@@ -184,17 +184,14 @@ export class VisualizationTab extends PureComponent<Props, State> {
     if (this.state.isVizPickerOpen) {
       return (
         <>
-          <label className="gf-form--has-input-icon">
-            <input
-              type="text"
-              className="gf-form-input width-13"
-              placeholder=""
-              onChange={this.onSearchQueryChange}
-              value={searchQuery}
-              ref={elem => elem && elem.focus()}
-            />
-            <i className="gf-form-input-icon fa fa-search" />
-          </label>
+          <FilterInput
+            labelClassName="gf-form--has-input-icon"
+            inputClassName="gf-form-input width-13"
+            placeholder=""
+            onChange={this.onSearchQueryChange}
+            value={searchQuery}
+            ref={elem => elem && elem.focus()}
+          />
           <button className="btn btn-link toolbar__close" onClick={this.onCloseVizPicker}>
             <i className="fa fa-chevron-up" />
           </button>
diff --git a/public/app/features/dashboard/services/DashboardSrv.ts b/public/app/features/dashboard/services/DashboardSrv.ts
index eccb1df9e43..e20c0ed5a31 100644
--- a/public/app/features/dashboard/services/DashboardSrv.ts
+++ b/public/app/features/dashboard/services/DashboardSrv.ts
@@ -31,7 +31,7 @@ export class DashboardSrv {
     removePanel(dashboard, dashboard.getPanelById(panelId), true);
   };
 
-  onPanelChangeView = (options) => {
+  onPanelChangeView = options => {
     const urlParams = this.$location.search();
 
     // handle toggle logic
diff --git a/public/app/features/dashboard/state/DashboardModel.ts b/public/app/features/dashboard/state/DashboardModel.ts
index aec6421d12a..17af2dbd801 100644
--- a/public/app/features/dashboard/state/DashboardModel.ts
+++ b/public/app/features/dashboard/state/DashboardModel.ts
@@ -917,5 +917,4 @@ export class DashboardModel {
       }
     }
   }
-
 }
diff --git a/public/app/features/dashboard/state/PanelModel.test.ts b/public/app/features/dashboard/state/PanelModel.test.ts
index b751caaa8f1..a7e112c7ba5 100644
--- a/public/app/features/dashboard/state/PanelModel.test.ts
+++ b/public/app/features/dashboard/state/PanelModel.test.ts
@@ -9,10 +9,7 @@ describe('PanelModel', () => {
       model = new PanelModel({
         type: 'table',
         showColumns: true,
-        targets: [
-          {refId: 'A'},
-          {noRefId: true}
-        ]
+        targets: [{ refId: 'A' }, { noRefId: true }],
       });
     });
 
diff --git a/public/app/features/dashboard/state/actions.ts b/public/app/features/dashboard/state/actions.ts
index f5911a233f7..50f64509575 100644
--- a/public/app/features/dashboard/state/actions.ts
+++ b/public/app/features/dashboard/state/actions.ts
@@ -139,4 +139,3 @@ export function removeDashboard(uri: string): ThunkResult<void> {
     dispatch(loadPluginDashboards());
   };
 }
-
diff --git a/public/app/features/dashboard/state/initDashboard.test.ts b/public/app/features/dashboard/state/initDashboard.test.ts
index ebef6fd8494..c06d5fb6e65 100644
--- a/public/app/features/dashboard/state/initDashboard.test.ts
+++ b/public/app/features/dashboard/state/initDashboard.test.ts
@@ -3,11 +3,7 @@ import thunk from 'redux-thunk';
 import { initDashboard, InitDashboardArgs } from './initDashboard';
 import { DashboardRouteInfo } from 'app/types';
 import { getBackendSrv } from 'app/core/services/backend_srv';
-import {
-  dashboardInitFetching,
-  dashboardInitCompleted,
-  dashboardInitServices,
-} from './actions';
+import { dashboardInitFetching, dashboardInitCompleted, dashboardInitServices } from './actions';
 
 jest.mock('app/core/services/backend_srv');
 
@@ -138,9 +134,11 @@ describeInitScenario('Initializing new dashboard', ctx => {
 describeInitScenario('Initializing home dashboard', ctx => {
   ctx.setup(() => {
     ctx.args.routeInfo = DashboardRouteInfo.Home;
-    ctx.backendSrv.get.mockReturnValue(Promise.resolve({
-      redirectUri: '/u/123/my-home'
-    }));
+    ctx.backendSrv.get.mockReturnValue(
+      Promise.resolve({
+        redirectUri: '/u/123/my-home',
+      })
+    );
   });
 
   it('Should redirect to custom home dashboard', () => {
@@ -148,5 +146,3 @@ describeInitScenario('Initializing home dashboard', ctx => {
     expect(ctx.actions[1].payload.path).toBe('/u/123/my-home');
   });
 });
-
-
diff --git a/public/app/features/dashboard/state/reducers.test.ts b/public/app/features/dashboard/state/reducers.test.ts
index 800ba27e800..a56af07ef74 100644
--- a/public/app/features/dashboard/state/reducers.test.ts
+++ b/public/app/features/dashboard/state/reducers.test.ts
@@ -49,7 +49,7 @@ describe('dashboard reducer', () => {
 
     beforeEach(() => {
       state = dashboardReducer(initialState, dashboardInitFetching());
-      state = dashboardReducer(state, dashboardInitFailed({message: 'Oh no', error: 'sad'}));
+      state = dashboardReducer(state, dashboardInitFailed({ message: 'Oh no', error: 'sad' }));
     });
 
     it('should set model', async () => {
diff --git a/public/app/features/dashboard/state/reducers.ts b/public/app/features/dashboard/state/reducers.ts
index 7a320beee93..8429e210253 100644
--- a/public/app/features/dashboard/state/reducers.ts
+++ b/public/app/features/dashboard/state/reducers.ts
@@ -70,7 +70,6 @@ export const dashboardReducer = reducerFactory(initialState)
   .addMapper({
     filter: cleanUpDashboard,
     mapper: (state, action) => {
-
       // Destroy current DashboardModel
       // Very important as this removes all dashboard event listeners
       state.model.destroy();
diff --git a/public/app/features/dashboard/utils/panel.test.ts b/public/app/features/dashboard/utils/panel.test.ts
index fdb4f16fa17..e32b7d84d68 100644
--- a/public/app/features/dashboard/utils/panel.test.ts
+++ b/public/app/features/dashboard/utils/panel.test.ts
@@ -39,7 +39,7 @@ describe('applyPanelTimeOverrides', () => {
 
   it('should apply time shift', () => {
     const panelModel = {
-      timeShift: '2h'
+      timeShift: '2h',
     };
 
     const expectedFromDate = moment([2019, 1, 11, 10, 0, 0]).toDate();
@@ -57,7 +57,7 @@ describe('applyPanelTimeOverrides', () => {
   it('should apply both relative time and time shift', () => {
     const panelModel = {
       timeFrom: '2h',
-      timeShift: '2h'
+      timeShift: '2h',
     };
 
     const expectedFromDate = moment([2019, 1, 11, 10, 0, 0]).toDate();
diff --git a/public/app/features/dashboard/utils/panel.ts b/public/app/features/dashboard/utils/panel.ts
index c0d753477a7..0c5d22412f5 100644
--- a/public/app/features/dashboard/utils/panel.ts
+++ b/public/app/features/dashboard/utils/panel.ts
@@ -4,7 +4,8 @@ import store from 'app/core/store';
 // Models
 import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 import { PanelModel } from 'app/features/dashboard/state/PanelModel';
-import { TimeRange } from '@grafana/ui';
+import { PanelData, TimeRange, TimeSeries } from '@grafana/ui';
+import { TableData } from '@grafana/ui/src';
 
 // Utils
 import { isString as _isString } from 'lodash';
@@ -168,3 +169,19 @@ export function getResolution(panel: PanelModel): number {
 
   return panel.maxDataPoints ? panel.maxDataPoints : Math.ceil(width * (panel.gridPos.w / 24));
 }
+
+const isTimeSeries = (data: any): data is TimeSeries => data && data.hasOwnProperty('datapoints');
+const isTableData = (data: any): data is TableData => data && data.hasOwnProperty('columns');
+export const snapshotDataToPanelData = (panel: PanelModel): PanelData => {
+  const snapshotData = panel.snapshotData;
+  if (isTimeSeries(snapshotData[0])) {
+    return {
+      timeSeries: snapshotData,
+    } as PanelData;
+  } else if (isTableData(snapshotData[0])) {
+    return {
+      tableData: snapshotData[0],
+    } as PanelData;
+  }
+  throw new Error('snapshotData is invalid:' + snapshotData.toString());
+};
diff --git a/public/app/features/datasources/DataSourceDashboards.test.tsx b/public/app/features/datasources/DataSourceDashboards.test.tsx
index 32e1d66928c..21ae806c603 100644
--- a/public/app/features/datasources/DataSourceDashboards.test.tsx
+++ b/public/app/features/datasources/DataSourceDashboards.test.tsx
@@ -14,7 +14,7 @@ const setup = (propOverrides?: object) => {
     loadDataSource: jest.fn(),
     loadPluginDashboards: jest.fn(),
     removeDashboard: jest.fn(),
-    isLoading: false
+    isLoading: false,
   };
 
   Object.assign(props, propOverrides);
diff --git a/public/app/features/datasources/DataSourceDashboards.tsx b/public/app/features/datasources/DataSourceDashboards.tsx
index 382f9433f46..89f5ddacc56 100644
--- a/public/app/features/datasources/DataSourceDashboards.tsx
+++ b/public/app/features/datasources/DataSourceDashboards.tsx
@@ -70,11 +70,10 @@ export class DataSourceDashboards extends PureComponent<Props> {
       <Page navModel={navModel}>
         <Page.Contents isLoading={isLoading}>
           <DashboardTable
-              dashboards={dashboards}
-              onImport={(dashboard, overwrite) => this.onImport(dashboard, overwrite)}
-              onRemove={dashboard => this.onRemove(dashboard)}
-            />
-
+            dashboards={dashboards}
+            onImport={(dashboard, overwrite) => this.onImport(dashboard, overwrite)}
+            onRemove={dashboard => this.onRemove(dashboard)}
+          />
         </Page.Contents>
       </Page>
     );
@@ -88,7 +87,7 @@ function mapStateToProps(state: StoreState) {
     pageId: pageId,
     dashboards: state.plugins.dashboards,
     dataSource: getDataSource(state.dataSources, pageId),
-    isLoading: state.plugins.isLoadingPluginDashboards
+    isLoading: state.plugins.isLoadingPluginDashboards,
   };
 }
 
diff --git a/public/app/features/datasources/NewDataSourcePage.tsx b/public/app/features/datasources/NewDataSourcePage.tsx
index 1d926048b8c..6cec3254106 100644
--- a/public/app/features/datasources/NewDataSourcePage.tsx
+++ b/public/app/features/datasources/NewDataSourcePage.tsx
@@ -6,6 +6,7 @@ import { NavModel, Plugin, StoreState } from 'app/types';
 import { addDataSource, loadDataSourceTypes, setDataSourceTypeSearchQuery } from './state/actions';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { getDataSourceTypes } from './state/selectors';
+import { FilterInput } from 'app/core/components/FilterInput/FilterInput';
 
 export interface Props {
   navModel: NavModel;
@@ -26,8 +27,8 @@ class NewDataSourcePage extends PureComponent<Props> {
     this.props.addDataSource(plugin);
   };
 
-  onSearchQueryChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    this.props.setDataSourceTypeSearchQuery(event.target.value);
+  onSearchQueryChange = (value: string) => {
+    this.props.setDataSourceTypeSearchQuery(value);
   };
 
   render() {
@@ -35,34 +36,29 @@ class NewDataSourcePage extends PureComponent<Props> {
     return (
       <Page navModel={navModel}>
         <Page.Contents isLoading={isLoading}>
-          <div className="page-container page-body">
-            <h2 className="add-data-source-header">Choose data source type</h2>
-            <div className="add-data-source-search">
-              <label className="gf-form--has-input-icon">
-                <input
-                  type="text"
-                  className="gf-form-input width-20"
-                  value={dataSourceTypeSearchQuery}
-                  onChange={this.onSearchQueryChange}
-                  placeholder="Filter by name or type"
-                />
-                <i className="gf-form-input-icon fa fa-search" />
-              </label>
-            </div>
-            <div className="add-data-source-grid">
-              {dataSourceTypes.map((plugin, index) => {
-                return (
-                  <div
-                    onClick={() => this.onDataSourceTypeClicked(plugin)}
-                    className="add-data-source-grid-item"
-                    key={`${plugin.id}-${index}`}
-                  >
-                    <img className="add-data-source-grid-item-logo" src={plugin.info.logos.small} />
-                    <span className="add-data-source-grid-item-text">{plugin.name}</span>
-                  </div>
-                );
-              })}
-            </div>
+          <h2 className="add-data-source-header">Choose data source type</h2>
+          <div className="add-data-source-search">
+            <FilterInput
+              labelClassName="gf-form--has-input-icon"
+              inputClassName="gf-form-input width-20"
+              value={dataSourceTypeSearchQuery}
+              onChange={this.onSearchQueryChange}
+              placeholder="Filter by name or type"
+            />
+          </div>
+          <div className="add-data-source-grid">
+            {dataSourceTypes.map((plugin, index) => {
+              return (
+                <div
+                  onClick={() => this.onDataSourceTypeClicked(plugin)}
+                  className="add-data-source-grid-item"
+                  key={`${plugin.id}-${index}`}
+                >
+                  <img className="add-data-source-grid-item-logo" src={plugin.info.logos.small} />
+                  <span className="add-data-source-grid-item-text">{plugin.name}</span>
+                </div>
+              );
+            })}
           </div>
         </Page.Contents>
       </Page>
@@ -74,7 +70,7 @@ function mapStateToProps(state: StoreState) {
   return {
     navModel: getNavModel(state.navIndex, 'datasources'),
     dataSourceTypes: getDataSourceTypes(state.dataSources),
-    isLoading: state.dataSources.isLoadingDataSources
+    isLoading: state.dataSources.isLoadingDataSources,
   };
 }
 
diff --git a/public/app/features/datasources/settings/ButtonRow.test.tsx b/public/app/features/datasources/settings/ButtonRow.test.tsx
index 0acab8941ff..84b16d829d5 100644
--- a/public/app/features/datasources/settings/ButtonRow.test.tsx
+++ b/public/app/features/datasources/settings/ButtonRow.test.tsx
@@ -7,6 +7,7 @@ const setup = (propOverrides?: object) => {
     isReadOnly: true,
     onSubmit: jest.fn(),
     onDelete: jest.fn(),
+    onTest: jest.fn(),
   };
 
   Object.assign(props, propOverrides);
diff --git a/public/app/features/datasources/settings/ButtonRow.tsx b/public/app/features/datasources/settings/ButtonRow.tsx
index 911bbe2c8b4..9f633ee6bcf 100644
--- a/public/app/features/datasources/settings/ButtonRow.tsx
+++ b/public/app/features/datasources/settings/ButtonRow.tsx
@@ -4,14 +4,22 @@ export interface Props {
   isReadOnly: boolean;
   onDelete: () => void;
   onSubmit: (event) => void;
+  onTest: (event) => void;
 }
 
-const ButtonRow: FC<Props> = ({ isReadOnly, onDelete, onSubmit }) => {
+const ButtonRow: FC<Props> = ({ isReadOnly, onDelete, onSubmit, onTest }) => {
   return (
     <div className="gf-form-button-row">
-      <button type="submit" className="btn btn-primary" disabled={isReadOnly} onClick={event => onSubmit(event)}>
-        Save &amp; Test
-      </button>
+      {!isReadOnly && (
+        <button type="submit" className="btn btn-primary" disabled={isReadOnly} onClick={event => onSubmit(event)}>
+          Save &amp; Test
+        </button>
+      )}
+      {isReadOnly && (
+        <button type="submit" className="btn btn-success" onClick={onTest}>
+          Test
+        </button>
+      )}
       <button type="submit" className="btn btn-danger" disabled={isReadOnly} onClick={onDelete}>
         Delete
       </button>
diff --git a/public/app/features/datasources/settings/DataSourceSettingsPage.tsx b/public/app/features/datasources/settings/DataSourceSettingsPage.tsx
index ff840390cf5..ba50c9430ba 100644
--- a/public/app/features/datasources/settings/DataSourceSettingsPage.tsx
+++ b/public/app/features/datasources/settings/DataSourceSettingsPage.tsx
@@ -72,6 +72,12 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
     this.testDataSource();
   };
 
+  onTest = async (evt: React.FormEvent<HTMLFormElement>) => {
+    evt.preventDefault();
+
+    this.testDataSource();
+  };
+
   onDelete = () => {
     appEvents.emit('confirm-modal', {
       title: 'Delete',
@@ -180,7 +186,7 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
     return (
       <Page navModel={navModel}>
         <Page.Contents isLoading={!this.hasDataSource}>
-          {this.hasDataSource && <div className="page-container page-body">
+          {this.hasDataSource && (
             <div>
               <form onSubmit={this.onSubmit}>
                 {this.isReadOnly() && this.renderIsReadOnlyMessage()}
@@ -201,7 +207,7 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
                   />
                 )}
 
-                <div className="gf-form-group section">
+                <div className="gf-form-group">
                   {testingMessage && (
                     <div className={`alert-${testingStatus} alert`}>
                       <div className="alert-icon">
@@ -222,10 +228,11 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
                   onSubmit={event => this.onSubmit(event)}
                   isReadOnly={this.isReadOnly()}
                   onDelete={this.onDelete}
+                  onTest={event => this.onTest(event)}
                 />
               </form>
             </div>
-          </div>}
+          )}
         </Page.Contents>
       </Page>
     );
diff --git a/public/app/features/datasources/settings/__snapshots__/ButtonRow.test.tsx.snap b/public/app/features/datasources/settings/__snapshots__/ButtonRow.test.tsx.snap
index 506a03ccd83..00251237f83 100644
--- a/public/app/features/datasources/settings/__snapshots__/ButtonRow.test.tsx.snap
+++ b/public/app/features/datasources/settings/__snapshots__/ButtonRow.test.tsx.snap
@@ -5,12 +5,11 @@ exports[`Render should render component 1`] = `
   className="gf-form-button-row"
 >
   <button
-    className="btn btn-primary"
-    disabled={true}
-    onClick={[Function]}
+    className="btn btn-success"
+    onClick={[MockFunction]}
     type="submit"
   >
-    Save & Test
+    Test
   </button>
   <button
     className="btn btn-danger"
diff --git a/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap b/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap
index af7895ac6b8..6855bf22b30 100644
--- a/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap
+++ b/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap
@@ -7,99 +7,96 @@ exports[`Render should render alpha info text 1`] = `
   <PageContents
     isLoading={false}
   >
-    <div
-      className="page-container page-body"
-    >
-      <div>
-        <form
-          onSubmit={[Function]}
+    <div>
+      <form
+        onSubmit={[Function]}
+      >
+        <div
+          className="grafana-info-box"
         >
-          <div
-            className="grafana-info-box"
-          >
-            This plugin is marked as being in alpha state, which means it is in early development phase and updates will include breaking changes.
-          </div>
-          <BasicSettings
-            dataSourceName="gdev-cloudwatch"
-            isDefault={false}
-            onDefaultChange={[Function]}
-            onNameChange={[Function]}
-          />
-          <PluginSettings
-            dataSource={
-              Object {
-                "access": "",
-                "basicAuth": false,
-                "basicAuthPassword": "",
-                "basicAuthUser": "",
-                "database": "",
-                "id": 13,
-                "isDefault": false,
-                "jsonData": Object {
-                  "authType": "credentials",
-                  "defaultRegion": "eu-west-2",
-                },
-                "name": "gdev-cloudwatch",
-                "orgId": 1,
-                "password": "",
-                "readOnly": false,
-                "type": "cloudwatch",
-                "typeLogoUrl": "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
-                "url": "",
-                "user": "",
-                "withCredentials": false,
-              }
+          This plugin is marked as being in alpha state, which means it is in early development phase and updates will include breaking changes.
+        </div>
+        <BasicSettings
+          dataSourceName="gdev-cloudwatch"
+          isDefault={false}
+          onDefaultChange={[Function]}
+          onNameChange={[Function]}
+        />
+        <PluginSettings
+          dataSource={
+            Object {
+              "access": "",
+              "basicAuth": false,
+              "basicAuthPassword": "",
+              "basicAuthUser": "",
+              "database": "",
+              "id": 13,
+              "isDefault": false,
+              "jsonData": Object {
+                "authType": "credentials",
+                "defaultRegion": "eu-west-2",
+              },
+              "name": "gdev-cloudwatch",
+              "orgId": 1,
+              "password": "",
+              "readOnly": false,
+              "type": "cloudwatch",
+              "typeLogoUrl": "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
+              "url": "",
+              "user": "",
+              "withCredentials": false,
             }
-            dataSourceMeta={
-              Object {
-                "defaultNavUrl": "some/url",
-                "enabled": false,
-                "hasUpdate": false,
-                "id": "1",
-                "info": Object {
-                  "author": Object {
-                    "name": "Grafana Labs",
-                    "url": "url/to/GrafanaLabs",
-                  },
-                  "description": "pretty decent plugin",
-                  "links": Array [
-                    Object {
-                      "name": "project",
-                      "url": "one link",
-                    },
-                  ],
-                  "logos": Object {
-                    "large": "large/logo",
-                    "small": "small/logo",
-                  },
-                  "screenshots": Array [
-                    Object {
-                      "path": "screenshot",
-                    },
-                  ],
-                  "updated": "2018-09-26",
-                  "version": "1",
+          }
+          dataSourceMeta={
+            Object {
+              "defaultNavUrl": "some/url",
+              "enabled": false,
+              "hasUpdate": false,
+              "id": "1",
+              "info": Object {
+                "author": Object {
+                  "name": "Grafana Labs",
+                  "url": "url/to/GrafanaLabs",
                 },
-                "latestVersion": "1",
-                "module": Object {},
-                "name": "pretty cool plugin 1",
-                "pinned": false,
-                "state": "alpha",
-                "type": "",
-              }
+                "description": "pretty decent plugin",
+                "links": Array [
+                  Object {
+                    "name": "project",
+                    "url": "one link",
+                  },
+                ],
+                "logos": Object {
+                  "large": "large/logo",
+                  "small": "small/logo",
+                },
+                "screenshots": Array [
+                  Object {
+                    "path": "screenshot",
+                  },
+                ],
+                "updated": "2018-09-26",
+                "version": "1",
+              },
+              "latestVersion": "1",
+              "module": Object {},
+              "name": "pretty cool plugin 1",
+              "pinned": false,
+              "state": "alpha",
+              "type": "",
             }
-            onModelChange={[Function]}
-          />
-          <div
-            className="gf-form-group section"
-          />
-          <ButtonRow
-            isReadOnly={false}
-            onDelete={[Function]}
-            onSubmit={[Function]}
-          />
-        </form>
-      </div>
+          }
+          onModelChange={[Function]}
+        />
+        <div
+          className="gf-form-group"
+        />
+        <ButtonRow
+          isReadOnly={false}
+          onDelete={[Function]}
+          onSubmit={[Function]}
+          onTest={[Function]}
+        />
+      </form>
     </div>
   </PageContents>
 </Page>
@@ -112,99 +109,96 @@ exports[`Render should render beta info text 1`] = `
   <PageContents
     isLoading={false}
   >
-    <div
-      className="page-container page-body"
-    >
-      <div>
-        <form
-          onSubmit={[Function]}
+    <div>
+      <form
+        onSubmit={[Function]}
+      >
+        <div
+          className="grafana-info-box"
         >
-          <div
-            className="grafana-info-box"
-          >
-            This plugin is marked as being in a beta development state. This means it is in currently in active development and could be missing important features.
-          </div>
-          <BasicSettings
-            dataSourceName="gdev-cloudwatch"
-            isDefault={false}
-            onDefaultChange={[Function]}
-            onNameChange={[Function]}
-          />
-          <PluginSettings
-            dataSource={
-              Object {
-                "access": "",
-                "basicAuth": false,
-                "basicAuthPassword": "",
-                "basicAuthUser": "",
-                "database": "",
-                "id": 13,
-                "isDefault": false,
-                "jsonData": Object {
-                  "authType": "credentials",
-                  "defaultRegion": "eu-west-2",
-                },
-                "name": "gdev-cloudwatch",
-                "orgId": 1,
-                "password": "",
-                "readOnly": false,
-                "type": "cloudwatch",
-                "typeLogoUrl": "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
-                "url": "",
-                "user": "",
-                "withCredentials": false,
-              }
+          This plugin is marked as being in a beta development state. This means it is in currently in active development and could be missing important features.
+        </div>
+        <BasicSettings
+          dataSourceName="gdev-cloudwatch"
+          isDefault={false}
+          onDefaultChange={[Function]}
+          onNameChange={[Function]}
+        />
+        <PluginSettings
+          dataSource={
+            Object {
+              "access": "",
+              "basicAuth": false,
+              "basicAuthPassword": "",
+              "basicAuthUser": "",
+              "database": "",
+              "id": 13,
+              "isDefault": false,
+              "jsonData": Object {
+                "authType": "credentials",
+                "defaultRegion": "eu-west-2",
+              },
+              "name": "gdev-cloudwatch",
+              "orgId": 1,
+              "password": "",
+              "readOnly": false,
+              "type": "cloudwatch",
+              "typeLogoUrl": "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
+              "url": "",
+              "user": "",
+              "withCredentials": false,
             }
-            dataSourceMeta={
-              Object {
-                "defaultNavUrl": "some/url",
-                "enabled": false,
-                "hasUpdate": false,
-                "id": "1",
-                "info": Object {
-                  "author": Object {
-                    "name": "Grafana Labs",
-                    "url": "url/to/GrafanaLabs",
-                  },
-                  "description": "pretty decent plugin",
-                  "links": Array [
-                    Object {
-                      "name": "project",
-                      "url": "one link",
-                    },
-                  ],
-                  "logos": Object {
-                    "large": "large/logo",
-                    "small": "small/logo",
-                  },
-                  "screenshots": Array [
-                    Object {
-                      "path": "screenshot",
-                    },
-                  ],
-                  "updated": "2018-09-26",
-                  "version": "1",
+          }
+          dataSourceMeta={
+            Object {
+              "defaultNavUrl": "some/url",
+              "enabled": false,
+              "hasUpdate": false,
+              "id": "1",
+              "info": Object {
+                "author": Object {
+                  "name": "Grafana Labs",
+                  "url": "url/to/GrafanaLabs",
                 },
-                "latestVersion": "1",
-                "module": Object {},
-                "name": "pretty cool plugin 1",
-                "pinned": false,
-                "state": "beta",
-                "type": "",
-              }
+                "description": "pretty decent plugin",
+                "links": Array [
+                  Object {
+                    "name": "project",
+                    "url": "one link",
+                  },
+                ],
+                "logos": Object {
+                  "large": "large/logo",
+                  "small": "small/logo",
+                },
+                "screenshots": Array [
+                  Object {
+                    "path": "screenshot",
+                  },
+                ],
+                "updated": "2018-09-26",
+                "version": "1",
+              },
+              "latestVersion": "1",
+              "module": Object {},
+              "name": "pretty cool plugin 1",
+              "pinned": false,
+              "state": "beta",
+              "type": "",
             }
-            onModelChange={[Function]}
-          />
-          <div
-            className="gf-form-group section"
-          />
-          <ButtonRow
-            isReadOnly={false}
-            onDelete={[Function]}
-            onSubmit={[Function]}
-          />
-        </form>
-      </div>
+          }
+          onModelChange={[Function]}
+        />
+        <div
+          className="gf-form-group"
+        />
+        <ButtonRow
+          isReadOnly={false}
+          onDelete={[Function]}
+          onSubmit={[Function]}
+          onTest={[Function]}
+        />
+      </form>
     </div>
   </PageContents>
 </Page>
@@ -217,94 +211,91 @@ exports[`Render should render component 1`] = `
   <PageContents
     isLoading={false}
   >
-    <div
-      className="page-container page-body"
-    >
-      <div>
-        <form
+    <div>
+      <form
+        onSubmit={[Function]}
+      >
+        <BasicSettings
+          dataSourceName="gdev-cloudwatch"
+          isDefault={false}
+          onDefaultChange={[Function]}
+          onNameChange={[Function]}
+        />
+        <PluginSettings
+          dataSource={
+            Object {
+              "access": "",
+              "basicAuth": false,
+              "basicAuthPassword": "",
+              "basicAuthUser": "",
+              "database": "",
+              "id": 13,
+              "isDefault": false,
+              "jsonData": Object {
+                "authType": "credentials",
+                "defaultRegion": "eu-west-2",
+              },
+              "name": "gdev-cloudwatch",
+              "orgId": 1,
+              "password": "",
+              "readOnly": false,
+              "type": "cloudwatch",
+              "typeLogoUrl": "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
+              "url": "",
+              "user": "",
+              "withCredentials": false,
+            }
+          }
+          dataSourceMeta={
+            Object {
+              "defaultNavUrl": "some/url",
+              "enabled": false,
+              "hasUpdate": false,
+              "id": "1",
+              "info": Object {
+                "author": Object {
+                  "name": "Grafana Labs",
+                  "url": "url/to/GrafanaLabs",
+                },
+                "description": "pretty decent plugin",
+                "links": Array [
+                  Object {
+                    "name": "project",
+                    "url": "one link",
+                  },
+                ],
+                "logos": Object {
+                  "large": "large/logo",
+                  "small": "small/logo",
+                },
+                "screenshots": Array [
+                  Object {
+                    "path": "screenshot",
+                  },
+                ],
+                "updated": "2018-09-26",
+                "version": "1",
+              },
+              "latestVersion": "1",
+              "module": Object {},
+              "name": "pretty cool plugin 1",
+              "pinned": false,
+              "state": "",
+              "type": "",
+            }
+          }
+          onModelChange={[Function]}
+        />
+        <div
+          className="gf-form-group"
+        />
+        <ButtonRow
+          isReadOnly={false}
+          onDelete={[Function]}
           onSubmit={[Function]}
-        >
-          <BasicSettings
-            dataSourceName="gdev-cloudwatch"
-            isDefault={false}
-            onDefaultChange={[Function]}
-            onNameChange={[Function]}
-          />
-          <PluginSettings
-            dataSource={
-              Object {
-                "access": "",
-                "basicAuth": false,
-                "basicAuthPassword": "",
-                "basicAuthUser": "",
-                "database": "",
-                "id": 13,
-                "isDefault": false,
-                "jsonData": Object {
-                  "authType": "credentials",
-                  "defaultRegion": "eu-west-2",
-                },
-                "name": "gdev-cloudwatch",
-                "orgId": 1,
-                "password": "",
-                "readOnly": false,
-                "type": "cloudwatch",
-                "typeLogoUrl": "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
-                "url": "",
-                "user": "",
-                "withCredentials": false,
-              }
-            }
-            dataSourceMeta={
-              Object {
-                "defaultNavUrl": "some/url",
-                "enabled": false,
-                "hasUpdate": false,
-                "id": "1",
-                "info": Object {
-                  "author": Object {
-                    "name": "Grafana Labs",
-                    "url": "url/to/GrafanaLabs",
-                  },
-                  "description": "pretty decent plugin",
-                  "links": Array [
-                    Object {
-                      "name": "project",
-                      "url": "one link",
-                    },
-                  ],
-                  "logos": Object {
-                    "large": "large/logo",
-                    "small": "small/logo",
-                  },
-                  "screenshots": Array [
-                    Object {
-                      "path": "screenshot",
-                    },
-                  ],
-                  "updated": "2018-09-26",
-                  "version": "1",
-                },
-                "latestVersion": "1",
-                "module": Object {},
-                "name": "pretty cool plugin 1",
-                "pinned": false,
-                "state": "",
-                "type": "",
-              }
-            }
-            onModelChange={[Function]}
-          />
-          <div
-            className="gf-form-group section"
-          />
-          <ButtonRow
-            isReadOnly={false}
-            onDelete={[Function]}
-            onSubmit={[Function]}
-          />
-        </form>
-      </div>
+          onTest={[Function]}
+        />
+      </form>
     </div>
   </PageContents>
 </Page>
@@ -317,99 +308,96 @@ exports[`Render should render is ready only message 1`] = `
   <PageContents
     isLoading={false}
   >
-    <div
-      className="page-container page-body"
-    >
-      <div>
-        <form
-          onSubmit={[Function]}
+    <div>
+      <form
+        onSubmit={[Function]}
+      >
+        <div
+          className="grafana-info-box span8"
         >
-          <div
-            className="grafana-info-box span8"
-          >
-            This datasource was added by config and cannot be modified using the UI. Please contact your server admin to update this datasource.
-          </div>
-          <BasicSettings
-            dataSourceName="gdev-cloudwatch"
-            isDefault={false}
-            onDefaultChange={[Function]}
-            onNameChange={[Function]}
-          />
-          <PluginSettings
-            dataSource={
-              Object {
-                "access": "",
-                "basicAuth": false,
-                "basicAuthPassword": "",
-                "basicAuthUser": "",
-                "database": "",
-                "id": 13,
-                "isDefault": false,
-                "jsonData": Object {
-                  "authType": "credentials",
-                  "defaultRegion": "eu-west-2",
-                },
-                "name": "gdev-cloudwatch",
-                "orgId": 1,
-                "password": "",
-                "readOnly": true,
-                "type": "cloudwatch",
-                "typeLogoUrl": "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
-                "url": "",
-                "user": "",
-                "withCredentials": false,
-              }
+          This datasource was added by config and cannot be modified using the UI. Please contact your server admin to update this datasource.
+        </div>
+        <BasicSettings
+          dataSourceName="gdev-cloudwatch"
+          isDefault={false}
+          onDefaultChange={[Function]}
+          onNameChange={[Function]}
+        />
+        <PluginSettings
+          dataSource={
+            Object {
+              "access": "",
+              "basicAuth": false,
+              "basicAuthPassword": "",
+              "basicAuthUser": "",
+              "database": "",
+              "id": 13,
+              "isDefault": false,
+              "jsonData": Object {
+                "authType": "credentials",
+                "defaultRegion": "eu-west-2",
+              },
+              "name": "gdev-cloudwatch",
+              "orgId": 1,
+              "password": "",
+              "readOnly": true,
+              "type": "cloudwatch",
+              "typeLogoUrl": "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
+              "url": "",
+              "user": "",
+              "withCredentials": false,
             }
-            dataSourceMeta={
-              Object {
-                "defaultNavUrl": "some/url",
-                "enabled": false,
-                "hasUpdate": false,
-                "id": "1",
-                "info": Object {
-                  "author": Object {
-                    "name": "Grafana Labs",
-                    "url": "url/to/GrafanaLabs",
-                  },
-                  "description": "pretty decent plugin",
-                  "links": Array [
-                    Object {
-                      "name": "project",
-                      "url": "one link",
-                    },
-                  ],
-                  "logos": Object {
-                    "large": "large/logo",
-                    "small": "small/logo",
-                  },
-                  "screenshots": Array [
-                    Object {
-                      "path": "screenshot",
-                    },
-                  ],
-                  "updated": "2018-09-26",
-                  "version": "1",
+          }
+          dataSourceMeta={
+            Object {
+              "defaultNavUrl": "some/url",
+              "enabled": false,
+              "hasUpdate": false,
+              "id": "1",
+              "info": Object {
+                "author": Object {
+                  "name": "Grafana Labs",
+                  "url": "url/to/GrafanaLabs",
                 },
-                "latestVersion": "1",
-                "module": Object {},
-                "name": "pretty cool plugin 1",
-                "pinned": false,
-                "state": "",
-                "type": "",
-              }
+                "description": "pretty decent plugin",
+                "links": Array [
+                  Object {
+                    "name": "project",
+                    "url": "one link",
+                  },
+                ],
+                "logos": Object {
+                  "large": "large/logo",
+                  "small": "small/logo",
+                },
+                "screenshots": Array [
+                  Object {
+                    "path": "screenshot",
+                  },
+                ],
+                "updated": "2018-09-26",
+                "version": "1",
+              },
+              "latestVersion": "1",
+              "module": Object {},
+              "name": "pretty cool plugin 1",
+              "pinned": false,
+              "state": "",
+              "type": "",
             }
-            onModelChange={[Function]}
-          />
-          <div
-            className="gf-form-group section"
-          />
-          <ButtonRow
-            isReadOnly={true}
-            onDelete={[Function]}
-            onSubmit={[Function]}
-          />
-        </form>
-      </div>
+          }
+          onModelChange={[Function]}
+        />
+        <div
+          className="gf-form-group"
+        />
+        <ButtonRow
+          isReadOnly={true}
+          onDelete={[Function]}
+          onSubmit={[Function]}
+          onTest={[Function]}
+        />
+      </form>
     </div>
   </PageContents>
 </Page>
diff --git a/public/app/features/explore/GraphContainer.tsx b/public/app/features/explore/GraphContainer.tsx
index 3950d89c11f..92aac41367c 100644
--- a/public/app/features/explore/GraphContainer.tsx
+++ b/public/app/features/explore/GraphContainer.tsx
@@ -25,7 +25,7 @@ interface GraphContainerProps {
 
 export class GraphContainer extends PureComponent<GraphContainerProps> {
   onClickGraphButton = () => {
-    this.props.toggleGraph(this.props.exploreId);
+    this.props.toggleGraph(this.props.exploreId, this.props.showingGraph);
   };
 
   onChangeTime = (timeRange: TimeRange) => {
diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx
index 1fde869d27e..a20d8a2f19c 100644
--- a/public/app/features/explore/Logs.tsx
+++ b/public/app/features/explore/Logs.tsx
@@ -5,15 +5,7 @@ import * as rangeUtil from 'app/core/utils/rangeutil';
 import { RawTimeRange, Switch } from '@grafana/ui';
 import TimeSeries from 'app/core/time_series2';
 
-import {
-  LogsDedupDescription,
-  LogsDedupStrategy,
-  LogsModel,
-  dedupLogRows,
-  filterLogLevels,
-  LogLevel,
-  LogsMetaKind,
-} from 'app/core/logs_model';
+import { LogsDedupDescription, LogsDedupStrategy, LogsModel, LogLevel, LogsMetaKind } from 'app/core/logs_model';
 
 import ToggleButtonGroup, { ToggleButton } from 'app/core/components/ToggleButtonGroup/ToggleButtonGroup';
 
@@ -51,6 +43,7 @@ function renderMetaItem(value: any, kind: LogsMetaKind) {
 
 interface Props {
   data?: LogsModel;
+  dedupedData?: LogsModel;
   width: number;
   exploreId: string;
   highlighterExpressions: string[];
@@ -58,16 +51,18 @@ interface Props {
   range?: RawTimeRange;
   scanning?: boolean;
   scanRange?: RawTimeRange;
+  dedupStrategy: LogsDedupStrategy;
+  hiddenLogLevels: Set<LogLevel>;
   onChangeTime?: (range: RawTimeRange) => void;
   onClickLabel?: (label: string, value: string) => void;
   onStartScanning?: () => void;
   onStopScanning?: () => void;
+  onDedupStrategyChange: (dedupStrategy: LogsDedupStrategy) => void;
+  onToggleLogLevel: (hiddenLogLevels: Set<LogLevel>) => void;
 }
 
 interface State {
-  dedup: LogsDedupStrategy;
   deferLogs: boolean;
-  hiddenLogLevels: Set<LogLevel>;
   renderAll: boolean;
   showLabels: boolean | null; // Tristate: null means auto
   showLocalTime: boolean;
@@ -79,9 +74,7 @@ export default class Logs extends PureComponent<Props, State> {
   renderAllTimer: NodeJS.Timer;
 
   state = {
-    dedup: LogsDedupStrategy.none,
     deferLogs: true,
-    hiddenLogLevels: new Set(),
     renderAll: false,
     showLabels: null,
     showLocalTime: true,
@@ -112,12 +105,11 @@ export default class Logs extends PureComponent<Props, State> {
   }
 
   onChangeDedup = (dedup: LogsDedupStrategy) => {
-    this.setState(prevState => {
-      if (prevState.dedup === dedup) {
-        return { dedup: LogsDedupStrategy.none };
-      }
-      return { dedup };
-    });
+    const { onDedupStrategyChange } = this.props;
+    if (this.props.dedupStrategy === dedup) {
+      return onDedupStrategyChange(LogsDedupStrategy.none);
+    }
+    return onDedupStrategyChange(dedup);
   };
 
   onChangeLabels = (event: React.SyntheticEvent) => {
@@ -143,7 +135,7 @@ export default class Logs extends PureComponent<Props, State> {
 
   onToggleLogLevel = (rawLevel: string, hiddenRawLevels: Set<string>) => {
     const hiddenLogLevels: Set<LogLevel> = new Set(Array.from(hiddenRawLevels).map(level => LogLevel[level]));
-    this.setState({ hiddenLogLevels });
+    this.props.onToggleLogLevel(hiddenLogLevels);
   };
 
   onClickScan = (event: React.SyntheticEvent) => {
@@ -167,23 +159,22 @@ export default class Logs extends PureComponent<Props, State> {
       scanning,
       scanRange,
       width,
+      dedupedData,
     } = this.props;
 
     if (!data) {
       return null;
     }
 
-    const { dedup, deferLogs, hiddenLogLevels, renderAll, showLocalTime, showUtc } = this.state;
+    const { deferLogs, renderAll, showLocalTime, showUtc } = this.state;
     let { showLabels } = this.state;
+    const { dedupStrategy } = this.props;
     const hasData = data && data.rows && data.rows.length > 0;
-    const showDuplicates = dedup !== LogsDedupStrategy.none;
-
-    // Filtering
-    const filteredData = filterLogLevels(data, hiddenLogLevels);
-    const dedupedData = dedupLogRows(filteredData, dedup);
+    const showDuplicates = dedupStrategy !== LogsDedupStrategy.none;
     const dedupCount = dedupedData.rows.reduce((sum, row) => sum + row.duplicates, 0);
     const meta = [...data.meta];
-    if (dedup !== LogsDedupStrategy.none) {
+
+    if (dedupStrategy !== LogsDedupStrategy.none) {
       meta.push({
         label: 'Dedup count',
         value: dedupCount,
@@ -236,7 +227,7 @@ export default class Logs extends PureComponent<Props, State> {
                   key={i}
                   value={dedupType}
                   onChange={this.onChangeDedup}
-                  selected={dedup === dedupType}
+                  selected={dedupStrategy === dedupType}
                   tooltip={LogsDedupDescription[dedupType]}
                 >
                   {dedupType}
diff --git a/public/app/features/explore/LogsContainer.tsx b/public/app/features/explore/LogsContainer.tsx
index fbb0597d2db..f91b14175cb 100644
--- a/public/app/features/explore/LogsContainer.tsx
+++ b/public/app/features/explore/LogsContainer.tsx
@@ -4,18 +4,21 @@ import { connect } from 'react-redux';
 import { RawTimeRange, TimeRange } from '@grafana/ui';
 
 import { ExploreId, ExploreItemState } from 'app/types/explore';
-import { LogsModel } from 'app/core/logs_model';
+import { LogsModel, LogsDedupStrategy, LogLevel } from 'app/core/logs_model';
 import { StoreState } from 'app/types';
 
-import { toggleLogs } from './state/actions';
+import { toggleLogs, changeDedupStrategy } from './state/actions';
 import Logs from './Logs';
 import Panel from './Panel';
+import { toggleLogLevelAction } from 'app/features/explore/state/actionTypes';
+import { deduplicatedLogsSelector, exploreItemUIStateSelector } from 'app/features/explore/state/selectors';
 
 interface LogsContainerProps {
   exploreId: ExploreId;
   loading: boolean;
   logsHighlighterExpressions?: string[];
   logsResult?: LogsModel;
+  dedupedResult?: LogsModel;
   onChangeTime: (range: TimeRange) => void;
   onClickLabel: (key: string, value: string) => void;
   onStartScanning: () => void;
@@ -25,12 +28,28 @@ interface LogsContainerProps {
   scanRange?: RawTimeRange;
   showingLogs: boolean;
   toggleLogs: typeof toggleLogs;
+  toggleLogLevelAction: typeof toggleLogLevelAction;
+  changeDedupStrategy: typeof changeDedupStrategy;
+  dedupStrategy: LogsDedupStrategy;
+  hiddenLogLevels: Set<LogLevel>;
   width: number;
 }
 
 export class LogsContainer extends PureComponent<LogsContainerProps> {
   onClickLogsButton = () => {
-    this.props.toggleLogs(this.props.exploreId);
+    this.props.toggleLogs(this.props.exploreId, this.props.showingLogs);
+  };
+
+  handleDedupStrategyChange = (dedupStrategy: LogsDedupStrategy) => {
+    this.props.changeDedupStrategy(this.props.exploreId, dedupStrategy);
+  };
+
+  hangleToggleLogLevel = (hiddenLogLevels: Set<LogLevel>) => {
+    const { exploreId } = this.props;
+    this.props.toggleLogLevelAction({
+      exploreId,
+      hiddenLogLevels,
+    });
   };
 
   render() {
@@ -39,6 +58,7 @@ export class LogsContainer extends PureComponent<LogsContainerProps> {
       loading,
       logsHighlighterExpressions,
       logsResult,
+      dedupedResult,
       onChangeTime,
       onClickLabel,
       onStartScanning,
@@ -48,12 +68,15 @@ export class LogsContainer extends PureComponent<LogsContainerProps> {
       scanning,
       scanRange,
       width,
+      hiddenLogLevels,
     } = this.props;
 
     return (
       <Panel label="Logs" loading={loading} isOpen={showingLogs} onToggle={this.onClickLogsButton}>
         <Logs
+          dedupStrategy={this.props.dedupStrategy || LogsDedupStrategy.none}
           data={logsResult}
+          dedupedData={dedupedResult}
           exploreId={exploreId}
           key={logsResult && logsResult.id}
           highlighterExpressions={logsHighlighterExpressions}
@@ -62,10 +85,13 @@ export class LogsContainer extends PureComponent<LogsContainerProps> {
           onClickLabel={onClickLabel}
           onStartScanning={onStartScanning}
           onStopScanning={onStopScanning}
+          onDedupStrategyChange={this.handleDedupStrategyChange}
+          onToggleLogLevel={this.hangleToggleLogLevel}
           range={range}
           scanning={scanning}
           scanRange={scanRange}
           width={width}
+          hiddenLogLevels={hiddenLogLevels}
         />
       </Panel>
     );
@@ -75,8 +101,12 @@ export class LogsContainer extends PureComponent<LogsContainerProps> {
 function mapStateToProps(state: StoreState, { exploreId }) {
   const explore = state.explore;
   const item: ExploreItemState = explore[exploreId];
-  const { logsHighlighterExpressions, logsResult, queryTransactions, scanning, scanRange, showingLogs, range } = item;
+  const { logsHighlighterExpressions, logsResult, queryTransactions, scanning, scanRange, range } = item;
   const loading = queryTransactions.some(qt => qt.resultType === 'Logs' && !qt.done);
+  const { showingLogs, dedupStrategy } = exploreItemUIStateSelector(item);
+  const hiddenLogLevels = new Set(item.hiddenLogLevels);
+  const dedupedResult = deduplicatedLogsSelector(item);
+
   return {
     loading,
     logsHighlighterExpressions,
@@ -85,11 +115,16 @@ function mapStateToProps(state: StoreState, { exploreId }) {
     scanRange,
     showingLogs,
     range,
+    dedupStrategy,
+    hiddenLogLevels,
+    dedupedResult,
   };
 }
 
 const mapDispatchToProps = {
   toggleLogs,
+  changeDedupStrategy,
+  toggleLogLevelAction,
 };
 
 export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(LogsContainer));
diff --git a/public/app/features/explore/TableContainer.tsx b/public/app/features/explore/TableContainer.tsx
index f386e5ab99b..e41d4a1eecb 100644
--- a/public/app/features/explore/TableContainer.tsx
+++ b/public/app/features/explore/TableContainer.tsx
@@ -21,7 +21,7 @@ interface TableContainerProps {
 
 export class TableContainer extends PureComponent<TableContainerProps> {
   onClickTableButton = () => {
-    this.props.toggleTable(this.props.exploreId);
+    this.props.toggleTable(this.props.exploreId, this.props.showingTable);
   };
 
   render() {
diff --git a/public/app/features/explore/state/actionTypes.ts b/public/app/features/explore/state/actionTypes.ts
index 98af5e8076e..26758bb750d 100644
--- a/public/app/features/explore/state/actionTypes.ts
+++ b/public/app/features/explore/state/actionTypes.ts
@@ -18,6 +18,7 @@ import {
   ExploreUIState,
 } from 'app/types/explore';
 import { actionCreatorFactory, noPayloadActionCreatorFactory, ActionOf } from 'app/core/redux/actionCreatorFactory';
+import { LogLevel } from 'app/core/logs_model';
 
 /**  Higher order actions
  *
@@ -192,11 +193,20 @@ export interface ToggleLogsPayload {
   exploreId: ExploreId;
 }
 
+export interface UpdateUIStatePayload extends Partial<ExploreUIState> {
+  exploreId: ExploreId;
+}
+
 export interface UpdateDatasourceInstancePayload {
   exploreId: ExploreId;
   datasourceInstance: DataSourceApi;
 }
 
+export interface ToggleLogLevelPayload {
+  exploreId: ExploreId;
+  hiddenLogLevels: Set<LogLevel>;
+}
+
 export interface QueriesImportedPayload {
   exploreId: ExploreId;
   queries: DataQuery[];
@@ -366,6 +376,11 @@ export const splitCloseAction = noPayloadActionCreatorFactory('explore/SPLIT_CLO
 export const splitOpenAction = actionCreatorFactory<SplitOpenPayload>('explore/SPLIT_OPEN').create();
 export const stateSaveAction = noPayloadActionCreatorFactory('explore/STATE_SAVE').create();
 
+/**
+ * Update state of Explores UI elements (panels visiblity and deduplication  strategy)
+ */
+export const updateUIStateAction = actionCreatorFactory<UpdateUIStatePayload>('explore/UPDATE_UI_STATE').create();
+
 /**
  * Expand/collapse the table result viewer. When collapsed, table queries won't be run.
  */
@@ -388,6 +403,8 @@ export const updateDatasourceInstanceAction = actionCreatorFactory<UpdateDatasou
   'explore/UPDATE_DATASOURCE_INSTANCE'
 ).create();
 
+export const toggleLogLevelAction = actionCreatorFactory<ToggleLogLevelPayload>('explore/TOGGLE_LOG_LEVEL').create();
+
 /**
  * Resets state for explore.
  */
@@ -427,4 +444,5 @@ export type Action =
   | ActionOf<ToggleGraphPayload>
   | ActionOf<ToggleLogsPayload>
   | ActionOf<UpdateDatasourceInstancePayload>
-  | ActionOf<QueriesImportedPayload>;
+  | ActionOf<QueriesImportedPayload>
+  | ActionOf<ToggleLogLevelPayload>;
diff --git a/public/app/features/explore/state/actions.ts b/public/app/features/explore/state/actions.ts
index f6fa5c05d63..b84a0534836 100644
--- a/public/app/features/explore/state/actions.ts
+++ b/public/app/features/explore/state/actions.ts
@@ -67,14 +67,26 @@ import {
   ToggleGraphPayload,
   ToggleLogsPayload,
   ToggleTablePayload,
+  updateUIStateAction,
 } from './actionTypes';
 import { ActionOf, ActionCreator } from 'app/core/redux/actionCreatorFactory';
+import { LogsDedupStrategy } from 'app/core/logs_model';
 
 type ThunkResult<R> = ThunkAction<R, StoreState, undefined, Action>;
 
-// /**
-//  * Adds a query row after the row with the given index.
-//  */
+/**
+ * Updates UI state and save it to the URL
+ */
+const updateExploreUIState = (exploreId, uiStateFragment: Partial<ExploreUIState>) => {
+  return dispatch => {
+    dispatch(updateUIStateAction({ exploreId, ...uiStateFragment }));
+    dispatch(stateSave());
+  };
+};
+
+/**
+ * Adds a query row after the row with the given index.
+ */
 export function addQueryRow(exploreId: ExploreId, index: number): ActionOf<AddQueryRowPayload> {
   const query = generateEmptyQuery(index + 1);
   return addQueryRowAction({ exploreId, index, query });
@@ -669,6 +681,7 @@ export function stateSave() {
         showingGraph: left.showingGraph,
         showingLogs: left.showingLogs,
         showingTable: left.showingTable,
+        dedupStrategy: left.dedupStrategy,
       },
     };
     urlStates.left = serializeStateToUrlParam(leftUrlState, true);
@@ -677,7 +690,12 @@ export function stateSave() {
         datasource: right.datasourceInstance.name,
         queries: right.queries.map(clearQueryKeys),
         range: right.range,
-        ui: { showingGraph: right.showingGraph, showingLogs: right.showingLogs, showingTable: right.showingTable },
+        ui: {
+          showingGraph: right.showingGraph,
+          showingLogs: right.showingLogs,
+          showingTable: right.showingTable,
+          dedupStrategy: right.dedupStrategy,
+        },
       };
 
       urlStates.right = serializeStateToUrlParam(rightUrlState, true);
@@ -696,24 +714,26 @@ const togglePanelActionCreator = (
     | ActionCreator<ToggleGraphPayload>
     | ActionCreator<ToggleLogsPayload>
     | ActionCreator<ToggleTablePayload>
-) => (exploreId: ExploreId) => {
-  return (dispatch, getState) => {
-    let shouldRunQueries;
-    dispatch(actionCreator({ exploreId }));
-    dispatch(stateSave());
+) => (exploreId: ExploreId, isPanelVisible: boolean) => {
+  return dispatch => {
+    let uiFragmentStateUpdate: Partial<ExploreUIState>;
+    const shouldRunQueries = !isPanelVisible;
 
     switch (actionCreator.type) {
       case toggleGraphAction.type:
-        shouldRunQueries = getState().explore[exploreId].showingGraph;
+        uiFragmentStateUpdate = { showingGraph: !isPanelVisible };
         break;
       case toggleLogsAction.type:
-        shouldRunQueries = getState().explore[exploreId].showingLogs;
+        uiFragmentStateUpdate = { showingLogs: !isPanelVisible };
         break;
       case toggleTableAction.type:
-        shouldRunQueries = getState().explore[exploreId].showingTable;
+        uiFragmentStateUpdate = { showingTable: !isPanelVisible };
         break;
     }
 
+    dispatch(actionCreator({ exploreId }));
+    dispatch(updateExploreUIState(exploreId, uiFragmentStateUpdate));
+
     if (shouldRunQueries) {
       dispatch(runQueries(exploreId));
     }
@@ -734,3 +754,12 @@ export const toggleLogs = togglePanelActionCreator(toggleLogsAction);
  * Expand/collapse the table result viewer. When collapsed, table queries won't be run.
  */
 export const toggleTable = togglePanelActionCreator(toggleTableAction);
+
+/**
+ * Change logs deduplication strategy and update URL.
+ */
+export const changeDedupStrategy = (exploreId, dedupStrategy: LogsDedupStrategy) => {
+  return dispatch => {
+    dispatch(updateExploreUIState(exploreId, { dedupStrategy }));
+  };
+};
diff --git a/public/app/features/explore/state/reducers.ts b/public/app/features/explore/state/reducers.ts
index 76fc7d5de32..a8815842c89 100644
--- a/public/app/features/explore/state/reducers.ts
+++ b/public/app/features/explore/state/reducers.ts
@@ -37,6 +37,8 @@ import {
   toggleLogsAction,
   toggleTableAction,
   queriesImportedAction,
+  updateUIStateAction,
+  toggleLogLevelAction,
 } from './actionTypes';
 
 export const DEFAULT_RANGE = {
@@ -406,6 +408,12 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
       };
     },
   })
+  .addMapper({
+    filter: updateUIStateAction,
+    mapper: (state, action): ExploreItemState => {
+      return { ...state, ...action.payload };
+    },
+  })
   .addMapper({
     filter: toggleGraphAction,
     mapper: (state): ExploreItemState => {
@@ -415,7 +423,7 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
         // Discard transactions related to Graph query
         nextQueryTransactions = state.queryTransactions.filter(qt => qt.resultType !== 'Graph');
       }
-      return { ...state, queryTransactions: nextQueryTransactions, showingGraph };
+      return { ...state, queryTransactions: nextQueryTransactions };
     },
   })
   .addMapper({
@@ -427,7 +435,7 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
         // Discard transactions related to Logs query
         nextQueryTransactions = state.queryTransactions.filter(qt => qt.resultType !== 'Logs');
       }
-      return { ...state, queryTransactions: nextQueryTransactions, showingLogs };
+      return { ...state, queryTransactions: nextQueryTransactions };
     },
   })
   .addMapper({
@@ -435,7 +443,7 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
     mapper: (state): ExploreItemState => {
       const showingTable = !state.showingTable;
       if (showingTable) {
-        return { ...state, showingTable, queryTransactions: state.queryTransactions };
+        return { ...state, queryTransactions: state.queryTransactions };
       }
 
       // Toggle off needs discarding of table queries and results
@@ -446,7 +454,7 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
         state.queryIntervals.intervalMs
       );
 
-      return { ...state, ...results, queryTransactions: nextQueryTransactions, showingTable };
+      return { ...state, ...results, queryTransactions: nextQueryTransactions };
     },
   })
   .addMapper({
@@ -460,6 +468,16 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
       };
     },
   })
+  .addMapper({
+    filter: toggleLogLevelAction,
+    mapper: (state, action): ExploreItemState => {
+      const { hiddenLogLevels } = action.payload;
+      return {
+        ...state,
+        hiddenLogLevels: Array.from(hiddenLogLevels),
+      };
+    },
+  })
   .create();
 
 /**
diff --git a/public/app/features/explore/state/selectors.ts b/public/app/features/explore/state/selectors.ts
new file mode 100644
index 00000000000..fff52651646
--- /dev/null
+++ b/public/app/features/explore/state/selectors.ts
@@ -0,0 +1,30 @@
+import { createLodashMemoizedSelector } from 'app/core/utils/reselect';
+import { ExploreItemState } from 'app/types';
+import { filterLogLevels, dedupLogRows } from 'app/core/logs_model';
+
+export const exploreItemUIStateSelector = (itemState: ExploreItemState) => {
+  const { showingGraph, showingLogs, showingTable, showingStartPage, dedupStrategy } = itemState;
+  return {
+    showingGraph,
+    showingLogs,
+    showingTable,
+    showingStartPage,
+    dedupStrategy,
+  };
+};
+
+const logsSelector = (state: ExploreItemState) => state.logsResult;
+const hiddenLogLevelsSelector = (state: ExploreItemState) => state.hiddenLogLevels;
+const dedupStrategySelector = (state: ExploreItemState) => state.dedupStrategy;
+export const deduplicatedLogsSelector = createLodashMemoizedSelector(
+  logsSelector,
+  hiddenLogLevelsSelector,
+  dedupStrategySelector,
+  (logs, hiddenLogLevels, dedupStrategy) => {
+    if (!logs) {
+      return null;
+    }
+    const filteredData = filterLogLevels(logs, new Set(hiddenLogLevels));
+    return dedupLogRows(filteredData, dedupStrategy);
+  }
+);
diff --git a/public/app/features/folders/CreateFolderCtrl.ts b/public/app/features/folders/CreateFolderCtrl.ts
index db70c2a18a2..9152dbca66e 100644
--- a/public/app/features/folders/CreateFolderCtrl.ts
+++ b/public/app/features/folders/CreateFolderCtrl.ts
@@ -38,4 +38,3 @@ export default class CreateFolderCtrl {
       });
   }
 }
-
diff --git a/public/app/features/folders/FolderDashboardsCtrl.ts b/public/app/features/folders/FolderDashboardsCtrl.ts
index 95ff355937b..94370900893 100644
--- a/public/app/features/folders/FolderDashboardsCtrl.ts
+++ b/public/app/features/folders/FolderDashboardsCtrl.ts
@@ -23,4 +23,3 @@ export default class FolderDashboardsCtrl {
     }
   }
 }
-
diff --git a/public/app/features/folders/FolderSettingsPage.tsx b/public/app/features/folders/FolderSettingsPage.tsx
index efd2802178f..a4c2ee0f2d3 100644
--- a/public/app/features/folders/FolderSettingsPage.tsx
+++ b/public/app/features/folders/FolderSettingsPage.tsx
@@ -26,7 +26,7 @@ export class FolderSettingsPage extends PureComponent<Props, State> {
   constructor(props: Props) {
     super(props);
     this.state = {
-      isLoading: false
+      isLoading: false,
     };
   }
 
@@ -41,9 +41,9 @@ export class FolderSettingsPage extends PureComponent<Props, State> {
   onSave = async (evt: React.FormEvent<HTMLFormElement>) => {
     evt.preventDefault();
     evt.stopPropagation();
-    this.setState({isLoading: true});
+    this.setState({ isLoading: true });
     await this.props.saveFolder(this.props.folder);
-    this.setState({isLoading: false});
+    this.setState({ isLoading: false });
   };
 
   onDelete = (evt: React.MouseEvent<HTMLButtonElement>) => {
@@ -67,30 +67,28 @@ export class FolderSettingsPage extends PureComponent<Props, State> {
     return (
       <Page navModel={navModel}>
         <Page.Contents isLoading={this.state.isLoading}>
-          <div className="page-container page-body">
-            <h2 className="page-sub-heading">Folder Settings</h2>
+          <h2 className="page-sub-heading">Folder Settings</h2>
 
-            <div className="section gf-form-group">
-              <form name="folderSettingsForm" onSubmit={this.onSave}>
-                <div className="gf-form">
-                  <label className="gf-form-label width-7">Name</label>
-                  <input
-                    type="text"
-                    className="gf-form-input width-30"
-                    value={folder.title}
-                    onChange={this.onTitleChange}
-                  />
-                </div>
-                <div className="gf-form-button-row">
-                  <button type="submit" className="btn btn-primary" disabled={!folder.canSave || !folder.hasChanged}>
-                    <i className="fa fa-save" /> Save
-                  </button>
-                  <button className="btn btn-danger" onClick={this.onDelete} disabled={!folder.canSave}>
-                    <i className="fa fa-trash" /> Delete
-                  </button>
-                </div>
-              </form>
-            </div>
+          <div className="section gf-form-group">
+            <form name="folderSettingsForm" onSubmit={this.onSave}>
+              <div className="gf-form">
+                <label className="gf-form-label width-7">Name</label>
+                <input
+                  type="text"
+                  className="gf-form-input width-30"
+                  value={folder.title}
+                  onChange={this.onTitleChange}
+                />
+              </div>
+              <div className="gf-form-button-row">
+                <button type="submit" className="btn btn-primary" disabled={!folder.canSave || !folder.hasChanged}>
+                  Save
+                </button>
+                <button className="btn btn-danger" onClick={this.onDelete} disabled={!folder.canSave}>
+                  Delete
+                </button>
+              </div>
+            </form>
           </div>
         </Page.Contents>
       </Page>
diff --git a/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap b/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap
index e51e5c0e180..e20273655b1 100644
--- a/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap
+++ b/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap
@@ -7,62 +7,52 @@ exports[`Render should enable save button 1`] = `
   <PageContents
     isLoading={false}
   >
-    <div
-      className="page-container page-body"
+    <h2
+      className="page-sub-heading"
     >
-      <h2
-        className="page-sub-heading"
+      Folder Settings
+    </h2>
+    <div
+      className="section gf-form-group"
+    >
+      <form
+        name="folderSettingsForm"
+        onSubmit={[Function]}
       >
-        Folder Settings
-      </h2>
-      <div
-        className="section gf-form-group"
-      >
-        <form
-          name="folderSettingsForm"
-          onSubmit={[Function]}
+        <div
+          className="gf-form"
         >
-          <div
-            className="gf-form"
+          <label
+            className="gf-form-label width-7"
           >
-            <label
-              className="gf-form-label width-7"
-            >
-              Name
-            </label>
-            <input
-              className="gf-form-input width-30"
-              onChange={[Function]}
-              type="text"
-              value="loading"
-            />
-          </div>
-          <div
-            className="gf-form-button-row"
+            Name
+          </label>
+          <input
+            className="gf-form-input width-30"
+            onChange={[Function]}
+            type="text"
+            value="loading"
+          />
+        </div>
+        <div
+          className="gf-form-button-row"
+        >
+          <button
+            className="btn btn-primary"
+            disabled={false}
+            type="submit"
           >
-            <button
-              className="btn btn-primary"
-              disabled={false}
-              type="submit"
-            >
-              <i
-                className="fa fa-save"
-              />
-               Save
-            </button>
-            <button
-              className="btn btn-danger"
-              disabled={false}
-              onClick={[Function]}
-            >
-              <i
-                className="fa fa-trash"
-              />
-               Delete
-            </button>
-          </div>
-        </form>
-      </div>
+            Save
+          </button>
+          <button
+            className="btn btn-danger"
+            disabled={false}
+            onClick={[Function]}
+          >
+            Delete
+          </button>
+        </div>
+      </form>
     </div>
   </PageContents>
 </Page>
@@ -75,62 +65,52 @@ exports[`Render should render component 1`] = `
   <PageContents
     isLoading={false}
   >
-    <div
-      className="page-container page-body"
+    <h2
+      className="page-sub-heading"
     >
-      <h2
-        className="page-sub-heading"
+      Folder Settings
+    </h2>
+    <div
+      className="section gf-form-group"
+    >
+      <form
+        name="folderSettingsForm"
+        onSubmit={[Function]}
       >
-        Folder Settings
-      </h2>
-      <div
-        className="section gf-form-group"
-      >
-        <form
-          name="folderSettingsForm"
-          onSubmit={[Function]}
+        <div
+          className="gf-form"
         >
-          <div
-            className="gf-form"
+          <label
+            className="gf-form-label width-7"
           >
-            <label
-              className="gf-form-label width-7"
-            >
-              Name
-            </label>
-            <input
-              className="gf-form-input width-30"
-              onChange={[Function]}
-              type="text"
-              value="loading"
-            />
-          </div>
-          <div
-            className="gf-form-button-row"
+            Name
+          </label>
+          <input
+            className="gf-form-input width-30"
+            onChange={[Function]}
+            type="text"
+            value="loading"
+          />
+        </div>
+        <div
+          className="gf-form-button-row"
+        >
+          <button
+            className="btn btn-primary"
+            disabled={true}
+            type="submit"
           >
-            <button
-              className="btn btn-primary"
-              disabled={true}
-              type="submit"
-            >
-              <i
-                className="fa fa-save"
-              />
-               Save
-            </button>
-            <button
-              className="btn btn-danger"
-              disabled={false}
-              onClick={[Function]}
-            >
-              <i
-                className="fa fa-trash"
-              />
-               Delete
-            </button>
-          </div>
-        </form>
-      </div>
+            Save
+          </button>
+          <button
+            className="btn btn-danger"
+            disabled={false}
+            onClick={[Function]}
+          >
+            Delete
+          </button>
+        </div>
+      </form>
     </div>
   </PageContents>
 </Page>
diff --git a/public/app/features/org/OrgDetailsPage.test.tsx b/public/app/features/org/OrgDetailsPage.test.tsx
index ceeaa6c2ad5..e7c2b651632 100644
--- a/public/app/features/org/OrgDetailsPage.test.tsx
+++ b/public/app/features/org/OrgDetailsPage.test.tsx
@@ -8,11 +8,11 @@ const setup = (propOverrides?: object) => {
     organization: {} as Organization,
     navModel: {
       main: {
-        text: 'Configuration'
+        text: 'Configuration',
       },
       node: {
-        text: 'Org details'
-      }
+        text: 'Org details',
+      },
     } as NavModel,
     loadOrganization: jest.fn(),
     setOrganizationName: jest.fn(),
diff --git a/public/app/features/panel/specs/metrics_panel_ctrl.test.ts b/public/app/features/panel/specs/metrics_panel_ctrl.test.ts
index d647af616a9..3ee4c5165cb 100644
--- a/public/app/features/panel/specs/metrics_panel_ctrl.test.ts
+++ b/public/app/features/panel/specs/metrics_panel_ctrl.test.ts
@@ -1,6 +1,9 @@
 jest.mock('app/core/core', () => ({}));
 jest.mock('app/core/config', () => {
   return {
+    bootData: {
+      user: {},
+    },
     panels: {
       test: {
         id: 'test',
diff --git a/public/app/features/playlist/partials/playlists.html b/public/app/features/playlist/partials/playlists.html
index 22e41ac7104..64b26e86e5b 100644
--- a/public/app/features/playlist/partials/playlists.html
+++ b/public/app/features/playlist/partials/playlists.html
@@ -5,7 +5,7 @@
     <div class="page-action-bar">
       <div class="page-action-bar__spacer"></div>
       <a class="btn btn-primary pull-right" href="playlists/create">
-        New Playlist
+        New playlist
       </a>
     </div>
 
diff --git a/public/app/features/playlist/playlist_srv.ts b/public/app/features/playlist/playlist_srv.ts
index 6c1cf2b4256..cb2763129ef 100644
--- a/public/app/features/playlist/playlist_srv.ts
+++ b/public/app/features/playlist/playlist_srv.ts
@@ -44,7 +44,7 @@ export class PlaylistSrv {
     // as this can be called from react
     this.$timeout(() => {
       const stripedUrl = locationUtil.stripBaseFromUrl(dash.url);
-      this.$location.url(stripedUrl  + '?' + toUrlParams(filteredParams));
+      this.$location.url(stripedUrl + '?' + toUrlParams(filteredParams));
     });
 
     this.index++;
diff --git a/public/app/features/plugins/PluginListPage.test.tsx b/public/app/features/plugins/PluginListPage.test.tsx
index 31956f41cc1..01c7f338cd5 100644
--- a/public/app/features/plugins/PluginListPage.test.tsx
+++ b/public/app/features/plugins/PluginListPage.test.tsx
@@ -8,11 +8,11 @@ const setup = (propOverrides?: object) => {
   const props: Props = {
     navModel: {
       main: {
-        text: 'Configuration'
+        text: 'Configuration',
       },
       node: {
-        text: 'Plugins'
-      }
+        text: 'Plugins',
+      },
     } as NavModel,
     plugins: [] as Plugin[],
     searchQuery: '',
diff --git a/public/app/features/plugins/PluginListPage.tsx b/public/app/features/plugins/PluginListPage.tsx
index 3bc0ee545b4..5026b4426b7 100644
--- a/public/app/features/plugins/PluginListPage.tsx
+++ b/public/app/features/plugins/PluginListPage.tsx
@@ -57,9 +57,7 @@ export class PluginListPage extends PureComponent<Props> {
               setSearchQuery={query => setPluginsSearchQuery(query)}
               linkButton={linkButton}
             />
-            {hasFetched && plugins && (
-              plugins && <PluginList plugins={plugins} layoutMode={layoutMode} />
-            )}
+            {hasFetched && plugins && (plugins && <PluginList plugins={plugins} layoutMode={layoutMode} />)}
           </>
         </Page.Contents>
       </Page>
diff --git a/public/app/features/plugins/__mocks__/pluginMocks.ts b/public/app/features/plugins/__mocks__/pluginMocks.ts
index b922840cb43..ab78f8094b3 100644
--- a/public/app/features/plugins/__mocks__/pluginMocks.ts
+++ b/public/app/features/plugins/__mocks__/pluginMocks.ts
@@ -1,4 +1,4 @@
-import { Plugin, PanelPlugin } from 'app/types';
+import { Plugin, PanelPlugin, PanelDataFormat } from 'app/types';
 
 export const getMockPlugins = (amount: number): Plugin[] => {
   const plugins = [];
@@ -38,6 +38,7 @@ export const getPanelPlugin = (options: { id: string; sort?: number; hideFromLis
     id: options.id,
     name: options.id,
     sort: options.sort || 1,
+    dataFormats: [PanelDataFormat.TimeSeries],
     info: {
       author: {
         name: options.id + 'name',
diff --git a/public/app/features/plugins/datasource_srv.ts b/public/app/features/plugins/datasource_srv.ts
index 9695cc621b7..f7dc0da32c4 100644
--- a/public/app/features/plugins/datasource_srv.ts
+++ b/public/app/features/plugins/datasource_srv.ts
@@ -7,7 +7,7 @@ import config from 'app/core/config';
 import { importPluginModule } from './plugin_loader';
 
 // Types
-import { DataSourceApi, DataSourceSelectItem  } from '@grafana/ui/src/types';
+import { DataSourceApi, DataSourceSelectItem } from '@grafana/ui/src/types';
 
 export class DatasourceSrv {
   datasources: { [name: string]: DataSourceApi };
diff --git a/public/app/features/plugins/state/actions.ts b/public/app/features/plugins/state/actions.ts
index a60bb6029b9..1b79789774b 100644
--- a/public/app/features/plugins/state/actions.ts
+++ b/public/app/features/plugins/state/actions.ts
@@ -60,7 +60,8 @@ const pluginDashboardsLoaded = (dashboards: PluginDashboard[]): LoadedPluginDash
   payload: dashboards,
 });
 
-export type Action = LoadPluginsAction
+export type Action =
+  | LoadPluginsAction
   | LoadPluginDashboardsAction
   | LoadedPluginDashboardsAction
   | SetPluginsSearchQueryAction
diff --git a/public/app/features/plugins/state/reducers.ts b/public/app/features/plugins/state/reducers.ts
index 842775370f5..3baf47d60cb 100644
--- a/public/app/features/plugins/state/reducers.ts
+++ b/public/app/features/plugins/state/reducers.ts
@@ -9,7 +9,7 @@ export const initialState: PluginsState = {
   layoutMode: LayoutModes.Grid,
   hasFetched: false,
   dashboards: [] as PluginDashboard[],
-  isLoadingPluginDashboards: false
+  isLoadingPluginDashboards: false,
 };
 
 export const pluginsReducer = (state = initialState, action: Action): PluginsState => {
diff --git a/public/app/features/teams/TeamList.test.tsx b/public/app/features/teams/TeamList.test.tsx
index 212da2e3310..369771bb340 100644
--- a/public/app/features/teams/TeamList.test.tsx
+++ b/public/app/features/teams/TeamList.test.tsx
@@ -8,11 +8,11 @@ const setup = (propOverrides?: object) => {
   const props: Props = {
     navModel: {
       main: {
-        text: 'Configuration'
+        text: 'Configuration',
       },
       node: {
-        text: 'Team List'
-      }
+        text: 'Team List',
+      },
     } as NavModel,
     teams: [] as Team[],
     loadTeams: jest.fn(),
@@ -74,9 +74,8 @@ describe('Functions', () => {
   describe('on search query change', () => {
     it('should call setSearchQuery', () => {
       const { instance } = setup();
-      const mockEvent = { target: { value: 'test' } };
 
-      instance.onSearchQueryChange(mockEvent);
+      instance.onSearchQueryChange('test');
 
       expect(instance.props.setSearchQuery).toHaveBeenCalledWith('test');
     });
diff --git a/public/app/features/teams/TeamList.tsx b/public/app/features/teams/TeamList.tsx
index 4007c58f579..06d7d4d65a2 100644
--- a/public/app/features/teams/TeamList.tsx
+++ b/public/app/features/teams/TeamList.tsx
@@ -8,6 +8,7 @@ import { NavModel, Team } from 'app/types';
 import { loadTeams, deleteTeam, setSearchQuery } from './state/actions';
 import { getSearchQuery, getTeams, getTeamsCount } from './state/selectors';
 import { getNavModel } from 'app/core/selectors/navModel';
+import { FilterInput } from 'app/core/components/FilterInput/FilterInput';
 
 export interface Props {
   navModel: NavModel;
@@ -33,8 +34,8 @@ export class TeamList extends PureComponent<Props, any> {
     this.props.deleteTeam(team.id);
   };
 
-  onSearchQueryChange = event => {
-    this.props.setSearchQuery(event.target.value);
+  onSearchQueryChange = (value: string) => {
+    this.props.setSearchQuery(value);
   };
 
   renderTeam(team: Team) {
@@ -89,16 +90,13 @@ export class TeamList extends PureComponent<Props, any> {
       <>
         <div className="page-action-bar">
           <div className="gf-form gf-form--grow">
-            <label className="gf-form--has-input-icon gf-form--grow">
-              <input
-                type="text"
-                className="gf-form-input"
-                placeholder="Search teams"
-                value={searchQuery}
-                onChange={this.onSearchQueryChange}
-              />
-              <i className="gf-form-input-icon fa fa-search" />
-            </label>
+            <FilterInput
+              labelClassName="gf-form--has-input-icon gf-form--grow"
+              inputClassName="gf-form-input"
+              placeholder="Search teams"
+              value={searchQuery}
+              onChange={this.onSearchQueryChange}
+            />
           </div>
 
           <div className="page-action-bar__spacer" />
@@ -141,9 +139,7 @@ export class TeamList extends PureComponent<Props, any> {
 
     return (
       <Page navModel={navModel}>
-        <Page.Contents isLoading={!hasFetched}>
-          {hasFetched && this.renderList()}
-        </Page.Contents>
+        <Page.Contents isLoading={!hasFetched}>{hasFetched && this.renderList()}</Page.Contents>
       </Page>
     );
   }
diff --git a/public/app/features/teams/TeamMembers.test.tsx b/public/app/features/teams/TeamMembers.test.tsx
index 696880bebd9..9922619adc2 100644
--- a/public/app/features/teams/TeamMembers.test.tsx
+++ b/public/app/features/teams/TeamMembers.test.tsx
@@ -55,9 +55,8 @@ describe('Functions', () => {
   describe('on search member query change', () => {
     it('it should call setSearchMemberQuery', () => {
       const { instance } = setup();
-      const mockEvent = { target: { value: 'member' } };
 
-      instance.onSearchQueryChange(mockEvent);
+      instance.onSearchQueryChange('member');
 
       expect(instance.props.setSearchMemberQuery).toHaveBeenCalledWith('member');
     });
diff --git a/public/app/features/teams/TeamMembers.tsx b/public/app/features/teams/TeamMembers.tsx
index ab8d43cb1a3..643b51b07bd 100644
--- a/public/app/features/teams/TeamMembers.tsx
+++ b/public/app/features/teams/TeamMembers.tsx
@@ -7,6 +7,7 @@ import { TagBadge } from 'app/core/components/TagFilter/TagBadge';
 import { TeamMember, User } from 'app/types';
 import { loadTeamMembers, addTeamMember, removeTeamMember, setSearchMemberQuery } from './state/actions';
 import { getSearchMemberQuery, getTeamMembers } from './state/selectors';
+import { FilterInput } from 'app/core/components/FilterInput/FilterInput';
 
 export interface Props {
   members: TeamMember[];
@@ -33,8 +34,8 @@ export class TeamMembers extends PureComponent<Props, State> {
     this.props.loadTeamMembers();
   }
 
-  onSearchQueryChange = event => {
-    this.props.setSearchMemberQuery(event.target.value);
+  onSearchQueryChange = (value: string) => {
+    this.props.setSearchMemberQuery(value);
   };
 
   onRemoveMember(member: TeamMember) {
@@ -89,22 +90,19 @@ export class TeamMembers extends PureComponent<Props, State> {
       <div>
         <div className="page-action-bar">
           <div className="gf-form gf-form--grow">
-            <label className="gf-form--has-input-icon gf-form--grow">
-              <input
-                type="text"
-                className="gf-form-input"
-                placeholder="Search members"
-                value={searchMemberQuery}
-                onChange={this.onSearchQueryChange}
-              />
-              <i className="gf-form-input-icon fa fa-search" />
-            </label>
+            <FilterInput
+              labelClassName="gf-form--has-input-icon gf-form--grow"
+              inputClassName="gf-form-input"
+              placeholder="Search members"
+              value={searchMemberQuery}
+              onChange={this.onSearchQueryChange}
+            />
           </div>
 
           <div className="page-action-bar__spacer" />
 
           <button className="btn btn-primary pull-right" onClick={this.onToggleAdding} disabled={isAdding}>
-            <i className="fa fa-plus" /> Add a member
+            Add member
           </button>
         </div>
 
@@ -113,7 +111,7 @@ export class TeamMembers extends PureComponent<Props, State> {
             <button className="cta-form__close btn btn-transparent" onClick={this.onToggleAdding}>
               <i className="fa fa-close" />
             </button>
-            <h5>Add Team Member</h5>
+            <h5>Add team member</h5>
             <div className="gf-form-inline">
               <UserPicker onSelected={this.onUserSelected} className="min-width-30" />
               {this.state.newTeamMember && (
diff --git a/public/app/features/teams/TeamPages.tsx b/public/app/features/teams/TeamPages.tsx
index 7a38197ff71..235936aa8f5 100644
--- a/public/app/features/teams/TeamPages.tsx
+++ b/public/app/features/teams/TeamPages.tsx
@@ -49,9 +49,9 @@ export class TeamPages extends PureComponent<Props, State> {
 
   async fetchTeam() {
     const { loadTeam, teamId } = this.props;
-    this.setState({isLoading: true});
+    this.setState({ isLoading: true });
     const team = await loadTeam(teamId);
-    this.setState({isLoading: false});
+    this.setState({ isLoading: false });
     return team;
   }
 
diff --git a/public/app/features/teams/__snapshots__/TeamList.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamList.test.tsx.snap
index 3a26b566e14..76d13e6a3d6 100644
--- a/public/app/features/teams/__snapshots__/TeamList.test.tsx.snap
+++ b/public/app/features/teams/__snapshots__/TeamList.test.tsx.snap
@@ -41,20 +41,13 @@ exports[`Render should render teams table 1`] = `
       <div
         className="gf-form gf-form--grow"
       >
-        <label
-          className="gf-form--has-input-icon gf-form--grow"
-        >
-          <input
-            className="gf-form-input"
-            onChange={[Function]}
-            placeholder="Search teams"
-            type="text"
-            value=""
-          />
-          <i
-            className="gf-form-input-icon fa fa-search"
-          />
-        </label>
+        <ForwardRef
+          inputClassName="gf-form-input"
+          labelClassName="gf-form--has-input-icon gf-form--grow"
+          onChange={[Function]}
+          placeholder="Search teams"
+          value=""
+        />
       </div>
       <div
         className="page-action-bar__spacer"
diff --git a/public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap
index 536102cb880..202da95c55c 100644
--- a/public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap
+++ b/public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap
@@ -8,20 +8,13 @@ exports[`Render should render component 1`] = `
     <div
       className="gf-form gf-form--grow"
     >
-      <label
-        className="gf-form--has-input-icon gf-form--grow"
-      >
-        <input
-          className="gf-form-input"
-          onChange={[Function]}
-          placeholder="Search members"
-          type="text"
-          value=""
-        />
-        <i
-          className="gf-form-input-icon fa fa-search"
-        />
-      </label>
+      <ForwardRef
+        inputClassName="gf-form-input"
+        labelClassName="gf-form--has-input-icon gf-form--grow"
+        onChange={[Function]}
+        placeholder="Search members"
+        value=""
+      />
     </div>
     <div
       className="page-action-bar__spacer"
@@ -31,10 +24,7 @@ exports[`Render should render component 1`] = `
       disabled={false}
       onClick={[Function]}
     >
-      <i
-        className="fa fa-plus"
-      />
-       Add a member
+      Add member
     </button>
   </div>
   <Component
@@ -52,7 +42,7 @@ exports[`Render should render component 1`] = `
         />
       </button>
       <h5>
-        Add Team Member
+        Add team member
       </h5>
       <div
         className="gf-form-inline"
@@ -102,20 +92,13 @@ exports[`Render should render team members 1`] = `
     <div
       className="gf-form gf-form--grow"
     >
-      <label
-        className="gf-form--has-input-icon gf-form--grow"
-      >
-        <input
-          className="gf-form-input"
-          onChange={[Function]}
-          placeholder="Search members"
-          type="text"
-          value=""
-        />
-        <i
-          className="gf-form-input-icon fa fa-search"
-        />
-      </label>
+      <ForwardRef
+        inputClassName="gf-form-input"
+        labelClassName="gf-form--has-input-icon gf-form--grow"
+        onChange={[Function]}
+        placeholder="Search members"
+        value=""
+      />
     </div>
     <div
       className="page-action-bar__spacer"
@@ -125,10 +108,7 @@ exports[`Render should render team members 1`] = `
       disabled={false}
       onClick={[Function]}
     >
-      <i
-        className="fa fa-plus"
-      />
-       Add a member
+      Add member
     </button>
   </div>
   <Component
@@ -146,7 +126,7 @@ exports[`Render should render team members 1`] = `
         />
       </button>
       <h5>
-        Add Team Member
+        Add team member
       </h5>
       <div
         className="gf-form-inline"
@@ -322,20 +302,13 @@ exports[`Render should render team members when sync enabled 1`] = `
     <div
       className="gf-form gf-form--grow"
     >
-      <label
-        className="gf-form--has-input-icon gf-form--grow"
-      >
-        <input
-          className="gf-form-input"
-          onChange={[Function]}
-          placeholder="Search members"
-          type="text"
-          value=""
-        />
-        <i
-          className="gf-form-input-icon fa fa-search"
-        />
-      </label>
+      <ForwardRef
+        inputClassName="gf-form-input"
+        labelClassName="gf-form--has-input-icon gf-form--grow"
+        onChange={[Function]}
+        placeholder="Search members"
+        value=""
+      />
     </div>
     <div
       className="page-action-bar__spacer"
@@ -345,10 +318,7 @@ exports[`Render should render team members when sync enabled 1`] = `
       disabled={false}
       onClick={[Function]}
     >
-      <i
-        className="fa fa-plus"
-      />
-       Add a member
+      Add member
     </button>
   </div>
   <Component
@@ -366,7 +336,7 @@ exports[`Render should render team members when sync enabled 1`] = `
         />
       </button>
       <h5>
-        Add Team Member
+        Add team member
       </h5>
       <div
         className="gf-form-inline"
diff --git a/public/app/features/templating/specs/template_srv.test.ts b/public/app/features/templating/specs/template_srv.test.ts
index 9a041f42cd3..1b36397c68c 100644
--- a/public/app/features/templating/specs/template_srv.test.ts
+++ b/public/app/features/templating/specs/template_srv.test.ts
@@ -473,7 +473,7 @@ describe('templateSrv', () => {
           type: 'custom',
           name: 'foo',
           current: { value: 'constructor', text: 'constructor' },
-        }
+        },
       ]);
       _templateSrv.setGrafanaVariable('$__auto_interval_interval', '13m');
       _templateSrv.updateIndex();
diff --git a/public/app/features/templating/specs/variable_srv.test.ts b/public/app/features/templating/specs/variable_srv.test.ts
index cf10235f6e8..13281fecead 100644
--- a/public/app/features/templating/specs/variable_srv.test.ts
+++ b/public/app/features/templating/specs/variable_srv.test.ts
@@ -47,13 +47,7 @@ describe('VariableSrv', function(this: any) {
         const ds: any = {};
         ds.metricFindQuery = () => Promise.resolve(scenario.queryResult);
 
-        ctx.variableSrv = new VariableSrv(
-          $q,
-          ctx.$location,
-          ctx.$injector,
-          ctx.templateSrv,
-          ctx.timeSrv
-        );
+        ctx.variableSrv = new VariableSrv($q, ctx.$location, ctx.$injector, ctx.templateSrv, ctx.timeSrv);
 
         ctx.variableSrv.timeSrv = ctx.timeSrv;
         ctx.datasourceSrv = {
diff --git a/public/app/features/templating/variable_srv.ts b/public/app/features/templating/variable_srv.ts
index 81e4e0a4a0b..ee7215e310a 100644
--- a/public/app/features/templating/variable_srv.ts
+++ b/public/app/features/templating/variable_srv.ts
@@ -18,13 +18,13 @@ export class VariableSrv {
   variables: any[];
 
   /** @ngInject */
-  constructor(private $q,
-              private $location,
-              private $injector,
-              private templateSrv: TemplateSrv,
-              private timeSrv: TimeSrv) {
-
-  }
+  constructor(
+    private $q,
+    private $location,
+    private $injector,
+    private templateSrv: TemplateSrv,
+    private timeSrv: TimeSrv
+  ) {}
 
   init(dashboard: DashboardModel) {
     this.dashboard = dashboard;
diff --git a/public/app/features/users/UsersActionBar.tsx b/public/app/features/users/UsersActionBar.tsx
index c7ce8c6f894..bfeadba7396 100644
--- a/public/app/features/users/UsersActionBar.tsx
+++ b/public/app/features/users/UsersActionBar.tsx
@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
 import classNames from 'classnames';
 import { setUsersSearchQuery } from './state/actions';
 import { getInviteesCount, getUsersSearchQuery } from './state/selectors';
+import { FilterInput } from 'app/core/components/FilterInput/FilterInput';
 
 export interface Props {
   searchQuery: string;
@@ -43,16 +44,13 @@ export class UsersActionBar extends PureComponent<Props> {
     return (
       <div className="page-action-bar">
         <div className="gf-form gf-form--grow">
-          <label className="gf-form--has-input-icon">
-            <input
-              type="text"
-              className="gf-form-input width-20"
-              value={searchQuery}
-              onChange={event => setUsersSearchQuery(event.target.value)}
-              placeholder="Filter by name or type"
-            />
-            <i className="gf-form-input-icon fa fa-search" />
-          </label>
+          <FilterInput
+            labelClassName="gf-form--has-input-icon"
+            inputClassName="gf-form-input width-20"
+            value={searchQuery}
+            onChange={setUsersSearchQuery}
+            placeholder="Filter by name or type"
+          />
           {pendingInvitesCount > 0 && (
             <div style={{ marginLeft: '1rem' }}>
               <button className={usersButtonStyle} key="users" onClick={onShowInvites}>
diff --git a/public/app/features/users/UsersListPage.test.tsx b/public/app/features/users/UsersListPage.test.tsx
index 9256285c9aa..f9192568aef 100644
--- a/public/app/features/users/UsersListPage.test.tsx
+++ b/public/app/features/users/UsersListPage.test.tsx
@@ -13,11 +13,11 @@ const setup = (propOverrides?: object) => {
   const props: Props = {
     navModel: {
       main: {
-        text: 'Configuration'
+        text: 'Configuration',
       },
       node: {
-        text: 'Users'
-      }
+        text: 'Users',
+      },
     } as NavModel,
     users: [] as OrgUser[],
     invitees: [] as Invitee[],
diff --git a/public/app/features/users/UsersListPage.tsx b/public/app/features/users/UsersListPage.tsx
index 5396603bbde..5a2f4b2e441 100644
--- a/public/app/features/users/UsersListPage.tsx
+++ b/public/app/features/users/UsersListPage.tsx
@@ -107,11 +107,11 @@ export class UsersListPage extends PureComponent<Props, State> {
       <Page navModel={navModel}>
         <Page.Contents isLoading={!hasFetched}>
           <>
-          <UsersActionBar onShowInvites={this.onShowInvites} showInvites={this.state.showInvites} />
-          {externalUserMngInfoHtml && (
-            <div className="grafana-info-box" dangerouslySetInnerHTML={{ __html: externalUserMngInfoHtml }} />
-          )}
-          {hasFetched && this.renderTable()}
+            <UsersActionBar onShowInvites={this.onShowInvites} showInvites={this.state.showInvites} />
+            {externalUserMngInfoHtml && (
+              <div className="grafana-info-box" dangerouslySetInnerHTML={{ __html: externalUserMngInfoHtml }} />
+            )}
+            {hasFetched && this.renderTable()}
           </>
         </Page.Contents>
       </Page>
diff --git a/public/app/features/users/__snapshots__/UsersActionBar.test.tsx.snap b/public/app/features/users/__snapshots__/UsersActionBar.test.tsx.snap
index a73d298581e..8c137200f26 100644
--- a/public/app/features/users/__snapshots__/UsersActionBar.test.tsx.snap
+++ b/public/app/features/users/__snapshots__/UsersActionBar.test.tsx.snap
@@ -7,20 +7,13 @@ exports[`Render should render component 1`] = `
   <div
     className="gf-form gf-form--grow"
   >
-    <label
-      className="gf-form--has-input-icon"
-    >
-      <input
-        className="gf-form-input width-20"
-        onChange={[Function]}
-        placeholder="Filter by name or type"
-        type="text"
-        value=""
-      />
-      <i
-        className="gf-form-input-icon fa fa-search"
-      />
-    </label>
+    <ForwardRef
+      inputClassName="gf-form-input width-20"
+      labelClassName="gf-form--has-input-icon"
+      onChange={[MockFunction]}
+      placeholder="Filter by name or type"
+      value=""
+    />
     <div
       className="page-action-bar__spacer"
     />
@@ -35,20 +28,13 @@ exports[`Render should render pending invites button 1`] = `
   <div
     className="gf-form gf-form--grow"
   >
-    <label
-      className="gf-form--has-input-icon"
-    >
-      <input
-        className="gf-form-input width-20"
-        onChange={[Function]}
-        placeholder="Filter by name or type"
-        type="text"
-        value=""
-      />
-      <i
-        className="gf-form-input-icon fa fa-search"
-      />
-    </label>
+    <ForwardRef
+      inputClassName="gf-form-input width-20"
+      labelClassName="gf-form--has-input-icon"
+      onChange={[MockFunction]}
+      placeholder="Filter by name or type"
+      value=""
+    />
     <div
       style={
         Object {
@@ -87,20 +73,13 @@ exports[`Render should show external user management button 1`] = `
   <div
     className="gf-form gf-form--grow"
   >
-    <label
-      className="gf-form--has-input-icon"
-    >
-      <input
-        className="gf-form-input width-20"
-        onChange={[Function]}
-        placeholder="Filter by name or type"
-        type="text"
-        value=""
-      />
-      <i
-        className="gf-form-input-icon fa fa-search"
-      />
-    </label>
+    <ForwardRef
+      inputClassName="gf-form-input width-20"
+      labelClassName="gf-form--has-input-icon"
+      onChange={[MockFunction]}
+      placeholder="Filter by name or type"
+      value=""
+    />
     <div
       className="page-action-bar__spacer"
     />
@@ -125,20 +104,13 @@ exports[`Render should show invite button 1`] = `
   <div
     className="gf-form gf-form--grow"
   >
-    <label
-      className="gf-form--has-input-icon"
-    >
-      <input
-        className="gf-form-input width-20"
-        onChange={[Function]}
-        placeholder="Filter by name or type"
-        type="text"
-        value=""
-      />
-      <i
-        className="gf-form-input-icon fa fa-search"
-      />
-    </label>
+    <ForwardRef
+      inputClassName="gf-form-input width-20"
+      labelClassName="gf-form--has-input-icon"
+      onChange={[MockFunction]}
+      placeholder="Filter by name or type"
+      value=""
+    />
     <div
       className="page-action-bar__spacer"
     />
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts
index a098800c77b..cb7d21003dc 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.ts
+++ b/public/app/plugins/datasource/cloudwatch/datasource.ts
@@ -301,7 +301,6 @@ export default class CloudWatchDatasource {
       return this.getEc2InstanceAttribute(region, targetAttributeName, filterJson);
     }
 
-
     const resourceARNsQuery = query.match(/^resource_arns\(([^,]+?),\s?([^,]+?),\s?(.+?)\)/);
     if (resourceARNsQuery) {
       region = resourceARNsQuery[1];
diff --git a/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts b/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts
index 1b2a2f4eead..37602a936eb 100644
--- a/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts
@@ -385,12 +385,16 @@ describe('CloudWatchDatasource', () => {
       scenario.requestResponse = {
         results: {
           metricFindQuery: {
-            tables: [{
-              rows: [[
-                'arn:aws:ec2:us-east-1:123456789012:instance/i-12345678901234567',
-                'arn:aws:ec2:us-east-1:123456789012:instance/i-76543210987654321'
-              ]]
-            }],
+            tables: [
+              {
+                rows: [
+                  [
+                    'arn:aws:ec2:us-east-1:123456789012:instance/i-12345678901234567',
+                    'arn:aws:ec2:us-east-1:123456789012:instance/i-76543210987654321',
+                  ],
+                ],
+              },
+            ],
           },
         },
       };
diff --git a/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts
index 0480fcb52e8..71b4a55b35b 100644
--- a/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts
@@ -17,7 +17,7 @@ describe('ElasticDatasource', function(this: any) {
 
   const templateSrv = {
     replace: jest.fn(text => {
-      if (text.startsWith("$")) {
+      if (text.startsWith('$')) {
         return `resolvedVariable`;
       } else {
         return text;
@@ -94,7 +94,7 @@ describe('ElasticDatasource', function(this: any) {
         },
         targets: [
           {
-            alias: "$varAlias",
+            alias: '$varAlias',
             bucketAggs: [],
             metrics: [{ type: 'raw_document' }],
             query: 'escape\\:test',
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/response_parser.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/response_parser.ts
index fa96e4a2e3e..6b5f006ca30 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/response_parser.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/response_parser.ts
@@ -202,7 +202,7 @@ export default class ResponseParser {
   parseQuerySchema() {
     const result = {
       Type: 'AppInsights',
-      Tables: {}
+      Tables: {},
     };
     if (this.results && this.results.data && this.results.data.Tables) {
       for (let i = 0; i < this.results.data.Tables[0].Rows.length; i++) {
@@ -215,9 +215,7 @@ export default class ResponseParser {
         } else {
           result.Tables[columnTable] = {
             Name: columnTable,
-            OrderedColumns: [
-              { Name: columnName, Type: columnType }
-            ]
+            OrderedColumns: [{ Name: columnName, Type: columnType }],
           };
         }
       }
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/KustoQueryField.tsx b/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/KustoQueryField.tsx
index 2a578176674..587ab807e33 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/KustoQueryField.tsx
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/KustoQueryField.tsx
@@ -10,7 +10,6 @@ import { getNextCharacter } from 'app/features/explore/utils/dom';
 import { KEYWORDS, functionTokens, operatorTokens, grafanaMacros } from './kusto/kusto';
 // import '../sass/editor.base.scss';
 
-
 const TYPEAHEAD_DELAY = 100;
 
 interface Suggestion {
@@ -41,8 +40,8 @@ interface KustoDBSchema {
 
 const defaultSchema = () => ({
   Databases: {
-    Default: {}
-  }
+    Default: {},
+  },
 });
 
 const cleanText = s => s.replace(/[{}[\]="(),!~+\-*/^%]/g, '').trim();
@@ -101,12 +100,12 @@ export default class KustoQueryField extends QueryField {
         typeaheadContext = 'context-function';
         suggestionGroups = this.getColumnSuggestions();
 
-      // where
+        // where
       } else if (modelPrefix.match(/(where\s(\w+\b)?$)/i)) {
         typeaheadContext = 'context-where';
         suggestionGroups = this.getColumnSuggestions();
 
-      // summarize by
+        // summarize by
       } else if (modelPrefix.match(/(summarize\s(\w+\b)?$)/i)) {
         typeaheadContext = 'context-summarize';
         suggestionGroups = this.getFunctionSuggestions();
@@ -114,12 +113,12 @@ export default class KustoQueryField extends QueryField {
         typeaheadContext = 'context-summarize-by';
         suggestionGroups = this.getColumnSuggestions();
 
-      // order by, top X by, ... by ...
+        // order by, top X by, ... by ...
       } else if (modelPrefix.match(/(by\s+([^,\s]+,\s*)*([^,\s]+\b)?$)/i)) {
         typeaheadContext = 'context-by';
         suggestionGroups = this.getColumnSuggestions();
 
-      // join
+        // join
       } else if (modelPrefix.match(/(on\s(.+\b)?$)/i)) {
         typeaheadContext = 'context-join-on';
         suggestionGroups = this.getColumnSuggestions();
@@ -127,12 +126,12 @@ export default class KustoQueryField extends QueryField {
         typeaheadContext = 'context-join';
         suggestionGroups = this.getTableSuggestions();
 
-      // distinct
+        // distinct
       } else if (modelPrefix.match(/(distinct\s(.+\b)?$)/i)) {
         typeaheadContext = 'context-distinct';
         suggestionGroups = this.getColumnSuggestions();
 
-      // database()
+        // database()
       } else if (modelPrefix.match(/(database\(\"(\w+)\"\)\.(.+\b)?$)/i)) {
         typeaheadContext = 'context-database-table';
         const db = this.getDBFromDatabaseFunction(modelPrefix);
@@ -140,7 +139,7 @@ export default class KustoQueryField extends QueryField {
         suggestionGroups = this.getTableSuggestions(db);
         prefix = prefix.replace('.', '');
 
-      // new
+        // new
       } else if (normalizeQuery(Plain.serialize(this.state.value)).match(/^\s*\w*$/i)) {
         typeaheadContext = 'context-new';
         if (this.schema) {
@@ -151,7 +150,7 @@ export default class KustoQueryField extends QueryField {
           return;
         }
 
-      // built-in
+        // built-in
       } else if (prefix && !wrapperClasses.contains('argument') && !force) {
         // Use only last typed word as a prefix for searching
         if (modelPrefix.match(/\s$/i)) {
@@ -171,18 +170,19 @@ export default class KustoQueryField extends QueryField {
 
       let results = 0;
       prefix = prefix.toLowerCase();
-      const filteredSuggestions = suggestionGroups.map(group => {
-        if (group.items && prefix && !group.skipFilter) {
-          group.items = group.items.filter(c => c.text.length >= prefix.length);
-          if (group.prefixMatch) {
-            group.items = group.items.filter(c => c.text.toLowerCase().indexOf(prefix) === 0);
-          } else {
-            group.items = group.items.filter(c => c.text.toLowerCase().indexOf(prefix) > -1);
+      const filteredSuggestions = suggestionGroups
+        .map(group => {
+          if (group.items && prefix && !group.skipFilter) {
+            group.items = group.items.filter(c => c.text.length >= prefix.length);
+            if (group.prefixMatch) {
+              group.items = group.items.filter(c => c.text.toLowerCase().indexOf(prefix) === 0);
+            } else {
+              group.items = group.items.filter(c => c.text.toLowerCase().indexOf(prefix) > -1);
+            }
           }
-        }
-        results += group.items.length;
-        return group;
-      })
+          results += group.items.length;
+          return group;
+        })
         .filter(group => group.items.length > 0);
 
       // console.log('onTypeahead', selection.anchorNode, wrapperClasses, text, offset, prefix, typeaheadContext);
@@ -195,7 +195,7 @@ export default class KustoQueryField extends QueryField {
         suggestions: results > 0 ? filteredSuggestions : [],
       });
     }
-  }
+  };
 
   applyTypeahead(change, suggestion) {
     const { typeaheadPrefix, typeaheadContext, typeaheadText } = this.state;
@@ -301,28 +301,34 @@ export default class KustoQueryField extends QueryField {
       {
         prefixMatch: true,
         label: 'Keywords',
-        items: KEYWORDS.map(wrapText)
+        items: KEYWORDS.map(wrapText),
       },
       {
         prefixMatch: true,
         label: 'Operators',
-        items: operatorTokens
+        items: operatorTokens,
       },
       {
         prefixMatch: true,
         label: 'Functions',
-        items: functionTokens.map((s: any) => { s.type = 'function'; return s; })
+        items: functionTokens.map((s: any) => {
+          s.type = 'function';
+          return s;
+        }),
       },
       {
         prefixMatch: true,
         label: 'Macros',
-        items: grafanaMacros.map((s: any) => { s.type = 'function'; return s; })
+        items: grafanaMacros.map((s: any) => {
+          s.type = 'function';
+          return s;
+        }),
       },
       {
         prefixMatch: true,
         label: 'Tables',
-        items: _.map(this.schema.Databases.Default.Tables, (t: any) => ({ text: t.Name }))
-      }
+        items: _.map(this.schema.Databases.Default.Tables, (t: any) => ({ text: t.Name })),
+      },
     ];
   }
 
@@ -331,13 +337,19 @@ export default class KustoQueryField extends QueryField {
       {
         prefixMatch: true,
         label: 'Functions',
-        items: functionTokens.map((s: any) => { s.type = 'function'; return s; })
+        items: functionTokens.map((s: any) => {
+          s.type = 'function';
+          return s;
+        }),
       },
       {
         prefixMatch: true,
         label: 'Macros',
-        items: grafanaMacros.map((s: any) => { s.type = 'function'; return s; })
-      }
+        items: grafanaMacros.map((s: any) => {
+          s.type = 'function';
+          return s;
+        }),
+      },
     ];
   }
 
@@ -347,8 +359,8 @@ export default class KustoQueryField extends QueryField {
         {
           prefixMatch: true,
           label: 'Tables',
-          items: _.map(this.schema.Databases[db].Tables, (t: any) => ({ text: t.Name }))
-        }
+          items: _.map(this.schema.Databases[db].Tables, (t: any) => ({ text: t.Name })),
+        },
       ];
     } else {
       return [];
@@ -366,9 +378,9 @@ export default class KustoQueryField extends QueryField {
             label: 'Fields',
             items: _.map(tableSchema.OrderedColumns, (f: any) => ({
               text: f.Name,
-              hint: f.Type
-            }))
-          }
+              hint: f.Type,
+            })),
+          },
         ];
       }
     }
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/editor_component.tsx b/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/editor_component.tsx
index bdc85f1577d..f483d585ac8 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/editor_component.tsx
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/editor_component.tsx
@@ -15,7 +15,7 @@ interface EditorProps {
 
 class Editor extends Component<EditorProps, any> {
   static defaultProps = {
-    placeholder: 'Enter a query'
+    placeholder: 'Enter a query',
   };
 
   constructor(props) {
@@ -68,8 +68,13 @@ coreModule.directive('kustoEditor', [
   'reactDirective',
   reactDirective => {
     return reactDirective(Editor, [
-      'change', 'database', 'execute', 'query', 'variables', 'placeholder',
-      ['getSchema', { watchDepth: 'reference' }]
+      'change',
+      'database',
+      'execute',
+      'query',
+      'variables',
+      'placeholder',
+      ['getSchema', { watchDepth: 'reference' }],
     ]);
   },
 ]);
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/kusto/kusto.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/kusto/kusto.ts
index e2a1142597b..5bf7dfb19eb 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/kusto/kusto.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/kusto/kusto.ts
@@ -1,272 +1,619 @@
 /* tslint:disable:max-line-length */
 export const operatorTokens = [
-  { text: "!between", hint: "Matches the input that is outside the inclusive range." },
-  { text: "as", hint: "Binds a name to the operator's input tabular expression." },
-  { text: "between", hint: "Matches the input that is inside the inclusive range." },
-  { text: "consume", hint: "The `consume` operator consumes the tabular data stream handed to it. It is\r\nmostly used for triggering the query side-effect without actually returning\r\nthe results back to the caller." },
-  { text: "count", hint: "Returns the number of records in the input record set." },
-  { text: "datatable", hint: "Returns a table whose schema and values are defined in the query itself." },
-  { text: "distinct", hint: "Produces a table with the distinct combination of the provided columns of the input table." },
-  { text: "evaluate", hint: "Invokes a service-side query extension (plugin)." },
-  { text: "extend", hint: "Create calculated columns and append them to the result set." },
-  { text: "externaldata", hint: "Returns a table whose schema is defined in the query itself, and whose data is read from an external raw file." },
-  { text: "facet", hint: "Returns a set of tables, one for each specified column.\r\nEach table specifies the list of values taken by its column.\r\nAn additional table can be created by using the `with` clause." },
-  { text: "find", hint: "Finds rows that match a predicate across a set of tables." },
-  { text: "fork", hint: "Runs multiple consumer operators in parallel." },
-  { text: "getschema", hint: "Produce a table that represents a tabular schema of the input." },
-  { text: "in", hint: "Filters a recordset based on the provided set of values." },
-  { text: "invoke", hint: "Invokes lambda that receives the source of `invoke` as tabular parameter argument." },
-  { text: "join", hint: "Merge the rows of two tables to form a new table by matching values of the specified column(s) from each table." },
-  { text: "limit", hint: "Return up to the specified number of rows." },
-  { text: "make-series", hint: "Create series of specified aggregated values along specified axis." },
-  { text: "mvexpand", hint: "Expands multi-value array or property bag." },
-  { text: "order", hint: "Sort the rows of the input table into order by one or more columns." },
-  { text: "parse", hint: "Evaluates a string expression and parses its value into one or more calculated columns." },
-  { text: "print", hint: "Evaluates one or more scalar expressions and inserts the results (as a single-row table with as many columns as there are expressions) into the output." },
-  { text: "project", hint: "Select the columns to include, rename or drop, and insert new computed columns." },
-  { text: "project-away", hint: "Select what  columns to exclude from the input." },
-  { text: "project-rename", hint: "Renames columns in the result output." },
-  { text: "range", hint: "Generates a single-column table of values." },
-  { text: "reduce", hint: "Groups a set of strings together based on values similarity." },
-  { text: "render", hint: "Instructs the user agent to render the results of the query in a particular way." },
-  { text: "sample", hint: "Returns up to the specified number of random rows from the input table." },
-  { text: "sample-distinct", hint: "Returns a single column that contains up to the specified number of distinct values of the requested column." },
-  { text: "search", hint: "The search operator provides a multi-table/multi-column search experience." },
-  { text: "serialize", hint: "Marks that order of the input row set is safe for window functions usage." },
-  { text: "sort", hint: "Sort the rows of the input table into order by one or more columns." },
-  { text: "summarize", hint: "Produces a table that aggregates the content of the input table." },
-  { text: "take", hint: "Return up to the specified number of rows." },
-  { text: "top", hint: "Returns the first *N* records sorted by the specified columns." },
-  { text: "top-hitters", hint: "Returns an approximation of the first *N* results (assuming skewed distribution of the input)." },
-  { text: "top-nested", hint: "Produces hierarchical top results, where each level is a drill-down based on previous level values." },
-  { text: "union", hint: "Takes two or more tables and returns the rows of all of them." },
-  { text: "where", hint: "Filters a table to the subset of rows that satisfy a predicate." },
+  { text: '!between', hint: 'Matches the input that is outside the inclusive range.' },
+  { text: 'as', hint: "Binds a name to the operator's input tabular expression." },
+  { text: 'between', hint: 'Matches the input that is inside the inclusive range.' },
+  {
+    text: 'consume',
+    hint:
+      'The `consume` operator consumes the tabular data stream handed to it. It is\r\nmostly used for triggering the query side-effect without actually returning\r\nthe results back to the caller.',
+  },
+  { text: 'count', hint: 'Returns the number of records in the input record set.' },
+  { text: 'datatable', hint: 'Returns a table whose schema and values are defined in the query itself.' },
+  {
+    text: 'distinct',
+    hint: 'Produces a table with the distinct combination of the provided columns of the input table.',
+  },
+  { text: 'evaluate', hint: 'Invokes a service-side query extension (plugin).' },
+  { text: 'extend', hint: 'Create calculated columns and append them to the result set.' },
+  {
+    text: 'externaldata',
+    hint:
+      'Returns a table whose schema is defined in the query itself, and whose data is read from an external raw file.',
+  },
+  {
+    text: 'facet',
+    hint:
+      'Returns a set of tables, one for each specified column.\r\nEach table specifies the list of values taken by its column.\r\nAn additional table can be created by using the `with` clause.',
+  },
+  { text: 'find', hint: 'Finds rows that match a predicate across a set of tables.' },
+  { text: 'fork', hint: 'Runs multiple consumer operators in parallel.' },
+  { text: 'getschema', hint: 'Produce a table that represents a tabular schema of the input.' },
+  { text: 'in', hint: 'Filters a recordset based on the provided set of values.' },
+  { text: 'invoke', hint: 'Invokes lambda that receives the source of `invoke` as tabular parameter argument.' },
+  {
+    text: 'join',
+    hint:
+      'Merge the rows of two tables to form a new table by matching values of the specified column(s) from each table.',
+  },
+  { text: 'limit', hint: 'Return up to the specified number of rows.' },
+  { text: 'make-series', hint: 'Create series of specified aggregated values along specified axis.' },
+  { text: 'mvexpand', hint: 'Expands multi-value array or property bag.' },
+  { text: 'order', hint: 'Sort the rows of the input table into order by one or more columns.' },
+  { text: 'parse', hint: 'Evaluates a string expression and parses its value into one or more calculated columns.' },
+  {
+    text: 'print',
+    hint:
+      'Evaluates one or more scalar expressions and inserts the results (as a single-row table with as many columns as there are expressions) into the output.',
+  },
+  { text: 'project', hint: 'Select the columns to include, rename or drop, and insert new computed columns.' },
+  { text: 'project-away', hint: 'Select what  columns to exclude from the input.' },
+  { text: 'project-rename', hint: 'Renames columns in the result output.' },
+  { text: 'range', hint: 'Generates a single-column table of values.' },
+  { text: 'reduce', hint: 'Groups a set of strings together based on values similarity.' },
+  { text: 'render', hint: 'Instructs the user agent to render the results of the query in a particular way.' },
+  { text: 'sample', hint: 'Returns up to the specified number of random rows from the input table.' },
+  {
+    text: 'sample-distinct',
+    hint:
+      'Returns a single column that contains up to the specified number of distinct values of the requested column.',
+  },
+  { text: 'search', hint: 'The search operator provides a multi-table/multi-column search experience.' },
+  { text: 'serialize', hint: 'Marks that order of the input row set is safe for window functions usage.' },
+  { text: 'sort', hint: 'Sort the rows of the input table into order by one or more columns.' },
+  { text: 'summarize', hint: 'Produces a table that aggregates the content of the input table.' },
+  { text: 'take', hint: 'Return up to the specified number of rows.' },
+  { text: 'top', hint: 'Returns the first *N* records sorted by the specified columns.' },
+  {
+    text: 'top-hitters',
+    hint: 'Returns an approximation of the first *N* results (assuming skewed distribution of the input).',
+  },
+  {
+    text: 'top-nested',
+    hint: 'Produces hierarchical top results, where each level is a drill-down based on previous level values.',
+  },
+  { text: 'union', hint: 'Takes two or more tables and returns the rows of all of them.' },
+  { text: 'where', hint: 'Filters a table to the subset of rows that satisfy a predicate.' },
 ];
 
 export const functionTokens = [
-  { text: "abs", hint: "Calculates the absolute value of the input." },
-  { text: "acos", hint: "Returns the angle whose cosine is the specified number (the inverse operation of [`cos()`](cosfunction.md)) ." },
-  { text: "ago", hint: "Subtracts the given timespan from the current UTC clock time." },
-  { text: "any", hint: "Returns random non-empty value from the specified expression values." },
-  { text: "arg_max", hint: "Finds a row in the group that maximizes *ExprToMaximize*, and returns the value of *ExprToReturn* (or `*` to return the entire row)." },
-  { text: "arg_min", hint: "Finds a row in the group that minimizes *ExprToMinimize*, and returns the value of *ExprToReturn* (or `*` to return the entire row)." },
-  { text: "argmax", hint: "Finds a row in the group that maximizes *ExprToMaximize*, and returns the value of *ExprToReturn* (or `*` to return the entire row)." },
-  { text: "argmin", hint: "Finds a row in the group that minimizes *ExprToMinimize*, and returns the value of *ExprToReturn* (or `*` to return the entire row)." },
-  { text: "array_concat", hint: "Concatenates a number of dynamic arrays to a single array." },
-  { text: "array_length", hint: "Calculates the number of elements in a dynamic array." },
-  { text: "array_slice", hint: "Extracts a slice of a dynamic array." },
-  { text: "array_split", hint: "Splits an array to multiple arrays according to the split indices and packs the generated array in a dynamic array." },
-  { text: "asin", hint: "Returns the angle whose sine is the specified number (the inverse operation of [`sin()`](sinfunction.md)) ." },
-  { text: "assert", hint: "Checks for a condition; if the condition is false, outputs error messages and fails the query." },
-  { text: "atan", hint: "Returns the angle whose tangent is the specified number (the inverse operation of [`tan()`](tanfunction.md)) ." },
-  { text: "atan2", hint: "Calculates the angle, in radians, between the positive x-axis and the ray from the origin to the point (y, x)." },
-  { text: "avg", hint: "Calculates the average of *Expr* across the group." },
-  { text: "avgif", hint: "Calculates the [average](avg-aggfunction.md) of *Expr* across the group for which *Predicate* evaluates to `true`." },
-  { text: "bag_keys", hint: "Enumerates all the root keys in a dynamic property-bag object." },
-  { text: "base64_decodestring", hint: "Decodes a base64 string to a UTF-8 string" },
-  { text: "base64_encodestring", hint: "Encodes a string as base64 string" },
-  { text: "beta_cdf", hint: "Returns the standard cumulative beta distribution function." },
-  { text: "beta_inv", hint: "Returns the inverse of the beta cumulative probability beta density function." },
-  { text: "beta_pdf", hint: "Returns the probability density beta function." },
-  { text: "bin", hint: "Rounds values down to an integer multiple of a given bin size." },
-  { text: "bin_at", hint: "Rounds values down to a fixed-size \'bin\', with control over the bin's starting point.\r\n(See also [`bin function`](./binfunction.md).)" },
-  { text: "bin_auto", hint: "Rounds values down to a fixed-size \'bin\', with control over the bin size and starting point provided by a query property." },
-  { text: "binary_and", hint: "Returns a result of the bitwise `and` operation between two values." },
-  { text: "binary_not", hint: "Returns a bitwise negation of the input value." },
-  { text: "binary_or", hint: "Returns a result of the bitwise `or` operation of the two values." },
-  { text: "binary_shift_left", hint: "Returns binary shift left operation on a pair of numbers." },
-  { text: "binary_shift_right", hint: "Returns binary shift right operation on a pair of numbers." },
-  { text: "binary_xor", hint: "Returns a result of the bitwise `xor` operation of the two values." },
-  { text: "buildschema", hint: "Returns the minimal schema that admits all values of *DynamicExpr*." },
-  { text: "case", hint: "Evaluates a list of predicates and returns the first result expression whose predicate is satisfied." },
-  { text: "ceiling", hint: "Calculates the smallest integer greater than, or equal to, the specified numeric expression." },
-  { text: "cluster", hint: "Changes the reference of the query to a remote cluster." },
-  { text: "coalesce", hint: "Evaluates a list of expressions and returns the first non-null (or non-empty for string) expression." },
-  { text: "cos", hint: "Returns the cosine function." },
-  { text: "cot", hint: "Calculates the trigonometric cotangent of the specified angle, in radians." },
-  { text: "count", hint: "Returns a count of the records per summarization group (or in total if summarization is done without grouping)." },
-  { text: "countif", hint: "Returns a count of rows for which *Predicate* evaluates to `true`." },
-  { text: "countof", hint: "Counts occurrences of a substring in a string. Plain string matches may overlap; regex matches do not." },
-  { text: "current_principal", hint: "Returns the current principal running this query." },
-  { text: "cursor_after", hint: "A predicate over the records of a table to compare their ingestion time\r\nagainst a database cursor." },
-  { text: "cursor_before_or_at", hint: "A predicate over the records of a table to compare their ingestion time\r\nagainst a database cursor." },
-  { text: "database", hint: "Changes the reference of the query to a specific database within the cluster scope." },
-  { text: "datetime_add", hint: "Calculates a new [datetime](./scalar-data-types/datetime.md) from a specified datepart multiplied by a specified amount, added to a specified [datetime](./scalar-data-types/datetime.md)." },
-  { text: "datetime_diff", hint: "Calculates calendarian difference between two [datetime](./scalar-data-types/datetime.md) values." },
-  { text: "datetime_part", hint: "Extracts the requested date part as an integer value." },
-  { text: "dayofmonth", hint: "Returns the integer number representing the day number of the given month" },
-  { text: "dayofweek", hint: "Returns the integer number of days since the preceding Sunday, as a `timespan`." },
-  { text: "dayofyear", hint: "Returns the integer number represents the day number of the given year." },
-  { text: "dcount", hint: "Returns an estimate of the number of distinct values of *Expr* in the group." },
-  { text: "dcount_hll", hint: "Calculates the dcount from hll results (which was generated by [hll](hll-aggfunction.md) or [hll_merge](hll-merge-aggfunction.md))." },
-  { text: "dcountif", hint: "Returns an estimate of the number of distinct values of *Expr* of rows for which *Predicate* evaluates to `true`." },
-  { text: "degrees", hint: "Converts angle value in radians into value in degrees, using formula `degrees = (180 / PI ) * angle_in_radians`" },
-  { text: "distance", hint: "Returns the distance between two points in meters." },
-  { text: "endofday", hint: "Returns the end of the day containing the date, shifted by an offset, if provided." },
-  { text: "endofmonth", hint: "Returns the end of the month containing the date, shifted by an offset, if provided." },
-  { text: "endofweek", hint: "Returns the end of the week containing the date, shifted by an offset, if provided." },
-  { text: "endofyear", hint: "Returns the end of the year containing the date, shifted by an offset, if provided." },
-  { text: "estimate_data_size", hint: "Returns an estimated data size of the selected columns of the tabular expression." },
-  { text: "exp", hint: "The base-e exponential function of x, which is e raised to the power x: e^x." },
-  { text: "exp10", hint: "The base-10 exponential function of x, which is 10 raised to the power x: 10^x.  \r\n**Syntax**" },
-  { text: "exp2", hint: "The base-2 exponential function of x, which is 2 raised to the power x: 2^x." },
-  { text: "extent_id", hint: "Returns a unique identifier that identifies the data shard (\"extent\") that the current record resides in." },
-  { text: "extent_tags", hint: "Returns a dynamic array with the [tags](../management/extents-overview.md#extent-tagging) of the data shard (\"extent\") that the current record resides in." },
-  { text: "extract", hint: "Get a match for a [regular expression](./re2.md) from a text string." },
-  { text: "extract_all", hint: "Get all matches for a [regular expression](./re2.md) from a text string." },
-  { text: "extractjson", hint: "Get a specified element out of a JSON text using a path expression." },
-  { text: "floor", hint: "An alias for [`bin()`](binfunction.md)." },
-  { text: "format_datetime", hint: "Formats a datetime parameter based on the format pattern parameter." },
-  { text: "format_timespan", hint: "Formats a timespan parameter based on the format pattern parameter." },
-  { text: "gamma", hint: "Computes [gamma function](https://en.wikipedia.org/wiki/Gamma_function)" },
-  { text: "getmonth", hint: "Get the month number (1-12) from a datetime." },
-  { text: "gettype", hint: "Returns the runtime type of its single argument." },
-  { text: "getyear", hint: "Returns the year part of the `datetime` argument." },
-  { text: "hash", hint: "Returns a hash value for the input value." },
-  { text: "hash_sha256", hint: "Returns a sha256 hash value for the input value." },
-  { text: "hll", hint: "Calculates the Intermediate results of [dcount](dcount-aggfunction.md) across the group." },
-  { text: "hll_merge", hint: "Merges hll results (scalar version of the aggregate version [`hll_merge()`](hll-merge-aggfunction.md))." },
-  { text: "hourofday", hint: "Returns the integer number representing the hour number of the given date" },
-  { text: "iff", hint: "Evaluates the first argument (the predicate), and returns the value of either the second or third arguments, depending on whether the predicate evaluated to `true` (second) or `false` (third)." },
-  { text: "iif", hint: "Evaluates the first argument (the predicate), and returns the value of either the second or third arguments, depending on whether the predicate evaluated to `true` (second) or `false` (third)." },
-  { text: "indexof", hint: "Function reports the zero-based index of the first occurrence of a specified string within input string." },
-  { text: "ingestion_time", hint: "Retrieves the record's `$IngestionTime` hidden `datetime` column, or null." },
-  { text: "iscolumnexists", hint: "Returns a boolean value indicating if the given string argument exists in the schema produced by the preceding tabular operator." },
-  { text: "isempty", hint: "Returns `true` if the argument is an empty string or is null." },
-  { text: "isfinite", hint: "Returns whether input is a finite value (is neither infinite nor NaN)." },
-  { text: "isinf", hint: "Returns whether input is an infinite (positive or negative) value." },
-  { text: "isnan", hint: "Returns whether input is Not-a-Number (NaN) value." },
-  { text: "isnotempty", hint: "Returns `true` if the argument is not an empty string nor it is a null." },
-  { text: "isnotnull", hint: "Returns `true` if the argument is not null." },
-  { text: "isnull", hint: "Evaluates its sole argument and returns a `bool` value indicating if the argument evaluates to a null value." },
-  { text: "log", hint: "Returns the natural logarithm function." },
-  { text: "log10", hint: "Returns the common (base-10) logarithm function." },
-  { text: "log2", hint: "Returns the base-2 logarithm function." },
-  { text: "loggamma", hint: "Computes log of absolute value of the [gamma function](https://en.wikipedia.org/wiki/Gamma_function)" },
-  { text: "make_datetime", hint: "Creates a [datetime](./scalar-data-types/datetime.md) scalar value from the specified date and time." },
-  { text: "make_dictionary", hint: "Returns a `dynamic` (JSON) property-bag (dictionary) of all the values of *Expr* in the group." },
-  { text: "make_string", hint: "Returns the string generated by the Unicode characters." },
-  { text: "make_timespan", hint: "Creates a [timespan](./scalar-data-types/timespan.md) scalar value from the specified time period." },
-  { text: "makelist", hint: "Returns a `dynamic` (JSON) array of all the values of *Expr* in the group." },
-  { text: "makeset", hint: "Returns a `dynamic` (JSON) array of the set of distinct values that *Expr* takes in the group." },
-  { text: "materialize", hint: "Allows caching a sub-query result during the time of query execution in a way that other subqueries can reference the partial result." },
-  { text: "max", hint: "Returns the maximum value across the group." },
-  { text: "max_of", hint: "Returns the maximum value of several evaluated numeric expressions." },
-  { text: "merge_tdigests", hint: "Merges tdigest results (scalar version of the aggregate version [`merge_tdigests()`](merge-tdigests-aggfunction.md))." },
-  { text: "min", hint: "Returns the minimum value agross the group." },
-  { text: "min_of", hint: "Returns the minimum value of several evaluated numeric expressions." },
-  { text: "monthofyear", hint: "Returns the integer number represents the month number of the given year." },
-  { text: "next", hint: "Returns the value of a column in a row that it at some offset following the\r\ncurrent row in a [serialized row set](./windowsfunctions.md#serialized-row-set)." },
-  { text: "not", hint: "Reverses the value of its `bool` argument." },
-  { text: "now", hint: "Returns the current UTC clock time, optionally offset by a given timespan.\r\nThis function can be used multiple times in a statement and the clock time being referenced will be the same for all instances." },
-  { text: "pack", hint: "Creates a `dynamic` object (property bag) from a list of names and values." },
-  { text: "pack_all", hint: "Creates a `dynamic` object (property bag) from all the columns of the tabular expression." },
-  { text: "pack_array", hint: "Packs all input values into a dynamic array." },
-  { text: "parse_ipv4", hint: "Converts input to integer (signed 64-bit) number representation." },
-  { text: "parse_json", hint: "Interprets a `string` as a [JSON value](https://json.org/)) and returns the value as [`dynamic`](./scalar-data-types/dynamic.md). \r\nIt is superior to using [extractjson() function](./extractjsonfunction.md)\r\nwhen you need to extract more than one element of a JSON compound object." },
-  { text: "parse_path", hint: "Parses a file path `string` and returns a [`dynamic`](./scalar-data-types/dynamic.md) object that contains the following parts of the path: \r\nScheme, RootPath, DirectoryPath, DirectoryName, FileName, Extension, AlternateDataStreamName.\r\nIn addition to the simple paths with both types of slashes, supports paths with schemas (e.g. \"file://...\"), shared paths (e.g. \"\\\\shareddrive\\users...\"), long paths (e.g \"\\\\?\\C:...\"\"), alternate data streams (e.g. \"file1.exe:file2.exe\")" },
-  { text: "parse_url", hint: "Parses an absolute URL `string` and returns a [`dynamic`](./scalar-data-types/dynamic.md) object contains all parts of the URL (Scheme, Host, Port, Path, Username, Password, Query Parameters, Fragment)." },
-  { text: "parse_urlquery", hint: "Parses a url query `string` and returns a [`dynamic`](./scalar-data-types/dynamic.md) object contains the Query parameters." },
-  { text: "parse_user_agent", hint: "Interprets a user-agent string, which identifies the user's browser and provides certain system details to servers hosting the websites the user visits. The result is returned as [`dynamic`](./scalar-data-types/dynamic.md)." },
-  { text: "parse_version", hint: "Converts input string representation of version to a comparable decimal number." },
-  { text: "parse_xml", hint: "Interprets a `string` as a XML value, converts the value to a [JSON value](https://json.org/) and returns the value as  [`dynamic`](./scalar-data-types/dynamic.md)." },
-  { text: "percentile", hint: "Returns an estimate for the specified [nearest-rank percentile](#nearest-rank-percentile) of the population defined by *Expr*. \r\nThe accuracy depends on the density of population in the region of the percentile." },
-  { text: "percentile_tdigest", hint: "Calculates the percentile result from tdigest results (which was generated by [tdigest](tdigest-aggfunction.md) or [merge-tdigests](merge-tdigests-aggfunction.md))" },
-  { text: "percentrank_tdigest", hint: "Calculates the approximate rank of the value in a set where rank is expressed as percentage of set's size. \r\nThis function can be viewed as the inverse of the percentile." },
-  { text: "pi", hint: "Returns the constant value of Pi (π)." },
-  { text: "point", hint: "Returns a dynamic array representation of a point." },
-  { text: "pow", hint: "Returns a result of raising to power" },
-  { text: "prev", hint: "Returns the value of a column in a row that it at some offset prior to the\r\ncurrent row in a [serialized row set](./windowsfunctions.md#serialized-row-set)." },
-  { text: "radians", hint: "Converts angle value in degrees into value in radians, using formula `radians = (PI / 180 ) * angle_in_degrees`" },
-  { text: "rand", hint: "Returns a random number." },
-  { text: "range", hint: "Generates a dynamic array holding a series of equally-spaced values." },
-  { text: "repeat", hint: "Generates a dynamic array holding a series of equal values." },
-  { text: "replace", hint: "Replace all regex matches with another string." },
-  { text: "reverse", hint: "Function makes reverse of input string." },
-  { text: "round", hint: "Returns the rounded source to the specified precision." },
-  { text: "row_cumsum", hint: "Calculates the cumulative sum of a column in a [serialized row set](./windowsfunctions.md#serialized-row-set)." },
-  { text: "row_number", hint: "Returns the current row's index in a [serialized row set](./windowsfunctions.md#serialized-row-set).\r\nThe row index starts by default at `1` for the first row, and is incremented by `1` for each additional row.\r\nOptionally, the row index can start at a different value than `1`.\r\nAdditionally, the row index may be reset according to some provided predicate." },
-  { text: "series_add", hint: "Calculates the element-wise addition of two numeric series inputs." },
-  { text: "series_decompose", hint: "Applies a decomposition transformation on a series." },
-  { text: "series_decompose_anomalies", hint: "Anomaly Detection based on series decomposition (refer to [series_decompose()](series-decomposefunction.md))" },
-  { text: "series_decompose_forecast", hint: "Forecast based on series decomposition." },
-  { text: "series_divide", hint: "Calculates the element-wise division of two numeric series inputs." },
-  { text: "series_equals", hint: "Calculates the element-wise equals (`==`) logic operation of two numeric series inputs." },
-  { text: "series_fill_backward", hint: "Performs backward fill interpolation of missing values in a series." },
-  { text: "series_fill_const", hint: "Replaces missing values in a series with a specified constant value." },
-  { text: "series_fill_forward", hint: "Performs forward fill interpolation of missing values in a series." },
-  { text: "series_fill_linear", hint: "Performs linear interpolation of missing values in a series." },
-  { text: "series_fir", hint: "Applies a Finite Impulse Response filter on a series." },
-  { text: "series_fit_2lines", hint: "Applies two segments linear regression on a series, returning multiple columns." },
-  { text: "series_fit_2lines_dynamic", hint: "Applies two segments linear regression on a series, returning dynamic object." },
-  { text: "series_fit_line", hint: "Applies linear regression on a series, returning multiple columns." },
-  { text: "series_fit_line_dynamic", hint: "Applies linear regression on a series, returning dynamic object." },
-  { text: "series_greater", hint: "Calculates the element-wise greater (`>`) logic operation of two numeric series inputs." },
-  { text: "series_greater_equals", hint: "Calculates the element-wise greater or equals (`>=`) logic operation of two numeric series inputs." },
-  { text: "series_iir", hint: "Applies a Infinite Impulse Response filter on a series." },
-  { text: "series_less", hint: "Calculates the element-wise less (`<`) logic operation of two numeric series inputs." },
-  { text: "series_less_equals", hint: "Calculates the element-wise less or equal (`<=`) logic operation of two numeric series inputs." },
-  { text: "series_multiply", hint: "Calculates the element-wise multiplication of two numeric series inputs." },
-  { text: "series_not_equals", hint: "Calculates the element-wise not equals (`!=`) logic operation of two numeric series inputs." },
-  { text: "series_outliers", hint: "Scores anomaly points in a series." },
-  { text: "series_periods_detect", hint: "Finds the most significant periods that exist in a time series." },
-  { text: "series_periods_validate", hint: "Checks whether a time series contains periodic patterns of given lengths." },
-  { text: "series_seasonal", hint: "Calculates the seasonal component of a series according to the detected or given seasonal period." },
-  { text: "series_stats", hint: "Returns statistics for a series in multiple columns." },
-  { text: "series_stats_dynamic", hint: "Returns statistics for a series in dynamic object." },
-  { text: "series_subtract", hint: "Calculates the element-wise subtraction of two numeric series inputs." },
-  { text: "sign", hint: "Sign of a numeric expression" },
-  { text: "sin", hint: "Returns the sine function." },
-  { text: "split", hint: "Splits a given string according to a given delimiter and returns a string array with the contained substrings." },
-  { text: "sqrt", hint: "Returns the square root function." },
-  { text: "startofday", hint: "Returns the start of the day containing the date, shifted by an offset, if provided." },
-  { text: "startofmonth", hint: "Returns the start of the month containing the date, shifted by an offset, if provided." },
-  { text: "startofweek", hint: "Returns the start of the week containing the date, shifted by an offset, if provided." },
-  { text: "startofyear", hint: "Returns the start of the year containing the date, shifted by an offset, if provided." },
-  { text: "stdev", hint: "Calculates the standard deviation of *Expr* across the group, considering the group as a [sample](https://en.wikipedia.org/wiki/Sample_%28statistics%29)." },
-  { text: "stdevif", hint: "Calculates the [stdev](stdev-aggfunction.md) of *Expr* across the group for which *Predicate* evaluates to `true`." },
-  { text: "stdevp", hint: "Calculates the standard deviation of *Expr* across the group, considering the group as a [population](https://en.wikipedia.org/wiki/Statistical_population)." },
-  { text: "strcat", hint: "Concatenates between 1 and 64 arguments." },
-  { text: "strcat_array", hint: "Creates a concatenated string of array values using specified delimiter." },
-  { text: "strcat_delim", hint: "Concatenates between 2 and 64 arguments, with delimiter, provided as first argument." },
-  { text: "strcmp", hint: "Compares two strings." },
-  { text: "string_size", hint: "Returns the size, in bytes, of the input string." },
-  { text: "strlen", hint: "Returns the length, in characters, of the input string." },
-  { text: "strrep", hint: "Repeats given [string](./scalar-data-types/string.md) provided amount of times." },
-  { text: "substring", hint: "Extracts a substring from a source string starting from some index to the end of the string." },
-  { text: "sum", hint: "Calculates the sum of *Expr* across the group." },
-  { text: "sumif", hint: "Returns a sum of *Expr* for which *Predicate* evaluates to `true`." },
-  { text: "table", hint: "References specific table using an query-time evaluated string-expression." },
-  { text: "tan", hint: "Returns the tangent function." },
-  { text: "tdigest", hint: "Calculates the Intermediate results of [`percentiles()`](percentiles-aggfunction.md) across the group." },
-  { text: "tdigest_merge", hint: "Merges tdigest results (scalar version of the aggregate version [`tdigest_merge()`](tdigest-merge-aggfunction.md))." },
-  { text: "tobool", hint: "Converts input to boolean (signed 8-bit) representation." },
-  { text: "todatetime", hint: "Converts input to [datetime](./scalar-data-types/datetime.md) scalar." },
-  { text: "todecimal", hint: "Converts input to decimal number representation." },
-  { text: "todouble", hint: "Converts the input to a value of type `real`. (`todouble()` and `toreal()` are synonyms.)" },
-  { text: "todynamic", hint: "Interprets a `string` as a [JSON value](https://json.org/) and returns the value as [`dynamic`](./scalar-data-types/dynamic.md)." },
-  { text: "toguid", hint: "Converts input to [`guid`](./scalar-data-types/guid.md) representation." },
-  { text: "tohex", hint: "Converts input to a hexadecimal string." },
-  { text: "toint", hint: "Converts input to integer (signed 32-bit) number representation." },
-  { text: "tolong", hint: "Converts input to long (signed 64-bit) number representation." },
-  { text: "tolower", hint: "Converts input string to lower case." },
-  { text: "toscalar", hint: "Returns a scalar constant value of the evaluated expression." },
-  { text: "tostring", hint: "Converts input to a string representation." },
-  { text: "totimespan", hint: "Converts input  to [timespan](./scalar-data-types/timespan.md) scalar." },
-  { text: "toupper", hint: "Converts a string to upper case." },
-  { text: "translate", hint: "Replaces a set of characters ('searchList') with another set of characters ('replacementList') in a given a string.\r\nThe function searches for characters in the 'searchList' and replaces them with the corresponding characters in 'replacementList'" },
-  { text: "treepath", hint: "Enumerates all the path expressions that identify leaves in a dynamic object." },
-  { text: "trim", hint: "Removes all leading and trailing matches of the specified regular expression." },
-  { text: "trim_end", hint: "Removes trailing match of the specified regular expression." },
-  { text: "trim_start", hint: "Removes leading match of the specified regular expression." },
-  { text: "url_decode", hint: "The function converts encoded URL into a to regular URL representation." },
-  { text: "url_encode", hint: "The function converts characters of the input URL into a format that can be transmitted over the Internet." },
-  { text: "variance", hint: "Calculates the variance of *Expr* across the group, considering the group as a [sample](https://en.wikipedia.org/wiki/Sample_%28statistics%29)." },
-  { text: "varianceif", hint: "Calculates the [variance](variance-aggfunction.md) of *Expr* across the group for which *Predicate* evaluates to `true`." },
-  { text: "variancep", hint: "Calculates the variance of *Expr* across the group, considering the group as a [population](https://en.wikipedia.org/wiki/Statistical_population)." },
-  { text: "weekofyear", hint: "Returns the integer number represents the week number." },
-  { text: "welch_test", hint: "Computes the p_value of the [Welch-test function](https://en.wikipedia.org/wiki/Welch%27s_t-test)" },
-  { text: "zip", hint: "The `zip` function accepts any number of `dynamic` arrays, and returns an\r\narray whose elements are each an array holding the elements of the input\r\narrays of the same index." },
+  { text: 'abs', hint: 'Calculates the absolute value of the input.' },
+  {
+    text: 'acos',
+    hint:
+      'Returns the angle whose cosine is the specified number (the inverse operation of [`cos()`](cosfunction.md)) .',
+  },
+  { text: 'ago', hint: 'Subtracts the given timespan from the current UTC clock time.' },
+  { text: 'any', hint: 'Returns random non-empty value from the specified expression values.' },
+  {
+    text: 'arg_max',
+    hint:
+      'Finds a row in the group that maximizes *ExprToMaximize*, and returns the value of *ExprToReturn* (or `*` to return the entire row).',
+  },
+  {
+    text: 'arg_min',
+    hint:
+      'Finds a row in the group that minimizes *ExprToMinimize*, and returns the value of *ExprToReturn* (or `*` to return the entire row).',
+  },
+  {
+    text: 'argmax',
+    hint:
+      'Finds a row in the group that maximizes *ExprToMaximize*, and returns the value of *ExprToReturn* (or `*` to return the entire row).',
+  },
+  {
+    text: 'argmin',
+    hint:
+      'Finds a row in the group that minimizes *ExprToMinimize*, and returns the value of *ExprToReturn* (or `*` to return the entire row).',
+  },
+  { text: 'array_concat', hint: 'Concatenates a number of dynamic arrays to a single array.' },
+  { text: 'array_length', hint: 'Calculates the number of elements in a dynamic array.' },
+  { text: 'array_slice', hint: 'Extracts a slice of a dynamic array.' },
+  {
+    text: 'array_split',
+    hint:
+      'Splits an array to multiple arrays according to the split indices and packs the generated array in a dynamic array.',
+  },
+  {
+    text: 'asin',
+    hint: 'Returns the angle whose sine is the specified number (the inverse operation of [`sin()`](sinfunction.md)) .',
+  },
+  {
+    text: 'assert',
+    hint: 'Checks for a condition; if the condition is false, outputs error messages and fails the query.',
+  },
+  {
+    text: 'atan',
+    hint:
+      'Returns the angle whose tangent is the specified number (the inverse operation of [`tan()`](tanfunction.md)) .',
+  },
+  {
+    text: 'atan2',
+    hint:
+      'Calculates the angle, in radians, between the positive x-axis and the ray from the origin to the point (y, x).',
+  },
+  { text: 'avg', hint: 'Calculates the average of *Expr* across the group.' },
+  {
+    text: 'avgif',
+    hint:
+      'Calculates the [average](avg-aggfunction.md) of *Expr* across the group for which *Predicate* evaluates to `true`.',
+  },
+  { text: 'bag_keys', hint: 'Enumerates all the root keys in a dynamic property-bag object.' },
+  { text: 'base64_decodestring', hint: 'Decodes a base64 string to a UTF-8 string' },
+  { text: 'base64_encodestring', hint: 'Encodes a string as base64 string' },
+  { text: 'beta_cdf', hint: 'Returns the standard cumulative beta distribution function.' },
+  { text: 'beta_inv', hint: 'Returns the inverse of the beta cumulative probability beta density function.' },
+  { text: 'beta_pdf', hint: 'Returns the probability density beta function.' },
+  { text: 'bin', hint: 'Rounds values down to an integer multiple of a given bin size.' },
+  {
+    text: 'bin_at',
+    hint:
+      "Rounds values down to a fixed-size 'bin', with control over the bin's starting point.\r\n(See also [`bin function`](./binfunction.md).)",
+  },
+  {
+    text: 'bin_auto',
+    hint:
+      "Rounds values down to a fixed-size 'bin', with control over the bin size and starting point provided by a query property.",
+  },
+  { text: 'binary_and', hint: 'Returns a result of the bitwise `and` operation between two values.' },
+  { text: 'binary_not', hint: 'Returns a bitwise negation of the input value.' },
+  { text: 'binary_or', hint: 'Returns a result of the bitwise `or` operation of the two values.' },
+  { text: 'binary_shift_left', hint: 'Returns binary shift left operation on a pair of numbers.' },
+  { text: 'binary_shift_right', hint: 'Returns binary shift right operation on a pair of numbers.' },
+  { text: 'binary_xor', hint: 'Returns a result of the bitwise `xor` operation of the two values.' },
+  { text: 'buildschema', hint: 'Returns the minimal schema that admits all values of *DynamicExpr*.' },
+  {
+    text: 'case',
+    hint: 'Evaluates a list of predicates and returns the first result expression whose predicate is satisfied.',
+  },
+  {
+    text: 'ceiling',
+    hint: 'Calculates the smallest integer greater than, or equal to, the specified numeric expression.',
+  },
+  { text: 'cluster', hint: 'Changes the reference of the query to a remote cluster.' },
+  {
+    text: 'coalesce',
+    hint: 'Evaluates a list of expressions and returns the first non-null (or non-empty for string) expression.',
+  },
+  { text: 'cos', hint: 'Returns the cosine function.' },
+  { text: 'cot', hint: 'Calculates the trigonometric cotangent of the specified angle, in radians.' },
+  {
+    text: 'count',
+    hint:
+      'Returns a count of the records per summarization group (or in total if summarization is done without grouping).',
+  },
+  { text: 'countif', hint: 'Returns a count of rows for which *Predicate* evaluates to `true`.' },
+  {
+    text: 'countof',
+    hint: 'Counts occurrences of a substring in a string. Plain string matches may overlap; regex matches do not.',
+  },
+  { text: 'current_principal', hint: 'Returns the current principal running this query.' },
+  {
+    text: 'cursor_after',
+    hint: 'A predicate over the records of a table to compare their ingestion time\r\nagainst a database cursor.',
+  },
+  {
+    text: 'cursor_before_or_at',
+    hint: 'A predicate over the records of a table to compare their ingestion time\r\nagainst a database cursor.',
+  },
+  { text: 'database', hint: 'Changes the reference of the query to a specific database within the cluster scope.' },
+  {
+    text: 'datetime_add',
+    hint:
+      'Calculates a new [datetime](./scalar-data-types/datetime.md) from a specified datepart multiplied by a specified amount, added to a specified [datetime](./scalar-data-types/datetime.md).',
+  },
+  {
+    text: 'datetime_diff',
+    hint: 'Calculates calendarian difference between two [datetime](./scalar-data-types/datetime.md) values.',
+  },
+  { text: 'datetime_part', hint: 'Extracts the requested date part as an integer value.' },
+  { text: 'dayofmonth', hint: 'Returns the integer number representing the day number of the given month' },
+  { text: 'dayofweek', hint: 'Returns the integer number of days since the preceding Sunday, as a `timespan`.' },
+  { text: 'dayofyear', hint: 'Returns the integer number represents the day number of the given year.' },
+  { text: 'dcount', hint: 'Returns an estimate of the number of distinct values of *Expr* in the group.' },
+  {
+    text: 'dcount_hll',
+    hint:
+      'Calculates the dcount from hll results (which was generated by [hll](hll-aggfunction.md) or [hll_merge](hll-merge-aggfunction.md)).',
+  },
+  {
+    text: 'dcountif',
+    hint:
+      'Returns an estimate of the number of distinct values of *Expr* of rows for which *Predicate* evaluates to `true`.',
+  },
+  {
+    text: 'degrees',
+    hint:
+      'Converts angle value in radians into value in degrees, using formula `degrees = (180 / PI ) * angle_in_radians`',
+  },
+  { text: 'distance', hint: 'Returns the distance between two points in meters.' },
+  { text: 'endofday', hint: 'Returns the end of the day containing the date, shifted by an offset, if provided.' },
+  { text: 'endofmonth', hint: 'Returns the end of the month containing the date, shifted by an offset, if provided.' },
+  { text: 'endofweek', hint: 'Returns the end of the week containing the date, shifted by an offset, if provided.' },
+  { text: 'endofyear', hint: 'Returns the end of the year containing the date, shifted by an offset, if provided.' },
+  {
+    text: 'estimate_data_size',
+    hint: 'Returns an estimated data size of the selected columns of the tabular expression.',
+  },
+  { text: 'exp', hint: 'The base-e exponential function of x, which is e raised to the power x: e^x.' },
+  {
+    text: 'exp10',
+    hint: 'The base-10 exponential function of x, which is 10 raised to the power x: 10^x.  \r\n**Syntax**',
+  },
+  { text: 'exp2', hint: 'The base-2 exponential function of x, which is 2 raised to the power x: 2^x.' },
+  {
+    text: 'extent_id',
+    hint: 'Returns a unique identifier that identifies the data shard ("extent") that the current record resides in.',
+  },
+  {
+    text: 'extent_tags',
+    hint:
+      'Returns a dynamic array with the [tags](../management/extents-overview.md#extent-tagging) of the data shard ("extent") that the current record resides in.',
+  },
+  { text: 'extract', hint: 'Get a match for a [regular expression](./re2.md) from a text string.' },
+  { text: 'extract_all', hint: 'Get all matches for a [regular expression](./re2.md) from a text string.' },
+  { text: 'extractjson', hint: 'Get a specified element out of a JSON text using a path expression.' },
+  { text: 'floor', hint: 'An alias for [`bin()`](binfunction.md).' },
+  { text: 'format_datetime', hint: 'Formats a datetime parameter based on the format pattern parameter.' },
+  { text: 'format_timespan', hint: 'Formats a timespan parameter based on the format pattern parameter.' },
+  { text: 'gamma', hint: 'Computes [gamma function](https://en.wikipedia.org/wiki/Gamma_function)' },
+  { text: 'getmonth', hint: 'Get the month number (1-12) from a datetime.' },
+  { text: 'gettype', hint: 'Returns the runtime type of its single argument.' },
+  { text: 'getyear', hint: 'Returns the year part of the `datetime` argument.' },
+  { text: 'hash', hint: 'Returns a hash value for the input value.' },
+  { text: 'hash_sha256', hint: 'Returns a sha256 hash value for the input value.' },
+  { text: 'hll', hint: 'Calculates the Intermediate results of [dcount](dcount-aggfunction.md) across the group.' },
+  {
+    text: 'hll_merge',
+    hint: 'Merges hll results (scalar version of the aggregate version [`hll_merge()`](hll-merge-aggfunction.md)).',
+  },
+  { text: 'hourofday', hint: 'Returns the integer number representing the hour number of the given date' },
+  {
+    text: 'iff',
+    hint:
+      'Evaluates the first argument (the predicate), and returns the value of either the second or third arguments, depending on whether the predicate evaluated to `true` (second) or `false` (third).',
+  },
+  {
+    text: 'iif',
+    hint:
+      'Evaluates the first argument (the predicate), and returns the value of either the second or third arguments, depending on whether the predicate evaluated to `true` (second) or `false` (third).',
+  },
+  {
+    text: 'indexof',
+    hint: 'Function reports the zero-based index of the first occurrence of a specified string within input string.',
+  },
+  { text: 'ingestion_time', hint: "Retrieves the record's `$IngestionTime` hidden `datetime` column, or null." },
+  {
+    text: 'iscolumnexists',
+    hint:
+      'Returns a boolean value indicating if the given string argument exists in the schema produced by the preceding tabular operator.',
+  },
+  { text: 'isempty', hint: 'Returns `true` if the argument is an empty string or is null.' },
+  { text: 'isfinite', hint: 'Returns whether input is a finite value (is neither infinite nor NaN).' },
+  { text: 'isinf', hint: 'Returns whether input is an infinite (positive or negative) value.' },
+  { text: 'isnan', hint: 'Returns whether input is Not-a-Number (NaN) value.' },
+  { text: 'isnotempty', hint: 'Returns `true` if the argument is not an empty string nor it is a null.' },
+  { text: 'isnotnull', hint: 'Returns `true` if the argument is not null.' },
+  {
+    text: 'isnull',
+    hint:
+      'Evaluates its sole argument and returns a `bool` value indicating if the argument evaluates to a null value.',
+  },
+  { text: 'log', hint: 'Returns the natural logarithm function.' },
+  { text: 'log10', hint: 'Returns the common (base-10) logarithm function.' },
+  { text: 'log2', hint: 'Returns the base-2 logarithm function.' },
+  {
+    text: 'loggamma',
+    hint: 'Computes log of absolute value of the [gamma function](https://en.wikipedia.org/wiki/Gamma_function)',
+  },
+  {
+    text: 'make_datetime',
+    hint: 'Creates a [datetime](./scalar-data-types/datetime.md) scalar value from the specified date and time.',
+  },
+  {
+    text: 'make_dictionary',
+    hint: 'Returns a `dynamic` (JSON) property-bag (dictionary) of all the values of *Expr* in the group.',
+  },
+  { text: 'make_string', hint: 'Returns the string generated by the Unicode characters.' },
+  {
+    text: 'make_timespan',
+    hint: 'Creates a [timespan](./scalar-data-types/timespan.md) scalar value from the specified time period.',
+  },
+  { text: 'makelist', hint: 'Returns a `dynamic` (JSON) array of all the values of *Expr* in the group.' },
+  {
+    text: 'makeset',
+    hint: 'Returns a `dynamic` (JSON) array of the set of distinct values that *Expr* takes in the group.',
+  },
+  {
+    text: 'materialize',
+    hint:
+      'Allows caching a sub-query result during the time of query execution in a way that other subqueries can reference the partial result.',
+  },
+  { text: 'max', hint: 'Returns the maximum value across the group.' },
+  { text: 'max_of', hint: 'Returns the maximum value of several evaluated numeric expressions.' },
+  {
+    text: 'merge_tdigests',
+    hint:
+      'Merges tdigest results (scalar version of the aggregate version [`merge_tdigests()`](merge-tdigests-aggfunction.md)).',
+  },
+  { text: 'min', hint: 'Returns the minimum value agross the group.' },
+  { text: 'min_of', hint: 'Returns the minimum value of several evaluated numeric expressions.' },
+  { text: 'monthofyear', hint: 'Returns the integer number represents the month number of the given year.' },
+  {
+    text: 'next',
+    hint:
+      'Returns the value of a column in a row that it at some offset following the\r\ncurrent row in a [serialized row set](./windowsfunctions.md#serialized-row-set).',
+  },
+  { text: 'not', hint: 'Reverses the value of its `bool` argument.' },
+  {
+    text: 'now',
+    hint:
+      'Returns the current UTC clock time, optionally offset by a given timespan.\r\nThis function can be used multiple times in a statement and the clock time being referenced will be the same for all instances.',
+  },
+  { text: 'pack', hint: 'Creates a `dynamic` object (property bag) from a list of names and values.' },
+  {
+    text: 'pack_all',
+    hint: 'Creates a `dynamic` object (property bag) from all the columns of the tabular expression.',
+  },
+  { text: 'pack_array', hint: 'Packs all input values into a dynamic array.' },
+  { text: 'parse_ipv4', hint: 'Converts input to integer (signed 64-bit) number representation.' },
+  {
+    text: 'parse_json',
+    hint:
+      'Interprets a `string` as a [JSON value](https://json.org/)) and returns the value as [`dynamic`](./scalar-data-types/dynamic.md). \r\nIt is superior to using [extractjson() function](./extractjsonfunction.md)\r\nwhen you need to extract more than one element of a JSON compound object.',
+  },
+  {
+    text: 'parse_path',
+    hint:
+      'Parses a file path `string` and returns a [`dynamic`](./scalar-data-types/dynamic.md) object that contains the following parts of the path: \r\nScheme, RootPath, DirectoryPath, DirectoryName, FileName, Extension, AlternateDataStreamName.\r\nIn addition to the simple paths with both types of slashes, supports paths with schemas (e.g. "file://..."), shared paths (e.g. "\\\\shareddrive\\users..."), long paths (e.g "\\\\?\\C:...""), alternate data streams (e.g. "file1.exe:file2.exe")',
+  },
+  {
+    text: 'parse_url',
+    hint:
+      'Parses an absolute URL `string` and returns a [`dynamic`](./scalar-data-types/dynamic.md) object contains all parts of the URL (Scheme, Host, Port, Path, Username, Password, Query Parameters, Fragment).',
+  },
+  {
+    text: 'parse_urlquery',
+    hint:
+      'Parses a url query `string` and returns a [`dynamic`](./scalar-data-types/dynamic.md) object contains the Query parameters.',
+  },
+  {
+    text: 'parse_user_agent',
+    hint:
+      "Interprets a user-agent string, which identifies the user's browser and provides certain system details to servers hosting the websites the user visits. The result is returned as [`dynamic`](./scalar-data-types/dynamic.md).",
+  },
+  { text: 'parse_version', hint: 'Converts input string representation of version to a comparable decimal number.' },
+  {
+    text: 'parse_xml',
+    hint:
+      'Interprets a `string` as a XML value, converts the value to a [JSON value](https://json.org/) and returns the value as  [`dynamic`](./scalar-data-types/dynamic.md).',
+  },
+  {
+    text: 'percentile',
+    hint:
+      'Returns an estimate for the specified [nearest-rank percentile](#nearest-rank-percentile) of the population defined by *Expr*. \r\nThe accuracy depends on the density of population in the region of the percentile.',
+  },
+  {
+    text: 'percentile_tdigest',
+    hint:
+      'Calculates the percentile result from tdigest results (which was generated by [tdigest](tdigest-aggfunction.md) or [merge-tdigests](merge-tdigests-aggfunction.md))',
+  },
+  {
+    text: 'percentrank_tdigest',
+    hint:
+      "Calculates the approximate rank of the value in a set where rank is expressed as percentage of set's size. \r\nThis function can be viewed as the inverse of the percentile.",
+  },
+  { text: 'pi', hint: 'Returns the constant value of Pi (π).' },
+  { text: 'point', hint: 'Returns a dynamic array representation of a point.' },
+  { text: 'pow', hint: 'Returns a result of raising to power' },
+  {
+    text: 'prev',
+    hint:
+      'Returns the value of a column in a row that it at some offset prior to the\r\ncurrent row in a [serialized row set](./windowsfunctions.md#serialized-row-set).',
+  },
+  {
+    text: 'radians',
+    hint:
+      'Converts angle value in degrees into value in radians, using formula `radians = (PI / 180 ) * angle_in_degrees`',
+  },
+  { text: 'rand', hint: 'Returns a random number.' },
+  { text: 'range', hint: 'Generates a dynamic array holding a series of equally-spaced values.' },
+  { text: 'repeat', hint: 'Generates a dynamic array holding a series of equal values.' },
+  { text: 'replace', hint: 'Replace all regex matches with another string.' },
+  { text: 'reverse', hint: 'Function makes reverse of input string.' },
+  { text: 'round', hint: 'Returns the rounded source to the specified precision.' },
+  {
+    text: 'row_cumsum',
+    hint:
+      'Calculates the cumulative sum of a column in a [serialized row set](./windowsfunctions.md#serialized-row-set).',
+  },
+  {
+    text: 'row_number',
+    hint:
+      "Returns the current row's index in a [serialized row set](./windowsfunctions.md#serialized-row-set).\r\nThe row index starts by default at `1` for the first row, and is incremented by `1` for each additional row.\r\nOptionally, the row index can start at a different value than `1`.\r\nAdditionally, the row index may be reset according to some provided predicate.",
+  },
+  { text: 'series_add', hint: 'Calculates the element-wise addition of two numeric series inputs.' },
+  { text: 'series_decompose', hint: 'Applies a decomposition transformation on a series.' },
+  {
+    text: 'series_decompose_anomalies',
+    hint:
+      'Anomaly Detection based on series decomposition (refer to [series_decompose()](series-decomposefunction.md))',
+  },
+  { text: 'series_decompose_forecast', hint: 'Forecast based on series decomposition.' },
+  { text: 'series_divide', hint: 'Calculates the element-wise division of two numeric series inputs.' },
+  {
+    text: 'series_equals',
+    hint: 'Calculates the element-wise equals (`==`) logic operation of two numeric series inputs.',
+  },
+  { text: 'series_fill_backward', hint: 'Performs backward fill interpolation of missing values in a series.' },
+  { text: 'series_fill_const', hint: 'Replaces missing values in a series with a specified constant value.' },
+  { text: 'series_fill_forward', hint: 'Performs forward fill interpolation of missing values in a series.' },
+  { text: 'series_fill_linear', hint: 'Performs linear interpolation of missing values in a series.' },
+  { text: 'series_fir', hint: 'Applies a Finite Impulse Response filter on a series.' },
+  {
+    text: 'series_fit_2lines',
+    hint: 'Applies two segments linear regression on a series, returning multiple columns.',
+  },
+  {
+    text: 'series_fit_2lines_dynamic',
+    hint: 'Applies two segments linear regression on a series, returning dynamic object.',
+  },
+  { text: 'series_fit_line', hint: 'Applies linear regression on a series, returning multiple columns.' },
+  { text: 'series_fit_line_dynamic', hint: 'Applies linear regression on a series, returning dynamic object.' },
+  {
+    text: 'series_greater',
+    hint: 'Calculates the element-wise greater (`>`) logic operation of two numeric series inputs.',
+  },
+  {
+    text: 'series_greater_equals',
+    hint: 'Calculates the element-wise greater or equals (`>=`) logic operation of two numeric series inputs.',
+  },
+  { text: 'series_iir', hint: 'Applies a Infinite Impulse Response filter on a series.' },
+  { text: 'series_less', hint: 'Calculates the element-wise less (`<`) logic operation of two numeric series inputs.' },
+  {
+    text: 'series_less_equals',
+    hint: 'Calculates the element-wise less or equal (`<=`) logic operation of two numeric series inputs.',
+  },
+  { text: 'series_multiply', hint: 'Calculates the element-wise multiplication of two numeric series inputs.' },
+  {
+    text: 'series_not_equals',
+    hint: 'Calculates the element-wise not equals (`!=`) logic operation of two numeric series inputs.',
+  },
+  { text: 'series_outliers', hint: 'Scores anomaly points in a series.' },
+  { text: 'series_periods_detect', hint: 'Finds the most significant periods that exist in a time series.' },
+  {
+    text: 'series_periods_validate',
+    hint: 'Checks whether a time series contains periodic patterns of given lengths.',
+  },
+  {
+    text: 'series_seasonal',
+    hint: 'Calculates the seasonal component of a series according to the detected or given seasonal period.',
+  },
+  { text: 'series_stats', hint: 'Returns statistics for a series in multiple columns.' },
+  { text: 'series_stats_dynamic', hint: 'Returns statistics for a series in dynamic object.' },
+  { text: 'series_subtract', hint: 'Calculates the element-wise subtraction of two numeric series inputs.' },
+  { text: 'sign', hint: 'Sign of a numeric expression' },
+  { text: 'sin', hint: 'Returns the sine function.' },
+  {
+    text: 'split',
+    hint:
+      'Splits a given string according to a given delimiter and returns a string array with the contained substrings.',
+  },
+  { text: 'sqrt', hint: 'Returns the square root function.' },
+  { text: 'startofday', hint: 'Returns the start of the day containing the date, shifted by an offset, if provided.' },
+  {
+    text: 'startofmonth',
+    hint: 'Returns the start of the month containing the date, shifted by an offset, if provided.',
+  },
+  {
+    text: 'startofweek',
+    hint: 'Returns the start of the week containing the date, shifted by an offset, if provided.',
+  },
+  {
+    text: 'startofyear',
+    hint: 'Returns the start of the year containing the date, shifted by an offset, if provided.',
+  },
+  {
+    text: 'stdev',
+    hint:
+      'Calculates the standard deviation of *Expr* across the group, considering the group as a [sample](https://en.wikipedia.org/wiki/Sample_%28statistics%29).',
+  },
+  {
+    text: 'stdevif',
+    hint:
+      'Calculates the [stdev](stdev-aggfunction.md) of *Expr* across the group for which *Predicate* evaluates to `true`.',
+  },
+  {
+    text: 'stdevp',
+    hint:
+      'Calculates the standard deviation of *Expr* across the group, considering the group as a [population](https://en.wikipedia.org/wiki/Statistical_population).',
+  },
+  { text: 'strcat', hint: 'Concatenates between 1 and 64 arguments.' },
+  { text: 'strcat_array', hint: 'Creates a concatenated string of array values using specified delimiter.' },
+  {
+    text: 'strcat_delim',
+    hint: 'Concatenates between 2 and 64 arguments, with delimiter, provided as first argument.',
+  },
+  { text: 'strcmp', hint: 'Compares two strings.' },
+  { text: 'string_size', hint: 'Returns the size, in bytes, of the input string.' },
+  { text: 'strlen', hint: 'Returns the length, in characters, of the input string.' },
+  { text: 'strrep', hint: 'Repeats given [string](./scalar-data-types/string.md) provided amount of times.' },
+  {
+    text: 'substring',
+    hint: 'Extracts a substring from a source string starting from some index to the end of the string.',
+  },
+  { text: 'sum', hint: 'Calculates the sum of *Expr* across the group.' },
+  { text: 'sumif', hint: 'Returns a sum of *Expr* for which *Predicate* evaluates to `true`.' },
+  { text: 'table', hint: 'References specific table using an query-time evaluated string-expression.' },
+  { text: 'tan', hint: 'Returns the tangent function.' },
+  {
+    text: 'tdigest',
+    hint: 'Calculates the Intermediate results of [`percentiles()`](percentiles-aggfunction.md) across the group.',
+  },
+  {
+    text: 'tdigest_merge',
+    hint:
+      'Merges tdigest results (scalar version of the aggregate version [`tdigest_merge()`](tdigest-merge-aggfunction.md)).',
+  },
+  { text: 'tobool', hint: 'Converts input to boolean (signed 8-bit) representation.' },
+  { text: 'todatetime', hint: 'Converts input to [datetime](./scalar-data-types/datetime.md) scalar.' },
+  { text: 'todecimal', hint: 'Converts input to decimal number representation.' },
+  {
+    text: 'todouble',
+    hint: 'Converts the input to a value of type `real`. (`todouble()` and `toreal()` are synonyms.)',
+  },
+  {
+    text: 'todynamic',
+    hint:
+      'Interprets a `string` as a [JSON value](https://json.org/) and returns the value as [`dynamic`](./scalar-data-types/dynamic.md).',
+  },
+  { text: 'toguid', hint: 'Converts input to [`guid`](./scalar-data-types/guid.md) representation.' },
+  { text: 'tohex', hint: 'Converts input to a hexadecimal string.' },
+  { text: 'toint', hint: 'Converts input to integer (signed 32-bit) number representation.' },
+  { text: 'tolong', hint: 'Converts input to long (signed 64-bit) number representation.' },
+  { text: 'tolower', hint: 'Converts input string to lower case.' },
+  { text: 'toscalar', hint: 'Returns a scalar constant value of the evaluated expression.' },
+  { text: 'tostring', hint: 'Converts input to a string representation.' },
+  { text: 'totimespan', hint: 'Converts input  to [timespan](./scalar-data-types/timespan.md) scalar.' },
+  { text: 'toupper', hint: 'Converts a string to upper case.' },
+  {
+    text: 'translate',
+    hint:
+      "Replaces a set of characters ('searchList') with another set of characters ('replacementList') in a given a string.\r\nThe function searches for characters in the 'searchList' and replaces them with the corresponding characters in 'replacementList'",
+  },
+  { text: 'treepath', hint: 'Enumerates all the path expressions that identify leaves in a dynamic object.' },
+  { text: 'trim', hint: 'Removes all leading and trailing matches of the specified regular expression.' },
+  { text: 'trim_end', hint: 'Removes trailing match of the specified regular expression.' },
+  { text: 'trim_start', hint: 'Removes leading match of the specified regular expression.' },
+  { text: 'url_decode', hint: 'The function converts encoded URL into a to regular URL representation.' },
+  {
+    text: 'url_encode',
+    hint: 'The function converts characters of the input URL into a format that can be transmitted over the Internet.',
+  },
+  {
+    text: 'variance',
+    hint:
+      'Calculates the variance of *Expr* across the group, considering the group as a [sample](https://en.wikipedia.org/wiki/Sample_%28statistics%29).',
+  },
+  {
+    text: 'varianceif',
+    hint:
+      'Calculates the [variance](variance-aggfunction.md) of *Expr* across the group for which *Predicate* evaluates to `true`.',
+  },
+  {
+    text: 'variancep',
+    hint:
+      'Calculates the variance of *Expr* across the group, considering the group as a [population](https://en.wikipedia.org/wiki/Statistical_population).',
+  },
+  { text: 'weekofyear', hint: 'Returns the integer number represents the week number.' },
+  {
+    text: 'welch_test',
+    hint: 'Computes the p_value of the [Welch-test function](https://en.wikipedia.org/wiki/Welch%27s_t-test)',
+  },
+  {
+    text: 'zip',
+    hint:
+      'The `zip` function accepts any number of `dynamic` arrays, and returns an\r\narray whose elements are each an array holding the elements of the input\r\narrays of the same index.',
+  },
 ];
 
 export const KEYWORDS = [
@@ -297,8 +644,16 @@ export const KEYWORDS = [
 ];
 
 export const grafanaMacros = [
-  { text: '$__timeFilter', display: '$__timeFilter()', hint: 'Macro that uses the selected timerange in Grafana to filter the query.', },
-  { text: '$__escapeMulti', display: '$__escapeMulti()', hint: 'Macro to escape multi-value template variables that contain illegal characters.', },
+  {
+    text: '$__timeFilter',
+    display: '$__timeFilter()',
+    hint: 'Macro that uses the selected timerange in Grafana to filter the query.',
+  },
+  {
+    text: '$__escapeMulti',
+    display: '$__escapeMulti()',
+    hint: 'Macro to escape multi-value template variables that contain illegal characters.',
+  },
   { text: '$__contains', display: '$__contains()', hint: 'Macro for multi-value template variables.' },
 ];
 
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts
index cee67d11ab3..6374af8c599 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts
@@ -314,7 +314,7 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
         }
       })
       .catch(this.handleQueryCtrlError.bind(this));
-  }
+  };
 
   getAzureLogAnalyticsSchema = () => {
     return this.getWorkspaces()
@@ -322,15 +322,15 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
         return this.datasource.azureLogAnalyticsDatasource.getSchema(this.target.azureLogAnalytics.workspace);
       })
       .catch(this.handleQueryCtrlError.bind(this));
-  }
+  };
 
   onLogAnalyticsQueryChange = (nextQuery: string) => {
     this.target.azureLogAnalytics.query = nextQuery;
-  }
+  };
 
   onLogAnalyticsQueryExecute = () => {
     this.panelCtrl.refresh();
-  }
+  };
 
   get templateVariables() {
     return this.templateSrv.variables.map(t => '$' + t.name);
@@ -380,16 +380,15 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
 
   onAppInsightsQueryChange = (nextQuery: string) => {
     this.target.appInsights.rawQueryString = nextQuery;
-  }
+  };
 
   onAppInsightsQueryExecute = () => {
     return this.refresh();
-  }
+  };
 
   getAppInsightsQuerySchema = () => {
-    return this.datasource.appInsightsDatasource.getQuerySchema()
-      .catch(this.handleQueryCtrlError.bind(this));
-  }
+    return this.datasource.appInsightsDatasource.getQuerySchema().catch(this.handleQueryCtrlError.bind(this));
+  };
 
   getAppInsightsGroupBySegments(query) {
     return _.map(this.target.appInsights.groupByOptions, option => {
diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
index 14fe046e098..f36623596d2 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
@@ -58,7 +58,9 @@ export class LokiQueryEditor extends PureComponent<Props> {
     return (
       <div>
         <div className="gf-form">
-          <div className="gf-form-label">Loki is currently not supported as dashboard data source. We are working on it!</div>
+          <div className="gf-form-label">
+            Loki is currently not supported as dashboard data source. We are working on it!
+          </div>
         </div>
         {/*
         <LokiQueryField
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index 282a62f9875..193ebc80b5c 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -92,8 +92,8 @@ export class LokiDatasource {
         const query = queryTargets[i];
 
         // add search term to stream & add to array
-        if (result.data)  {
-          for (const stream of (result.data.streams || [])) {
+        if (result.data) {
+          for (const stream of result.data.streams || []) {
             stream.search = query.regexp;
             allStreams.push(stream);
           }
@@ -152,35 +152,35 @@ export class LokiDatasource {
 
   testDatasource() {
     return this._request('/api/prom/label')
-    .then(res => {
-      if (res && res.data && res.data.values && res.data.values.length > 0) {
-        return { status: 'success', message: 'Data source connected and labels found.' };
-      }
-      return {
-        status: 'error',
-        message:
-          'Data source connected, but no labels received. Verify that Loki and Promtail is configured properly.',
-      };
-    })
-    .catch(err => {
-      let message = 'Loki: ';
-      if (err.statusText) {
-        message += err.statusText;
-      } else {
-        message += 'Cannot connect to Loki';
-      }
+      .then(res => {
+        if (res && res.data && res.data.values && res.data.values.length > 0) {
+          return { status: 'success', message: 'Data source connected and labels found.' };
+        }
+        return {
+          status: 'error',
+          message:
+            'Data source connected, but no labels received. Verify that Loki and Promtail is configured properly.',
+        };
+      })
+      .catch(err => {
+        let message = 'Loki: ';
+        if (err.statusText) {
+          message += err.statusText;
+        } else {
+          message += 'Cannot connect to Loki';
+        }
 
-      if (err.status) {
-        message += `. ${err.status}`;
-      }
+        if (err.status) {
+          message += `. ${err.status}`;
+        }
 
-      if (err.data && err.data.message) {
-        message += `. ${err.data.message}`;
-      } else if (err.data) {
-        message += `. ${err.data}`;
-      }
-      return { status: 'error', message: message };
-    });
+        if (err.data && err.data.message) {
+          message += `. ${err.data.message}`;
+        } else if (err.data) {
+          message += `. ${err.data}`;
+        }
+        return { status: 'error', message: message };
+      });
   }
 }
 
diff --git a/public/app/plugins/datasource/loki/types.ts b/public/app/plugins/datasource/loki/types.ts
index 1d5d72d4aa3..fabbc7169e2 100644
--- a/public/app/plugins/datasource/loki/types.ts
+++ b/public/app/plugins/datasource/loki/types.ts
@@ -6,4 +6,3 @@ export interface LokiQuery extends DataQuery {
 }
 
 export type LokiQueryResultFormats = 'time_series' | 'logs';
-
diff --git a/public/app/plugins/datasource/mssql/specs/datasource.test.ts b/public/app/plugins/datasource/mssql/specs/datasource.test.ts
index a05848b3da8..49b13387369 100644
--- a/public/app/plugins/datasource/mssql/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/mssql/specs/datasource.test.ts
@@ -210,7 +210,7 @@ describe('MSSQLDatasource', () => {
     };
     const time = {
       from: moment(1521545610656),
-      to: moment(1521546251185)
+      to: moment(1521546251185),
     };
 
     beforeEach(() => {
diff --git a/public/app/plugins/datasource/prometheus/types.ts b/public/app/plugins/datasource/prometheus/types.ts
index 5bdc687d774..81fc4d8108d 100644
--- a/public/app/plugins/datasource/prometheus/types.ts
+++ b/public/app/plugins/datasource/prometheus/types.ts
@@ -3,4 +3,3 @@ import { DataQuery } from '@grafana/ui/src/types';
 export interface PromQuery extends DataQuery {
   expr: string;
 }
-
diff --git a/public/app/plugins/datasource/testdata/QueryEditor.tsx b/public/app/plugins/datasource/testdata/QueryEditor.tsx
index c483df41096..811d6f217ff 100644
--- a/public/app/plugins/datasource/testdata/QueryEditor.tsx
+++ b/public/app/plugins/datasource/testdata/QueryEditor.tsx
@@ -45,7 +45,7 @@ export class QueryEditor extends PureComponent<Props> {
       ...this.props.query,
       scenarioId: item.value,
     });
-  }
+  };
 
   render() {
     const { query } = this.props;
diff --git a/public/app/plugins/datasource/testdata/datasource.ts b/public/app/plugins/datasource/testdata/datasource.ts
index 6ba0da59457..8ed9217a5c2 100644
--- a/public/app/plugins/datasource/testdata/datasource.ts
+++ b/public/app/plugins/datasource/testdata/datasource.ts
@@ -98,4 +98,3 @@ export class TestDataDatasource implements DataSourceApi<TestDataQuery> {
     return this.backendSrv.get('/api/tsdb/testdata/scenarios');
   }
 }
-
diff --git a/public/app/plugins/datasource/testdata/types.ts b/public/app/plugins/datasource/testdata/types.ts
index e233c3ef7a0..7d8244892e5 100644
--- a/public/app/plugins/datasource/testdata/types.ts
+++ b/public/app/plugins/datasource/testdata/types.ts
@@ -8,4 +8,3 @@ export interface Scenario {
   id: string;
   name: string;
 }
-
diff --git a/public/app/plugins/panel/alertlist/plugin.json b/public/app/plugins/panel/alertlist/plugin.json
index ff36a572f2b..130c307ae6c 100644
--- a/public/app/plugins/panel/alertlist/plugin.json
+++ b/public/app/plugins/panel/alertlist/plugin.json
@@ -3,6 +3,8 @@
   "name": "Alert List",
   "id": "alertlist",
 
+  "dataFormats": [],
+
   "info": {
     "description": "Shows list of alerts and their current status",
     "author": {
diff --git a/public/app/plugins/panel/dashlist/plugin.json b/public/app/plugins/panel/dashlist/plugin.json
index 9dcde08a598..11f9db928b0 100644
--- a/public/app/plugins/panel/dashlist/plugin.json
+++ b/public/app/plugins/panel/dashlist/plugin.json
@@ -3,12 +3,14 @@
   "name": "Dashboard list",
   "id": "dashlist",
 
+  "dataFormats": [],
+
   "info": {
     "description": "List of dynamic links to other dashboards",
     "author": {
       "name": "Grafana Project",
       "url": "https://grafana.com"
-},
+    },
     "logos": {
       "small": "img/icn-dashlist-panel.svg",
       "large": "img/icn-dashlist-panel.svg"
diff --git a/public/app/plugins/panel/gauge/plugin.json b/public/app/plugins/panel/gauge/plugin.json
index 58437779d25..6dde42127be 100644
--- a/public/app/plugins/panel/gauge/plugin.json
+++ b/public/app/plugins/panel/gauge/plugin.json
@@ -3,6 +3,8 @@
   "name": "Gauge",
   "id": "gauge",
 
+  "dataFormats": ["time_series"],
+
   "info": {
     "author": {
       "name": "Grafana Project",
diff --git a/public/app/plugins/panel/graph/Legend/Legend.tsx b/public/app/plugins/panel/graph/Legend/Legend.tsx
index 47a84622947..161975eda9f 100644
--- a/public/app/plugins/panel/graph/Legend/Legend.tsx
+++ b/public/app/plugins/panel/graph/Legend/Legend.tsx
@@ -311,7 +311,7 @@ class LegendTableHeaderItem extends PureComponent<LegendTableHeaderProps & Legen
 export class Legend extends PureComponent<GraphLegendProps> {
   render() {
     return (
-      <CustomScrollbar renderTrackHorizontal={(props) => <div {...props} style={{visibility: 'none'}} />}>
+      <CustomScrollbar renderTrackHorizontal={props => <div {...props} style={{ visibility: 'none' }} />}>
         <GraphLegend {...this.props} />
       </CustomScrollbar>
     );
diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index 54ba4ed1e6f..7f020e68160 100755
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -46,7 +46,6 @@ class GraphElement {
   legendElem: HTMLElement;
 
   constructor(private scope, private elem, private timeSrv) {
-
     this.ctrl = scope.ctrl;
     this.dashboard = this.ctrl.dashboard;
     this.panel = this.ctrl.panel;
diff --git a/public/app/plugins/panel/graph/plugin.json b/public/app/plugins/panel/graph/plugin.json
index c0c8e8db290..81f7c6c54cf 100644
--- a/public/app/plugins/panel/graph/plugin.json
+++ b/public/app/plugins/panel/graph/plugin.json
@@ -3,12 +3,14 @@
   "name": "Graph",
   "id": "graph",
 
+  "dataFormats": ["time_series", "table"],
+
   "info": {
     "description": "Graph Panel for Grafana",
     "author": {
       "name": "Grafana Project",
       "url": "https://grafana.com"
-},
+    },
     "logos": {
       "small": "img/icn-graph-panel.svg",
       "large": "img/icn-graph-panel.svg"
@@ -16,4 +18,3 @@
     "version": "5.0.0"
   }
 }
-
diff --git a/public/app/plugins/panel/graph/time_regions_form.ts b/public/app/plugins/panel/graph/time_regions_form.ts
index aa7c94e3cf1..ac5ac50f068 100644
--- a/public/app/plugins/panel/graph/time_regions_form.ts
+++ b/public/app/plugins/panel/graph/time_regions_form.ts
@@ -37,7 +37,7 @@ export class TimeRegionFormCtrl {
       line: false,
       // Default colors for new
       fillColor: 'rgba(234, 112, 112, 0.12)',
-      lineColor: 'rgba(237, 46, 24, 0.60)'
+      lineColor: 'rgba(237, 46, 24, 0.60)',
     });
     this.panelCtrl.render();
   }
diff --git a/public/app/plugins/panel/graph2/GraphPanel.tsx b/public/app/plugins/panel/graph2/GraphPanel.tsx
index 01e5b2d819d..f1fc2b43d51 100644
--- a/public/app/plugins/panel/graph2/GraphPanel.tsx
+++ b/public/app/plugins/panel/graph2/GraphPanel.tsx
@@ -9,7 +9,7 @@ import { processTimeSeries } from '@grafana/ui/src/utils';
 import { Graph } from '@grafana/ui';
 
 // Types
-import { PanelProps, NullValueMode } from '@grafana/ui/src/types';
+import { PanelProps, NullValueMode, TimeSeriesVMs } from '@grafana/ui/src/types';
 import { Options } from './types';
 
 interface Props extends PanelProps<Options> {}
@@ -19,7 +19,7 @@ export class GraphPanel extends PureComponent<Props> {
     const { panelData, timeRange, width, height } = this.props;
     const { showLines, showBars, showPoints } = this.props.options;
 
-    let vmSeries;
+    let vmSeries: TimeSeriesVMs;
     if (panelData.timeSeries) {
       vmSeries = processTimeSeries({
         timeSeries: panelData.timeSeries,
diff --git a/public/app/plugins/panel/graph2/GraphPanelOptions.tsx b/public/app/plugins/panel/graph2/GraphPanelOptions.tsx
index 467a83b68af..a9c2d299589 100644
--- a/public/app/plugins/panel/graph2/GraphPanelOptions.tsx
+++ b/public/app/plugins/panel/graph2/GraphPanelOptions.tsx
@@ -2,7 +2,6 @@
 import _ from 'lodash';
 import React, { PureComponent } from 'react';
 
-
 // Types
 import { PanelOptionsProps, Switch } from '@grafana/ui';
 import { Options } from './types';
diff --git a/public/app/plugins/panel/graph2/plugin.json b/public/app/plugins/panel/graph2/plugin.json
index 9cb6a1f78a4..b11f93c9adc 100644
--- a/public/app/plugins/panel/graph2/plugin.json
+++ b/public/app/plugins/panel/graph2/plugin.json
@@ -2,7 +2,6 @@
   "type": "panel",
   "name": "React Graph",
   "id": "graph2",
-
   "state": "alpha",
 
   "info": {
diff --git a/public/app/plugins/panel/heatmap/color_legend.ts b/public/app/plugins/panel/heatmap/color_legend.ts
index dea250abf74..13e821cc46c 100644
--- a/public/app/plugins/panel/heatmap/color_legend.ts
+++ b/public/app/plugins/panel/heatmap/color_legend.ts
@@ -250,7 +250,10 @@ function drawSimpleOpacityLegend(elem, options) {
       .attr('stroke-width', 0)
       .attr(
         'fill',
-        getColorFromHexRgbOrName(options.cardColor, contextSrv.user.lightTheme ? GrafanaThemeType.Light : GrafanaThemeType.Dark)
+        getColorFromHexRgbOrName(
+          options.cardColor,
+          contextSrv.user.lightTheme ? GrafanaThemeType.Light : GrafanaThemeType.Dark
+        )
       )
       .style('opacity', d => legendOpacityScale(d));
   }
diff --git a/public/app/plugins/panel/heatmap/plugin.json b/public/app/plugins/panel/heatmap/plugin.json
index 723d8e886a0..0073c600bb6 100644
--- a/public/app/plugins/panel/heatmap/plugin.json
+++ b/public/app/plugins/panel/heatmap/plugin.json
@@ -3,6 +3,8 @@
   "name": "Heatmap",
   "id": "heatmap",
 
+  "dataFormats": ["time_series"],
+
   "info": {
     "description": "Heatmap Panel for Grafana",
     "author": {
diff --git a/public/app/plugins/panel/pluginlist/plugin.json b/public/app/plugins/panel/pluginlist/plugin.json
index b955177f1bc..8927b25b880 100644
--- a/public/app/plugins/panel/pluginlist/plugin.json
+++ b/public/app/plugins/panel/pluginlist/plugin.json
@@ -3,6 +3,8 @@
   "name": "Plugin list",
   "id": "pluginlist",
 
+  "dataFormats": [],
+
   "info": {
     "description": "Plugin List for Grafana",
     "author": {
diff --git a/public/app/plugins/panel/singlestat/module.ts b/public/app/plugins/panel/singlestat/module.ts
index 21ab32278f8..bcf09297cf7 100644
--- a/public/app/plugins/panel/singlestat/module.ts
+++ b/public/app/plugins/panel/singlestat/module.ts
@@ -624,7 +624,10 @@ class SingleStatCtrl extends MetricsPanelCtrl {
 
       // Map panel colors to hex or rgb/a values
       data.colorMap = panel.colors.map(color =>
-        getColorFromHexRgbOrName(color, config.bootData.user.lightTheme ? GrafanaThemeType.Light : GrafanaThemeType.Dark)
+        getColorFromHexRgbOrName(
+          color,
+          config.bootData.user.lightTheme ? GrafanaThemeType.Light : GrafanaThemeType.Dark
+        )
       );
 
       const body = panel.gauge.show ? '' : getBigValueHtml();
diff --git a/public/app/plugins/panel/singlestat/plugin.json b/public/app/plugins/panel/singlestat/plugin.json
index 5e36ab5cf4e..e64d0ec7fe0 100644
--- a/public/app/plugins/panel/singlestat/plugin.json
+++ b/public/app/plugins/panel/singlestat/plugin.json
@@ -3,12 +3,14 @@
   "name": "Singlestat",
   "id": "singlestat",
 
+  "dataFormats": ["time_series", "table"],
+
   "info": {
     "description": "Singlestat Panel for Grafana",
     "author": {
       "name": "Grafana Project",
       "url": "https://grafana.com"
-},
+    },
     "logos": {
       "small": "img/icn-singlestat-panel.svg",
       "large": "img/icn-singlestat-panel.svg"
@@ -16,4 +18,3 @@
     "version": "5.0.0"
   }
 }
-
diff --git a/public/app/plugins/panel/table/plugin.json b/public/app/plugins/panel/table/plugin.json
index 3b6cbaae876..212688fbfa8 100644
--- a/public/app/plugins/panel/table/plugin.json
+++ b/public/app/plugins/panel/table/plugin.json
@@ -3,12 +3,14 @@
   "name": "Table",
   "id": "table",
 
+  "dataFormats": ["table", "time_series"],
+
   "info": {
     "description": "Table Panel for Grafana",
     "author": {
       "name": "Grafana Project",
       "url": "https://grafana.com"
-},
+    },
     "logos": {
       "small": "img/icn-table-panel.svg",
       "large": "img/icn-table-panel.svg"
@@ -16,4 +18,3 @@
     "version": "5.0.0"
   }
 }
-
diff --git a/public/app/plugins/panel/text/module.ts b/public/app/plugins/panel/text/module.ts
index 9c47b8bbe06..ad60fe8aa6a 100644
--- a/public/app/plugins/panel/text/module.ts
+++ b/public/app/plugins/panel/text/module.ts
@@ -37,10 +37,7 @@ export class TextPanelCtrl extends PanelCtrl {
 
     const renderWhenChanged = (scope: any) => {
       const { panel } = scope.ctrl;
-      return [
-        panel.content,
-        panel.mode
-      ].join();
+      return [panel.content, panel.mode].join();
     };
 
     $scope.$watch(
diff --git a/public/app/plugins/panel/text/plugin.json b/public/app/plugins/panel/text/plugin.json
index 6152bd322b5..4e678bdc312 100644
--- a/public/app/plugins/panel/text/plugin.json
+++ b/public/app/plugins/panel/text/plugin.json
@@ -3,11 +3,13 @@
   "name": "Text",
   "id": "text",
 
+  "dataFormats": [],
+
   "info": {
     "author": {
       "name": "Grafana Project",
       "url": "https://grafana.com"
-},
+    },
     "logos": {
       "small": "img/icn-text-panel.svg",
       "large": "img/icn-text-panel.svg"
diff --git a/public/app/plugins/panel/text2/module.tsx b/public/app/plugins/panel/text2/module.tsx
index 68523ff0880..cc3ec016273 100644
--- a/public/app/plugins/panel/text2/module.tsx
+++ b/public/app/plugins/panel/text2/module.tsx
@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import { PanelProps } from '@grafana/ui';
 
 export class Text2 extends PureComponent<PanelProps> {
-  constructor(props) {
+  constructor(props: PanelProps) {
     super(props);
   }
 
diff --git a/public/app/plugins/panel/text2/plugin.json b/public/app/plugins/panel/text2/plugin.json
index 53885dbd0f4..840bb820696 100644
--- a/public/app/plugins/panel/text2/plugin.json
+++ b/public/app/plugins/panel/text2/plugin.json
@@ -2,9 +2,10 @@
   "type": "panel",
   "name": "Text v2",
   "id": "text2",
-
   "state": "alpha",
 
+  "dataFormats": [],
+
   "info": {
     "author": {
       "name": "Grafana Project",
diff --git a/public/app/routes/ReactContainer.tsx b/public/app/routes/ReactContainer.tsx
index 35c23239561..d429306a54e 100644
--- a/public/app/routes/ReactContainer.tsx
+++ b/public/app/routes/ReactContainer.tsx
@@ -16,13 +16,7 @@ function WrapInProvider(store, Component, props) {
 }
 
 /** @ngInject */
-export function reactContainer(
-  $route,
-  $location,
-  $injector,
-  $rootScope,
-  contextSrv: ContextSrv
-) {
+export function reactContainer($route, $location, $injector, $rootScope, contextSrv: ContextSrv) {
   return {
     restrict: 'E',
     template: '',
diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts
index 9c8d977c3ad..7a6af04b2ee 100644
--- a/public/app/types/explore.ts
+++ b/public/app/types/explore.ts
@@ -11,7 +11,7 @@ import {
 } from '@grafana/ui';
 
 import { Emitter } from 'app/core/core';
-import { LogsModel } from 'app/core/logs_model';
+import { LogsModel, LogsDedupStrategy, LogLevel } from 'app/core/logs_model';
 import TableModel from 'app/core/table_model';
 
 export interface CompletionItem {
@@ -237,12 +237,23 @@ export interface ExploreItemState {
    * React keys for rendering of QueryRows
    */
   queryKeys: string[];
+
+  /**
+   * Current logs deduplication strategy
+   */
+  dedupStrategy?: LogsDedupStrategy;
+
+  /**
+   * Currently hidden log series
+   */
+  hiddenLogLevels?: LogLevel[];
 }
 
 export interface ExploreUIState {
   showingTable: boolean;
   showingGraph: boolean;
   showingLogs: boolean;
+  dedupStrategy?: LogsDedupStrategy;
 }
 
 export interface ExploreUrlState {
diff --git a/public/app/types/index.ts b/public/app/types/index.ts
index f41183de7d4..eefba746c61 100644
--- a/public/app/types/index.ts
+++ b/public/app/types/index.ts
@@ -15,5 +15,3 @@ export * from './search';
 export * from './form';
 export * from './explore';
 export * from './store';
-
-
diff --git a/public/app/types/plugins.ts b/public/app/types/plugins.ts
index 51c3b7b0476..d812cf5d81e 100644
--- a/public/app/types/plugins.ts
+++ b/public/app/types/plugins.ts
@@ -9,6 +9,12 @@ export interface PanelPlugin {
   info: any;
   sort: number;
   exports?: PluginExports;
+  dataFormats: PanelDataFormat[];
+}
+
+export enum PanelDataFormat {
+  Table = 'table',
+  TimeSeries = 'time_series',
 }
 
 export interface Plugin {
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index 6181590985f..481500be2c1 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -6,17 +6,16 @@ $theme-name: dark;
 // New Colors
 // -------------------------
 $sapphire-faint: #041126;
-$sapphire-light: #5794F2;
-$sapphire-base: #3274D9;
-$sapphire-shade: #1F60C4;
-$lobster-base: #E02F44;
-$lobster-shade: #C4162A;
-$forest-light: #96D98D;
-$forest-base: #37872D;
-$forest-shade: #19730E;
-$green-base: #299C46;
-$green-shade: #23843B;
-
+$sapphire-light: #5794f2;
+$sapphire-base: #3274d9;
+$sapphire-shade: #1f60c4;
+$lobster-base: #e02f44;
+$lobster-shade: #c4162a;
+$forest-light: #96d98d;
+$forest-base: #37872d;
+$forest-shade: #19730e;
+$green-base: #299c46;
+$green-shade: #23843b;
 
 // Grays
 // -------------------------
diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss
index f0e0a535653..57ab0d9e12a 100644
--- a/public/sass/_variables.light.scss
+++ b/public/sass/_variables.light.scss
@@ -5,18 +5,18 @@ $theme-name: light;
 
 // New Colors
 // -------------------------
-$sapphire-faint: #F5F9FF;
-$sapphire-light: #A8CAFF;
-$sapphire-base: #3274D9;
-$sapphire-shade: #1F60C4;
-$lobster-base: #E02F44;
-$lobster-shade: #C4162A;
-$green-base: #37872D;
-$green-shade: #19730E;
-$green-base: #3EB15B;
-$green-shade: #369B4F;
-$purple-shade: #8F3BB8;
-$yellow-base: #F2CC0C;
+$sapphire-faint: #f5f9ff;
+$sapphire-light: #a8caff;
+$sapphire-base: #3274d9;
+$sapphire-shade: #1f60c4;
+$lobster-base: #e02f44;
+$lobster-shade: #c4162a;
+$green-base: #37872d;
+$green-shade: #19730e;
+$green-base: #3eb15b;
+$green-shade: #369b4f;
+$purple-shade: #8f3bb8;
+$yellow-base: #f2cc0c;
 
 // Grays
 // -------------------------
@@ -78,12 +78,7 @@ $text-color-emphasis: $dark-5;
 $text-shadow-faint: none;
 
 // gradients
-$brand-gradient: linear-gradient(
-  to right,
-  rgba(255, 213, 0, 1) 0%,
-  rgba(255, 68, 0, 1) 99%,
-  rgba(255, 68, 0, 1) 100%
-);
+$brand-gradient: linear-gradient(to right, rgba(255, 213, 0, 1) 0%, rgba(255, 68, 0, 1) 99%, rgba(255, 68, 0, 1) 100%);
 
 $page-gradient: linear-gradient(180deg, $white 10px, $gray-7 100px);
 $edit-gradient: linear-gradient(-60deg, $gray-7, #f5f6f9 70%, $gray-7 98%);
@@ -349,14 +344,14 @@ $variable-option-bg: $dropdownLinkBackgroundHover;
 $switch-bg: $white;
 $switch-slider-color: $gray-7;
 $switch-slider-off-bg: $gray-5;
-$switch-slider-on-bg: linear-gradient(90deg, #FF9830, #E55400);
+$switch-slider-on-bg: linear-gradient(90deg, #ff9830, #e55400);
 $switch-slider-shadow: 0 0 3px $dark-5;
 
 //Checkbox
 // -------------------------
 $checkbox-bg: $gray-6;
 $checkbox-border: 1px solid $gray-3;
-$checkbox-checked-bg: linear-gradient(0deg, #FF9830, #E55400);
+$checkbox-checked-bg: linear-gradient(0deg, #ff9830, #e55400);
 $checkbox-color: $gray-7;
 
 //Panel Edit
@@ -369,7 +364,8 @@ $panel-editor-viz-item-shadow-hover: 0 0 4px $blue-light;
 $panel-editor-viz-item-border-hover: 1px solid $blue-light;
 $panel-editor-viz-item-bg: $white;
 $panel-editor-tabs-line-color: $dark-5;
-$panel-editor-viz-item-bg-hover: lighten($blue, 62%);$panel-options-group-border: none;
+$panel-editor-viz-item-bg-hover: lighten($blue, 62%);
+$panel-options-group-border: none;
 $panel-options-group-header-bg: $gray-5;
 
 $panel-grid-placeholder-bg: $sapphire-faint;
diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss
index 4e9e69c4d2f..fbd110f75df 100644
--- a/public/sass/_variables.scss
+++ b/public/sass/_variables.scss
@@ -206,6 +206,6 @@ $external-services: (
   !default;
 
 :export {
-  panelHorizontalPadding: $panel-horizontal-padding;
-  panelVerticalPadding: $panel-vertical-padding;
+  panelhorizontalpadding: $panel-horizontal-padding;
+  panelverticalpadding: $panel-vertical-padding;
 }
diff --git a/public/sass/_variables.scss.d.ts b/public/sass/_variables.scss.d.ts
index f3de2340419..5b44580a7aa 100644
--- a/public/sass/_variables.scss.d.ts
+++ b/public/sass/_variables.scss.d.ts
@@ -1,6 +1,6 @@
 export interface GrafanaVariables {
-  'panelHorizontalPadding': number;
-  'panelVerticalPadding': number;
+  panelHorizontalPadding: number;
+  panelVerticalPadding: number;
 }
 
 declare const variables: GrafanaVariables;
diff --git a/public/sass/base/_font_awesome.scss b/public/sass/base/_font_awesome.scss
index 47398b2e9ba..c3521338143 100644
--- a/public/sass/base/_font_awesome.scss
+++ b/public/sass/base/_font_awesome.scss
@@ -3,16 +3,16 @@
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 
-@import "./font-awesome/variables";
-@import "./font-awesome/mixins";
-@import "./font-awesome/path";
-@import "./font-awesome/core";
-@import "./font-awesome/larger";
-@import "./font-awesome/fixed-width";
-@import "./font-awesome/list";
-@import "./font-awesome/bordered-pulled";
-@import "./font-awesome/animated";
-@import "./font-awesome/rotated-flipped";
-@import "./font-awesome/stacked";
-@import "./font-awesome/icons";
-@import "./font-awesome/screen-reader";
+@import './font-awesome/variables';
+@import './font-awesome/mixins';
+@import './font-awesome/path';
+@import './font-awesome/core';
+@import './font-awesome/larger';
+@import './font-awesome/fixed-width';
+@import './font-awesome/list';
+@import './font-awesome/bordered-pulled';
+@import './font-awesome/animated';
+@import './font-awesome/rotated-flipped';
+@import './font-awesome/stacked';
+@import './font-awesome/icons';
+@import './font-awesome/screen-reader';
diff --git a/public/sass/base/_forms.scss b/public/sass/base/_forms.scss
index 3197eb57991..239bb8d4e1e 100644
--- a/public/sass/base/_forms.scss
+++ b/public/sass/base/_forms.scss
@@ -58,19 +58,19 @@ textarea {
 }
 
 // Reset width of input images, buttons, radios, checkboxes
-input[type="file"],
-input[type="image"],
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="radio"],
-input[type="checkbox"] {
+input[type='file'],
+input[type='image'],
+input[type='submit'],
+input[type='reset'],
+input[type='button'],
+input[type='radio'],
+input[type='checkbox'] {
   width: auto; // Override of generic input selector
 }
 
 // Set the height of select and file controls to match text inputs
 select,
-input[type="file"] {
+input[type='file'] {
   height: $input-height; /* In IE7, the height of the select element cannot be changed by height, only font-size */
   line-height: $input-height;
 }
@@ -90,19 +90,19 @@ select[size] {
 
 // Focus for select, file, radio, and checkbox
 select:focus,
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus {
+input[type='file']:focus,
+input[type='radio']:focus,
+input[type='checkbox']:focus {
   @include tab-focus();
 }
 
 // not a big fan of number fields
-input[type="number"]::-webkit-outer-spin-button,
-input[type="number"]::-webkit-inner-spin-button {
+input[type='number']::-webkit-outer-spin-button,
+input[type='number']::-webkit-inner-spin-button {
   -webkit-appearance: none;
   margin: 0;
 }
-input[type="number"] {
+input[type='number'] {
   -moz-appearance: textfield;
 }
 // Placeholder
@@ -155,15 +155,15 @@ textarea[readonly] {
 }
 
 // Explicitly reset the colors here
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"][readonly],
-input[type="checkbox"][readonly] {
+input[type='radio'][disabled],
+input[type='checkbox'][disabled],
+input[type='radio'][readonly],
+input[type='checkbox'][readonly] {
   cursor: $cursor-disabled;
   background-color: transparent;
 }
 
-input[type="text"].input-fluid {
+input[type='text'].input-fluid {
   width: 100%;
   box-sizing: border-box;
   padding: 10px;
@@ -172,7 +172,7 @@ input[type="text"].input-fluid {
   height: 100%;
 }
 
-input[type="checkbox"].cr1 {
+input[type='checkbox'].cr1 {
   display: none;
 }
 
@@ -194,7 +194,7 @@ label.cr1 {
   cursor: pointer;
 }
 
-input[type="checkbox"].cr1:checked + label {
+input[type='checkbox'].cr1:checked + label {
   background: url($checkboxImageUrl) 0px -18px no-repeat;
 }
 
@@ -203,7 +203,7 @@ input[type="checkbox"].cr1:checked + label {
   display: block;
   overflow: hidden;
   padding-right: 10px;
-  input[type="text"] {
+  input[type='text'] {
     width: 100%;
     padding: 5px 6px;
     height: 100%;
diff --git a/public/sass/base/_grafana_icons.scss b/public/sass/base/_grafana_icons.scss
index 55e57f6d087..73574ff9efc 100644
--- a/public/sass/base/_grafana_icons.scss
+++ b/public/sass/base/_grafana_icons.scss
@@ -1,18 +1,17 @@
 @font-face {
-  font-family: "grafana-icons";
-  src: url("../fonts/grafana-icons.eot?okx5td");
-  src: url("../fonts/grafana-icons.eot?okx5td#iefix")
-      format("embedded-opentype"),
-    url("../fonts/grafana-icons.ttf?okx5td") format("truetype"),
-    url("../fonts/grafana-icons.woff?okx5td") format("woff"),
-    url("../fonts/grafana-icons.svg?okx5td#grafana-icons") format("svg");
+  font-family: 'grafana-icons';
+  src: url('../fonts/grafana-icons.eot?okx5td');
+  src: url('../fonts/grafana-icons.eot?okx5td#iefix') format('embedded-opentype'),
+    url('../fonts/grafana-icons.ttf?okx5td') format('truetype'),
+    url('../fonts/grafana-icons.woff?okx5td') format('woff'),
+    url('../fonts/grafana-icons.svg?okx5td#grafana-icons') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 
 .icon-gf {
   /* use !important to prevent issues with browser extensions that change fonts */
-  font-family: "grafana-icons" !important;
+  font-family: 'grafana-icons' !important;
   speak: none;
   font-style: normal;
   font-weight: normal;
@@ -37,165 +36,165 @@
 }
 
 .icon-gf-raintank_wordmark:before {
-  content: "\e600";
+  content: '\e600';
 }
 .micon-gf-raintank_icn:before {
-  content: "\e601";
+  content: '\e601';
 }
 .icon-gf-raintank_r-icn:before {
-  content: "\e905";
+  content: '\e905';
 }
 .icon-gf-check-alt:before {
-  content: "\e603";
+  content: '\e603';
 }
 .icon-gf-check:before {
-  content: "\e604";
+  content: '\e604';
 }
 .icon-gf-collector:before {
-  content: "\e605";
+  content: '\e605';
 }
 .icon-gf-dashboard:before {
-  content: "\e606";
+  content: '\e606';
 }
 .icon-gf-panel:before {
-  content: "\e904";
+  content: '\e904';
 }
 .icon-gf-datasources:before {
-  content: "\e607";
+  content: '\e607';
 }
 .icon-gf-endpoint-tiny:before {
-  content: "\e608";
+  content: '\e608';
 }
 .icon-gf-endpoint:before {
-  content: "\e609";
+  content: '\e609';
 }
 .icon-gf-page:before {
-  content: "\e908";
+  content: '\e908';
 }
 .icon-gf-filter:before {
-  content: "\e60a";
+  content: '\e60a';
 }
 .icon-gf-status:before {
-  content: "\e60b";
+  content: '\e60b';
 }
 .icon-gf-monitoring:before {
-  content: "\e60c";
+  content: '\e60c';
 }
 .icon-gf-monitoring-tiny:before {
-  content: "\e620";
+  content: '\e620';
 }
 .icon-gf-jump-to-dashboard:before {
-  content: "\e60d";
+  content: '\e60d';
 }
 .icon-gf-warn,
 .icon-gf-warning:before {
-  content: "\e60e";
+  content: '\e60e';
 }
 .icon-gf-nodata:before {
-  content: "\e60f";
+  content: '\e60f';
 }
 .icon-gf-critical:before {
-  content: "\e610";
+  content: '\e610';
 }
 .icon-gf-crit:before {
-  content: "\e610";
+  content: '\e610';
 }
 .icon-gf-online:before {
-  content: "\e611";
+  content: '\e611';
 }
 .icon-gf-event-error:before {
-  content: "\e623";
+  content: '\e623';
 }
 .icon-gf-event:before {
-  content: "\e624";
+  content: '\e624';
 }
 .icon-gf-sadface:before {
-  content: "\e907";
+  content: '\e907';
 }
 .icon-gf-private-collector:before {
-  content: "\e612";
+  content: '\e612';
 }
 .icon-gf-alert:before {
-  content: "\e61f";
+  content: '\e61f';
 }
 .icon-gf-alert-disabled:before {
-  content: "\e621";
+  content: '\e621';
 }
 .icon-gf-refresh:before {
-  content: "\e613";
+  content: '\e613';
 }
 .icon-gf-save:before {
-  content: "\e614";
+  content: '\e614';
 }
 .icon-gf-share:before {
-  content: "\e616";
+  content: '\e616';
 }
 .icon-gf-star:before {
-  content: "\e617";
+  content: '\e617';
 }
 .icon-gf-search:before {
-  content: "\e618";
+  content: '\e618';
 }
 .icon-gf-settings:before {
-  content: "\e615";
+  content: '\e615';
 }
 .icon-gf-add:before {
-  content: "\e619";
+  content: '\e619';
 }
 .icon-gf-remove:before {
-  content: "\e61a";
+  content: '\e61a';
 }
 .icon-gf-video:before {
-  content: "\e61b";
+  content: '\e61b';
 }
 .icon-gf-bulk_action:before {
-  content: "\e61c";
+  content: '\e61c';
 }
 .icon-gf-grabber:before {
-  content: "\e90b";
+  content: '\e90b';
 }
 .icon-gf-users:before {
-  content: "\e622";
+  content: '\e622';
 }
 .icon-gf-globe:before {
-  content: "\e61d";
+  content: '\e61d';
 }
 .icon-gf-snapshot:before {
-  content: "\e61e";
+  content: '\e61e';
 }
 .icon-gf-play-grafana-icon:before {
-  content: "\e629";
+  content: '\e629';
 }
 .icon-gf-grafana-icon:before {
-  content: "\e625";
+  content: '\e625';
 }
 .icon-gf-email:before {
-  content: "\e628";
+  content: '\e628';
 }
 .icon-gf-stopwatch:before {
-  content: "\e626";
+  content: '\e626';
 }
 .icon-gf-skull:before {
-  content: "\e900";
+  content: '\e900';
 }
 .icon-gf-probe:before {
-  content: "\e901";
+  content: '\e901';
 }
 .icon-gf-apps:before {
-  content: "\e902";
+  content: '\e902';
 }
 .icon-gf-scale:before {
-  content: "\e906";
+  content: '\e906';
 }
 .icon-gf-pending:before {
-  content: "\e909";
+  content: '\e909';
 }
 .icon-gf-verified:before {
-  content: "\e90a";
+  content: '\e90a';
 }
 .icon-gf-worldping:before {
-  content: "\e627";
+  content: '\e627';
 }
 .icon-gf-grafana_wordmark:before {
-  content: "\e903";
+  content: '\e903';
 }
diff --git a/public/sass/base/_icons.scss b/public/sass/base/_icons.scss
index a2649b31fcd..2d0cb394da1 100644
--- a/public/sass/base/_icons.scss
+++ b/public/sass/base/_icons.scss
@@ -212,7 +212,8 @@
   padding-right: 5px;
 }
 
-.panel-editor-tabs, .add-panel-widget__icon {
+.panel-editor-tabs,
+.add-panel-widget__icon {
   .gicon-advanced-active {
     background-image: url('../img/icons_#{$theme-name}_theme/icon_advanced_active.svg');
   }
diff --git a/public/sass/base/_normalize.scss b/public/sass/base/_normalize.scss
index 057f5c63602..fff6ad95d7c 100644
--- a/public/sass/base/_normalize.scss
+++ b/public/sass/base/_normalize.scss
@@ -291,9 +291,9 @@ select {
 //
 
 button,
-html input[type="button"],
-// 1 input[type="reset"],
-input[type="submit"] {
+html input[type='button'],
+// 1 input[type='reset'],
+input[type='submit'] {
   -webkit-appearance: button; // 2
   cursor: pointer; // 3
 }
@@ -334,8 +334,8 @@ input {
 // 2. Remove excess padding in IE 8/9/10.
 //
 
-input[type="checkbox"],
-input[type="radio"] {
+input[type='checkbox'],
+input[type='radio'] {
   box-sizing: border-box; // 1
   padding: 0; // 2
 }
@@ -346,8 +346,8 @@ input[type="radio"] {
 // decrement button to change from `default` to `text`.
 //
 
-input[type="number"]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
+input[type='number']::-webkit-inner-spin-button,
+input[type='number']::-webkit-outer-spin-button {
   height: auto;
 }
 
@@ -355,7 +355,7 @@ input[type="number"]::-webkit-outer-spin-button {
 // Address `appearance` set to `searchfield` in Safari and Chrome.
 //
 
-input[type="search"] {
+input[type='search'] {
   -webkit-appearance: textfield;
 }
 
@@ -365,8 +365,8 @@ input[type="search"] {
 // padding (and `textfield` appearance).
 //
 
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
+input[type='search']::-webkit-search-cancel-button,
+input[type='search']::-webkit-search-decoration {
   -webkit-appearance: none;
 }
 
diff --git a/public/sass/base/font-awesome/_core.scss b/public/sass/base/font-awesome/_core.scss
index 9940b63463d..a5411f108af 100644
--- a/public/sass/base/font-awesome/_core.scss
+++ b/public/sass/base/font-awesome/_core.scss
@@ -3,8 +3,7 @@
 
 .#{$fa-css-prefix} {
   display: inline-block;
-  font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base}
-    FontAwesome; // shortening font declaration
+  font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration
   font-size: inherit; // can't have font-size inherit on line above, so need to override
   text-rendering: auto; // optimizelegibility throws things off #1094
   -webkit-font-smoothing: antialiased;
diff --git a/public/sass/base/font-awesome/_mixins.scss b/public/sass/base/font-awesome/_mixins.scss
index 19771009107..f2a92c1e922 100644
--- a/public/sass/base/font-awesome/_mixins.scss
+++ b/public/sass/base/font-awesome/_mixins.scss
@@ -3,8 +3,7 @@
 
 @mixin fa-icon() {
   display: inline-block;
-  font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base}
-    FontAwesome; // shortening font declaration
+  font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration
   font-size: inherit; // can't have font-size inherit on line above, so need to override
   text-rendering: auto; // optimizelegibility throws things off #1094
   -webkit-font-smoothing: antialiased;
@@ -12,14 +11,14 @@
 }
 
 @mixin fa-icon-rotate($degrees, $rotation) {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation})";
+  -ms-filter: 'progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation})';
   -webkit-transform: rotate($degrees);
   -ms-transform: rotate($degrees);
   transform: rotate($degrees);
 }
 
 @mixin fa-icon-flip($horiz, $vert, $rotation) {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}, mirror=1)";
+  -ms-filter: 'progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}, mirror=1)';
   -webkit-transform: scale($horiz, $vert);
   -ms-transform: scale($horiz, $vert);
   transform: scale($horiz, $vert);
diff --git a/public/sass/base/font-awesome/_path.scss b/public/sass/base/font-awesome/_path.scss
index 0316afa161d..d452de2170a 100644
--- a/public/sass/base/font-awesome/_path.scss
+++ b/public/sass/base/font-awesome/_path.scss
@@ -2,18 +2,13 @@
  * -------------------------- */
 
 @font-face {
-  font-family: "FontAwesome";
-  src: url("#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}");
-  src: url("#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}")
-      format("embedded-opentype"),
-    url("#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}")
-      format("woff2"),
-    url("#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}")
-      format("woff"),
-    url("#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}")
-      format("truetype"),
-    url("#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular")
-      format("svg");
+  font-family: 'FontAwesome';
+  src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}');
+  src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
+    url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'),
+    url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'),
+    url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'),
+    url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg');
   //  src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
diff --git a/public/sass/base/font-awesome/_variables.scss b/public/sass/base/font-awesome/_variables.scss
index a4bd3cd87b9..1e91e831e66 100644
--- a/public/sass/base/font-awesome/_variables.scss
+++ b/public/sass/base/font-awesome/_variables.scss
@@ -1,799 +1,799 @@
 // Variables
 // --------------------------
 
-$fa-font-path: "../fonts" !default;
+$fa-font-path: '../fonts' !default;
 $fa-font-size-base: 14px !default;
 $fa-line-height-base: 1 !default;
 //$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.7.0/fonts" !default; // for referencing Bootstrap CDN font files directly
 $fa-css-prefix: fa !default;
-$fa-version: "4.7.0" !default;
+$fa-version: '4.7.0' !default;
 $fa-border-color: #eee !default;
 $fa-inverse: #fff !default;
 $fa-li-width: (30em / 14) !default;
 
-$fa-var-500px: "\f26e";
-$fa-var-address-book: "\f2b9";
-$fa-var-address-book-o: "\f2ba";
-$fa-var-address-card: "\f2bb";
-$fa-var-address-card-o: "\f2bc";
-$fa-var-adjust: "\f042";
-$fa-var-adn: "\f170";
-$fa-var-align-center: "\f037";
-$fa-var-align-justify: "\f039";
-$fa-var-align-left: "\f036";
-$fa-var-align-right: "\f038";
-$fa-var-amazon: "\f270";
-$fa-var-ambulance: "\f0f9";
-$fa-var-american-sign-language-interpreting: "\f2a3";
-$fa-var-anchor: "\f13d";
-$fa-var-android: "\f17b";
-$fa-var-angellist: "\f209";
-$fa-var-angle-double-down: "\f103";
-$fa-var-angle-double-left: "\f100";
-$fa-var-angle-double-right: "\f101";
-$fa-var-angle-double-up: "\f102";
-$fa-var-angle-down: "\f107";
-$fa-var-angle-left: "\f104";
-$fa-var-angle-right: "\f105";
-$fa-var-angle-up: "\f106";
-$fa-var-apple: "\f179";
-$fa-var-archive: "\f187";
-$fa-var-area-chart: "\f1fe";
-$fa-var-arrow-circle-down: "\f0ab";
-$fa-var-arrow-circle-left: "\f0a8";
-$fa-var-arrow-circle-o-down: "\f01a";
-$fa-var-arrow-circle-o-left: "\f190";
-$fa-var-arrow-circle-o-right: "\f18e";
-$fa-var-arrow-circle-o-up: "\f01b";
-$fa-var-arrow-circle-right: "\f0a9";
-$fa-var-arrow-circle-up: "\f0aa";
-$fa-var-arrow-down: "\f063";
-$fa-var-arrow-left: "\f060";
-$fa-var-arrow-right: "\f061";
-$fa-var-arrow-up: "\f062";
-$fa-var-arrows: "\f047";
-$fa-var-arrows-alt: "\f0b2";
-$fa-var-arrows-h: "\f07e";
-$fa-var-arrows-v: "\f07d";
-$fa-var-asl-interpreting: "\f2a3";
-$fa-var-assistive-listening-systems: "\f2a2";
-$fa-var-asterisk: "\f069";
-$fa-var-at: "\f1fa";
-$fa-var-audio-description: "\f29e";
-$fa-var-automobile: "\f1b9";
-$fa-var-backward: "\f04a";
-$fa-var-balance-scale: "\f24e";
-$fa-var-ban: "\f05e";
-$fa-var-bandcamp: "\f2d5";
-$fa-var-bank: "\f19c";
-$fa-var-bar-chart: "\f080";
-$fa-var-bar-chart-o: "\f080";
-$fa-var-barcode: "\f02a";
-$fa-var-bars: "\f0c9";
-$fa-var-bath: "\f2cd";
-$fa-var-bathtub: "\f2cd";
-$fa-var-battery: "\f240";
-$fa-var-battery-0: "\f244";
-$fa-var-battery-1: "\f243";
-$fa-var-battery-2: "\f242";
-$fa-var-battery-3: "\f241";
-$fa-var-battery-4: "\f240";
-$fa-var-battery-empty: "\f244";
-$fa-var-battery-full: "\f240";
-$fa-var-battery-half: "\f242";
-$fa-var-battery-quarter: "\f243";
-$fa-var-battery-three-quarters: "\f241";
-$fa-var-bed: "\f236";
-$fa-var-beer: "\f0fc";
-$fa-var-behance: "\f1b4";
-$fa-var-behance-square: "\f1b5";
-$fa-var-bell: "\f0f3";
-$fa-var-bell-o: "\f0a2";
-$fa-var-bell-slash: "\f1f6";
-$fa-var-bell-slash-o: "\f1f7";
-$fa-var-bicycle: "\f206";
-$fa-var-binoculars: "\f1e5";
-$fa-var-birthday-cake: "\f1fd";
-$fa-var-bitbucket: "\f171";
-$fa-var-bitbucket-square: "\f172";
-$fa-var-bitcoin: "\f15a";
-$fa-var-black-tie: "\f27e";
-$fa-var-blind: "\f29d";
-$fa-var-bluetooth: "\f293";
-$fa-var-bluetooth-b: "\f294";
-$fa-var-bold: "\f032";
-$fa-var-bolt: "\f0e7";
-$fa-var-bomb: "\f1e2";
-$fa-var-book: "\f02d";
-$fa-var-bookmark: "\f02e";
-$fa-var-bookmark-o: "\f097";
-$fa-var-braille: "\f2a1";
-$fa-var-briefcase: "\f0b1";
-$fa-var-btc: "\f15a";
-$fa-var-bug: "\f188";
-$fa-var-building: "\f1ad";
-$fa-var-building-o: "\f0f7";
-$fa-var-bullhorn: "\f0a1";
-$fa-var-bullseye: "\f140";
-$fa-var-bus: "\f207";
-$fa-var-buysellads: "\f20d";
-$fa-var-cab: "\f1ba";
-$fa-var-calculator: "\f1ec";
-$fa-var-calendar: "\f073";
-$fa-var-calendar-check-o: "\f274";
-$fa-var-calendar-minus-o: "\f272";
-$fa-var-calendar-o: "\f133";
-$fa-var-calendar-plus-o: "\f271";
-$fa-var-calendar-times-o: "\f273";
-$fa-var-camera: "\f030";
-$fa-var-camera-retro: "\f083";
-$fa-var-car: "\f1b9";
-$fa-var-caret-down: "\f0d7";
-$fa-var-caret-left: "\f0d9";
-$fa-var-caret-right: "\f0da";
-$fa-var-caret-square-o-down: "\f150";
-$fa-var-caret-square-o-left: "\f191";
-$fa-var-caret-square-o-right: "\f152";
-$fa-var-caret-square-o-up: "\f151";
-$fa-var-caret-up: "\f0d8";
-$fa-var-cart-arrow-down: "\f218";
-$fa-var-cart-plus: "\f217";
-$fa-var-cc: "\f20a";
-$fa-var-cc-amex: "\f1f3";
-$fa-var-cc-diners-club: "\f24c";
-$fa-var-cc-discover: "\f1f2";
-$fa-var-cc-jcb: "\f24b";
-$fa-var-cc-mastercard: "\f1f1";
-$fa-var-cc-paypal: "\f1f4";
-$fa-var-cc-stripe: "\f1f5";
-$fa-var-cc-visa: "\f1f0";
-$fa-var-certificate: "\f0a3";
-$fa-var-chain: "\f0c1";
-$fa-var-chain-broken: "\f127";
-$fa-var-check: "\f00c";
-$fa-var-check-circle: "\f058";
-$fa-var-check-circle-o: "\f05d";
-$fa-var-check-square: "\f14a";
-$fa-var-check-square-o: "\f046";
-$fa-var-chevron-circle-down: "\f13a";
-$fa-var-chevron-circle-left: "\f137";
-$fa-var-chevron-circle-right: "\f138";
-$fa-var-chevron-circle-up: "\f139";
-$fa-var-chevron-down: "\f078";
-$fa-var-chevron-left: "\f053";
-$fa-var-chevron-right: "\f054";
-$fa-var-chevron-up: "\f077";
-$fa-var-child: "\f1ae";
-$fa-var-chrome: "\f268";
-$fa-var-circle: "\f111";
-$fa-var-circle-o: "\f10c";
-$fa-var-circle-o-notch: "\f1ce";
-$fa-var-circle-thin: "\f1db";
-$fa-var-clipboard: "\f0ea";
-$fa-var-clock-o: "\f017";
-$fa-var-clone: "\f24d";
-$fa-var-close: "\f00d";
-$fa-var-cloud: "\f0c2";
-$fa-var-cloud-download: "\f0ed";
-$fa-var-cloud-upload: "\f0ee";
-$fa-var-cny: "\f157";
-$fa-var-code: "\f121";
-$fa-var-code-fork: "\f126";
-$fa-var-codepen: "\f1cb";
-$fa-var-codiepie: "\f284";
-$fa-var-coffee: "\f0f4";
-$fa-var-cog: "\f013";
-$fa-var-cogs: "\f085";
-$fa-var-columns: "\f0db";
-$fa-var-comment: "\f075";
-$fa-var-comment-o: "\f0e5";
-$fa-var-commenting: "\f27a";
-$fa-var-commenting-o: "\f27b";
-$fa-var-comments: "\f086";
-$fa-var-comments-o: "\f0e6";
-$fa-var-compass: "\f14e";
-$fa-var-compress: "\f066";
-$fa-var-connectdevelop: "\f20e";
-$fa-var-contao: "\f26d";
-$fa-var-copy: "\f0c5";
-$fa-var-copyright: "\f1f9";
-$fa-var-creative-commons: "\f25e";
-$fa-var-credit-card: "\f09d";
-$fa-var-credit-card-alt: "\f283";
-$fa-var-crop: "\f125";
-$fa-var-crosshairs: "\f05b";
-$fa-var-css3: "\f13c";
-$fa-var-cube: "\f1b2";
-$fa-var-cubes: "\f1b3";
-$fa-var-cut: "\f0c4";
-$fa-var-cutlery: "\f0f5";
-$fa-var-dashboard: "\f0e4";
-$fa-var-dashcube: "\f210";
-$fa-var-database: "\f1c0";
-$fa-var-deaf: "\f2a4";
-$fa-var-deafness: "\f2a4";
-$fa-var-dedent: "\f03b";
-$fa-var-delicious: "\f1a5";
-$fa-var-desktop: "\f108";
-$fa-var-deviantart: "\f1bd";
-$fa-var-diamond: "\f219";
-$fa-var-digg: "\f1a6";
-$fa-var-dollar: "\f155";
-$fa-var-dot-circle-o: "\f192";
-$fa-var-download: "\f019";
-$fa-var-dribbble: "\f17d";
-$fa-var-drivers-license: "\f2c2";
-$fa-var-drivers-license-o: "\f2c3";
-$fa-var-dropbox: "\f16b";
-$fa-var-drupal: "\f1a9";
-$fa-var-edge: "\f282";
-$fa-var-edit: "\f044";
-$fa-var-eercast: "\f2da";
-$fa-var-eject: "\f052";
-$fa-var-ellipsis-h: "\f141";
-$fa-var-ellipsis-v: "\f142";
-$fa-var-empire: "\f1d1";
-$fa-var-envelope: "\f0e0";
-$fa-var-envelope-o: "\f003";
-$fa-var-envelope-open: "\f2b6";
-$fa-var-envelope-open-o: "\f2b7";
-$fa-var-envelope-square: "\f199";
-$fa-var-envira: "\f299";
-$fa-var-eraser: "\f12d";
-$fa-var-etsy: "\f2d7";
-$fa-var-eur: "\f153";
-$fa-var-euro: "\f153";
-$fa-var-exchange: "\f0ec";
-$fa-var-exclamation: "\f12a";
-$fa-var-exclamation-circle: "\f06a";
-$fa-var-exclamation-triangle: "\f071";
-$fa-var-expand: "\f065";
-$fa-var-expeditedssl: "\f23e";
-$fa-var-external-link: "\f08e";
-$fa-var-external-link-square: "\f14c";
-$fa-var-eye: "\f06e";
-$fa-var-eye-slash: "\f070";
-$fa-var-eyedropper: "\f1fb";
-$fa-var-fa: "\f2b4";
-$fa-var-facebook: "\f09a";
-$fa-var-facebook-f: "\f09a";
-$fa-var-facebook-official: "\f230";
-$fa-var-facebook-square: "\f082";
-$fa-var-fast-backward: "\f049";
-$fa-var-fast-forward: "\f050";
-$fa-var-fax: "\f1ac";
-$fa-var-feed: "\f09e";
-$fa-var-female: "\f182";
-$fa-var-fighter-jet: "\f0fb";
-$fa-var-file: "\f15b";
-$fa-var-file-archive-o: "\f1c6";
-$fa-var-file-audio-o: "\f1c7";
-$fa-var-file-code-o: "\f1c9";
-$fa-var-file-excel-o: "\f1c3";
-$fa-var-file-image-o: "\f1c5";
-$fa-var-file-movie-o: "\f1c8";
-$fa-var-file-o: "\f016";
-$fa-var-file-pdf-o: "\f1c1";
-$fa-var-file-photo-o: "\f1c5";
-$fa-var-file-picture-o: "\f1c5";
-$fa-var-file-powerpoint-o: "\f1c4";
-$fa-var-file-sound-o: "\f1c7";
-$fa-var-file-text: "\f15c";
-$fa-var-file-text-o: "\f0f6";
-$fa-var-file-video-o: "\f1c8";
-$fa-var-file-word-o: "\f1c2";
-$fa-var-file-zip-o: "\f1c6";
-$fa-var-files-o: "\f0c5";
-$fa-var-film: "\f008";
-$fa-var-filter: "\f0b0";
-$fa-var-fire: "\f06d";
-$fa-var-fire-extinguisher: "\f134";
-$fa-var-firefox: "\f269";
-$fa-var-first-order: "\f2b0";
-$fa-var-flag: "\f024";
-$fa-var-flag-checkered: "\f11e";
-$fa-var-flag-o: "\f11d";
-$fa-var-flash: "\f0e7";
-$fa-var-flask: "\f0c3";
-$fa-var-flickr: "\f16e";
-$fa-var-floppy-o: "\f0c7";
-$fa-var-folder: "\f07b";
-$fa-var-folder-o: "\f114";
-$fa-var-folder-open: "\f07c";
-$fa-var-folder-open-o: "\f115";
-$fa-var-font: "\f031";
-$fa-var-font-awesome: "\f2b4";
-$fa-var-fonticons: "\f280";
-$fa-var-fort-awesome: "\f286";
-$fa-var-forumbee: "\f211";
-$fa-var-forward: "\f04e";
-$fa-var-foursquare: "\f180";
-$fa-var-free-code-camp: "\f2c5";
-$fa-var-frown-o: "\f119";
-$fa-var-futbol-o: "\f1e3";
-$fa-var-gamepad: "\f11b";
-$fa-var-gavel: "\f0e3";
-$fa-var-gbp: "\f154";
-$fa-var-ge: "\f1d1";
-$fa-var-gear: "\f013";
-$fa-var-gears: "\f085";
-$fa-var-genderless: "\f22d";
-$fa-var-get-pocket: "\f265";
-$fa-var-gg: "\f260";
-$fa-var-gg-circle: "\f261";
-$fa-var-gift: "\f06b";
-$fa-var-git: "\f1d3";
-$fa-var-git-square: "\f1d2";
-$fa-var-github: "\f09b";
-$fa-var-github-alt: "\f113";
-$fa-var-github-square: "\f092";
-$fa-var-gitlab: "\f296";
-$fa-var-gittip: "\f184";
-$fa-var-glass: "\f000";
-$fa-var-glide: "\f2a5";
-$fa-var-glide-g: "\f2a6";
-$fa-var-globe: "\f0ac";
-$fa-var-google: "\f1a0";
-$fa-var-google-plus: "\f0d5";
-$fa-var-google-plus-circle: "\f2b3";
-$fa-var-google-plus-official: "\f2b3";
-$fa-var-google-plus-square: "\f0d4";
-$fa-var-google-wallet: "\f1ee";
-$fa-var-graduation-cap: "\f19d";
-$fa-var-gratipay: "\f184";
-$fa-var-grav: "\f2d6";
-$fa-var-group: "\f0c0";
-$fa-var-h-square: "\f0fd";
-$fa-var-hacker-news: "\f1d4";
-$fa-var-hand-grab-o: "\f255";
-$fa-var-hand-lizard-o: "\f258";
-$fa-var-hand-o-down: "\f0a7";
-$fa-var-hand-o-left: "\f0a5";
-$fa-var-hand-o-right: "\f0a4";
-$fa-var-hand-o-up: "\f0a6";
-$fa-var-hand-paper-o: "\f256";
-$fa-var-hand-peace-o: "\f25b";
-$fa-var-hand-pointer-o: "\f25a";
-$fa-var-hand-rock-o: "\f255";
-$fa-var-hand-scissors-o: "\f257";
-$fa-var-hand-spock-o: "\f259";
-$fa-var-hand-stop-o: "\f256";
-$fa-var-handshake-o: "\f2b5";
-$fa-var-hard-of-hearing: "\f2a4";
-$fa-var-hashtag: "\f292";
-$fa-var-hdd-o: "\f0a0";
-$fa-var-header: "\f1dc";
-$fa-var-headphones: "\f025";
-$fa-var-heart: "\f004";
-$fa-var-heart-o: "\f08a";
-$fa-var-heartbeat: "\f21e";
-$fa-var-history: "\f1da";
-$fa-var-home: "\f015";
-$fa-var-hospital-o: "\f0f8";
-$fa-var-hotel: "\f236";
-$fa-var-hourglass: "\f254";
-$fa-var-hourglass-1: "\f251";
-$fa-var-hourglass-2: "\f252";
-$fa-var-hourglass-3: "\f253";
-$fa-var-hourglass-end: "\f253";
-$fa-var-hourglass-half: "\f252";
-$fa-var-hourglass-o: "\f250";
-$fa-var-hourglass-start: "\f251";
-$fa-var-houzz: "\f27c";
-$fa-var-html5: "\f13b";
-$fa-var-i-cursor: "\f246";
-$fa-var-id-badge: "\f2c1";
-$fa-var-id-card: "\f2c2";
-$fa-var-id-card-o: "\f2c3";
-$fa-var-ils: "\f20b";
-$fa-var-image: "\f03e";
-$fa-var-imdb: "\f2d8";
-$fa-var-inbox: "\f01c";
-$fa-var-indent: "\f03c";
-$fa-var-industry: "\f275";
-$fa-var-info: "\f129";
-$fa-var-info-circle: "\f05a";
-$fa-var-inr: "\f156";
-$fa-var-instagram: "\f16d";
-$fa-var-institution: "\f19c";
-$fa-var-internet-explorer: "\f26b";
-$fa-var-intersex: "\f224";
-$fa-var-ioxhost: "\f208";
-$fa-var-italic: "\f033";
-$fa-var-joomla: "\f1aa";
-$fa-var-jpy: "\f157";
-$fa-var-jsfiddle: "\f1cc";
-$fa-var-key: "\f084";
-$fa-var-keyboard-o: "\f11c";
-$fa-var-krw: "\f159";
-$fa-var-language: "\f1ab";
-$fa-var-laptop: "\f109";
-$fa-var-lastfm: "\f202";
-$fa-var-lastfm-square: "\f203";
-$fa-var-leaf: "\f06c";
-$fa-var-leanpub: "\f212";
-$fa-var-legal: "\f0e3";
-$fa-var-lemon-o: "\f094";
-$fa-var-level-down: "\f149";
-$fa-var-level-up: "\f148";
-$fa-var-life-bouy: "\f1cd";
-$fa-var-life-buoy: "\f1cd";
-$fa-var-life-ring: "\f1cd";
-$fa-var-life-saver: "\f1cd";
-$fa-var-lightbulb-o: "\f0eb";
-$fa-var-line-chart: "\f201";
-$fa-var-link: "\f0c1";
-$fa-var-linkedin: "\f0e1";
-$fa-var-linkedin-square: "\f08c";
-$fa-var-linode: "\f2b8";
-$fa-var-linux: "\f17c";
-$fa-var-list: "\f03a";
-$fa-var-list-alt: "\f022";
-$fa-var-list-ol: "\f0cb";
-$fa-var-list-ul: "\f0ca";
-$fa-var-location-arrow: "\f124";
-$fa-var-lock: "\f023";
-$fa-var-long-arrow-down: "\f175";
-$fa-var-long-arrow-left: "\f177";
-$fa-var-long-arrow-right: "\f178";
-$fa-var-long-arrow-up: "\f176";
-$fa-var-low-vision: "\f2a8";
-$fa-var-magic: "\f0d0";
-$fa-var-magnet: "\f076";
-$fa-var-mail-forward: "\f064";
-$fa-var-mail-reply: "\f112";
-$fa-var-mail-reply-all: "\f122";
-$fa-var-male: "\f183";
-$fa-var-map: "\f279";
-$fa-var-map-marker: "\f041";
-$fa-var-map-o: "\f278";
-$fa-var-map-pin: "\f276";
-$fa-var-map-signs: "\f277";
-$fa-var-mars: "\f222";
-$fa-var-mars-double: "\f227";
-$fa-var-mars-stroke: "\f229";
-$fa-var-mars-stroke-h: "\f22b";
-$fa-var-mars-stroke-v: "\f22a";
-$fa-var-maxcdn: "\f136";
-$fa-var-meanpath: "\f20c";
-$fa-var-medium: "\f23a";
-$fa-var-medkit: "\f0fa";
-$fa-var-meetup: "\f2e0";
-$fa-var-meh-o: "\f11a";
-$fa-var-mercury: "\f223";
-$fa-var-microchip: "\f2db";
-$fa-var-microphone: "\f130";
-$fa-var-microphone-slash: "\f131";
-$fa-var-minus: "\f068";
-$fa-var-minus-circle: "\f056";
-$fa-var-minus-square: "\f146";
-$fa-var-minus-square-o: "\f147";
-$fa-var-mixcloud: "\f289";
-$fa-var-mobile: "\f10b";
-$fa-var-mobile-phone: "\f10b";
-$fa-var-modx: "\f285";
-$fa-var-money: "\f0d6";
-$fa-var-moon-o: "\f186";
-$fa-var-mortar-board: "\f19d";
-$fa-var-motorcycle: "\f21c";
-$fa-var-mouse-pointer: "\f245";
-$fa-var-music: "\f001";
-$fa-var-navicon: "\f0c9";
-$fa-var-neuter: "\f22c";
-$fa-var-newspaper-o: "\f1ea";
-$fa-var-object-group: "\f247";
-$fa-var-object-ungroup: "\f248";
-$fa-var-odnoklassniki: "\f263";
-$fa-var-odnoklassniki-square: "\f264";
-$fa-var-opencart: "\f23d";
-$fa-var-openid: "\f19b";
-$fa-var-opera: "\f26a";
-$fa-var-optin-monster: "\f23c";
-$fa-var-outdent: "\f03b";
-$fa-var-pagelines: "\f18c";
-$fa-var-paint-brush: "\f1fc";
-$fa-var-paper-plane: "\f1d8";
-$fa-var-paper-plane-o: "\f1d9";
-$fa-var-paperclip: "\f0c6";
-$fa-var-paragraph: "\f1dd";
-$fa-var-paste: "\f0ea";
-$fa-var-pause: "\f04c";
-$fa-var-pause-circle: "\f28b";
-$fa-var-pause-circle-o: "\f28c";
-$fa-var-paw: "\f1b0";
-$fa-var-paypal: "\f1ed";
-$fa-var-pencil: "\f040";
-$fa-var-pencil-square: "\f14b";
-$fa-var-pencil-square-o: "\f044";
-$fa-var-percent: "\f295";
-$fa-var-phone: "\f095";
-$fa-var-phone-square: "\f098";
-$fa-var-photo: "\f03e";
-$fa-var-picture-o: "\f03e";
-$fa-var-pie-chart: "\f200";
-$fa-var-pied-piper: "\f2ae";
-$fa-var-pied-piper-alt: "\f1a8";
-$fa-var-pied-piper-pp: "\f1a7";
-$fa-var-pinterest: "\f0d2";
-$fa-var-pinterest-p: "\f231";
-$fa-var-pinterest-square: "\f0d3";
-$fa-var-plane: "\f072";
-$fa-var-play: "\f04b";
-$fa-var-play-circle: "\f144";
-$fa-var-play-circle-o: "\f01d";
-$fa-var-plug: "\f1e6";
-$fa-var-plus: "\f067";
-$fa-var-plus-circle: "\f055";
-$fa-var-plus-square: "\f0fe";
-$fa-var-plus-square-o: "\f196";
-$fa-var-podcast: "\f2ce";
-$fa-var-power-off: "\f011";
-$fa-var-print: "\f02f";
-$fa-var-product-hunt: "\f288";
-$fa-var-puzzle-piece: "\f12e";
-$fa-var-qq: "\f1d6";
-$fa-var-qrcode: "\f029";
-$fa-var-question: "\f128";
-$fa-var-question-circle: "\f059";
-$fa-var-question-circle-o: "\f29c";
-$fa-var-quora: "\f2c4";
-$fa-var-quote-left: "\f10d";
-$fa-var-quote-right: "\f10e";
-$fa-var-ra: "\f1d0";
-$fa-var-random: "\f074";
-$fa-var-ravelry: "\f2d9";
-$fa-var-rebel: "\f1d0";
-$fa-var-recycle: "\f1b8";
-$fa-var-reddit: "\f1a1";
-$fa-var-reddit-alien: "\f281";
-$fa-var-reddit-square: "\f1a2";
-$fa-var-refresh: "\f021";
-$fa-var-registered: "\f25d";
-$fa-var-remove: "\f00d";
-$fa-var-renren: "\f18b";
-$fa-var-reorder: "\f0c9";
-$fa-var-repeat: "\f01e";
-$fa-var-reply: "\f112";
-$fa-var-reply-all: "\f122";
-$fa-var-resistance: "\f1d0";
-$fa-var-retweet: "\f079";
-$fa-var-rmb: "\f157";
-$fa-var-road: "\f018";
-$fa-var-rocket: "\f135";
-$fa-var-rotate-left: "\f0e2";
-$fa-var-rotate-right: "\f01e";
-$fa-var-rouble: "\f158";
-$fa-var-rss: "\f09e";
-$fa-var-rss-square: "\f143";
-$fa-var-rub: "\f158";
-$fa-var-ruble: "\f158";
-$fa-var-rupee: "\f156";
-$fa-var-s15: "\f2cd";
-$fa-var-safari: "\f267";
-$fa-var-save: "\f0c7";
-$fa-var-scissors: "\f0c4";
-$fa-var-scribd: "\f28a";
-$fa-var-search: "\f002";
-$fa-var-search-minus: "\f010";
-$fa-var-search-plus: "\f00e";
-$fa-var-sellsy: "\f213";
-$fa-var-send: "\f1d8";
-$fa-var-send-o: "\f1d9";
-$fa-var-server: "\f233";
-$fa-var-share: "\f064";
-$fa-var-share-alt: "\f1e0";
-$fa-var-share-alt-square: "\f1e1";
-$fa-var-share-square: "\f14d";
-$fa-var-share-square-o: "\f045";
-$fa-var-shekel: "\f20b";
-$fa-var-sheqel: "\f20b";
-$fa-var-shield: "\f132";
-$fa-var-ship: "\f21a";
-$fa-var-shirtsinbulk: "\f214";
-$fa-var-shopping-bag: "\f290";
-$fa-var-shopping-basket: "\f291";
-$fa-var-shopping-cart: "\f07a";
-$fa-var-shower: "\f2cc";
-$fa-var-sign-in: "\f090";
-$fa-var-sign-language: "\f2a7";
-$fa-var-sign-out: "\f08b";
-$fa-var-signal: "\f012";
-$fa-var-signing: "\f2a7";
-$fa-var-simplybuilt: "\f215";
-$fa-var-sitemap: "\f0e8";
-$fa-var-skyatlas: "\f216";
-$fa-var-skype: "\f17e";
-$fa-var-slack: "\f198";
-$fa-var-sliders: "\f1de";
-$fa-var-slideshare: "\f1e7";
-$fa-var-smile-o: "\f118";
-$fa-var-snapchat: "\f2ab";
-$fa-var-snapchat-ghost: "\f2ac";
-$fa-var-snapchat-square: "\f2ad";
-$fa-var-snowflake-o: "\f2dc";
-$fa-var-soccer-ball-o: "\f1e3";
-$fa-var-sort: "\f0dc";
-$fa-var-sort-alpha-asc: "\f15d";
-$fa-var-sort-alpha-desc: "\f15e";
-$fa-var-sort-amount-asc: "\f160";
-$fa-var-sort-amount-desc: "\f161";
-$fa-var-sort-asc: "\f0de";
-$fa-var-sort-desc: "\f0dd";
-$fa-var-sort-down: "\f0dd";
-$fa-var-sort-numeric-asc: "\f162";
-$fa-var-sort-numeric-desc: "\f163";
-$fa-var-sort-up: "\f0de";
-$fa-var-soundcloud: "\f1be";
-$fa-var-space-shuttle: "\f197";
-$fa-var-spinner: "\f110";
-$fa-var-spoon: "\f1b1";
-$fa-var-spotify: "\f1bc";
-$fa-var-square: "\f0c8";
-$fa-var-square-o: "\f096";
-$fa-var-stack-exchange: "\f18d";
-$fa-var-stack-overflow: "\f16c";
-$fa-var-star: "\f005";
-$fa-var-star-half: "\f089";
-$fa-var-star-half-empty: "\f123";
-$fa-var-star-half-full: "\f123";
-$fa-var-star-half-o: "\f123";
-$fa-var-star-o: "\f006";
-$fa-var-steam: "\f1b6";
-$fa-var-steam-square: "\f1b7";
-$fa-var-step-backward: "\f048";
-$fa-var-step-forward: "\f051";
-$fa-var-stethoscope: "\f0f1";
-$fa-var-sticky-note: "\f249";
-$fa-var-sticky-note-o: "\f24a";
-$fa-var-stop: "\f04d";
-$fa-var-stop-circle: "\f28d";
-$fa-var-stop-circle-o: "\f28e";
-$fa-var-street-view: "\f21d";
-$fa-var-strikethrough: "\f0cc";
-$fa-var-stumbleupon: "\f1a4";
-$fa-var-stumbleupon-circle: "\f1a3";
-$fa-var-subscript: "\f12c";
-$fa-var-subway: "\f239";
-$fa-var-suitcase: "\f0f2";
-$fa-var-sun-o: "\f185";
-$fa-var-superpowers: "\f2dd";
-$fa-var-superscript: "\f12b";
-$fa-var-support: "\f1cd";
-$fa-var-table: "\f0ce";
-$fa-var-tablet: "\f10a";
-$fa-var-tachometer: "\f0e4";
-$fa-var-tag: "\f02b";
-$fa-var-tags: "\f02c";
-$fa-var-tasks: "\f0ae";
-$fa-var-taxi: "\f1ba";
-$fa-var-telegram: "\f2c6";
-$fa-var-television: "\f26c";
-$fa-var-tencent-weibo: "\f1d5";
-$fa-var-terminal: "\f120";
-$fa-var-text-height: "\f034";
-$fa-var-text-width: "\f035";
-$fa-var-th: "\f00a";
-$fa-var-th-large: "\f009";
-$fa-var-th-list: "\f00b";
-$fa-var-themeisle: "\f2b2";
-$fa-var-thermometer: "\f2c7";
-$fa-var-thermometer-0: "\f2cb";
-$fa-var-thermometer-1: "\f2ca";
-$fa-var-thermometer-2: "\f2c9";
-$fa-var-thermometer-3: "\f2c8";
-$fa-var-thermometer-4: "\f2c7";
-$fa-var-thermometer-empty: "\f2cb";
-$fa-var-thermometer-full: "\f2c7";
-$fa-var-thermometer-half: "\f2c9";
-$fa-var-thermometer-quarter: "\f2ca";
-$fa-var-thermometer-three-quarters: "\f2c8";
-$fa-var-thumb-tack: "\f08d";
-$fa-var-thumbs-down: "\f165";
-$fa-var-thumbs-o-down: "\f088";
-$fa-var-thumbs-o-up: "\f087";
-$fa-var-thumbs-up: "\f164";
-$fa-var-ticket: "\f145";
-$fa-var-times: "\f00d";
-$fa-var-times-circle: "\f057";
-$fa-var-times-circle-o: "\f05c";
-$fa-var-times-rectangle: "\f2d3";
-$fa-var-times-rectangle-o: "\f2d4";
-$fa-var-tint: "\f043";
-$fa-var-toggle-down: "\f150";
-$fa-var-toggle-left: "\f191";
-$fa-var-toggle-off: "\f204";
-$fa-var-toggle-on: "\f205";
-$fa-var-toggle-right: "\f152";
-$fa-var-toggle-up: "\f151";
-$fa-var-trademark: "\f25c";
-$fa-var-train: "\f238";
-$fa-var-transgender: "\f224";
-$fa-var-transgender-alt: "\f225";
-$fa-var-trash: "\f1f8";
-$fa-var-trash-o: "\f014";
-$fa-var-tree: "\f1bb";
-$fa-var-trello: "\f181";
-$fa-var-tripadvisor: "\f262";
-$fa-var-trophy: "\f091";
-$fa-var-truck: "\f0d1";
-$fa-var-try: "\f195";
-$fa-var-tty: "\f1e4";
-$fa-var-tumblr: "\f173";
-$fa-var-tumblr-square: "\f174";
-$fa-var-turkish-lira: "\f195";
-$fa-var-tv: "\f26c";
-$fa-var-twitch: "\f1e8";
-$fa-var-twitter: "\f099";
-$fa-var-twitter-square: "\f081";
-$fa-var-umbrella: "\f0e9";
-$fa-var-underline: "\f0cd";
-$fa-var-undo: "\f0e2";
-$fa-var-universal-access: "\f29a";
-$fa-var-university: "\f19c";
-$fa-var-unlink: "\f127";
-$fa-var-unlock: "\f09c";
-$fa-var-unlock-alt: "\f13e";
-$fa-var-unsorted: "\f0dc";
-$fa-var-upload: "\f093";
-$fa-var-usb: "\f287";
-$fa-var-usd: "\f155";
-$fa-var-user: "\f007";
-$fa-var-user-circle: "\f2bd";
-$fa-var-user-circle-o: "\f2be";
-$fa-var-user-md: "\f0f0";
-$fa-var-user-o: "\f2c0";
-$fa-var-user-plus: "\f234";
-$fa-var-user-secret: "\f21b";
-$fa-var-user-times: "\f235";
-$fa-var-users: "\f0c0";
-$fa-var-vcard: "\f2bb";
-$fa-var-vcard-o: "\f2bc";
-$fa-var-venus: "\f221";
-$fa-var-venus-double: "\f226";
-$fa-var-venus-mars: "\f228";
-$fa-var-viacoin: "\f237";
-$fa-var-viadeo: "\f2a9";
-$fa-var-viadeo-square: "\f2aa";
-$fa-var-video-camera: "\f03d";
-$fa-var-vimeo: "\f27d";
-$fa-var-vimeo-square: "\f194";
-$fa-var-vine: "\f1ca";
-$fa-var-vk: "\f189";
-$fa-var-volume-control-phone: "\f2a0";
-$fa-var-volume-down: "\f027";
-$fa-var-volume-off: "\f026";
-$fa-var-volume-up: "\f028";
-$fa-var-warning: "\f071";
-$fa-var-wechat: "\f1d7";
-$fa-var-weibo: "\f18a";
-$fa-var-weixin: "\f1d7";
-$fa-var-whatsapp: "\f232";
-$fa-var-wheelchair: "\f193";
-$fa-var-wheelchair-alt: "\f29b";
-$fa-var-wifi: "\f1eb";
-$fa-var-wikipedia-w: "\f266";
-$fa-var-window-close: "\f2d3";
-$fa-var-window-close-o: "\f2d4";
-$fa-var-window-maximize: "\f2d0";
-$fa-var-window-minimize: "\f2d1";
-$fa-var-window-restore: "\f2d2";
-$fa-var-windows: "\f17a";
-$fa-var-won: "\f159";
-$fa-var-wordpress: "\f19a";
-$fa-var-wpbeginner: "\f297";
-$fa-var-wpexplorer: "\f2de";
-$fa-var-wpforms: "\f298";
-$fa-var-wrench: "\f0ad";
-$fa-var-xing: "\f168";
-$fa-var-xing-square: "\f169";
-$fa-var-y-combinator: "\f23b";
-$fa-var-y-combinator-square: "\f1d4";
-$fa-var-yahoo: "\f19e";
-$fa-var-yc: "\f23b";
-$fa-var-yc-square: "\f1d4";
-$fa-var-yelp: "\f1e9";
-$fa-var-yen: "\f157";
-$fa-var-yoast: "\f2b1";
-$fa-var-youtube: "\f167";
-$fa-var-youtube-play: "\f16a";
-$fa-var-youtube-square: "\f166";
+$fa-var-500px: '\f26e';
+$fa-var-address-book: '\f2b9';
+$fa-var-address-book-o: '\f2ba';
+$fa-var-address-card: '\f2bb';
+$fa-var-address-card-o: '\f2bc';
+$fa-var-adjust: '\f042';
+$fa-var-adn: '\f170';
+$fa-var-align-center: '\f037';
+$fa-var-align-justify: '\f039';
+$fa-var-align-left: '\f036';
+$fa-var-align-right: '\f038';
+$fa-var-amazon: '\f270';
+$fa-var-ambulance: '\f0f9';
+$fa-var-american-sign-language-interpreting: '\f2a3';
+$fa-var-anchor: '\f13d';
+$fa-var-android: '\f17b';
+$fa-var-angellist: '\f209';
+$fa-var-angle-double-down: '\f103';
+$fa-var-angle-double-left: '\f100';
+$fa-var-angle-double-right: '\f101';
+$fa-var-angle-double-up: '\f102';
+$fa-var-angle-down: '\f107';
+$fa-var-angle-left: '\f104';
+$fa-var-angle-right: '\f105';
+$fa-var-angle-up: '\f106';
+$fa-var-apple: '\f179';
+$fa-var-archive: '\f187';
+$fa-var-area-chart: '\f1fe';
+$fa-var-arrow-circle-down: '\f0ab';
+$fa-var-arrow-circle-left: '\f0a8';
+$fa-var-arrow-circle-o-down: '\f01a';
+$fa-var-arrow-circle-o-left: '\f190';
+$fa-var-arrow-circle-o-right: '\f18e';
+$fa-var-arrow-circle-o-up: '\f01b';
+$fa-var-arrow-circle-right: '\f0a9';
+$fa-var-arrow-circle-up: '\f0aa';
+$fa-var-arrow-down: '\f063';
+$fa-var-arrow-left: '\f060';
+$fa-var-arrow-right: '\f061';
+$fa-var-arrow-up: '\f062';
+$fa-var-arrows: '\f047';
+$fa-var-arrows-alt: '\f0b2';
+$fa-var-arrows-h: '\f07e';
+$fa-var-arrows-v: '\f07d';
+$fa-var-asl-interpreting: '\f2a3';
+$fa-var-assistive-listening-systems: '\f2a2';
+$fa-var-asterisk: '\f069';
+$fa-var-at: '\f1fa';
+$fa-var-audio-description: '\f29e';
+$fa-var-automobile: '\f1b9';
+$fa-var-backward: '\f04a';
+$fa-var-balance-scale: '\f24e';
+$fa-var-ban: '\f05e';
+$fa-var-bandcamp: '\f2d5';
+$fa-var-bank: '\f19c';
+$fa-var-bar-chart: '\f080';
+$fa-var-bar-chart-o: '\f080';
+$fa-var-barcode: '\f02a';
+$fa-var-bars: '\f0c9';
+$fa-var-bath: '\f2cd';
+$fa-var-bathtub: '\f2cd';
+$fa-var-battery: '\f240';
+$fa-var-battery-0: '\f244';
+$fa-var-battery-1: '\f243';
+$fa-var-battery-2: '\f242';
+$fa-var-battery-3: '\f241';
+$fa-var-battery-4: '\f240';
+$fa-var-battery-empty: '\f244';
+$fa-var-battery-full: '\f240';
+$fa-var-battery-half: '\f242';
+$fa-var-battery-quarter: '\f243';
+$fa-var-battery-three-quarters: '\f241';
+$fa-var-bed: '\f236';
+$fa-var-beer: '\f0fc';
+$fa-var-behance: '\f1b4';
+$fa-var-behance-square: '\f1b5';
+$fa-var-bell: '\f0f3';
+$fa-var-bell-o: '\f0a2';
+$fa-var-bell-slash: '\f1f6';
+$fa-var-bell-slash-o: '\f1f7';
+$fa-var-bicycle: '\f206';
+$fa-var-binoculars: '\f1e5';
+$fa-var-birthday-cake: '\f1fd';
+$fa-var-bitbucket: '\f171';
+$fa-var-bitbucket-square: '\f172';
+$fa-var-bitcoin: '\f15a';
+$fa-var-black-tie: '\f27e';
+$fa-var-blind: '\f29d';
+$fa-var-bluetooth: '\f293';
+$fa-var-bluetooth-b: '\f294';
+$fa-var-bold: '\f032';
+$fa-var-bolt: '\f0e7';
+$fa-var-bomb: '\f1e2';
+$fa-var-book: '\f02d';
+$fa-var-bookmark: '\f02e';
+$fa-var-bookmark-o: '\f097';
+$fa-var-braille: '\f2a1';
+$fa-var-briefcase: '\f0b1';
+$fa-var-btc: '\f15a';
+$fa-var-bug: '\f188';
+$fa-var-building: '\f1ad';
+$fa-var-building-o: '\f0f7';
+$fa-var-bullhorn: '\f0a1';
+$fa-var-bullseye: '\f140';
+$fa-var-bus: '\f207';
+$fa-var-buysellads: '\f20d';
+$fa-var-cab: '\f1ba';
+$fa-var-calculator: '\f1ec';
+$fa-var-calendar: '\f073';
+$fa-var-calendar-check-o: '\f274';
+$fa-var-calendar-minus-o: '\f272';
+$fa-var-calendar-o: '\f133';
+$fa-var-calendar-plus-o: '\f271';
+$fa-var-calendar-times-o: '\f273';
+$fa-var-camera: '\f030';
+$fa-var-camera-retro: '\f083';
+$fa-var-car: '\f1b9';
+$fa-var-caret-down: '\f0d7';
+$fa-var-caret-left: '\f0d9';
+$fa-var-caret-right: '\f0da';
+$fa-var-caret-square-o-down: '\f150';
+$fa-var-caret-square-o-left: '\f191';
+$fa-var-caret-square-o-right: '\f152';
+$fa-var-caret-square-o-up: '\f151';
+$fa-var-caret-up: '\f0d8';
+$fa-var-cart-arrow-down: '\f218';
+$fa-var-cart-plus: '\f217';
+$fa-var-cc: '\f20a';
+$fa-var-cc-amex: '\f1f3';
+$fa-var-cc-diners-club: '\f24c';
+$fa-var-cc-discover: '\f1f2';
+$fa-var-cc-jcb: '\f24b';
+$fa-var-cc-mastercard: '\f1f1';
+$fa-var-cc-paypal: '\f1f4';
+$fa-var-cc-stripe: '\f1f5';
+$fa-var-cc-visa: '\f1f0';
+$fa-var-certificate: '\f0a3';
+$fa-var-chain: '\f0c1';
+$fa-var-chain-broken: '\f127';
+$fa-var-check: '\f00c';
+$fa-var-check-circle: '\f058';
+$fa-var-check-circle-o: '\f05d';
+$fa-var-check-square: '\f14a';
+$fa-var-check-square-o: '\f046';
+$fa-var-chevron-circle-down: '\f13a';
+$fa-var-chevron-circle-left: '\f137';
+$fa-var-chevron-circle-right: '\f138';
+$fa-var-chevron-circle-up: '\f139';
+$fa-var-chevron-down: '\f078';
+$fa-var-chevron-left: '\f053';
+$fa-var-chevron-right: '\f054';
+$fa-var-chevron-up: '\f077';
+$fa-var-child: '\f1ae';
+$fa-var-chrome: '\f268';
+$fa-var-circle: '\f111';
+$fa-var-circle-o: '\f10c';
+$fa-var-circle-o-notch: '\f1ce';
+$fa-var-circle-thin: '\f1db';
+$fa-var-clipboard: '\f0ea';
+$fa-var-clock-o: '\f017';
+$fa-var-clone: '\f24d';
+$fa-var-close: '\f00d';
+$fa-var-cloud: '\f0c2';
+$fa-var-cloud-download: '\f0ed';
+$fa-var-cloud-upload: '\f0ee';
+$fa-var-cny: '\f157';
+$fa-var-code: '\f121';
+$fa-var-code-fork: '\f126';
+$fa-var-codepen: '\f1cb';
+$fa-var-codiepie: '\f284';
+$fa-var-coffee: '\f0f4';
+$fa-var-cog: '\f013';
+$fa-var-cogs: '\f085';
+$fa-var-columns: '\f0db';
+$fa-var-comment: '\f075';
+$fa-var-comment-o: '\f0e5';
+$fa-var-commenting: '\f27a';
+$fa-var-commenting-o: '\f27b';
+$fa-var-comments: '\f086';
+$fa-var-comments-o: '\f0e6';
+$fa-var-compass: '\f14e';
+$fa-var-compress: '\f066';
+$fa-var-connectdevelop: '\f20e';
+$fa-var-contao: '\f26d';
+$fa-var-copy: '\f0c5';
+$fa-var-copyright: '\f1f9';
+$fa-var-creative-commons: '\f25e';
+$fa-var-credit-card: '\f09d';
+$fa-var-credit-card-alt: '\f283';
+$fa-var-crop: '\f125';
+$fa-var-crosshairs: '\f05b';
+$fa-var-css3: '\f13c';
+$fa-var-cube: '\f1b2';
+$fa-var-cubes: '\f1b3';
+$fa-var-cut: '\f0c4';
+$fa-var-cutlery: '\f0f5';
+$fa-var-dashboard: '\f0e4';
+$fa-var-dashcube: '\f210';
+$fa-var-database: '\f1c0';
+$fa-var-deaf: '\f2a4';
+$fa-var-deafness: '\f2a4';
+$fa-var-dedent: '\f03b';
+$fa-var-delicious: '\f1a5';
+$fa-var-desktop: '\f108';
+$fa-var-deviantart: '\f1bd';
+$fa-var-diamond: '\f219';
+$fa-var-digg: '\f1a6';
+$fa-var-dollar: '\f155';
+$fa-var-dot-circle-o: '\f192';
+$fa-var-download: '\f019';
+$fa-var-dribbble: '\f17d';
+$fa-var-drivers-license: '\f2c2';
+$fa-var-drivers-license-o: '\f2c3';
+$fa-var-dropbox: '\f16b';
+$fa-var-drupal: '\f1a9';
+$fa-var-edge: '\f282';
+$fa-var-edit: '\f044';
+$fa-var-eercast: '\f2da';
+$fa-var-eject: '\f052';
+$fa-var-ellipsis-h: '\f141';
+$fa-var-ellipsis-v: '\f142';
+$fa-var-empire: '\f1d1';
+$fa-var-envelope: '\f0e0';
+$fa-var-envelope-o: '\f003';
+$fa-var-envelope-open: '\f2b6';
+$fa-var-envelope-open-o: '\f2b7';
+$fa-var-envelope-square: '\f199';
+$fa-var-envira: '\f299';
+$fa-var-eraser: '\f12d';
+$fa-var-etsy: '\f2d7';
+$fa-var-eur: '\f153';
+$fa-var-euro: '\f153';
+$fa-var-exchange: '\f0ec';
+$fa-var-exclamation: '\f12a';
+$fa-var-exclamation-circle: '\f06a';
+$fa-var-exclamation-triangle: '\f071';
+$fa-var-expand: '\f065';
+$fa-var-expeditedssl: '\f23e';
+$fa-var-external-link: '\f08e';
+$fa-var-external-link-square: '\f14c';
+$fa-var-eye: '\f06e';
+$fa-var-eye-slash: '\f070';
+$fa-var-eyedropper: '\f1fb';
+$fa-var-fa: '\f2b4';
+$fa-var-facebook: '\f09a';
+$fa-var-facebook-f: '\f09a';
+$fa-var-facebook-official: '\f230';
+$fa-var-facebook-square: '\f082';
+$fa-var-fast-backward: '\f049';
+$fa-var-fast-forward: '\f050';
+$fa-var-fax: '\f1ac';
+$fa-var-feed: '\f09e';
+$fa-var-female: '\f182';
+$fa-var-fighter-jet: '\f0fb';
+$fa-var-file: '\f15b';
+$fa-var-file-archive-o: '\f1c6';
+$fa-var-file-audio-o: '\f1c7';
+$fa-var-file-code-o: '\f1c9';
+$fa-var-file-excel-o: '\f1c3';
+$fa-var-file-image-o: '\f1c5';
+$fa-var-file-movie-o: '\f1c8';
+$fa-var-file-o: '\f016';
+$fa-var-file-pdf-o: '\f1c1';
+$fa-var-file-photo-o: '\f1c5';
+$fa-var-file-picture-o: '\f1c5';
+$fa-var-file-powerpoint-o: '\f1c4';
+$fa-var-file-sound-o: '\f1c7';
+$fa-var-file-text: '\f15c';
+$fa-var-file-text-o: '\f0f6';
+$fa-var-file-video-o: '\f1c8';
+$fa-var-file-word-o: '\f1c2';
+$fa-var-file-zip-o: '\f1c6';
+$fa-var-files-o: '\f0c5';
+$fa-var-film: '\f008';
+$fa-var-filter: '\f0b0';
+$fa-var-fire: '\f06d';
+$fa-var-fire-extinguisher: '\f134';
+$fa-var-firefox: '\f269';
+$fa-var-first-order: '\f2b0';
+$fa-var-flag: '\f024';
+$fa-var-flag-checkered: '\f11e';
+$fa-var-flag-o: '\f11d';
+$fa-var-flash: '\f0e7';
+$fa-var-flask: '\f0c3';
+$fa-var-flickr: '\f16e';
+$fa-var-floppy-o: '\f0c7';
+$fa-var-folder: '\f07b';
+$fa-var-folder-o: '\f114';
+$fa-var-folder-open: '\f07c';
+$fa-var-folder-open-o: '\f115';
+$fa-var-font: '\f031';
+$fa-var-font-awesome: '\f2b4';
+$fa-var-fonticons: '\f280';
+$fa-var-fort-awesome: '\f286';
+$fa-var-forumbee: '\f211';
+$fa-var-forward: '\f04e';
+$fa-var-foursquare: '\f180';
+$fa-var-free-code-camp: '\f2c5';
+$fa-var-frown-o: '\f119';
+$fa-var-futbol-o: '\f1e3';
+$fa-var-gamepad: '\f11b';
+$fa-var-gavel: '\f0e3';
+$fa-var-gbp: '\f154';
+$fa-var-ge: '\f1d1';
+$fa-var-gear: '\f013';
+$fa-var-gears: '\f085';
+$fa-var-genderless: '\f22d';
+$fa-var-get-pocket: '\f265';
+$fa-var-gg: '\f260';
+$fa-var-gg-circle: '\f261';
+$fa-var-gift: '\f06b';
+$fa-var-git: '\f1d3';
+$fa-var-git-square: '\f1d2';
+$fa-var-github: '\f09b';
+$fa-var-github-alt: '\f113';
+$fa-var-github-square: '\f092';
+$fa-var-gitlab: '\f296';
+$fa-var-gittip: '\f184';
+$fa-var-glass: '\f000';
+$fa-var-glide: '\f2a5';
+$fa-var-glide-g: '\f2a6';
+$fa-var-globe: '\f0ac';
+$fa-var-google: '\f1a0';
+$fa-var-google-plus: '\f0d5';
+$fa-var-google-plus-circle: '\f2b3';
+$fa-var-google-plus-official: '\f2b3';
+$fa-var-google-plus-square: '\f0d4';
+$fa-var-google-wallet: '\f1ee';
+$fa-var-graduation-cap: '\f19d';
+$fa-var-gratipay: '\f184';
+$fa-var-grav: '\f2d6';
+$fa-var-group: '\f0c0';
+$fa-var-h-square: '\f0fd';
+$fa-var-hacker-news: '\f1d4';
+$fa-var-hand-grab-o: '\f255';
+$fa-var-hand-lizard-o: '\f258';
+$fa-var-hand-o-down: '\f0a7';
+$fa-var-hand-o-left: '\f0a5';
+$fa-var-hand-o-right: '\f0a4';
+$fa-var-hand-o-up: '\f0a6';
+$fa-var-hand-paper-o: '\f256';
+$fa-var-hand-peace-o: '\f25b';
+$fa-var-hand-pointer-o: '\f25a';
+$fa-var-hand-rock-o: '\f255';
+$fa-var-hand-scissors-o: '\f257';
+$fa-var-hand-spock-o: '\f259';
+$fa-var-hand-stop-o: '\f256';
+$fa-var-handshake-o: '\f2b5';
+$fa-var-hard-of-hearing: '\f2a4';
+$fa-var-hashtag: '\f292';
+$fa-var-hdd-o: '\f0a0';
+$fa-var-header: '\f1dc';
+$fa-var-headphones: '\f025';
+$fa-var-heart: '\f004';
+$fa-var-heart-o: '\f08a';
+$fa-var-heartbeat: '\f21e';
+$fa-var-history: '\f1da';
+$fa-var-home: '\f015';
+$fa-var-hospital-o: '\f0f8';
+$fa-var-hotel: '\f236';
+$fa-var-hourglass: '\f254';
+$fa-var-hourglass-1: '\f251';
+$fa-var-hourglass-2: '\f252';
+$fa-var-hourglass-3: '\f253';
+$fa-var-hourglass-end: '\f253';
+$fa-var-hourglass-half: '\f252';
+$fa-var-hourglass-o: '\f250';
+$fa-var-hourglass-start: '\f251';
+$fa-var-houzz: '\f27c';
+$fa-var-html5: '\f13b';
+$fa-var-i-cursor: '\f246';
+$fa-var-id-badge: '\f2c1';
+$fa-var-id-card: '\f2c2';
+$fa-var-id-card-o: '\f2c3';
+$fa-var-ils: '\f20b';
+$fa-var-image: '\f03e';
+$fa-var-imdb: '\f2d8';
+$fa-var-inbox: '\f01c';
+$fa-var-indent: '\f03c';
+$fa-var-industry: '\f275';
+$fa-var-info: '\f129';
+$fa-var-info-circle: '\f05a';
+$fa-var-inr: '\f156';
+$fa-var-instagram: '\f16d';
+$fa-var-institution: '\f19c';
+$fa-var-internet-explorer: '\f26b';
+$fa-var-intersex: '\f224';
+$fa-var-ioxhost: '\f208';
+$fa-var-italic: '\f033';
+$fa-var-joomla: '\f1aa';
+$fa-var-jpy: '\f157';
+$fa-var-jsfiddle: '\f1cc';
+$fa-var-key: '\f084';
+$fa-var-keyboard-o: '\f11c';
+$fa-var-krw: '\f159';
+$fa-var-language: '\f1ab';
+$fa-var-laptop: '\f109';
+$fa-var-lastfm: '\f202';
+$fa-var-lastfm-square: '\f203';
+$fa-var-leaf: '\f06c';
+$fa-var-leanpub: '\f212';
+$fa-var-legal: '\f0e3';
+$fa-var-lemon-o: '\f094';
+$fa-var-level-down: '\f149';
+$fa-var-level-up: '\f148';
+$fa-var-life-bouy: '\f1cd';
+$fa-var-life-buoy: '\f1cd';
+$fa-var-life-ring: '\f1cd';
+$fa-var-life-saver: '\f1cd';
+$fa-var-lightbulb-o: '\f0eb';
+$fa-var-line-chart: '\f201';
+$fa-var-link: '\f0c1';
+$fa-var-linkedin: '\f0e1';
+$fa-var-linkedin-square: '\f08c';
+$fa-var-linode: '\f2b8';
+$fa-var-linux: '\f17c';
+$fa-var-list: '\f03a';
+$fa-var-list-alt: '\f022';
+$fa-var-list-ol: '\f0cb';
+$fa-var-list-ul: '\f0ca';
+$fa-var-location-arrow: '\f124';
+$fa-var-lock: '\f023';
+$fa-var-long-arrow-down: '\f175';
+$fa-var-long-arrow-left: '\f177';
+$fa-var-long-arrow-right: '\f178';
+$fa-var-long-arrow-up: '\f176';
+$fa-var-low-vision: '\f2a8';
+$fa-var-magic: '\f0d0';
+$fa-var-magnet: '\f076';
+$fa-var-mail-forward: '\f064';
+$fa-var-mail-reply: '\f112';
+$fa-var-mail-reply-all: '\f122';
+$fa-var-male: '\f183';
+$fa-var-map: '\f279';
+$fa-var-map-marker: '\f041';
+$fa-var-map-o: '\f278';
+$fa-var-map-pin: '\f276';
+$fa-var-map-signs: '\f277';
+$fa-var-mars: '\f222';
+$fa-var-mars-double: '\f227';
+$fa-var-mars-stroke: '\f229';
+$fa-var-mars-stroke-h: '\f22b';
+$fa-var-mars-stroke-v: '\f22a';
+$fa-var-maxcdn: '\f136';
+$fa-var-meanpath: '\f20c';
+$fa-var-medium: '\f23a';
+$fa-var-medkit: '\f0fa';
+$fa-var-meetup: '\f2e0';
+$fa-var-meh-o: '\f11a';
+$fa-var-mercury: '\f223';
+$fa-var-microchip: '\f2db';
+$fa-var-microphone: '\f130';
+$fa-var-microphone-slash: '\f131';
+$fa-var-minus: '\f068';
+$fa-var-minus-circle: '\f056';
+$fa-var-minus-square: '\f146';
+$fa-var-minus-square-o: '\f147';
+$fa-var-mixcloud: '\f289';
+$fa-var-mobile: '\f10b';
+$fa-var-mobile-phone: '\f10b';
+$fa-var-modx: '\f285';
+$fa-var-money: '\f0d6';
+$fa-var-moon-o: '\f186';
+$fa-var-mortar-board: '\f19d';
+$fa-var-motorcycle: '\f21c';
+$fa-var-mouse-pointer: '\f245';
+$fa-var-music: '\f001';
+$fa-var-navicon: '\f0c9';
+$fa-var-neuter: '\f22c';
+$fa-var-newspaper-o: '\f1ea';
+$fa-var-object-group: '\f247';
+$fa-var-object-ungroup: '\f248';
+$fa-var-odnoklassniki: '\f263';
+$fa-var-odnoklassniki-square: '\f264';
+$fa-var-opencart: '\f23d';
+$fa-var-openid: '\f19b';
+$fa-var-opera: '\f26a';
+$fa-var-optin-monster: '\f23c';
+$fa-var-outdent: '\f03b';
+$fa-var-pagelines: '\f18c';
+$fa-var-paint-brush: '\f1fc';
+$fa-var-paper-plane: '\f1d8';
+$fa-var-paper-plane-o: '\f1d9';
+$fa-var-paperclip: '\f0c6';
+$fa-var-paragraph: '\f1dd';
+$fa-var-paste: '\f0ea';
+$fa-var-pause: '\f04c';
+$fa-var-pause-circle: '\f28b';
+$fa-var-pause-circle-o: '\f28c';
+$fa-var-paw: '\f1b0';
+$fa-var-paypal: '\f1ed';
+$fa-var-pencil: '\f040';
+$fa-var-pencil-square: '\f14b';
+$fa-var-pencil-square-o: '\f044';
+$fa-var-percent: '\f295';
+$fa-var-phone: '\f095';
+$fa-var-phone-square: '\f098';
+$fa-var-photo: '\f03e';
+$fa-var-picture-o: '\f03e';
+$fa-var-pie-chart: '\f200';
+$fa-var-pied-piper: '\f2ae';
+$fa-var-pied-piper-alt: '\f1a8';
+$fa-var-pied-piper-pp: '\f1a7';
+$fa-var-pinterest: '\f0d2';
+$fa-var-pinterest-p: '\f231';
+$fa-var-pinterest-square: '\f0d3';
+$fa-var-plane: '\f072';
+$fa-var-play: '\f04b';
+$fa-var-play-circle: '\f144';
+$fa-var-play-circle-o: '\f01d';
+$fa-var-plug: '\f1e6';
+$fa-var-plus: '\f067';
+$fa-var-plus-circle: '\f055';
+$fa-var-plus-square: '\f0fe';
+$fa-var-plus-square-o: '\f196';
+$fa-var-podcast: '\f2ce';
+$fa-var-power-off: '\f011';
+$fa-var-print: '\f02f';
+$fa-var-product-hunt: '\f288';
+$fa-var-puzzle-piece: '\f12e';
+$fa-var-qq: '\f1d6';
+$fa-var-qrcode: '\f029';
+$fa-var-question: '\f128';
+$fa-var-question-circle: '\f059';
+$fa-var-question-circle-o: '\f29c';
+$fa-var-quora: '\f2c4';
+$fa-var-quote-left: '\f10d';
+$fa-var-quote-right: '\f10e';
+$fa-var-ra: '\f1d0';
+$fa-var-random: '\f074';
+$fa-var-ravelry: '\f2d9';
+$fa-var-rebel: '\f1d0';
+$fa-var-recycle: '\f1b8';
+$fa-var-reddit: '\f1a1';
+$fa-var-reddit-alien: '\f281';
+$fa-var-reddit-square: '\f1a2';
+$fa-var-refresh: '\f021';
+$fa-var-registered: '\f25d';
+$fa-var-remove: '\f00d';
+$fa-var-renren: '\f18b';
+$fa-var-reorder: '\f0c9';
+$fa-var-repeat: '\f01e';
+$fa-var-reply: '\f112';
+$fa-var-reply-all: '\f122';
+$fa-var-resistance: '\f1d0';
+$fa-var-retweet: '\f079';
+$fa-var-rmb: '\f157';
+$fa-var-road: '\f018';
+$fa-var-rocket: '\f135';
+$fa-var-rotate-left: '\f0e2';
+$fa-var-rotate-right: '\f01e';
+$fa-var-rouble: '\f158';
+$fa-var-rss: '\f09e';
+$fa-var-rss-square: '\f143';
+$fa-var-rub: '\f158';
+$fa-var-ruble: '\f158';
+$fa-var-rupee: '\f156';
+$fa-var-s15: '\f2cd';
+$fa-var-safari: '\f267';
+$fa-var-save: '\f0c7';
+$fa-var-scissors: '\f0c4';
+$fa-var-scribd: '\f28a';
+$fa-var-search: '\f002';
+$fa-var-search-minus: '\f010';
+$fa-var-search-plus: '\f00e';
+$fa-var-sellsy: '\f213';
+$fa-var-send: '\f1d8';
+$fa-var-send-o: '\f1d9';
+$fa-var-server: '\f233';
+$fa-var-share: '\f064';
+$fa-var-share-alt: '\f1e0';
+$fa-var-share-alt-square: '\f1e1';
+$fa-var-share-square: '\f14d';
+$fa-var-share-square-o: '\f045';
+$fa-var-shekel: '\f20b';
+$fa-var-sheqel: '\f20b';
+$fa-var-shield: '\f132';
+$fa-var-ship: '\f21a';
+$fa-var-shirtsinbulk: '\f214';
+$fa-var-shopping-bag: '\f290';
+$fa-var-shopping-basket: '\f291';
+$fa-var-shopping-cart: '\f07a';
+$fa-var-shower: '\f2cc';
+$fa-var-sign-in: '\f090';
+$fa-var-sign-language: '\f2a7';
+$fa-var-sign-out: '\f08b';
+$fa-var-signal: '\f012';
+$fa-var-signing: '\f2a7';
+$fa-var-simplybuilt: '\f215';
+$fa-var-sitemap: '\f0e8';
+$fa-var-skyatlas: '\f216';
+$fa-var-skype: '\f17e';
+$fa-var-slack: '\f198';
+$fa-var-sliders: '\f1de';
+$fa-var-slideshare: '\f1e7';
+$fa-var-smile-o: '\f118';
+$fa-var-snapchat: '\f2ab';
+$fa-var-snapchat-ghost: '\f2ac';
+$fa-var-snapchat-square: '\f2ad';
+$fa-var-snowflake-o: '\f2dc';
+$fa-var-soccer-ball-o: '\f1e3';
+$fa-var-sort: '\f0dc';
+$fa-var-sort-alpha-asc: '\f15d';
+$fa-var-sort-alpha-desc: '\f15e';
+$fa-var-sort-amount-asc: '\f160';
+$fa-var-sort-amount-desc: '\f161';
+$fa-var-sort-asc: '\f0de';
+$fa-var-sort-desc: '\f0dd';
+$fa-var-sort-down: '\f0dd';
+$fa-var-sort-numeric-asc: '\f162';
+$fa-var-sort-numeric-desc: '\f163';
+$fa-var-sort-up: '\f0de';
+$fa-var-soundcloud: '\f1be';
+$fa-var-space-shuttle: '\f197';
+$fa-var-spinner: '\f110';
+$fa-var-spoon: '\f1b1';
+$fa-var-spotify: '\f1bc';
+$fa-var-square: '\f0c8';
+$fa-var-square-o: '\f096';
+$fa-var-stack-exchange: '\f18d';
+$fa-var-stack-overflow: '\f16c';
+$fa-var-star: '\f005';
+$fa-var-star-half: '\f089';
+$fa-var-star-half-empty: '\f123';
+$fa-var-star-half-full: '\f123';
+$fa-var-star-half-o: '\f123';
+$fa-var-star-o: '\f006';
+$fa-var-steam: '\f1b6';
+$fa-var-steam-square: '\f1b7';
+$fa-var-step-backward: '\f048';
+$fa-var-step-forward: '\f051';
+$fa-var-stethoscope: '\f0f1';
+$fa-var-sticky-note: '\f249';
+$fa-var-sticky-note-o: '\f24a';
+$fa-var-stop: '\f04d';
+$fa-var-stop-circle: '\f28d';
+$fa-var-stop-circle-o: '\f28e';
+$fa-var-street-view: '\f21d';
+$fa-var-strikethrough: '\f0cc';
+$fa-var-stumbleupon: '\f1a4';
+$fa-var-stumbleupon-circle: '\f1a3';
+$fa-var-subscript: '\f12c';
+$fa-var-subway: '\f239';
+$fa-var-suitcase: '\f0f2';
+$fa-var-sun-o: '\f185';
+$fa-var-superpowers: '\f2dd';
+$fa-var-superscript: '\f12b';
+$fa-var-support: '\f1cd';
+$fa-var-table: '\f0ce';
+$fa-var-tablet: '\f10a';
+$fa-var-tachometer: '\f0e4';
+$fa-var-tag: '\f02b';
+$fa-var-tags: '\f02c';
+$fa-var-tasks: '\f0ae';
+$fa-var-taxi: '\f1ba';
+$fa-var-telegram: '\f2c6';
+$fa-var-television: '\f26c';
+$fa-var-tencent-weibo: '\f1d5';
+$fa-var-terminal: '\f120';
+$fa-var-text-height: '\f034';
+$fa-var-text-width: '\f035';
+$fa-var-th: '\f00a';
+$fa-var-th-large: '\f009';
+$fa-var-th-list: '\f00b';
+$fa-var-themeisle: '\f2b2';
+$fa-var-thermometer: '\f2c7';
+$fa-var-thermometer-0: '\f2cb';
+$fa-var-thermometer-1: '\f2ca';
+$fa-var-thermometer-2: '\f2c9';
+$fa-var-thermometer-3: '\f2c8';
+$fa-var-thermometer-4: '\f2c7';
+$fa-var-thermometer-empty: '\f2cb';
+$fa-var-thermometer-full: '\f2c7';
+$fa-var-thermometer-half: '\f2c9';
+$fa-var-thermometer-quarter: '\f2ca';
+$fa-var-thermometer-three-quarters: '\f2c8';
+$fa-var-thumb-tack: '\f08d';
+$fa-var-thumbs-down: '\f165';
+$fa-var-thumbs-o-down: '\f088';
+$fa-var-thumbs-o-up: '\f087';
+$fa-var-thumbs-up: '\f164';
+$fa-var-ticket: '\f145';
+$fa-var-times: '\f00d';
+$fa-var-times-circle: '\f057';
+$fa-var-times-circle-o: '\f05c';
+$fa-var-times-rectangle: '\f2d3';
+$fa-var-times-rectangle-o: '\f2d4';
+$fa-var-tint: '\f043';
+$fa-var-toggle-down: '\f150';
+$fa-var-toggle-left: '\f191';
+$fa-var-toggle-off: '\f204';
+$fa-var-toggle-on: '\f205';
+$fa-var-toggle-right: '\f152';
+$fa-var-toggle-up: '\f151';
+$fa-var-trademark: '\f25c';
+$fa-var-train: '\f238';
+$fa-var-transgender: '\f224';
+$fa-var-transgender-alt: '\f225';
+$fa-var-trash: '\f1f8';
+$fa-var-trash-o: '\f014';
+$fa-var-tree: '\f1bb';
+$fa-var-trello: '\f181';
+$fa-var-tripadvisor: '\f262';
+$fa-var-trophy: '\f091';
+$fa-var-truck: '\f0d1';
+$fa-var-try: '\f195';
+$fa-var-tty: '\f1e4';
+$fa-var-tumblr: '\f173';
+$fa-var-tumblr-square: '\f174';
+$fa-var-turkish-lira: '\f195';
+$fa-var-tv: '\f26c';
+$fa-var-twitch: '\f1e8';
+$fa-var-twitter: '\f099';
+$fa-var-twitter-square: '\f081';
+$fa-var-umbrella: '\f0e9';
+$fa-var-underline: '\f0cd';
+$fa-var-undo: '\f0e2';
+$fa-var-universal-access: '\f29a';
+$fa-var-university: '\f19c';
+$fa-var-unlink: '\f127';
+$fa-var-unlock: '\f09c';
+$fa-var-unlock-alt: '\f13e';
+$fa-var-unsorted: '\f0dc';
+$fa-var-upload: '\f093';
+$fa-var-usb: '\f287';
+$fa-var-usd: '\f155';
+$fa-var-user: '\f007';
+$fa-var-user-circle: '\f2bd';
+$fa-var-user-circle-o: '\f2be';
+$fa-var-user-md: '\f0f0';
+$fa-var-user-o: '\f2c0';
+$fa-var-user-plus: '\f234';
+$fa-var-user-secret: '\f21b';
+$fa-var-user-times: '\f235';
+$fa-var-users: '\f0c0';
+$fa-var-vcard: '\f2bb';
+$fa-var-vcard-o: '\f2bc';
+$fa-var-venus: '\f221';
+$fa-var-venus-double: '\f226';
+$fa-var-venus-mars: '\f228';
+$fa-var-viacoin: '\f237';
+$fa-var-viadeo: '\f2a9';
+$fa-var-viadeo-square: '\f2aa';
+$fa-var-video-camera: '\f03d';
+$fa-var-vimeo: '\f27d';
+$fa-var-vimeo-square: '\f194';
+$fa-var-vine: '\f1ca';
+$fa-var-vk: '\f189';
+$fa-var-volume-control-phone: '\f2a0';
+$fa-var-volume-down: '\f027';
+$fa-var-volume-off: '\f026';
+$fa-var-volume-up: '\f028';
+$fa-var-warning: '\f071';
+$fa-var-wechat: '\f1d7';
+$fa-var-weibo: '\f18a';
+$fa-var-weixin: '\f1d7';
+$fa-var-whatsapp: '\f232';
+$fa-var-wheelchair: '\f193';
+$fa-var-wheelchair-alt: '\f29b';
+$fa-var-wifi: '\f1eb';
+$fa-var-wikipedia-w: '\f266';
+$fa-var-window-close: '\f2d3';
+$fa-var-window-close-o: '\f2d4';
+$fa-var-window-maximize: '\f2d0';
+$fa-var-window-minimize: '\f2d1';
+$fa-var-window-restore: '\f2d2';
+$fa-var-windows: '\f17a';
+$fa-var-won: '\f159';
+$fa-var-wordpress: '\f19a';
+$fa-var-wpbeginner: '\f297';
+$fa-var-wpexplorer: '\f2de';
+$fa-var-wpforms: '\f298';
+$fa-var-wrench: '\f0ad';
+$fa-var-xing: '\f168';
+$fa-var-xing-square: '\f169';
+$fa-var-y-combinator: '\f23b';
+$fa-var-y-combinator-square: '\f1d4';
+$fa-var-yahoo: '\f19e';
+$fa-var-yc: '\f23b';
+$fa-var-yc-square: '\f1d4';
+$fa-var-yelp: '\f1e9';
+$fa-var-yen: '\f157';
+$fa-var-yoast: '\f2b1';
+$fa-var-youtube: '\f167';
+$fa-var-youtube-play: '\f16a';
+$fa-var-youtube-square: '\f166';
diff --git a/public/sass/components/_cards.scss b/public/sass/components/_cards.scss
index 569b16279dd..64bc9351fd9 100644
--- a/public/sass/components/_cards.scss
+++ b/public/sass/components/_cards.scss
@@ -110,7 +110,7 @@
 }
 
 .card-item-label {
-    margin-left: 8px;
+  margin-left: 8px;
 }
 
 .card-item-sub-name {
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index 90ef1da30dc..ff93d2b9f5f 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -146,7 +146,6 @@ $input-border: 1px solid $input-border-color;
   }
 }
 
-
 .gf-form-label + .gf-form-label {
   margin-right: $gf-form-margin;
 }
diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss
index 2bf16bd2d43..a915d003eab 100644
--- a/public/sass/components/_navbar.scss
+++ b/public/sass/components/_navbar.scss
@@ -47,7 +47,6 @@
   .navbar-button--add-panel,
   .navbar-button--star,
   .navbar-button--tv,
-
   .navbar-buttons--close {
     display: flex;
   }
@@ -185,7 +184,7 @@
   padding-left: 7px;
 }
 
-.navbar-edit__back-btn  {
+.navbar-edit__back-btn {
   background: transparent;
   border: 2px solid $text-color;
   border-radius: 50%;
@@ -205,5 +204,3 @@
     border-color: $text-color-strong;
   }
 }
-
-
diff --git a/public/sass/components/_panel_editor.scss b/public/sass/components/_panel_editor.scss
index 475d7444b03..78e21da00ad 100644
--- a/public/sass/components/_panel_editor.scss
+++ b/public/sass/components/_panel_editor.scss
@@ -154,7 +154,6 @@
     box-shadow: $panel-editor-viz-item-shadow-hover;
     background: $panel-editor-viz-item-bg-hover;
     border: $panel-editor-viz-item-border-hover;
-
   }
 
   &--current {
@@ -236,4 +235,3 @@
   position: relative;
   min-width: 200px;
 }
-
diff --git a/public/sass/components/_query_editor.scss b/public/sass/components/_query_editor.scss
index 6b2e93121f5..71332541b2e 100644
--- a/public/sass/components/_query_editor.scss
+++ b/public/sass/components/_query_editor.scss
@@ -127,7 +127,6 @@ input[type='text'].tight-form-func-param {
       color: $text-color-weak;
     }
   }
-
 }
 
 .query-editor-row__header {
@@ -138,7 +137,6 @@ input[type='text'].tight-form-func-param {
   background: $page-bg;
   flex-wrap: nowrap;
   align-items: center;
-
 }
 .query-editor-row__ref-id {
   font-weight: $font-weight-semi-bold;
@@ -206,4 +204,3 @@ input[type='text'].tight-form-func-param {
   color: $text-muted;
   padding-left: 10px;
 }
-
diff --git a/public/sass/components/_view_states.scss b/public/sass/components/_view_states.scss
index 518d5d0f446..b92bd596193 100644
--- a/public/sass/components/_view_states.scss
+++ b/public/sass/components/_view_states.scss
@@ -50,4 +50,3 @@
     display: none;
   }
 }
-
diff --git a/public/sass/mixins/_drop_element.scss b/public/sass/mixins/_drop_element.scss
index e7e53382e0e..eb354b219fc 100644
--- a/public/sass/mixins/_drop_element.scss
+++ b/public/sass/mixins/_drop_element.scss
@@ -15,7 +15,7 @@
       border: 1px solid $border-color;
 
       &:before {
-        content: "";
+        content: '';
         display: block;
         position: absolute;
         width: 0;
@@ -88,8 +88,7 @@
       left: $popover-arrow-size * 2;
     }
 
-    &.drop-element-attached-top.drop-element-attached-left.drop-target-attached-middle
-      .drop-content {
+    &.drop-element-attached-top.drop-element-attached-left.drop-target-attached-middle .drop-content {
       margin-top: $popover-arrow-size;
 
       &:before {
@@ -99,8 +98,7 @@
       }
     }
 
-    &.drop-element-attached-top.drop-element-attached-right.drop-target-attached-middle
-      .drop-content {
+    &.drop-element-attached-top.drop-element-attached-right.drop-target-attached-middle .drop-content {
       margin-top: $popover-arrow-size;
 
       &:before {
@@ -110,8 +108,7 @@
       }
     }
 
-    &.drop-element-attached-bottom.drop-element-attached-left.drop-target-attached-middle
-      .drop-content {
+    &.drop-element-attached-bottom.drop-element-attached-left.drop-target-attached-middle .drop-content {
       margin-bottom: $popover-arrow-size;
 
       &:before {
@@ -121,8 +118,7 @@
       }
     }
 
-    &.drop-element-attached-bottom.drop-element-attached-right.drop-target-attached-middle
-      .drop-content {
+    &.drop-element-attached-bottom.drop-element-attached-right.drop-target-attached-middle .drop-content {
       margin-bottom: $popover-arrow-size;
 
       &:before {
@@ -133,8 +129,7 @@
     }
 
     // Top and bottom corners
-    &.drop-element-attached-top.drop-element-attached-left.drop-target-attached-bottom
-      .drop-content {
+    &.drop-element-attached-top.drop-element-attached-left.drop-target-attached-bottom .drop-content {
       margin-top: $popover-arrow-size;
 
       &:before {
@@ -144,8 +139,7 @@
       }
     }
 
-    &.drop-element-attached-top.drop-element-attached-right.drop-target-attached-bottom
-      .drop-content {
+    &.drop-element-attached-top.drop-element-attached-right.drop-target-attached-bottom .drop-content {
       margin-top: $popover-arrow-size;
 
       &:before {
@@ -155,8 +149,7 @@
       }
     }
 
-    &.drop-element-attached-bottom.drop-element-attached-left.drop-target-attached-top
-      .drop-content {
+    &.drop-element-attached-bottom.drop-element-attached-left.drop-target-attached-top .drop-content {
       margin-bottom: $popover-arrow-size;
 
       &:before {
@@ -166,8 +159,7 @@
       }
     }
 
-    &.drop-element-attached-bottom.drop-element-attached-right.drop-target-attached-top
-      .drop-content {
+    &.drop-element-attached-bottom.drop-element-attached-right.drop-target-attached-top .drop-content {
       margin-bottom: $popover-arrow-size;
 
       &:before {
@@ -178,8 +170,7 @@
     }
 
     // Side corners
-    &.drop-element-attached-top.drop-element-attached-right.drop-target-attached-left
-      .drop-content {
+    &.drop-element-attached-top.drop-element-attached-right.drop-target-attached-left .drop-content {
       margin-right: $popover-arrow-size;
 
       &:before {
@@ -189,8 +180,7 @@
       }
     }
 
-    &.drop-element-attached-top.drop-element-attached-left.drop-target-attached-right
-      .drop-content {
+    &.drop-element-attached-top.drop-element-attached-left.drop-target-attached-right .drop-content {
       margin-left: $popover-arrow-size;
 
       &:before {
@@ -200,8 +190,7 @@
       }
     }
 
-    &.drop-element-attached-bottom.drop-element-attached-right.drop-target-attached-left
-      .drop-content {
+    &.drop-element-attached-bottom.drop-element-attached-right.drop-target-attached-left .drop-content {
       margin-right: $popover-arrow-size;
 
       &:before {
@@ -211,8 +200,7 @@
       }
     }
 
-    &.drop-element-attached-bottom.drop-element-attached-left.drop-target-attached-right
-      .drop-content {
+    &.drop-element-attached-bottom.drop-element-attached-left.drop-target-attached-right .drop-content {
       margin-left: $popover-arrow-size;
 
       &:before {
@@ -224,7 +212,7 @@
   }
 }
 
-@mixin drop-animation-scale($themePrefix: "drop", $themeName: "default", $attachmentOffset: 0, $easing: "linear") {
+@mixin drop-animation-scale($themePrefix: 'drop', $themeName: 'default', $attachmentOffset: 0, $easing: 'linear') {
   .#{$themePrefix}-element.#{$themePrefix}-#{$themeName} {
     transform: translateZ(0);
     transition: opacity 100ms;
@@ -247,20 +235,16 @@
       }
     }
     // Centers and middles
-    &.#{$themePrefix}-element-attached-bottom.#{$themePrefix}-element-attached-center
-      .#{$themePrefix}-content {
+    &.#{$themePrefix}-element-attached-bottom.#{$themePrefix}-element-attached-center .#{$themePrefix}-content {
       transform-origin: 50% calc(100% + #{$attachmentOffset});
     }
-    &.#{$themePrefix}-element-attached-top.#{$themePrefix}-element-attached-center
-      .#{$themePrefix}-content {
+    &.#{$themePrefix}-element-attached-top.#{$themePrefix}-element-attached-center .#{$themePrefix}-content {
       transform-origin: 50% (-$attachmentOffset);
     }
-    &.#{$themePrefix}-element-attached-right.#{$themePrefix}-element-attached-middle
-      .#{$themePrefix}-content {
+    &.#{$themePrefix}-element-attached-right.#{$themePrefix}-element-attached-middle .#{$themePrefix}-content {
       transform-origin: calc(100% + #{$attachmentOffset}) 50%;
     }
-    &.#{$themePrefix}-element-attached-left.#{$themePrefix}-element-attached-middle
-      .#{$themePrefix}-content {
+    &.#{$themePrefix}-element-attached-left.#{$themePrefix}-element-attached-middle .#{$themePrefix}-content {
       transform-origin: -($attachmentOffset 50%);
     }
     // Top and bottom corners
diff --git a/public/sass/mixins/_forms.scss b/public/sass/mixins/_forms.scss
index 5d2a4421353..727f1af1bee 100644
--- a/public/sass/mixins/_forms.scss
+++ b/public/sass/mixins/_forms.scss
@@ -34,8 +34,7 @@
   &:focus {
     border-color: $input-border-focus;
     outline: none;
-    $shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),
-      0 0 5px $input-box-shadow-focus;
+    $shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 5px $input-box-shadow-focus;
     @include box-shadow($shadow);
   }
 }
diff --git a/public/sass/utils/_hacks.scss b/public/sass/utils/_hacks.scss
index 25cc324aa64..31d25c658c2 100644
--- a/public/sass/utils/_hacks.scss
+++ b/public/sass/utils/_hacks.scss
@@ -1,11 +1,25 @@
 // <3: https://medium.com/@brunn/detecting-autofilled-fields-in-javascript-aed598d25da7
 // sass-lint:disable no-empty-rulesets
-@keyframes onAutoFillStart {  from {/**/}  to {/**/}}
-@keyframes onAutoFillCancel {  from {/**/}  to {/**/}}
+@keyframes onAutoFillStart {
+  from {
+    /**/
+  }
+  to {
+    /**/
+  }
+}
+@keyframes onAutoFillCancel {
+  from {
+    /**/
+  }
+  to {
+    /**/
+  }
+}
 input:-webkit-autofill {
   animation-name: onAutoFillStart;
   transition: transform 1ms;
 }
 input:not(:-webkit-autofill) {
   animation-name: onAutoFillCancel;
-}
\ No newline at end of file
+}
diff --git a/public/test/helpers/getQueryOptions.ts b/public/test/helpers/getQueryOptions.ts
index ac92c2afb55..5e1f534f0e4 100644
--- a/public/test/helpers/getQueryOptions.ts
+++ b/public/test/helpers/getQueryOptions.ts
@@ -1,10 +1,11 @@
 import { DataQueryOptions, DataQuery } from '@grafana/ui';
 import moment from 'moment';
 
-
-export function getQueryOptions<TQuery extends DataQuery>(options: Partial<DataQueryOptions<TQuery>>): DataQueryOptions<TQuery> {
-  const raw = {from: 'now', to: 'now-1h'};
-  const range = { from: moment(), to: moment(), raw: raw};
+export function getQueryOptions<TQuery extends DataQuery>(
+  options: Partial<DataQueryOptions<TQuery>>
+): DataQueryOptions<TQuery> {
+  const raw = { from: 'now', to: 'now-1h' };
+  const range = { from: moment(), to: moment(), raw: raw };
 
   const defaults: DataQueryOptions<TQuery> = {
     range: range,
diff --git a/public/test/mocks/backend_srv.ts b/public/test/mocks/backend_srv.ts
index 666de593722..32c04866395 100644
--- a/public/test/mocks/backend_srv.ts
+++ b/public/test/mocks/backend_srv.ts
@@ -1,8 +1,5 @@
 export class BackendSrvMock {
   search: any;
 
-  constructor() {
-  }
-
+  constructor() {}
 }
-
diff --git a/scripts/circle-test-frontend.sh b/scripts/circle-test-frontend.sh
index 3af199d3ff2..cd42dd0b7e9 100755
--- a/scripts/circle-test-frontend.sh
+++ b/scripts/circle-test-frontend.sh
@@ -10,4 +10,5 @@ function exit_if_fail {
     fi
 }
 
+exit_if_fail npm run prettier:check
 exit_if_fail npm run test
diff --git a/yarn.lock b/yarn.lock
index 2fb4a5d3ee2..e77b8af58cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1833,6 +1833,13 @@
     "@types/prop-types" "*"
     csstype "^2.2.0"
 
+"@types/reselect@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@types/reselect/-/reselect-2.2.0.tgz#c667206cfdc38190e1d379babe08865b2288575f"
+  integrity sha1-xmcgbP3DgZDh03m6vgiGWyKIV18=
+  dependencies:
+    reselect "*"
+
 "@types/storybook__addon-actions@^3.4.1":
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/@types/storybook__addon-actions/-/storybook__addon-actions-3.4.1.tgz#8f90d76b023b58ee794170f2fe774a3fddda2c1d"
@@ -4712,6 +4719,11 @@ ci-info@^1.5.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
   integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
 
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
 cidr-regex@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cidr-regex/-/cidr-regex-1.0.6.tgz#74abfd619df370b9d54ab14475568e97dd64c0c1"
@@ -7922,6 +7934,11 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
+get-stdin@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
+  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
+
 get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -8886,14 +8903,21 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^0.14.3:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
-  integrity sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==
+husky@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0"
+  integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==
   dependencies:
-    is-ci "^1.0.10"
-    normalize-path "^1.0.0"
-    strip-indent "^2.0.0"
+    cosmiconfig "^5.0.7"
+    execa "^1.0.0"
+    find-up "^3.0.0"
+    get-stdin "^6.0.0"
+    is-ci "^2.0.0"
+    pkg-dir "^3.0.0"
+    please-upgrade-node "^3.1.1"
+    read-pkg "^4.0.1"
+    run-node "^1.0.0"
+    slash "^2.0.0"
 
 iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
@@ -9279,6 +9303,13 @@ is-ci@^1.0.10:
   dependencies:
     ci-info "^1.5.0"
 
+is-ci@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
+  dependencies:
+    ci-info "^2.0.0"
+
 is-cidr@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-1.0.0.tgz#fb5aacf659255310359da32cae03e40c6a1c2afc"
@@ -11925,11 +11956,6 @@ normalize-path@2.0.1:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a"
   integrity sha1-R4hqwWYnYNQmG32XnSQXCdPOP3o=
 
-normalize-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
-  integrity sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=
-
 normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -12948,7 +12974,7 @@ pkg-up@^1.0.0:
   dependencies:
     find-up "^1.0.0"
 
-please-upgrade-node@^3.0.2:
+please-upgrade-node@^3.0.2, please-upgrade-node@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
   integrity sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==
@@ -14336,6 +14362,15 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
+read-pkg@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
+  integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
+  dependencies:
+    normalize-package-data "^2.3.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+
 read@1, read@~1.0.1, read@~1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
@@ -14823,6 +14858,11 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
+reselect@*, reselect@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
+  integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==
+
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -14990,6 +15030,11 @@ run-async@^2.0.0, run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
+run-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
+  integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==
+
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -15448,6 +15493,11 @@ slash@^1.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+
 slate-base64-serializer@^0.2.36:
   version "0.2.94"
   resolved "https://registry.yarnpkg.com/slate-base64-serializer/-/slate-base64-serializer-0.2.94.tgz#b908c3af481b9a0ead78f313653414c4b2b4b2d5"
@@ -16147,11 +16197,6 @@ strip-indent@^1.0.1:
   dependencies:
     get-stdin "^4.0.1"
 
-strip-indent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
-  integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
-
 strip-json-comments@~1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"