Adding upstream version 1.43.0.upstream/1.43.0

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

1 files changed, 4 insertions, 69 deletions

diff --git a/collectors/plugins.d/plugins_d.h b/collectors/plugins.d/plugins_d.h
index 4988b5071..7c5df4168 100644
--- a/collectors/plugins.d/plugins_d.h
+++ b/collectors/plugins.d/plugins_d.h
@@ -10,47 +10,15 @@
 #define PLUGINSD_CMD_MAX (FILENAME_MAX*2)
 #define PLUGINSD_STOCK_PLUGINS_DIRECTORY_PATH 0
 
-#define PLUGINSD_KEYWORD_CHART                  "CHART"
-#define PLUGINSD_KEYWORD_CHART_DEFINITION_END   "CHART_DEFINITION_END"
-#define PLUGINSD_KEYWORD_DIMENSION              "DIMENSION"
-#define PLUGINSD_KEYWORD_BEGIN                  "BEGIN"
-#define PLUGINSD_KEYWORD_SET                    "SET"
-#define PLUGINSD_KEYWORD_END                    "END"
-#define PLUGINSD_KEYWORD_FLUSH                  "FLUSH"
-#define PLUGINSD_KEYWORD_DISABLE                "DISABLE"
-#define PLUGINSD_KEYWORD_VARIABLE               "VARIABLE"
-#define PLUGINSD_KEYWORD_LABEL                  "LABEL"
-#define PLUGINSD_KEYWORD_OVERWRITE              "OVERWRITE"
-#define PLUGINSD_KEYWORD_CLABEL                 "CLABEL"
-#define PLUGINSD_KEYWORD_CLABEL_COMMIT          "CLABEL_COMMIT"
-#define PLUGINSD_KEYWORD_FUNCTION               "FUNCTION"
-#define PLUGINSD_KEYWORD_FUNCTION_RESULT_BEGIN  "FUNCTION_RESULT_BEGIN"
-#define PLUGINSD_KEYWORD_FUNCTION_RESULT_END    "FUNCTION_RESULT_END"
-
-#define PLUGINSD_KEYWORD_REPLAY_CHART           "REPLAY_CHART"
-#define PLUGINSD_KEYWORD_REPLAY_BEGIN           "RBEGIN"
-#define PLUGINSD_KEYWORD_REPLAY_SET             "RSET"
-#define PLUGINSD_KEYWORD_REPLAY_RRDDIM_STATE    "RDSTATE"
-#define PLUGINSD_KEYWORD_REPLAY_RRDSET_STATE    "RSSTATE"
-#define PLUGINSD_KEYWORD_REPLAY_END             "REND"
-
-#define PLUGINSD_KEYWORD_BEGIN_V2               "BEGIN2"
-#define PLUGINSD_KEYWORD_SET_V2                 "SET2"
-#define PLUGINSD_KEYWORD_END_V2                 "END2"
-
-#define PLUGINSD_KEYWORD_HOST_DEFINE            "HOST_DEFINE"
-#define PLUGINSD_KEYWORD_HOST_DEFINE_END        "HOST_DEFINE_END"
-#define PLUGINSD_KEYWORD_HOST_LABEL             "HOST_LABEL"
-#define PLUGINSD_KEYWORD_HOST                   "HOST"
+#define PLUGINSD_KEYWORD_FUNCTION_PAYLOAD       "FUNCTION_PAYLOAD"
+#define PLUGINSD_KEYWORD_FUNCTION_PAYLOAD_END   "FUNCTION_PAYLOAD_END"
 
 #define PLUGINSD_KEYWORD_DYNCFG_ENABLE          "DYNCFG_ENABLE"
 #define PLUGINSD_KEYWORD_DYNCFG_REGISTER_MODULE "DYNCFG_REGISTER_MODULE"
+#define PLUGINSD_KEYWORD_DYNCFG_REGISTER_JOB    "DYNCFG_REGISTER_JOB"
 
 #define PLUGINSD_KEYWORD_REPORT_JOB_STATUS      "REPORT_JOB_STATUS"
-
-#define PLUGINSD_KEYWORD_EXIT                   "EXIT"
-
-#define PLUGINS_FUNCTIONS_TIMEOUT_DEFAULT 10 // seconds
+#define PLUGINSD_KEYWORD_DELETE_JOB             "DELETE_JOB"
 
 #define PLUGINSD_LINE_MAX_SSL_READ 512
 
@@ -99,37 +67,4 @@ void pluginsd_process_thread_cleanup(void *ptr);
 
 size_t pluginsd_initialize_plugin_directories();
 
-#define pluginsd_function_result_begin_to_buffer(wb, transaction, code, content_type, expires)      \
-    buffer_sprintf(wb                                                                               \
-                    , PLUGINSD_KEYWORD_FUNCTION_RESULT_BEGIN " \"%s\" %d \"%s\" %ld\n"              \
-                    , (transaction) ? (transaction) : ""                                            \
-                    , (int)(code)                                                                   \
-                    , (content_type) ? (content_type) : ""                                          \
-                    , (long int)(expires)                                                           \
-    )
-
-#define pluginsd_function_result_end_to_buffer(wb) \
-    buffer_strcat(wb, "\n" PLUGINSD_KEYWORD_FUNCTION_RESULT_END "\n")
-
-#define pluginsd_function_result_begin_to_stdout(transaction, code, content_type, expires)          \
-    fprintf(stdout                                                                                  \
-                    , PLUGINSD_KEYWORD_FUNCTION_RESULT_BEGIN " \"%s\" %d \"%s\" %ld\n"              \
-                    , (transaction) ? (transaction) : ""                                            \
-                    , (int)(code)                                                                   \
-                    , (content_type) ? (content_type) : ""                                          \
-                    , (long int)(expires)                                                           \
-    )
-
-#define pluginsd_function_result_end_to_stdout() \
-    fprintf(stdout, "\n" PLUGINSD_KEYWORD_FUNCTION_RESULT_END "\n")
-
-static inline void pluginsd_function_json_error(const char *transaction, int code, const char *msg) {
-    char buffer[PLUGINSD_LINE_MAX + 1];
-    json_escape_string(buffer, msg, PLUGINSD_LINE_MAX);
-
-    pluginsd_function_result_begin_to_stdout(transaction, code, "application/json", now_realtime_sec());
-    fprintf(stdout, "{\"status\":%d,\"error_message\":\"%s\"}", code, buffer);
-    pluginsd_function_result_end_to_stdout();
-}
-
 #endif /* NETDATA_PLUGINS_D_H */