Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).

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

1 files changed, 4 insertions, 6 deletions

diff --git a/src/database/rrdfunctions.h b/src/database/rrdfunctions.h
index d3c7f0e13..69c6c703c 100644
--- a/src/database/rrdfunctions.h
+++ b/src/database/rrdfunctions.h
@@ -7,6 +7,8 @@
 #include "libnetdata/libnetdata.h"
 
 #define RRDFUNCTIONS_PRIORITY_DEFAULT 100
+#define RRDFUNCTIONS_VERSION_DEFAULT 0
+#define RRDFUNCTIONS_TAG_HIDDEN "hidden"
 
 #define RRDFUNCTIONS_TIMEOUT_EXTENSION_UT (1 * USEC_PER_SEC)
 
@@ -66,7 +68,7 @@ void rrd_functions_host_init(RRDHOST *host);
 void rrd_functions_host_destroy(RRDHOST *host);
 
 // add a function, to be run from the collector
-void rrd_function_add(RRDHOST *host, RRDSET *st, const char *name, int timeout, int priority, const char *help, const char *tags,
+void rrd_function_add(RRDHOST *host, RRDSET *st, const char *name, int timeout, int priority, uint32_t version, const char *help, const char *tags,
                       HTTP_ACCESS access, bool sync, rrd_function_execute_cb_t execute_cb,
                       void *execute_cb_data);
 
@@ -79,9 +81,7 @@ int rrd_function_run(RRDHOST *host, BUFFER *result_wb, int timeout_s,
                      rrd_function_result_callback_t result_cb, void *result_cb_data,
                      rrd_function_progress_cb_t progress_cb, void *progress_cb_data,
                      rrd_function_is_cancelled_cb_t is_cancelled_cb, void *is_cancelled_cb_data,
-                     BUFFER *payload, const char *source);
-
-int rrd_call_function_error(BUFFER *wb, const char *msg, int code);
+                     BUFFER *payload, const char *source, bool allow_restricted);
 
 bool rrd_function_available(RRDHOST *host, const char *function);
 
@@ -90,7 +90,5 @@ bool rrd_function_has_this_original_result_callback(nd_uuid_t *transaction, rrd_
 #include "rrdfunctions-inline.h"
 #include "rrdfunctions-inflight.h"
 #include "rrdfunctions-exporters.h"
-#include "rrdfunctions-streaming.h"
-#include "rrdfunctions-progress.h"
 
 #endif // NETDATA_RRDFUNCTIONS_H