Merging upstream version 1.37.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 7 deletions

diff --git a/ml/Config.h b/ml/Config.h
index 595fd072b..d876d4aa4 100644
--- a/ml/Config.h
+++ b/ml/Config.h
@@ -14,6 +14,7 @@ public:
     unsigned MaxTrainSamples;
     unsigned MinTrainSamples;
     unsigned TrainEvery;
+    unsigned NumModelsToUse;
 
     unsigned DBEngineAnomalyRateEvery;
 
@@ -25,13 +26,10 @@ public:
     unsigned MaxKMeansIters;
 
     double DimensionAnomalyScoreThreshold;
-    double HostAnomalyRateThreshold;
 
-    double ADMinWindowSize;
-    double ADMaxWindowSize;
-    double ADIdleWindowSize;
-    double ADWindowRateThreshold;
-    double ADDimensionRateThreshold;
+    double HostAnomalyRateThreshold;
+    RRDR_GROUPING AnomalyDetectionGroupingMethod;
+    time_t AnomalyDetectionQueryDuration;
 
     bool StreamADCharts;
 
@@ -41,7 +39,6 @@ public:
     std::string ChartsToSkip;
     SIMPLE_PATTERN *SP_ChartsToSkip;
 
-    std::string AnomalyDBPath;
     std::vector<uint32_t> RandomNums;
 
     void readMLConfig();