Skip to content

N
nexpie-grafana-theme
Commit 75e14aa1 by Zoltán Bedi Committed by GitHub
Options

Chore: Let kbn util infer types (#26907) 

* Chore: Let kbn util infer types

Type fixes where needed

* Address review comments + test fix

* Modify kbn method and property names to pascalCase
parent 6b1b52b7
Showing with 145 additions and 172 deletions
packages/grafana-data/src/types/data.ts
...@@ -43,7 +43,7 @@ export interface QueryResultMeta { ...@@ -43,7 +43,7 @@ export interface QueryResultMeta {
* Legacy data source specific, should be moved to custom * Legacy data source specific, should be moved to custom
* */ * */
gmdMeta?: any[]; // used by cloudwatch 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 searchWords?: string[]; // used by log models and loki
limit?: number; // 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 json?: boolean; // used to keep track of old json doc values
......
packages/grafana-data/src/valueFormats/valueFormats.ts
...@@ -32,7 +32,7 @@ export interface ValueFormatCategory { ...@@ -32,7 +32,7 @@ export interface ValueFormatCategory {
formats: ValueFormat[]; formats: ValueFormat[];
} }
interface ValueFormatterIndex { export interface ValueFormatterIndex {
[id: string]: ValueFormatter; [id: string]: ValueFormatter;
} }
......
public/app/core/directives/misc.ts
...@@ -14,7 +14,7 @@ function tip($compile: any) { ...@@ -14,7 +14,7 @@ function tip($compile: any) {
'<i class="grafana-tip fa fa-' + '<i class="grafana-tip fa fa-' +
(attrs.icon || 'question-circle') + (attrs.icon || 'question-circle') +
'" bs-tooltip="\'' + '" bs-tooltip="\'' +
kbn.addslashes(elem.text()) + kbn.addSlashes(elem.text()) +
'\'"></i>'; '\'"></i>';
_t = _t.replace(/{/g, '\\{').replace(/}/g, '\\}'); _t = _t.replace(/{/g, '\\{').replace(/}/g, '\\}');
elem.replaceWith($compile(angular.element(_t))(scope)); elem.replaceWith($compile(angular.element(_t))(scope));
......
public/app/core/services/context_srv.ts
...@@ -61,7 +61,7 @@ export class ContextSrv { ...@@ -61,7 +61,7 @@ export class ContextSrv {
if (!config.minRefreshInterval) { if (!config.minRefreshInterval) {
return true; 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) { getValidInterval(interval: string) {
......
public/app/core/utils/kbn.test.ts
...@@ -53,7 +53,7 @@ describe('Chcek KBN value formats', () => { ...@@ -53,7 +53,7 @@ describe('Chcek KBN value formats', () => {
describe('describe_interval', () => { describe('describe_interval', () => {
it('falls back to seconds if input is a number', () => { it('falls back to seconds if input is a number', () => {
expect(kbn.describe_interval('123')).toEqual({ expect(kbn.describeInterval('123')).toEqual({
sec: 1, sec: 1,
type: 's', type: 's',
count: 123, count: 123,
...@@ -61,7 +61,7 @@ describe('describe_interval', () => { ...@@ -61,7 +61,7 @@ describe('describe_interval', () => {
}); });
it('parses a valid time unt string correctly', () => { it('parses a valid time unt string correctly', () => {
expect(kbn.describe_interval('123h')).toEqual({ expect(kbn.describeInterval('123h')).toEqual({
sec: 3600, sec: 3600,
type: 'h', type: 'h',
count: 123, count: 123,
...@@ -69,7 +69,7 @@ describe('describe_interval', () => { ...@@ -69,7 +69,7 @@ describe('describe_interval', () => {
}); });
it('fails if input is invalid', () => { it('fails if input is invalid', () => {
expect(() => kbn.describe_interval('123xyz')).toThrow(); expect(() => kbn.describeInterval('123xyz')).toThrow();
expect(() => kbn.describe_interval('xyz')).toThrow(); expect(() => kbn.describeInterval('xyz')).toThrow();
}); });
}); });
public/app/core/utils/kbn.ts
import { has } from 'lodash';
import { import {
DecimalCount,
deprecationWarning,
formattedValueToString,
getValueFormat, getValueFormat,
getValueFormatterIndex,
getValueFormats, getValueFormats,
getValueFormatterIndex,
stringToJsRegex, stringToJsRegex,
TimeRange, TimeRange,
deprecationWarning, ValueFormatterIndex,
DecimalCount,
formattedValueToString,
} from '@grafana/data'; } from '@grafana/data';
import { has } from 'lodash';
const kbn: any = {}; const kbn = {
valueFormats: {} as ValueFormatterIndex,
kbn.valueFormats = {}; intervalRegex: /(\d+(?:\.\d+)?)(ms|[Mwdhmsy])/,
intervalsInSeconds: {
kbn.regexEscape = (value: string) => { y: 31536000,
return value.replace(/[\\^$*+?.()|[\]{}\/]/g, '\\$&'); M: 2592000,
}; w: 604800,
d: 86400,
///// HELPER FUNCTIONS ///// h: 3600,
m: 60,
kbn.round_interval = (interval: number) => { s: 1,
ms: 0.001,
} as { [index: string]: number },
regexEscape: (value: string) => value.replace(/[\\^$*+?.()|[\]{}\/]/g, '\\$&'),
roundInterval: (interval: number) => {
switch (true) { switch (true) {
// 0.015s // 0.015s
case interval < 15: case interval < 15:
...@@ -109,154 +114,126 @@ kbn.round_interval = (interval: number) => { ...@@ -109,154 +114,126 @@ kbn.round_interval = (interval: number) => {
default: default:
return 31536000000; // 1y return 31536000000; // 1y
} }
}; },
secondsToHms: (seconds: number) => {
kbn.secondsToHms = (seconds: number) => { const numYears = Math.floor(seconds / 31536000);
const numyears = Math.floor(seconds / 31536000); if (numYears) {
if (numyears) { return numYears + 'y';
return numyears + 'y';
} }
const numdays = Math.floor((seconds % 31536000) / 86400); const numDays = Math.floor((seconds % 31536000) / 86400);
if (numdays) { if (numDays) {
return numdays + 'd'; return numDays + 'd';
} }
const numhours = Math.floor(((seconds % 31536000) % 86400) / 3600); const numHours = Math.floor(((seconds % 31536000) % 86400) / 3600);
if (numhours) { if (numHours) {
return numhours + 'h'; return numHours + 'h';
} }
const numminutes = Math.floor((((seconds % 31536000) % 86400) % 3600) / 60); const numMinutes = Math.floor((((seconds % 31536000) % 86400) % 3600) / 60);
if (numminutes) { if (numMinutes) {
return numminutes + 'm'; return numMinutes + 'm';
} }
const numseconds = Math.floor((((seconds % 31536000) % 86400) % 3600) % 60); const numSeconds = Math.floor((((seconds % 31536000) % 86400) % 3600) % 60);
if (numseconds) { if (numSeconds) {
return numseconds + 's'; return numSeconds + 's';
} }
const nummilliseconds = Math.floor(seconds * 1000.0); const numMilliseconds = Math.floor(seconds * 1000.0);
if (nummilliseconds) { if (numMilliseconds) {
return nummilliseconds + 'ms'; return numMilliseconds + 'ms';
} }
return 'less than a millisecond'; //'just now' //or other string you like; return 'less than a millisecond'; //'just now' //or other string you like;
}; },
secondsToHhmmss: (seconds: number) => {
kbn.secondsToHhmmss = (seconds: number) => {
const strings: string[] = []; const strings: string[] = [];
const numhours = Math.floor(seconds / 3600); const numHours = Math.floor(seconds / 3600);
const numminutes = Math.floor((seconds % 3600) / 60); const numMinutes = Math.floor((seconds % 3600) / 60);
const numseconds = Math.floor((seconds % 3600) % 60); const numSeconds = Math.floor((seconds % 3600) % 60);
numhours > 9 ? strings.push('' + numhours) : strings.push('0' + numhours); numHours > 9 ? strings.push('' + numHours) : strings.push('0' + numHours);
numminutes > 9 ? strings.push('' + numminutes) : strings.push('0' + numminutes); numMinutes > 9 ? strings.push('' + numMinutes) : strings.push('0' + numMinutes);
numseconds > 9 ? strings.push('' + numseconds) : strings.push('0' + numseconds); numSeconds > 9 ? strings.push('' + numSeconds) : strings.push('0' + numSeconds);
return strings.join(':'); return strings.join(':');
}; },
toPercent: (nr: number, outOf: number) => Math.floor((nr / outOf) * 10000) / 100 + '%',
kbn.to_percent = (nr: number, outof: number) => { addSlashes: (str: string) => {
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(/\'/g, "\\'");
str = str.replace(/\"/g, '\\"'); str = str.replace(/\"/g, '\\"');
str = str.replace(/\0/g, '\\0'); str = str.replace(/\0/g, '\\0');
return str; return str;
}; },
describeInterval: (str: string) => {
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);
}
lowLimitMs = kbn.interval_to_ms(lowLimitInterval);
}
intervalMs = kbn.round_interval((range.to.valueOf() - range.from.valueOf()) / resolution);
if (lowLimitMs > intervalMs) {
intervalMs = lowLimitMs;
}
return {
intervalMs: intervalMs,
interval: kbn.secondsToHms(intervalMs / 1000),
};
};
kbn.describe_interval = (str: string) => {
// Default to seconds if no unit is provided // Default to seconds if no unit is provided
if (Number(str)) { if (Number(str)) {
return { return {
sec: kbn.intervals_in_seconds.s, sec: kbn.intervalsInSeconds.s,
type: 's', type: 's',
count: parseInt(str, 10), count: parseInt(str, 10),
}; };
} }
const matches = str.match(kbn.interval_regex); const matches = str.match(kbn.intervalRegex);
if (!matches || !has(kbn.intervals_in_seconds, matches[2])) { if (!matches || !has(kbn.intervalsInSeconds, matches[2])) {
throw new Error( throw new Error(
`Invalid interval string, has to be either unit-less or end with one of the following units: "${Object.keys( `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(', ')}"` ).join(', ')}"`
); );
} else { } else {
return { return {
sec: kbn.intervals_in_seconds[matches[2]], sec: kbn.intervalsInSeconds[matches[2]],
type: matches[2], type: matches[2],
count: parseInt(matches[1], 10), count: parseInt(matches[1], 10),
}; };
} }
}; },
intervalToSeconds: (str: string): number => {
kbn.interval_to_ms = (str: string) => { const info = kbn.describeInterval(str);
const info = kbn.describe_interval(str); return info.sec * info.count;
},
intervalToMs: (str: string) => {
const info = kbn.describeInterval(str);
return info.sec * 1000 * info.count; return info.sec * 1000 * info.count;
}; },
calculateInterval: (range: TimeRange, resolution: number, lowLimitInterval?: string) => {
let lowLimitMs = 1; // 1 millisecond default low limit
let intervalMs;
kbn.interval_to_seconds = (str: string): number => { if (lowLimitInterval) {
const info = kbn.describe_interval(str); if (lowLimitInterval[0] === '>') {
return info.sec * info.count; lowLimitInterval = lowLimitInterval.slice(1);
}; }
lowLimitMs = kbn.intervalToMs(lowLimitInterval);
}
kbn.query_color_dot = (color: string, diameter: string) => { intervalMs = kbn.roundInterval((range.to.valueOf() - range.from.valueOf()) / resolution);
if (lowLimitMs > intervalMs) {
intervalMs = lowLimitMs;
}
return {
intervalMs: intervalMs,
interval: kbn.secondsToHms(intervalMs / 1000),
};
},
queryColorDot: (color: string, diameter: string) => {
return ( return (
'<div class="icon-circle" style="' + '<div class="icon-circle" style="' +
['display:inline-block', 'color:' + color, 'font-size:' + diameter + 'px'].join(';') + ['display:inline-block', 'color:' + color, 'font-size:' + diameter + 'px'].join(';') +
'"></div>' '"></div>'
); );
}; },
slugifyForUrl: (str: string) => {
kbn.slugifyForUrl = (str: string) => {
return str return str
.toLowerCase() .toLowerCase()
.replace(/[^\w ]+/g, '') .replace(/[^\w ]+/g, '')
.replace(/ +/g, '-'); .replace(/ +/g, '-');
}; },
/** deprecated since 6.1, use grafana/data */
/** deprecated since 6.1, use grafana/data */ stringToJsRegex: (str: string) => {
kbn.stringToJsRegex = (str: string) => {
deprecationWarning('kbn.ts', 'kbn.stringToJsRegex()', '@grafana/data'); deprecationWarning('kbn.ts', 'kbn.stringToJsRegex()', '@grafana/data');
return stringToJsRegex(str); return stringToJsRegex(str);
}; },
toFixed: (value: number | null, decimals: number) => {
kbn.toFixed = (value: number | null, decimals: number) => {
if (value === null) { if (value === null) {
return ''; return '';
} }
...@@ -280,40 +257,35 @@ kbn.toFixed = (value: number | null, decimals: number) => { ...@@ -280,40 +257,35 @@ kbn.toFixed = (value: number | null, decimals: number) => {
} }
return formatted; return formatted;
}; },
toFixedScaled: (
kbn.toFixedScaled = (
value: number, value: number,
decimals: number, decimals: number,
scaledDecimals: number | null, scaledDecimals: number | null,
additionalDecimals: number, additionalDecimals: number,
ext: number ext: number
) => { ) => {
if (scaledDecimals === null) { if (scaledDecimals === null) {
return kbn.toFixed(value, decimals) + ext; return kbn.toFixed(value, decimals) + ext;
} else { } else {
return kbn.toFixed(value, scaledDecimals + additionalDecimals) + ext; return kbn.toFixed(value, scaledDecimals + additionalDecimals) + ext;
} }
}; },
roundValue: (num: number, decimals: number) => {
kbn.roundValue = (num: number, decimals: number) => {
if (num === null) { if (num === null) {
return null; return null;
} }
const n = Math.pow(10, decimals); const n = Math.pow(10, decimals);
const formatted = (n * num).toFixed(decimals); const formatted = (n * num).toFixed(decimals);
return Math.round(parseFloat(formatted)) / n; return Math.round(parseFloat(formatted)) / n;
},
// FORMAT MENU
getUnitFormats: getValueFormats,
}; };
///// FORMAT MENU ///// /**
* Backward compatible layer for value formats to support old plugins
kbn.getUnitFormats = () => { */
return getValueFormats();
};
//
// Backward compatible layer for value formats to support old plugins
//
if (typeof Proxy !== 'undefined') { if (typeof Proxy !== 'undefined') {
kbn.valueFormats = new Proxy(kbn.valueFormats, { kbn.valueFormats = new Proxy(kbn.valueFormats, {
get(target, name, receiver) { get(target, name, receiver) {
......
public/app/features/alerting/AlertTabCtrl.ts
...@@ -253,7 +253,7 @@ export class AlertTabCtrl { ...@@ -253,7 +253,7 @@ export class AlertTabCtrl {
this.frequencyWarning = ''; this.frequencyWarning = '';
try { try {
const frequencySecs = kbn.interval_to_seconds(this.alert.frequency); const frequencySecs = kbn.intervalToSeconds(this.alert.frequency);
if (frequencySecs < this.alertingMinIntervalSecs) { if (frequencySecs < this.alertingMinIntervalSecs) {
this.frequencyWarning = this.frequencyWarning =
'A minimum evaluation interval of ' + 'A minimum evaluation interval of ' +
......
public/app/features/api-keys/ApiKeysPage.tsx
...@@ -37,7 +37,7 @@ const timeRangeValidationEvents: ValidationEvents = { ...@@ -37,7 +37,7 @@ const timeRangeValidationEvents: ValidationEvents = {
return true; return true;
} }
try { try {
kbn.interval_to_seconds(value); kbn.intervalToSeconds(value);
return true; return true;
} catch { } catch {
return false; return false;
...@@ -125,7 +125,7 @@ export class ApiKeysPage extends PureComponent<Props, any> { ...@@ -125,7 +125,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
// make sure that secondsToLive is number or null // make sure that secondsToLive is number or null
const secondsToLive = this.state.newApiKey['secondsToLive']; 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.props.addApiKey(this.state.newApiKey, openModal, this.props.includeExpired);
this.setState((prevState: State) => { this.setState((prevState: State) => {
return { return {
......
public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
...@@ -39,7 +39,7 @@ export class TimePickerSettings extends PureComponent<Props, State> { ...@@ -39,7 +39,7 @@ export class TimePickerSettings extends PureComponent<Props, State> {
if (config.minRefreshInterval) { if (config.minRefreshInterval) {
intervals = intervals.filter(rate => { intervals = intervals.filter(rate => {
return kbn.interval_to_ms(rate) >= kbn.interval_to_ms(config.minRefreshInterval); return kbn.intervalToMs(rate) >= kbn.intervalToMs(config.minRefreshInterval);
}); });
} }
......
public/app/features/dashboard/services/TimeSrv.ts
...@@ -115,7 +115,7 @@ export class TimeSrv { ...@@ -115,7 +115,7 @@ export class TimeSrv {
// when time window specified in ms // when time window specified in ms
timeWindowMs = parseInt(timeWindow, 10); timeWindowMs = parseInt(timeWindow, 10);
} else { } else {
timeWindowMs = kbn.interval_to_ms(timeWindow); timeWindowMs = kbn.intervalToMs(timeWindow);
} }
return { return {
...@@ -181,7 +181,7 @@ export class TimeSrv { ...@@ -181,7 +181,7 @@ export class TimeSrv {
if (interval) { if (interval) {
const validInterval = this.contextSrv.getValidInterval(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.refreshTimer = this.timer.register(
this.$timeout(() => { this.$timeout(() => {
......
public/app/features/playlist/playlist_srv.ts
...@@ -97,7 +97,7 @@ export class PlaylistSrv { ...@@ -97,7 +97,7 @@ export class PlaylistSrv {
.get(`/api/playlists/${playlistId}/dashboards`) .get(`/api/playlists/${playlistId}/dashboards`)
.then((dashboards: any) => { .then((dashboards: any) => {
this.dashboards = dashboards; this.dashboards = dashboards;
this.interval = kbn.interval_to_ms(playlist.interval); this.interval = kbn.intervalToMs(playlist.interval);
this.next(); this.next();
}); });
}); });
......
public/app/features/variables/interval/actions.test.ts
...@@ -81,7 +81,7 @@ describe('interval actions', () => { ...@@ -81,7 +81,7 @@ describe('interval actions', () => {
expect(appEventMock.emit).toHaveBeenCalledWith(AppEvents.alertError, [ expect(appEventMock.emit).toHaveBeenCalledWith(AppEvents.alertError, [
'Templating', 'Templating',
`Invalid interval string, has to be either unit-less or end with one of the following units: "${Object.keys( `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(', ')}"`, ).join(', ')}"`,
]); ]);
setTimeSrv(originalTimeSrv); setTimeSrv(originalTimeSrv);
...@@ -99,7 +99,7 @@ describe('interval actions', () => { ...@@ -99,7 +99,7 @@ describe('interval actions', () => {
const dependencies: UpdateAutoValueDependencies = { const dependencies: UpdateAutoValueDependencies = {
kbn: { kbn: {
calculateInterval: jest.fn(), calculateInterval: jest.fn(),
}, } as any,
getTimeSrv: () => { getTimeSrv: () => {
return ({ return ({
timeRange: jest.fn().mockReturnValue({ timeRange: jest.fn().mockReturnValue({
...@@ -152,7 +152,7 @@ describe('interval actions', () => { ...@@ -152,7 +152,7 @@ describe('interval actions', () => {
const dependencies: UpdateAutoValueDependencies = { const dependencies: UpdateAutoValueDependencies = {
kbn: { kbn: {
calculateInterval: jest.fn().mockReturnValue({ interval: '10s' }), calculateInterval: jest.fn().mockReturnValue({ interval: '10s' }),
}, } as any,
getTimeSrv: () => { getTimeSrv: () => {
return ({ return ({
timeRange: timeRangeMock, timeRange: timeRangeMock,
......
public/app/plugins/datasource/cloud-monitoring/components/AlignmentPeriods.tsx
...@@ -13,7 +13,7 @@ export interface Props { ...@@ -13,7 +13,7 @@ export interface Props {
templateVariableOptions: Array<SelectableValue<string>>; templateVariableOptions: Array<SelectableValue<string>>;
alignmentPeriod: string; alignmentPeriod: string;
perSeriesAligner: string; perSeriesAligner: string;
usedAlignmentPeriod: string; usedAlignmentPeriod?: number;
} }
export const AlignmentPeriods: FC<Props> = ({ export const AlignmentPeriods: FC<Props> = ({
...@@ -25,7 +25,9 @@ export const AlignmentPeriods: FC<Props> = ({ ...@@ -25,7 +25,9 @@ export const AlignmentPeriods: FC<Props> = ({
usedAlignmentPeriod, usedAlignmentPeriod,
}) => { }) => {
const alignment = alignOptions.find(ap => ap.value === templateSrv.replace(perSeriesAligner)); 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 => ({ const options = alignmentPeriods.map(ap => ({
...ap, ...ap,
label: ap.text, label: ap.text,
......
public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx
...@@ -7,7 +7,7 @@ import { SelectableValue } from '@grafana/data'; ...@@ -7,7 +7,7 @@ import { SelectableValue } from '@grafana/data';
export interface Props { export interface Props {
refId: string; refId: string;
usedAlignmentPeriod: string; usedAlignmentPeriod?: number;
variableOptionGroup: SelectableValue<string>; variableOptionGroup: SelectableValue<string>;
onChange: (query: MetricQuery) => void; onChange: (query: MetricQuery) => void;
onRunQuery: () => void; onRunQuery: () => void;
......
public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx
...@@ -67,7 +67,7 @@ export class QueryEditor extends PureComponent<Props, State> { ...@@ -67,7 +67,7 @@ export class QueryEditor extends PureComponent<Props, State> {
const sloQuery = { ...defaultSLOQuery, ...query.sloQuery, projectName: datasource.getDefaultProject() }; const sloQuery = { ...defaultSLOQuery, ...query.sloQuery, projectName: datasource.getDefaultProject() };
const queryType = query.queryType || QueryType.METRICS; const queryType = query.queryType || QueryType.METRICS;
const meta = this.props.data?.series.length ? this.props.data?.series[0].meta : {}; 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 = { const variableOptionGroup = {
label: 'Template Variables', label: 'Template Variables',
expanded: false, expanded: false,
......
public/app/plugins/datasource/cloud-monitoring/components/SLOQueryEditor.tsx
...@@ -7,7 +7,7 @@ import { SLOQuery } from '../types'; ...@@ -7,7 +7,7 @@ import { SLOQuery } from '../types';
import CloudMonitoringDatasource from '../datasource'; import CloudMonitoringDatasource from '../datasource';
export interface Props { export interface Props {
usedAlignmentPeriod: string; usedAlignmentPeriod?: number;
variableOptionGroup: SelectableValue<string>; variableOptionGroup: SelectableValue<string>;
onChange: (query: SLOQuery) => void; onChange: (query: SLOQuery) => void;
onRunQuery: () => void; onRunQuery: () => void;
......
public/app/plugins/datasource/cloudwatch/datasource.ts
...@@ -419,7 +419,7 @@ export class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery, CloudWa ...@@ -419,7 +419,7 @@ export class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery, CloudWa
if (/^\d+$/.test(period)) { if (/^\d+$/.test(period)) {
period = parseInt(period, 10); period = parseInt(period, 10);
} else { } else {
period = kbn.interval_to_seconds(period); period = kbn.intervalToSeconds(period);
} }
if (period < 1) { if (period < 1) {
......
public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts
...@@ -490,7 +490,7 @@ export class AzureMonitorQueryCtrl extends QueryCtrl { ...@@ -490,7 +490,7 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
const allowedTimeGrainsMs: number[] = []; const allowedTimeGrainsMs: number[] = [];
timeGrains.forEach((tg: any) => { timeGrains.forEach((tg: any) => {
if (tg.value !== 'auto') { if (tg.value !== 'auto') {
allowedTimeGrainsMs.push(kbn.interval_to_ms(TimegrainConverter.createKbnUnitFromISO8601Duration(tg.value))); allowedTimeGrainsMs.push(kbn.intervalToMs(TimegrainConverter.createKbnUnitFromISO8601Duration(tg.value)));
} }
}); });
return allowedTimeGrainsMs; return allowedTimeGrainsMs;
......
public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.ts
...@@ -36,11 +36,11 @@ export default class TimeGrainConverter { ...@@ -36,11 +36,11 @@ export default class TimeGrainConverter {
const timeGrains = _.filter(allowedTimeGrains, o => o !== 'auto'); const timeGrains = _.filter(allowedTimeGrains, o => o !== 'auto');
let closest = timeGrains[0]; let closest = timeGrains[0];
const intervalMs = kbn.interval_to_ms(interval); const intervalMs = kbn.intervalToMs(interval);
for (let i = 0; i < timeGrains.length; i++) { for (let i = 0; i < timeGrains.length; i++) {
// abs (num - val) < abs (num - curr): // 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) { if (i + 1 < timeGrains.length) {
closest = timeGrains[i + 1]; closest = timeGrains[i + 1];
} else { } else {
......
public/app/plugins/datasource/graphite/MetricTankMetaInspector.tsx
...@@ -22,11 +22,10 @@ export class MetricTankMetaInspector extends PureComponent<Props, State> { ...@@ -22,11 +22,10 @@ export class MetricTankMetaInspector extends PureComponent<Props, State> {
const runtimeNotice = getRuntimeConsolidationNotice([meta]); const runtimeNotice = getRuntimeConsolidationNotice([meta]);
const normFunc = (meta['consolidator-normfetch'] ?? '').replace('Consolidator', ''); const normFunc = (meta['consolidator-normfetch'] ?? '').replace('Consolidator', '');
let totalSeconds = 0; const totalSeconds = buckets.reduce(
(acc, bucket) => acc + (bucket.retention ? kbn.intervalToSeconds(bucket.retention) : 0),
for (const bucket of buckets) { 0
totalSeconds += kbn.interval_to_seconds(bucket.retention); );
}
return ( return (
<div className={styles.metaItem} key={key}> <div className={styles.metaItem} key={key}>
...@@ -46,7 +45,7 @@ export class MetricTankMetaInspector extends PureComponent<Props, State> { ...@@ -46,7 +45,7 @@ export class MetricTankMetaInspector extends PureComponent<Props, State> {
<div> <div>
{buckets.map((bucket, index) => { {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 lengthPercent = (bucketLength / totalSeconds) * 100;
const isActive = index === meta['archive-read']; const isActive = index === meta['archive-read'];
......
public/app/plugins/datasource/opentsdb/query_ctrl.ts
...@@ -205,7 +205,7 @@ export class OpenTsQueryCtrl extends QueryCtrl { ...@@ -205,7 +205,7 @@ export class OpenTsQueryCtrl extends QueryCtrl {
if (this.target.shouldDownsample) { if (this.target.shouldDownsample) {
try { try {
if (this.target.downsampleInterval) { if (this.target.downsampleInterval) {
kbn.describe_interval(this.target.downsampleInterval); kbn.describeInterval(this.target.downsampleInterval);
} else { } else {
errs.downsampleInterval = "You must supply a downsample interval (e.g. '1m' or '1h')."; errs.downsampleInterval = "You must supply a downsample interval (e.g. '1m' or '1h').";
} }
......
public/app/plugins/datasource/prometheus/datasource.ts
...@@ -327,9 +327,9 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions> ...@@ -327,9 +327,9 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
const range = Math.ceil(end - start); const range = Math.ceil(end - start);
// options.interval is the dynamically calculated interval // 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 // 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) templateSrv.replace(target.interval || options.interval, options.scopedVars)
); );
const intervalFactor = target.intervalFactor || 1; const intervalFactor = target.intervalFactor || 1;
...@@ -495,7 +495,7 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions> ...@@ -495,7 +495,7 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
const scopedVars = { const scopedVars = {
__interval: { text: this.interval, value: this.interval }, __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()), ...this.getRangeScopedVars(getTimeSrv().timeRange()),
}; };
const interpolated = templateSrv.replace(query, scopedVars, this.interpolateQueryExpr); const interpolated = templateSrv.replace(query, scopedVars, this.interpolateQueryExpr);
......
public/app/plugins/panel/heatmap/heatmap_ctrl.ts
...@@ -180,9 +180,9 @@ export class HeatmapCtrl extends MetricsPanelCtrl { ...@@ -180,9 +180,9 @@ export class HeatmapCtrl extends MetricsPanelCtrl {
const xBucketSizeByNumber = Math.floor((this.range.to.valueOf() - this.range.from.valueOf()) / xBucketNumber); const xBucketSizeByNumber = Math.floor((this.range.to.valueOf() - this.range.from.valueOf()) / xBucketNumber);
// Parse X bucket size (number or interval) // 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) { if (isIntervalString) {
xBucketSize = kbn.interval_to_ms(this.panel.xBucketSize); xBucketSize = kbn.intervalToMs(this.panel.xBucketSize);
} else if ( } else if (
isNaN(Number(this.panel.xBucketSize)) || isNaN(Number(this.panel.xBucketSize)) ||
this.panel.xBucketSize === '' || this.panel.xBucketSize === '' ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment