Anomaly detector detection re running in inspect mode #757

server/spec/analytic_controller.jest.ts

@@ -7,7 +7,7 @@ jest.mock('grafana-datasource-kit', () => (
   }
 ));
 
-import { saveAnalyticUnitFromObject, runDetect, onDetect } from '../src/controllers/analytics_controller';
+import { saveAnalyticUnitFromObject, runDetect, onDetect, getHSR } from '../src/controllers/analytics_controller';
 import * as AnalyticUnit from '../src/models/analytic_units';
 import * as AnalyticUnitCache from '../src/models/analytic_unit_cache_model';
 import * as Segment from '../src/models/segment_model';
@@ -16,71 +16,69 @@ import { buildSegments, clearSegmentsDB, convertSegmentsToTimeRanges } from './u
 
 import { HASTIC_API_KEY } from '../src/config';
 
-
-describe('Check detection range', function() {
-  const analyticUnitObj = {
-    _id: 'test',
-    name: "test",
-    grafanaUrl: "http://127.0.0.1:3000",
-    panelId: "ZLc0KfNZk/2",
-    type: "GENERAL",
-    metric: {
-      datasource: {
-        url: "api/datasources/proxy/5/query",
-        method: "GET",
-        data: null,
-        params: {
-          db:"dbname",
-          q: "SELECT mean(\"value\") FROM \"autogen\".\"tcpconns_value\" WHERE time >= now() - 6h GROUP BY time(20s) fill(null)",
-          epoch: "ms"
-        },
-        type: "influxdb"
+const analyticUnitObj = {
+  name: "test",
+  grafanaUrl: "http://127.0.0.1:3000",
+  panelId: "ZLc0KfNZk/2",
+  type: "GENERAL",
+  metric: {
+    datasource: {
+      url: "api/datasources/proxy/5/query",
+      method: "GET",
+      data: null,
+      params: {
+        db:"dbname",
+        q: "SELECT mean(\"value\") FROM \"autogen\".\"tcpconns_value\" WHERE time >= now() - 6h GROUP BY time(20s) fill(null)",
+        epoch: "ms"
       },
-      targets: [
-        {
-          groupBy: [
-            {
-              params: ["$__interval"],
-              type: "time"
-            },
-            {
-              params: ["null"],
-              type: "fill"
-            }
-          ],
-          measurement: "tcpconns_value",
-          orderByTime: "ASC",
-          policy: "autogen",
-          refId: "A",
-          resultFormat: "time_series",
-          select: [[{"params":["value"],"type":"field"},{"params":[],"type":"mean"}]],"tags":[]
-        }
-      ]
+      type: "influxdb"
     },
-    alert: false,
-    labeledColor: "#FF99FF",
-    deletedColor: "#00f0ff",
-    detectorType: "pattern",
-    visible: true,
-    collapsed: false,
-    createdAt: {"$$date":1564476040880},
-    updatedAt: {"$$date":1564476040880}
-  }
-
-  const WINDOW_SIZE = 10;
-  const TIME_STEP = 1000;
-
-  async function addTestUnitToDB(): Promise<string> {
-    const analyticUnitId = await saveAnalyticUnitFromObject(analyticUnitObj);
-    await AnalyticUnit.update(analyticUnitId, {lastDetectionTime: 1000});
-    await AnalyticUnitCache.create(analyticUnitId);
-    await AnalyticUnitCache.setData(analyticUnitId, {
-      windowSize: WINDOW_SIZE,
-      timeStep: TIME_STEP
-    });
-    return analyticUnitId;
-  };
+    targets: [
+      {
+        groupBy: [
+          {
+            params: ["$__interval"],
+            type: "time"
+          },
+          {
+            params: ["null"],
+            type: "fill"
+          }
+        ],
+        measurement: "tcpconns_value",
+        orderByTime: "ASC",
+        policy: "autogen",
+        refId: "A",
+        resultFormat: "time_series",
+        select: [[{"params":["value"],"type":"field"},{"params":[],"type":"mean"}]],"tags":[]
+      }
+    ]
+  },
+  alert: false,
+  labeledColor: "#FF99FF",
+  deletedColor: "#00f0ff",
+  detectorType: "pattern",
+  visible: true,
+  collapsed: false,
+  createdAt: {"$$date":1564476040880},
+  updatedAt: {"$$date":1564476040880}
+}
+
+const WINDOW_SIZE = 10;
+const TIME_STEP = 1000;
+
+async function addTestUnitToDB(): Promise<string> {
+  const analyticUnitId = await saveAnalyticUnitFromObject(analyticUnitObj);
+  await AnalyticUnit.update(analyticUnitId, {lastDetectionTime: 1000});
+  await AnalyticUnitCache.create(analyticUnitId);
+  await AnalyticUnitCache.setData(analyticUnitId, {
+    windowSize: WINDOW_SIZE,
+    timeStep: TIME_STEP
+  });
+  return analyticUnitId;
+};
 
+describe('Check detection range', function() {
   it('check range >= 2 * window size * timeStep', async () => {
     const from = 1500000000000;
     const to = 1500000000001;
@@ -136,3 +134,12 @@ describe('onDetect', () => {
     expect(detectedRanges).toEqual([[7, 8]]);
   });
 });
+
+describe('getHSR', function() {
+  it('should return nothink if unit state is LEARNING', async () => {
+    const analyticUnitId = await addTestUnitToDB()
+    const unit = await AnalyticUnit.findById(analyticUnitId);
+    const result = await getHSR(unit, 9000, 100000);
+    expect(result.hsr).toBe(undefined);
+  });
+});

server/src/controllers/analytics_controller.ts

@@ -644,7 +644,7 @@ export async function getHSR(
   hsr: TableTimeSeries,
   lowerBound?: TableTimeSeries,
   upperBound?: TableTimeSeries
-}> {
+} | undefined> {
   try {
     const grafanaUrl = getGrafanaUrl(analyticUnit.grafanaUrl);
     const data = await queryByMetric(analyticUnit.metric, grafanaUrl, from, to, HASTIC_API_KEY);
@@ -657,7 +657,11 @@ export async function getHSR(
     }
 
     let cache = await AnalyticUnitCache.findById(analyticUnit.id);
-    if(cache === null || cache.isCacheOutdated(analyticUnit)) {
+
+    if(cache === null || cache.data === null) {
+      if(analyticUnit.status === AnalyticUnit.AnalyticUnitStatus.LEARNING) {
+        return; // because we wait end of learning
+      }
       await runLearning(analyticUnit.id, from, to);
       cache = await AnalyticUnitCache.findById(analyticUnit.id);
     }

server/src/models/analytic_unit_cache_model.ts

@@ -52,12 +52,6 @@ export class AnalyticUnitCache {
   public getTimeStep(): number {
     return this.data.timeStep;
   }
-
-  public isCacheOutdated(analyticUnit: AnalyticUnit) {
-    return !_.every(
-      _.keys(analyticUnit.analyticProps).map(k => _.isEqual(analyticUnit.analyticProps[k], this.data[k]))
-    );
-  }
 }
 
 export async function findById(id: AnalyticUnitId): Promise<AnalyticUnitCache> {