From aef1c8363d7c5b4f4e665d0e49281d6b93764c54 Mon Sep 17 00:00:00 2001 From: Dmitry Nalobin Date: Wed, 30 Sep 2020 19:29:30 +0400 Subject: [PATCH] Change grafana-datasource-kit library to tsdb-kit (#932) --- server/package.json | 2 +- server/spec/analytic_controller.jest.ts | 6 +++--- server/spec/utils_for_tests/analytic_units.ts | 2 +- server/src/controllers/analytics_controller.ts | 4 ++-- server/src/models/analytic_units/analytic_unit_model.ts | 2 +- .../models/analytic_units/anomaly_analytic_unit_model.ts | 2 +- server/src/models/analytic_units/db.ts | 2 +- .../models/analytic_units/pattern_analytic_unit_model.ts | 2 +- .../models/analytic_units/threshold_analytic_unit_model.ts | 2 +- server/src/models/analytic_units/types.ts | 2 +- server/src/services/data_puller.ts | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/server/package.json b/server/package.json index f6ac75a..dd4a73c 100644 --- a/server/package.json +++ b/server/package.json @@ -20,6 +20,7 @@ "homepage": "https://github.com/hastic/hastic-server#readme", "dependencies": {}, "devDependencies": { + "@corpglory/tsdb-kit": "^1.1.1", "@types/deasync": "^0.1.0", "@types/jest": "^23.3.14", "@types/koa": "^2.0.46", @@ -41,7 +42,6 @@ "event-stream": "3.3.4", "file-loader": "^1.1.11", "git-revision-webpack-plugin": "^3.0.4", - "grafana-datasource-kit": "0.1.17", "jest": "^23.1.1", "koa": "^2.0.46", "koa-bodyparser": "^4.2.0", diff --git a/server/spec/analytic_controller.jest.ts b/server/spec/analytic_controller.jest.ts index 2f4ae9f..77f82eb 100644 --- a/server/spec/analytic_controller.jest.ts +++ b/server/spec/analytic_controller.jest.ts @@ -1,8 +1,8 @@ -import { queryByMetric } from 'grafana-datasource-kit'; +import { queryByMetric } from '@corpglory/tsdb-kit'; -jest.mock('grafana-datasource-kit', () => ( +jest.mock('@corpglory/tsdb-kit', () => ( { - ...(jest.requireActual('grafana-datasource-kit')), + ...(jest.requireActual('@corpglory/tsdb-kit')), queryByMetric: jest.fn((metric, url, from, to, apiKey) => { return { values:[], columns:[] } }) diff --git a/server/spec/utils_for_tests/analytic_units.ts b/server/spec/utils_for_tests/analytic_units.ts index 9c20c97..32d2537 100644 --- a/server/spec/utils_for_tests/analytic_units.ts +++ b/server/spec/utils_for_tests/analytic_units.ts @@ -2,7 +2,7 @@ import * as AnalyticUnit from '../../src/models/analytic_units'; import * as AnalyticUnitCache from '../../src/models/analytic_unit_cache_model'; -import { Metric } from 'grafana-datasource-kit'; +import { Metric } from '@corpglory/tsdb-kit'; import * as _ from 'lodash'; diff --git a/server/src/controllers/analytics_controller.ts b/server/src/controllers/analytics_controller.ts index e279fa9..a34ab3c 100644 --- a/server/src/controllers/analytics_controller.ts +++ b/server/src/controllers/analytics_controller.ts @@ -12,7 +12,7 @@ import { DataPuller } from '../services/data_puller'; import { getGrafanaUrl } from '../utils/grafana'; import { cutSegmentWithSegments } from '../utils/segments'; -import { queryByMetric, GrafanaUnavailable, DatasourceUnavailable } from 'grafana-datasource-kit'; +import { queryByMetric, GrafanaUnavailable, DatasourceUnavailable } from '@corpglory/tsdb-kit'; import * as _ from 'lodash'; @@ -20,7 +20,7 @@ const SECONDS_IN_MINUTE = 60; type TaskResult = any; type DetectionResult = any; -// TODO: move TableTimeSeries to grafana-datasource-kit +// TODO: move TableTimeSeries to @corpglory/tsdb-kit // TODO: TableTimeSeries is bad name type TableTimeSeries = { values: [number, number][], columns: string[] }; // TODO: move type definitions somewhere diff --git a/server/src/models/analytic_units/analytic_unit_model.ts b/server/src/models/analytic_units/analytic_unit_model.ts index 1e68d92..ece5fdb 100644 --- a/server/src/models/analytic_units/analytic_unit_model.ts +++ b/server/src/models/analytic_units/analytic_unit_model.ts @@ -2,7 +2,7 @@ import { AnalyticUnitId, AnalyticUnitStatus, DetectorType } from './types'; -import { Metric } from 'grafana-datasource-kit'; +import { Metric } from '@corpglory/tsdb-kit'; import * as _ from 'lodash'; diff --git a/server/src/models/analytic_units/anomaly_analytic_unit_model.ts b/server/src/models/analytic_units/anomaly_analytic_unit_model.ts index 0802f5c..98abbd1 100644 --- a/server/src/models/analytic_units/anomaly_analytic_unit_model.ts +++ b/server/src/models/analytic_units/anomaly_analytic_unit_model.ts @@ -1,7 +1,7 @@ import { AnalyticUnit } from './analytic_unit_model'; import { AnalyticUnitId, AnalyticUnitStatus, DetectorType } from './types'; -import { Metric } from 'grafana-datasource-kit'; +import { Metric } from '@corpglory/tsdb-kit'; type SeasonalityPeriod = { unit: string, diff --git a/server/src/models/analytic_units/db.ts b/server/src/models/analytic_units/db.ts index bac07f4..65d5bde 100644 --- a/server/src/models/analytic_units/db.ts +++ b/server/src/models/analytic_units/db.ts @@ -4,7 +4,7 @@ import { AnalyticUnitId, FindManyQuery } from './types'; import { Collection } from '../../services/data_service/collection'; import { DataService, SortingOrder } from '../../services/data_service'; -import { Metric } from 'grafana-datasource-kit'; +import { Metric } from '@corpglory/tsdb-kit'; import * as _ from 'lodash'; diff --git a/server/src/models/analytic_units/pattern_analytic_unit_model.ts b/server/src/models/analytic_units/pattern_analytic_unit_model.ts index 56f74ed..dcddc6f 100644 --- a/server/src/models/analytic_units/pattern_analytic_unit_model.ts +++ b/server/src/models/analytic_units/pattern_analytic_unit_model.ts @@ -1,7 +1,7 @@ import { AnalyticUnit } from './analytic_unit_model'; import { AnalyticUnitId, AnalyticUnitStatus, DetectorType } from './types'; -import { Metric } from 'grafana-datasource-kit'; +import { Metric } from '@corpglory/tsdb-kit'; export class PatternAnalyticUnit extends AnalyticUnit { diff --git a/server/src/models/analytic_units/threshold_analytic_unit_model.ts b/server/src/models/analytic_units/threshold_analytic_unit_model.ts index d5a830a..9dca135 100644 --- a/server/src/models/analytic_units/threshold_analytic_unit_model.ts +++ b/server/src/models/analytic_units/threshold_analytic_unit_model.ts @@ -1,7 +1,7 @@ import { AnalyticUnit } from './analytic_unit_model'; import { AnalyticUnitId, AnalyticUnitStatus, DetectorType } from './types'; -import { Metric } from 'grafana-datasource-kit'; +import { Metric } from '@corpglory/tsdb-kit'; export enum Condition { diff --git a/server/src/models/analytic_units/types.ts b/server/src/models/analytic_units/types.ts index e95eaa9..d66c629 100644 --- a/server/src/models/analytic_units/types.ts +++ b/server/src/models/analytic_units/types.ts @@ -1,4 +1,4 @@ -import { Metric } from 'grafana-datasource-kit'; +import { Metric } from '@corpglory/tsdb-kit'; export type AnalyticUnitId = string; diff --git a/server/src/services/data_puller.ts b/server/src/services/data_puller.ts index 0b00f3d..43a56df 100644 --- a/server/src/services/data_puller.ts +++ b/server/src/services/data_puller.ts @@ -7,7 +7,7 @@ import { availableReporter } from '../utils/reporter'; import { AlertService } from './alert_service'; import { getGrafanaUrl } from '../utils/grafana'; -import { queryByMetric, GrafanaUnavailable, DatasourceUnavailable } from 'grafana-datasource-kit'; +import { queryByMetric, GrafanaUnavailable, DatasourceUnavailable } from '@corpglory/tsdb-kit'; import * as _ from 'lodash';