diff --git a/packages/grafana-data/src/types/data.ts b/packages/grafana-data/src/types/data.ts
index 7fe6ae08961..77f7c47d47b 100644
--- a/packages/grafana-data/src/types/data.ts
+++ b/packages/grafana-data/src/types/data.ts
@@ -43,7 +43,7 @@ export interface QueryResultMeta {
    * Legacy data source specific, should be moved to custom
    * */
   gmdMeta?: any[]; // used by cloudwatch
-  alignmentPeriod?: string; // used by cloud monitoring
+  alignmentPeriod?: number; // used by cloud monitoring
   searchWords?: string[]; // used by log models and loki
   limit?: number; // used by log models and loki
   json?: boolean; // used to keep track of old json doc values
diff --git a/packages/grafana-data/src/valueFormats/valueFormats.ts b/packages/grafana-data/src/valueFormats/valueFormats.ts
index f11f0347730..ea1e4b87f54 100644
--- a/packages/grafana-data/src/valueFormats/valueFormats.ts
+++ b/packages/grafana-data/src/valueFormats/valueFormats.ts
@@ -32,7 +32,7 @@ export interface ValueFormatCategory {
   formats: ValueFormat[];
 }
 
-interface ValueFormatterIndex {
+export interface ValueFormatterIndex {
   [id: string]: ValueFormatter;
 }
 
diff --git a/public/app/core/directives/misc.ts b/public/app/core/directives/misc.ts
index 4695d943ea7..b9e2f4b675c 100644
--- a/public/app/core/directives/misc.ts
+++ b/public/app/core/directives/misc.ts
@@ -14,7 +14,7 @@ function tip($compile: any) {
         '<i class="grafana-tip fa fa-' +
         (attrs.icon || 'question-circle') +
         '" bs-tooltip="\'' +
-        kbn.addslashes(elem.text()) +
+        kbn.addSlashes(elem.text()) +
         '\'"></i>';
       _t = _t.replace(/{/g, '\\{').replace(/}/g, '\\}');
       elem.replaceWith($compile(angular.element(_t))(scope));
diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts
index b6a3c8f08cc..0b2d5ec4a98 100644
--- a/public/app/core/services/context_srv.ts
+++ b/public/app/core/services/context_srv.ts
@@ -61,7 +61,7 @@ export class ContextSrv {
     if (!config.minRefreshInterval) {
       return true;
     }
-    return kbn.interval_to_ms(interval) >= kbn.interval_to_ms(config.minRefreshInterval);
+    return kbn.intervalToMs(interval) >= kbn.intervalToMs(config.minRefreshInterval);
   }
 
   getValidInterval(interval: string) {
diff --git a/public/app/core/utils/kbn.test.ts b/public/app/core/utils/kbn.test.ts
index 80dd53ed5b3..3bf5b44cfe7 100644
--- a/public/app/core/utils/kbn.test.ts
+++ b/public/app/core/utils/kbn.test.ts
@@ -53,7 +53,7 @@ describe('Chcek KBN value formats', () => {
 
 describe('describe_interval', () => {
   it('falls back to seconds if input is a number', () => {
-    expect(kbn.describe_interval('123')).toEqual({
+    expect(kbn.describeInterval('123')).toEqual({
       sec: 1,
       type: 's',
       count: 123,
@@ -61,7 +61,7 @@ describe('describe_interval', () => {
   });
 
   it('parses a valid time unt string correctly', () => {
-    expect(kbn.describe_interval('123h')).toEqual({
+    expect(kbn.describeInterval('123h')).toEqual({
       sec: 3600,
       type: 'h',
       count: 123,
@@ -69,7 +69,7 @@ describe('describe_interval', () => {
   });
 
   it('fails if input is invalid', () => {
-    expect(() => kbn.describe_interval('123xyz')).toThrow();
-    expect(() => kbn.describe_interval('xyz')).toThrow();
+    expect(() => kbn.describeInterval('123xyz')).toThrow();
+    expect(() => kbn.describeInterval('xyz')).toThrow();
   });
 });
diff --git a/public/app/core/utils/kbn.ts b/public/app/core/utils/kbn.ts
index 4fc19c35c62..cc991b12fd5 100644
--- a/public/app/core/utils/kbn.ts
+++ b/public/app/core/utils/kbn.ts
@@ -1,319 +1,291 @@
-import { has } from 'lodash';
 import {
+  DecimalCount,
+  deprecationWarning,
+  formattedValueToString,
   getValueFormat,
-  getValueFormatterIndex,
   getValueFormats,
+  getValueFormatterIndex,
   stringToJsRegex,
   TimeRange,
-  deprecationWarning,
-  DecimalCount,
-  formattedValueToString,
+  ValueFormatterIndex,
 } from '@grafana/data';
+import { has } from 'lodash';
 
-const kbn: any = {};
-
-kbn.valueFormats = {};
-
-kbn.regexEscape = (value: string) => {
-  return value.replace(/[\\^$*+?.()|[\]{}\/]/g, '\\$&');
-};
-
-///// HELPER FUNCTIONS /////
-
-kbn.round_interval = (interval: number) => {
-  switch (true) {
-    // 0.015s
-    case interval < 15:
-      return 10; // 0.01s
-    // 0.035s
-    case interval < 35:
-      return 20; // 0.02s
-    // 0.075s
-    case interval < 75:
-      return 50; // 0.05s
-    // 0.15s
-    case interval < 150:
-      return 100; // 0.1s
-    // 0.35s
-    case interval < 350:
-      return 200; // 0.2s
-    // 0.75s
-    case interval < 750:
-      return 500; // 0.5s
-    // 1.5s
-    case interval < 1500:
-      return 1000; // 1s
-    // 3.5s
-    case interval < 3500:
-      return 2000; // 2s
-    // 7.5s
-    case interval < 7500:
-      return 5000; // 5s
-    // 12.5s
-    case interval < 12500:
-      return 10000; // 10s
-    // 17.5s
-    case interval < 17500:
-      return 15000; // 15s
-    // 25s
-    case interval < 25000:
-      return 20000; // 20s
-    // 45s
-    case interval < 45000:
-      return 30000; // 30s
-    // 1.5m
-    case interval < 90000:
-      return 60000; // 1m
-    // 3.5m
-    case interval < 210000:
-      return 120000; // 2m
-    // 7.5m
-    case interval < 450000:
-      return 300000; // 5m
-    // 12.5m
-    case interval < 750000:
-      return 600000; // 10m
-    // 12.5m
-    case interval < 1050000:
-      return 900000; // 15m
-    // 25m
-    case interval < 1500000:
-      return 1200000; // 20m
-    // 45m
-    case interval < 2700000:
-      return 1800000; // 30m
-    // 1.5h
-    case interval < 5400000:
-      return 3600000; // 1h
-    // 2.5h
-    case interval < 9000000:
-      return 7200000; // 2h
-    // 4.5h
-    case interval < 16200000:
-      return 10800000; // 3h
-    // 9h
-    case interval < 32400000:
-      return 21600000; // 6h
-    // 1d
-    case interval < 86400000:
-      return 43200000; // 12h
-    // 1w
-    case interval < 604800000:
-      return 86400000; // 1d
-    // 3w
-    case interval < 1814400000:
-      return 604800000; // 1w
-    // 6w
-    case interval < 3628800000:
-      return 2592000000; // 30d
-    default:
-      return 31536000000; // 1y
-  }
-};
-
-kbn.secondsToHms = (seconds: number) => {
-  const numyears = Math.floor(seconds / 31536000);
-  if (numyears) {
-    return numyears + 'y';
-  }
-  const numdays = Math.floor((seconds % 31536000) / 86400);
-  if (numdays) {
-    return numdays + 'd';
-  }
-  const numhours = Math.floor(((seconds % 31536000) % 86400) / 3600);
-  if (numhours) {
-    return numhours + 'h';
-  }
-  const numminutes = Math.floor((((seconds % 31536000) % 86400) % 3600) / 60);
-  if (numminutes) {
-    return numminutes + 'm';
-  }
-  const numseconds = Math.floor((((seconds % 31536000) % 86400) % 3600) % 60);
-  if (numseconds) {
-    return numseconds + 's';
-  }
-  const nummilliseconds = Math.floor(seconds * 1000.0);
-  if (nummilliseconds) {
-    return nummilliseconds + 'ms';
-  }
-
-  return 'less than a millisecond'; //'just now' //or other string you like;
-};
-
-kbn.secondsToHhmmss = (seconds: number) => {
-  const strings: string[] = [];
-  const numhours = Math.floor(seconds / 3600);
-  const numminutes = Math.floor((seconds % 3600) / 60);
-  const numseconds = Math.floor((seconds % 3600) % 60);
-  numhours > 9 ? strings.push('' + numhours) : strings.push('0' + numhours);
-  numminutes > 9 ? strings.push('' + numminutes) : strings.push('0' + numminutes);
-  numseconds > 9 ? strings.push('' + numseconds) : strings.push('0' + numseconds);
-  return strings.join(':');
-};
-
-kbn.to_percent = (nr: number, outof: number) => {
-  return Math.floor((nr / outof) * 10000) / 100 + '%';
-};
-
-kbn.addslashes = (str: string) => {
-  str = str.replace(/\\/g, '\\\\');
-  str = str.replace(/\'/g, "\\'");
-  str = str.replace(/\"/g, '\\"');
-  str = str.replace(/\0/g, '\\0');
-  return str;
-};
-
-kbn.interval_regex = /(\d+(?:\.\d+)?)(ms|[Mwdhmsy])/;
-
-// histogram & trends
-kbn.intervals_in_seconds = {
-  y: 31536000,
-  M: 2592000,
-  w: 604800,
-  d: 86400,
-  h: 3600,
-  m: 60,
-  s: 1,
-  ms: 0.001,
-};
-
-kbn.calculateInterval = (range: TimeRange, resolution: number, lowLimitInterval: string[]) => {
-  let lowLimitMs = 1; // 1 millisecond default low limit
-  let intervalMs;
-
-  if (lowLimitInterval) {
-    if (lowLimitInterval[0] === '>') {
-      lowLimitInterval = lowLimitInterval.slice(1);
+const kbn = {
+  valueFormats: {} as ValueFormatterIndex,
+  intervalRegex: /(\d+(?:\.\d+)?)(ms|[Mwdhmsy])/,
+  intervalsInSeconds: {
+    y: 31536000,
+    M: 2592000,
+    w: 604800,
+    d: 86400,
+    h: 3600,
+    m: 60,
+    s: 1,
+    ms: 0.001,
+  } as { [index: string]: number },
+  regexEscape: (value: string) => value.replace(/[\\^$*+?.()|[\]{}\/]/g, '\\$&'),
+  roundInterval: (interval: number) => {
+    switch (true) {
+      // 0.015s
+      case interval < 15:
+        return 10; // 0.01s
+      // 0.035s
+      case interval < 35:
+        return 20; // 0.02s
+      // 0.075s
+      case interval < 75:
+        return 50; // 0.05s
+      // 0.15s
+      case interval < 150:
+        return 100; // 0.1s
+      // 0.35s
+      case interval < 350:
+        return 200; // 0.2s
+      // 0.75s
+      case interval < 750:
+        return 500; // 0.5s
+      // 1.5s
+      case interval < 1500:
+        return 1000; // 1s
+      // 3.5s
+      case interval < 3500:
+        return 2000; // 2s
+      // 7.5s
+      case interval < 7500:
+        return 5000; // 5s
+      // 12.5s
+      case interval < 12500:
+        return 10000; // 10s
+      // 17.5s
+      case interval < 17500:
+        return 15000; // 15s
+      // 25s
+      case interval < 25000:
+        return 20000; // 20s
+      // 45s
+      case interval < 45000:
+        return 30000; // 30s
+      // 1.5m
+      case interval < 90000:
+        return 60000; // 1m
+      // 3.5m
+      case interval < 210000:
+        return 120000; // 2m
+      // 7.5m
+      case interval < 450000:
+        return 300000; // 5m
+      // 12.5m
+      case interval < 750000:
+        return 600000; // 10m
+      // 12.5m
+      case interval < 1050000:
+        return 900000; // 15m
+      // 25m
+      case interval < 1500000:
+        return 1200000; // 20m
+      // 45m
+      case interval < 2700000:
+        return 1800000; // 30m
+      // 1.5h
+      case interval < 5400000:
+        return 3600000; // 1h
+      // 2.5h
+      case interval < 9000000:
+        return 7200000; // 2h
+      // 4.5h
+      case interval < 16200000:
+        return 10800000; // 3h
+      // 9h
+      case interval < 32400000:
+        return 21600000; // 6h
+      // 1d
+      case interval < 86400000:
+        return 43200000; // 12h
+      // 1w
+      case interval < 604800000:
+        return 86400000; // 1d
+      // 3w
+      case interval < 1814400000:
+        return 604800000; // 1w
+      // 6w
+      case interval < 3628800000:
+        return 2592000000; // 30d
+      default:
+        return 31536000000; // 1y
+    }
+  },
+  secondsToHms: (seconds: number) => {
+    const numYears = Math.floor(seconds / 31536000);
+    if (numYears) {
+      return numYears + 'y';
+    }
+    const numDays = Math.floor((seconds % 31536000) / 86400);
+    if (numDays) {
+      return numDays + 'd';
+    }
+    const numHours = Math.floor(((seconds % 31536000) % 86400) / 3600);
+    if (numHours) {
+      return numHours + 'h';
+    }
+    const numMinutes = Math.floor((((seconds % 31536000) % 86400) % 3600) / 60);
+    if (numMinutes) {
+      return numMinutes + 'm';
+    }
+    const numSeconds = Math.floor((((seconds % 31536000) % 86400) % 3600) % 60);
+    if (numSeconds) {
+      return numSeconds + 's';
+    }
+    const numMilliseconds = Math.floor(seconds * 1000.0);
+    if (numMilliseconds) {
+      return numMilliseconds + 'ms';
     }
-    lowLimitMs = kbn.interval_to_ms(lowLimitInterval);
-  }
 
-  intervalMs = kbn.round_interval((range.to.valueOf() - range.from.valueOf()) / resolution);
-  if (lowLimitMs > intervalMs) {
-    intervalMs = lowLimitMs;
-  }
+    return 'less than a millisecond'; //'just now' //or other string you like;
+  },
+  secondsToHhmmss: (seconds: number) => {
+    const strings: string[] = [];
+    const numHours = Math.floor(seconds / 3600);
+    const numMinutes = Math.floor((seconds % 3600) / 60);
+    const numSeconds = Math.floor((seconds % 3600) % 60);
+    numHours > 9 ? strings.push('' + numHours) : strings.push('0' + numHours);
+    numMinutes > 9 ? strings.push('' + numMinutes) : strings.push('0' + numMinutes);
+    numSeconds > 9 ? strings.push('' + numSeconds) : strings.push('0' + numSeconds);
+    return strings.join(':');
+  },
+  toPercent: (nr: number, outOf: number) => Math.floor((nr / outOf) * 10000) / 100 + '%',
+  addSlashes: (str: string) => {
+    str = str.replace(/\\/g, '\\\\');
+    str = str.replace(/\'/g, "\\'");
+    str = str.replace(/\"/g, '\\"');
+    str = str.replace(/\0/g, '\\0');
+    return str;
+  },
+  describeInterval: (str: string) => {
+    // Default to seconds if no unit is provided
+    if (Number(str)) {
+      return {
+        sec: kbn.intervalsInSeconds.s,
+        type: 's',
+        count: parseInt(str, 10),
+      };
+    }
 
-  return {
-    intervalMs: intervalMs,
-    interval: kbn.secondsToHms(intervalMs / 1000),
-  };
-};
+    const matches = str.match(kbn.intervalRegex);
+    if (!matches || !has(kbn.intervalsInSeconds, matches[2])) {
+      throw new Error(
+        `Invalid interval string, has to be either unit-less or end with one of the following units: "${Object.keys(
+          kbn.intervalsInSeconds
+        ).join(', ')}"`
+      );
+    } else {
+      return {
+        sec: kbn.intervalsInSeconds[matches[2]],
+        type: matches[2],
+        count: parseInt(matches[1], 10),
+      };
+    }
+  },
+  intervalToSeconds: (str: string): number => {
+    const info = kbn.describeInterval(str);
+    return info.sec * info.count;
+  },
+  intervalToMs: (str: string) => {
+    const info = kbn.describeInterval(str);
+    return info.sec * 1000 * info.count;
+  },
+  calculateInterval: (range: TimeRange, resolution: number, lowLimitInterval?: string) => {
+    let lowLimitMs = 1; // 1 millisecond default low limit
+    let intervalMs;
+
+    if (lowLimitInterval) {
+      if (lowLimitInterval[0] === '>') {
+        lowLimitInterval = lowLimitInterval.slice(1);
+      }
+      lowLimitMs = kbn.intervalToMs(lowLimitInterval);
+    }
+
+    intervalMs = kbn.roundInterval((range.to.valueOf() - range.from.valueOf()) / resolution);
+    if (lowLimitMs > intervalMs) {
+      intervalMs = lowLimitMs;
+    }
 
-kbn.describe_interval = (str: string) => {
-  // Default to seconds if no unit is provided
-  if (Number(str)) {
     return {
-      sec: kbn.intervals_in_seconds.s,
-      type: 's',
-      count: parseInt(str, 10),
+      intervalMs: intervalMs,
+      interval: kbn.secondsToHms(intervalMs / 1000),
     };
-  }
-
-  const matches = str.match(kbn.interval_regex);
-  if (!matches || !has(kbn.intervals_in_seconds, matches[2])) {
-    throw new Error(
-      `Invalid interval string, has to be either unit-less or end with one of the following units: "${Object.keys(
-        kbn.intervals_in_seconds
-      ).join(', ')}"`
+  },
+  queryColorDot: (color: string, diameter: string) => {
+    return (
+      '<div class="icon-circle" style="' +
+      ['display:inline-block', 'color:' + color, 'font-size:' + diameter + 'px'].join(';') +
+      '"></div>'
     );
-  } else {
-    return {
-      sec: kbn.intervals_in_seconds[matches[2]],
-      type: matches[2],
-      count: parseInt(matches[1], 10),
-    };
-  }
-};
-
-kbn.interval_to_ms = (str: string) => {
-  const info = kbn.describe_interval(str);
-  return info.sec * 1000 * info.count;
-};
-
-kbn.interval_to_seconds = (str: string): number => {
-  const info = kbn.describe_interval(str);
-  return info.sec * info.count;
-};
-
-kbn.query_color_dot = (color: string, diameter: string) => {
-  return (
-    '<div class="icon-circle" style="' +
-    ['display:inline-block', 'color:' + color, 'font-size:' + diameter + 'px'].join(';') +
-    '"></div>'
-  );
-};
-
-kbn.slugifyForUrl = (str: string) => {
-  return str
-    .toLowerCase()
-    .replace(/[^\w ]+/g, '')
-    .replace(/ +/g, '-');
-};
-
-/** deprecated since 6.1, use grafana/data */
-kbn.stringToJsRegex = (str: string) => {
-  deprecationWarning('kbn.ts', 'kbn.stringToJsRegex()', '@grafana/data');
-  return stringToJsRegex(str);
-};
-
-kbn.toFixed = (value: number | null, decimals: number) => {
-  if (value === null) {
-    return '';
-  }
-
-  const factor = decimals ? Math.pow(10, Math.max(0, decimals)) : 1;
-  const formatted = String(Math.round(value * factor) / factor);
-
-  // if exponent return directly
-  if (formatted.indexOf('e') !== -1 || value === 0) {
-    return formatted;
-  }
-
-  // If tickDecimals was specified, ensure that we have exactly that
-  // much precision; otherwise default to the value's own precision.
-  if (decimals != null) {
-    const decimalPos = formatted.indexOf('.');
-    const precision = decimalPos === -1 ? 0 : formatted.length - decimalPos - 1;
-    if (precision < decimals) {
-      return (precision ? formatted : formatted + '.') + String(factor).substr(1, decimals - precision);
+  },
+  slugifyForUrl: (str: string) => {
+    return str
+      .toLowerCase()
+      .replace(/[^\w ]+/g, '')
+      .replace(/ +/g, '-');
+  },
+  /** deprecated since 6.1, use grafana/data */
+  stringToJsRegex: (str: string) => {
+    deprecationWarning('kbn.ts', 'kbn.stringToJsRegex()', '@grafana/data');
+    return stringToJsRegex(str);
+  },
+  toFixed: (value: number | null, decimals: number) => {
+    if (value === null) {
+      return '';
     }
-  }
 
-  return formatted;
+    const factor = decimals ? Math.pow(10, Math.max(0, decimals)) : 1;
+    const formatted = String(Math.round(value * factor) / factor);
+
+    // if exponent return directly
+    if (formatted.indexOf('e') !== -1 || value === 0) {
+      return formatted;
+    }
+
+    // If tickDecimals was specified, ensure that we have exactly that
+    // much precision; otherwise default to the value's own precision.
+    if (decimals != null) {
+      const decimalPos = formatted.indexOf('.');
+      const precision = decimalPos === -1 ? 0 : formatted.length - decimalPos - 1;
+      if (precision < decimals) {
+        return (precision ? formatted : formatted + '.') + String(factor).substr(1, decimals - precision);
+      }
+    }
+
+    return formatted;
+  },
+  toFixedScaled: (
+    value: number,
+    decimals: number,
+    scaledDecimals: number | null,
+    additionalDecimals: number,
+    ext: number
+  ) => {
+    if (scaledDecimals === null) {
+      return kbn.toFixed(value, decimals) + ext;
+    } else {
+      return kbn.toFixed(value, scaledDecimals + additionalDecimals) + ext;
+    }
+  },
+  roundValue: (num: number, decimals: number) => {
+    if (num === null) {
+      return null;
+    }
+    const n = Math.pow(10, decimals);
+    const formatted = (n * num).toFixed(decimals);
+    return Math.round(parseFloat(formatted)) / n;
+  },
+  // FORMAT MENU
+  getUnitFormats: getValueFormats,
 };
 
-kbn.toFixedScaled = (
-  value: number,
-  decimals: number,
-  scaledDecimals: number | null,
-  additionalDecimals: number,
-  ext: number
-) => {
-  if (scaledDecimals === null) {
-    return kbn.toFixed(value, decimals) + ext;
-  } else {
-    return kbn.toFixed(value, scaledDecimals + additionalDecimals) + ext;
-  }
-};
-
-kbn.roundValue = (num: number, decimals: number) => {
-  if (num === null) {
-    return null;
-  }
-  const n = Math.pow(10, decimals);
-  const formatted = (n * num).toFixed(decimals);
-  return Math.round(parseFloat(formatted)) / n;
-};
-
-///// FORMAT MENU /////
-
-kbn.getUnitFormats = () => {
-  return getValueFormats();
-};
-
-//
-// Backward compatible layer for value formats to support old plugins
-//
+/**
+ * Backward compatible layer for value formats to support old plugins
+ */
 if (typeof Proxy !== 'undefined') {
   kbn.valueFormats = new Proxy(kbn.valueFormats, {
     get(target, name, receiver) {
diff --git a/public/app/features/alerting/AlertTabCtrl.ts b/public/app/features/alerting/AlertTabCtrl.ts
index 5da5fae2f8f..f38ce575031 100644
--- a/public/app/features/alerting/AlertTabCtrl.ts
+++ b/public/app/features/alerting/AlertTabCtrl.ts
@@ -253,7 +253,7 @@ export class AlertTabCtrl {
     this.frequencyWarning = '';
 
     try {
-      const frequencySecs = kbn.interval_to_seconds(this.alert.frequency);
+      const frequencySecs = kbn.intervalToSeconds(this.alert.frequency);
       if (frequencySecs < this.alertingMinIntervalSecs) {
         this.frequencyWarning =
           'A minimum evaluation interval of ' +
diff --git a/public/app/features/api-keys/ApiKeysPage.tsx b/public/app/features/api-keys/ApiKeysPage.tsx
index 39699a0a8cd..37a85290326 100644
--- a/public/app/features/api-keys/ApiKeysPage.tsx
+++ b/public/app/features/api-keys/ApiKeysPage.tsx
@@ -37,7 +37,7 @@ const timeRangeValidationEvents: ValidationEvents = {
           return true;
         }
         try {
-          kbn.interval_to_seconds(value);
+          kbn.intervalToSeconds(value);
           return true;
         } catch {
           return false;
@@ -125,7 +125,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
 
     // make sure that secondsToLive is number or null
     const secondsToLive = this.state.newApiKey['secondsToLive'];
-    this.state.newApiKey['secondsToLive'] = secondsToLive ? kbn.interval_to_seconds(secondsToLive) : null;
+    this.state.newApiKey['secondsToLive'] = secondsToLive ? kbn.intervalToSeconds(secondsToLive) : null;
     this.props.addApiKey(this.state.newApiKey, openModal, this.props.includeExpired);
     this.setState((prevState: State) => {
       return {
diff --git a/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
index 4c7051d8138..d62042e722a 100644
--- a/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
@@ -39,7 +39,7 @@ export class TimePickerSettings extends PureComponent<Props, State> {
 
     if (config.minRefreshInterval) {
       intervals = intervals.filter(rate => {
-        return kbn.interval_to_ms(rate) >= kbn.interval_to_ms(config.minRefreshInterval);
+        return kbn.intervalToMs(rate) >= kbn.intervalToMs(config.minRefreshInterval);
       });
     }
 
diff --git a/public/app/features/dashboard/services/TimeSrv.ts b/public/app/features/dashboard/services/TimeSrv.ts
index fe62f45615a..44a9c58603e 100644
--- a/public/app/features/dashboard/services/TimeSrv.ts
+++ b/public/app/features/dashboard/services/TimeSrv.ts
@@ -115,7 +115,7 @@ export class TimeSrv {
       // when time window specified in ms
       timeWindowMs = parseInt(timeWindow, 10);
     } else {
-      timeWindowMs = kbn.interval_to_ms(timeWindow);
+      timeWindowMs = kbn.intervalToMs(timeWindow);
     }
 
     return {
@@ -181,7 +181,7 @@ export class TimeSrv {
 
     if (interval) {
       const validInterval = this.contextSrv.getValidInterval(interval);
-      const intervalMs = kbn.interval_to_ms(validInterval);
+      const intervalMs = kbn.intervalToMs(validInterval);
 
       this.refreshTimer = this.timer.register(
         this.$timeout(() => {
diff --git a/public/app/features/playlist/playlist_srv.ts b/public/app/features/playlist/playlist_srv.ts
index f294db740fa..55c92eb22a2 100644
--- a/public/app/features/playlist/playlist_srv.ts
+++ b/public/app/features/playlist/playlist_srv.ts
@@ -97,7 +97,7 @@ export class PlaylistSrv {
           .get(`/api/playlists/${playlistId}/dashboards`)
           .then((dashboards: any) => {
             this.dashboards = dashboards;
-            this.interval = kbn.interval_to_ms(playlist.interval);
+            this.interval = kbn.intervalToMs(playlist.interval);
             this.next();
           });
       });
diff --git a/public/app/features/variables/interval/actions.test.ts b/public/app/features/variables/interval/actions.test.ts
index 356c980c33e..8914648c3f5 100644
--- a/public/app/features/variables/interval/actions.test.ts
+++ b/public/app/features/variables/interval/actions.test.ts
@@ -81,7 +81,7 @@ describe('interval actions', () => {
       expect(appEventMock.emit).toHaveBeenCalledWith(AppEvents.alertError, [
         'Templating',
         `Invalid interval string, has to be either unit-less or end with one of the following units: "${Object.keys(
-          kbn.intervals_in_seconds
+          kbn.intervalsInSeconds
         ).join(', ')}"`,
       ]);
       setTimeSrv(originalTimeSrv);
@@ -99,7 +99,7 @@ describe('interval actions', () => {
         const dependencies: UpdateAutoValueDependencies = {
           kbn: {
             calculateInterval: jest.fn(),
-          },
+          } as any,
           getTimeSrv: () => {
             return ({
               timeRange: jest.fn().mockReturnValue({
@@ -152,7 +152,7 @@ describe('interval actions', () => {
         const dependencies: UpdateAutoValueDependencies = {
           kbn: {
             calculateInterval: jest.fn().mockReturnValue({ interval: '10s' }),
-          },
+          } as any,
           getTimeSrv: () => {
             return ({
               timeRange: timeRangeMock,
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/AlignmentPeriods.tsx b/public/app/plugins/datasource/cloud-monitoring/components/AlignmentPeriods.tsx
index 9def31dcb8f..49279a38efa 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/AlignmentPeriods.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/AlignmentPeriods.tsx
@@ -13,7 +13,7 @@ export interface Props {
   templateVariableOptions: Array<SelectableValue<string>>;
   alignmentPeriod: string;
   perSeriesAligner: string;
-  usedAlignmentPeriod: string;
+  usedAlignmentPeriod?: number;
 }
 
 export const AlignmentPeriods: FC<Props> = ({
@@ -25,7 +25,9 @@ export const AlignmentPeriods: FC<Props> = ({
   usedAlignmentPeriod,
 }) => {
   const alignment = alignOptions.find(ap => ap.value === templateSrv.replace(perSeriesAligner));
-  const formatAlignmentText = `${kbn.secondsToHms(usedAlignmentPeriod)} interval (${alignment ? alignment.text : ''})`;
+  const formatAlignmentText = usedAlignmentPeriod
+    ? `${kbn.secondsToHms(usedAlignmentPeriod)} interval (${alignment ? alignment.text : ''})`
+    : '';
   const options = alignmentPeriods.map(ap => ({
     ...ap,
     label: ap.text,
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx
index 80e332e820e..9ebc00e3880 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx
@@ -7,7 +7,7 @@ import { SelectableValue } from '@grafana/data';
 
 export interface Props {
   refId: string;
-  usedAlignmentPeriod: string;
+  usedAlignmentPeriod?: number;
   variableOptionGroup: SelectableValue<string>;
   onChange: (query: MetricQuery) => void;
   onRunQuery: () => void;
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx
index c0d785f3fa8..d07df06828a 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx
@@ -67,7 +67,7 @@ export class QueryEditor extends PureComponent<Props, State> {
     const sloQuery = { ...defaultSLOQuery, ...query.sloQuery, projectName: datasource.getDefaultProject() };
     const queryType = query.queryType || QueryType.METRICS;
     const meta = this.props.data?.series.length ? this.props.data?.series[0].meta : {};
-    const usedAlignmentPeriod = meta?.alignmentPeriod as string;
+    const usedAlignmentPeriod = meta?.alignmentPeriod;
     const variableOptionGroup = {
       label: 'Template Variables',
       expanded: false,
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/SLOQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/SLOQueryEditor.tsx
index 7c0a6ffb2b3..87145878f88 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/SLOQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/SLOQueryEditor.tsx
@@ -7,7 +7,7 @@ import { SLOQuery } from '../types';
 import CloudMonitoringDatasource from '../datasource';
 
 export interface Props {
-  usedAlignmentPeriod: string;
+  usedAlignmentPeriod?: number;
   variableOptionGroup: SelectableValue<string>;
   onChange: (query: SLOQuery) => void;
   onRunQuery: () => void;
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts
index a0711c3f6fe..81dcfaa3f8f 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.ts
+++ b/public/app/plugins/datasource/cloudwatch/datasource.ts
@@ -419,7 +419,7 @@ export class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery, CloudWa
       if (/^\d+$/.test(period)) {
         period = parseInt(period, 10);
       } else {
-        period = kbn.interval_to_seconds(period);
+        period = kbn.intervalToSeconds(period);
       }
 
       if (period < 1) {
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 bd6ccc88f24..23509930e75 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
@@ -490,7 +490,7 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
     const allowedTimeGrainsMs: number[] = [];
     timeGrains.forEach((tg: any) => {
       if (tg.value !== 'auto') {
-        allowedTimeGrainsMs.push(kbn.interval_to_ms(TimegrainConverter.createKbnUnitFromISO8601Duration(tg.value)));
+        allowedTimeGrainsMs.push(kbn.intervalToMs(TimegrainConverter.createKbnUnitFromISO8601Duration(tg.value)));
       }
     });
     return allowedTimeGrainsMs;
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.ts
index bcd1dca0b3c..80f4265e1c2 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.ts
@@ -36,11 +36,11 @@ export default class TimeGrainConverter {
     const timeGrains = _.filter(allowedTimeGrains, o => o !== 'auto');
 
     let closest = timeGrains[0];
-    const intervalMs = kbn.interval_to_ms(interval);
+    const intervalMs = kbn.intervalToMs(interval);
 
     for (let i = 0; i < timeGrains.length; i++) {
       // abs (num - val) < abs (num - curr):
-      if (intervalMs > kbn.interval_to_ms(timeGrains[i])) {
+      if (intervalMs > kbn.intervalToMs(timeGrains[i])) {
         if (i + 1 < timeGrains.length) {
           closest = timeGrains[i + 1];
         } else {
diff --git a/public/app/plugins/datasource/graphite/MetricTankMetaInspector.tsx b/public/app/plugins/datasource/graphite/MetricTankMetaInspector.tsx
index 5009ddae751..e768b9d7576 100644
--- a/public/app/plugins/datasource/graphite/MetricTankMetaInspector.tsx
+++ b/public/app/plugins/datasource/graphite/MetricTankMetaInspector.tsx
@@ -22,11 +22,10 @@ export class MetricTankMetaInspector extends PureComponent<Props, State> {
     const runtimeNotice = getRuntimeConsolidationNotice([meta]);
     const normFunc = (meta['consolidator-normfetch'] ?? '').replace('Consolidator', '');
 
-    let totalSeconds = 0;
-
-    for (const bucket of buckets) {
-      totalSeconds += kbn.interval_to_seconds(bucket.retention);
-    }
+    const totalSeconds = buckets.reduce(
+      (acc, bucket) => acc + (bucket.retention ? kbn.intervalToSeconds(bucket.retention) : 0),
+      0
+    );
 
     return (
       <div className={styles.metaItem} key={key}>
@@ -46,7 +45,7 @@ export class MetricTankMetaInspector extends PureComponent<Props, State> {
 
             <div>
               {buckets.map((bucket, index) => {
-                const bucketLength = kbn.interval_to_seconds(bucket.retention);
+                const bucketLength = bucket.retention ? kbn.intervalToSeconds(bucket.retention) : 0;
                 const lengthPercent = (bucketLength / totalSeconds) * 100;
                 const isActive = index === meta['archive-read'];
 
diff --git a/public/app/plugins/datasource/opentsdb/query_ctrl.ts b/public/app/plugins/datasource/opentsdb/query_ctrl.ts
index 2365f026baa..3954e564a1c 100644
--- a/public/app/plugins/datasource/opentsdb/query_ctrl.ts
+++ b/public/app/plugins/datasource/opentsdb/query_ctrl.ts
@@ -205,7 +205,7 @@ export class OpenTsQueryCtrl extends QueryCtrl {
     if (this.target.shouldDownsample) {
       try {
         if (this.target.downsampleInterval) {
-          kbn.describe_interval(this.target.downsampleInterval);
+          kbn.describeInterval(this.target.downsampleInterval);
         } else {
           errs.downsampleInterval = "You must supply a downsample interval (e.g. '1m' or '1h').";
         }
diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts
index 4e02bd78088..b21a60095db 100644
--- a/public/app/plugins/datasource/prometheus/datasource.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.ts
@@ -327,9 +327,9 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
     const range = Math.ceil(end - start);
 
     // options.interval is the dynamically calculated interval
-    let interval: number = kbn.interval_to_seconds(options.interval);
+    let interval: number = kbn.intervalToSeconds(options.interval);
     // Minimum interval ("Min step"), if specified for the query or datasource. or same as interval otherwise
-    const minInterval = kbn.interval_to_seconds(
+    const minInterval = kbn.intervalToSeconds(
       templateSrv.replace(target.interval || options.interval, options.scopedVars)
     );
     const intervalFactor = target.intervalFactor || 1;
@@ -495,7 +495,7 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
 
     const scopedVars = {
       __interval: { text: this.interval, value: this.interval },
-      __interval_ms: { text: kbn.interval_to_ms(this.interval), value: kbn.interval_to_ms(this.interval) },
+      __interval_ms: { text: kbn.intervalToMs(this.interval), value: kbn.intervalToMs(this.interval) },
       ...this.getRangeScopedVars(getTimeSrv().timeRange()),
     };
     const interpolated = templateSrv.replace(query, scopedVars, this.interpolateQueryExpr);
diff --git a/public/app/plugins/panel/heatmap/heatmap_ctrl.ts b/public/app/plugins/panel/heatmap/heatmap_ctrl.ts
index a596eb97bdb..3dbe32abc41 100644
--- a/public/app/plugins/panel/heatmap/heatmap_ctrl.ts
+++ b/public/app/plugins/panel/heatmap/heatmap_ctrl.ts
@@ -180,9 +180,9 @@ export class HeatmapCtrl extends MetricsPanelCtrl {
     const xBucketSizeByNumber = Math.floor((this.range.to.valueOf() - this.range.from.valueOf()) / xBucketNumber);
 
     // Parse X bucket size (number or interval)
-    const isIntervalString = kbn.interval_regex.test(this.panel.xBucketSize);
+    const isIntervalString = kbn.intervalRegex.test(this.panel.xBucketSize);
     if (isIntervalString) {
-      xBucketSize = kbn.interval_to_ms(this.panel.xBucketSize);
+      xBucketSize = kbn.intervalToMs(this.panel.xBucketSize);
     } else if (
       isNaN(Number(this.panel.xBucketSize)) ||
       this.panel.xBucketSize === '' ||