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

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

1 files changed, 20 insertions, 2 deletions

diff --git a/src/web/api/web_api.h b/src/web/api/web_api.h
index 634e59657..cb694a33d 100644
--- a/src/web/api/web_api.h
+++ b/src/web/api/web_api.h
@@ -3,14 +3,28 @@
 #ifndef NETDATA_WEB_API_H
 #define NETDATA_WEB_API_H 1
 
+#define ENABLE_API_V1 1
+#define ENABLE_API_v2 1
+
+struct web_client;
+
 #include "daemon/common.h"
+#include "maps/maps.h"
+#include "functions/functions.h"
+
 #include "web/api/http_header.h"
 #include "web/api/http_auth.h"
-#include "web/api/badges/web_buffer_svg.h"
-#include "web/api/ilove/ilove.h"
 #include "web/api/formatters/rrd2json.h"
 #include "web/api/queries/weights.h"
 
+void nd_web_api_init(void);
+
+bool request_source_is_cloud(const char *source);
+void web_client_api_request_vX_source_to_buffer(struct web_client *w, BUFFER *source);
+void web_client_progress_functions_update(void *data, size_t done, size_t all);
+
+void host_labels2json(RRDHOST *host, BUFFER *wb, const char *key);
+
 struct web_api_command {
     const char *api;
     uint32_t hash;
@@ -37,7 +51,11 @@ int web_client_api_request_weights(RRDHOST *host, struct web_client *w, char *ur
 
 bool web_client_interrupt_callback(void *data);
 
+char *format_value_and_unit(char *value_string, size_t value_string_len,
+                            NETDATA_DOUBLE value, const char *units, int precision);
+
 #include "web_api_v1.h"
 #include "web_api_v2.h"
+#include "web_api_v3.h"
 
 #endif //NETDATA_WEB_API_H