Merging upstream version 1.39.0.

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

1 files changed, 19 insertions, 23 deletions

diff --git a/ml/ml.h b/ml/ml.h
index 8bed627f5..964dd0821 100644
--- a/ml/ml.h
+++ b/ml/ml.h
@@ -10,39 +10,35 @@ extern "C" {
 #include "daemon/common.h"
 #include "web/api/queries/rrdr.h"
 
-// This is a DBEngine function redeclared here so that we can free
-// the anomaly rate dimension, whenever its backing dimension is freed.
-void rrddim_free(RRDSET *st, RRDDIM *rd);
-
 bool ml_capable();
-
-bool ml_enabled(RRDHOST *RH);
+bool ml_enabled(RRDHOST *rh);
+bool ml_streaming_enabled();
 
 void ml_init(void);
+void ml_fini(void);
 
-void ml_host_new(RRDHOST *RH);
-void ml_host_delete(RRDHOST *RH);
+void ml_start_threads(void);
+void ml_stop_threads(void);
 
-void ml_chart_new(RRDSET *RS);
-void ml_chart_delete(RRDSET *RS);
+void ml_host_new(RRDHOST *rh);
+void ml_host_delete(RRDHOST *rh);
 
-void ml_dimension_new(RRDDIM *RD);
-void ml_dimension_delete(RRDDIM *RD);
+void ml_host_get_info(RRDHOST *RH, BUFFER *wb);
+void ml_host_get_detection_info(RRDHOST *RH, BUFFER *wb);
+void ml_host_get_models(RRDHOST *RH, BUFFER *wb);
 
-void ml_start_anomaly_detection_threads(RRDHOST *RH);
-void ml_stop_anomaly_detection_threads(RRDHOST *RH);
-void ml_cancel_anomaly_detection_threads(RRDHOST *RH);
+void ml_chart_new(RRDSET *rs);
+void ml_chart_delete(RRDSET *rs);
+bool ml_chart_update_begin(RRDSET *rs);
+void ml_chart_update_end(RRDSET *rs);
 
-char *ml_get_host_info(RRDHOST *RH);
-char *ml_get_host_runtime_info(RRDHOST *RH);
-char *ml_get_host_models(RRDHOST *RH);
+void ml_dimension_new(RRDDIM *rd);
+void ml_dimension_delete(RRDDIM *rd);
+bool ml_dimension_is_anomalous(RRDDIM *rd, time_t curr_time, double value, bool exists);
 
-void ml_chart_update_begin(RRDSET *RS);
-void ml_chart_update_end(RRDSET *RS);
+int ml_dimension_load_models(RRDDIM *rd);
 
-bool ml_is_anomalous(RRDDIM *RD, time_t curr_t, double value, bool exists);
-
-bool ml_streaming_enabled();
+void ml_update_global_statistics_charts(uint64_t models_consulted);
 
 #ifdef __cplusplus
 };