Adding upstream version 1.39.0.upstream/1.39.0

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

1 files changed, 40 insertions, 5 deletions

diff --git a/web/api/queries/weights.h b/web/api/queries/weights.h
index 50d8634e..66bea6ab 100644
--- a/web/api/queries/weights.h
+++ b/web/api/queries/weights.h
@@ -9,22 +9,57 @@ typedef enum {
     WEIGHTS_METHOD_MC_KS2       = 1,
     WEIGHTS_METHOD_MC_VOLUME    = 2,
     WEIGHTS_METHOD_ANOMALY_RATE = 3,
+    WEIGHTS_METHOD_VALUE        = 4,
 } WEIGHTS_METHOD;
 
 typedef enum {
     WEIGHTS_FORMAT_CHARTS    = 1,
     WEIGHTS_FORMAT_CONTEXTS  = 2,
+    WEIGHTS_FORMAT_MULTINODE = 3,
 } WEIGHTS_FORMAT;
 
 extern int enable_metric_correlations;
 extern int metric_correlations_version;
 extern WEIGHTS_METHOD default_metric_correlations_method;
 
-int web_api_v1_weights (RRDHOST *host, BUFFER *wb, WEIGHTS_METHOD method, WEIGHTS_FORMAT format,
-                               RRDR_GROUPING group, const char *group_options,
-                               time_t baseline_after, time_t baseline_before,
-                               time_t after, time_t before,
-                               size_t points, RRDR_OPTIONS options, SIMPLE_PATTERN *contexts, size_t tier, size_t timeout);
+typedef bool (*weights_interrupt_callback_t)(void *data);
+
+typedef struct query_weights_request {
+    size_t version;
+    RRDHOST *host;
+    const char *scope_nodes;
+    const char *scope_contexts;
+    const char *nodes;
+    const char *contexts;
+    const char *instances;
+    const char *dimensions;
+    const char *labels;
+    const char *alerts;
+
+    struct {
+        RRDR_GROUP_BY group_by;
+        char *group_by_label;
+        RRDR_GROUP_BY_FUNCTION aggregation;
+    } group_by;
+
+    WEIGHTS_METHOD method;
+    WEIGHTS_FORMAT format;
+    RRDR_TIME_GROUPING time_group_method;
+    const char *time_group_options;
+    time_t baseline_after;
+    time_t baseline_before;
+    time_t after;
+    time_t before;
+    size_t points;
+    RRDR_OPTIONS options;
+    size_t tier;
+    time_t timeout_ms;
+
+    weights_interrupt_callback_t interrupt_callback;
+    void *interrupt_callback_data;
+} QUERY_WEIGHTS_REQUEST;
+
+int web_api_v12_weights(BUFFER *wb, QUERY_WEIGHTS_REQUEST *qwr);
 
 WEIGHTS_METHOD weights_string_to_method(const char *method);
 const char *weights_method_to_string(WEIGHTS_METHOD method);