diff options
88 files changed, 211 insertions, 5248 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9a8dc05d26..389da1dbed 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -8,11 +8,6 @@ .travis/ @Ferroin @iigorkarpov @maneamarius @kaskavel .github/ @Ferroin @iigorkarpov @maneamarius @kaskavel aclk/ @stelfrag @underhood -backends/ @thiagoftsm @vlvkobal -backends/graphite/ @thiagoftsm @vlvkobal -backends/json/ @thiagoftsm @vlvkobal -backends/opentsdb/ @thiagoftsm @vlvkobal -backends/prometheus/ @vlvkobal @thiagoftsm build/ @Ferroin @iigorkarpov @maneamarius contrib/debian @Ferroin @iigorkarpov @maneamarius collectors/ @vlvkobal diff --git a/.github/labeler.yml b/.github/labeler.yml index 5ad4cf595c..950e94834b 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -15,10 +15,6 @@ ACLK: - aclk/**/* - mqtt_websockets -area/backends: - - backends/* - - backends/**/* - area/claim: - claim/* diff --git a/CMakeLists.txt b/CMakeLists.txt index f8705f2ed8..a10801cc5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -745,19 +745,6 @@ set(STREAMING_PLUGIN_FILES streaming/sender.c ) -set(BACKENDS_PLUGIN_FILES - backends/backends.c - backends/backends.h - backends/graphite/graphite.c - backends/graphite/graphite.h - backends/json/json.c - backends/json/json.h - backends/opentsdb/opentsdb.c - backends/opentsdb/opentsdb.h - backends/prometheus/backend_prometheus.c - backends/prometheus/backend_prometheus.h - ) - set(CLAIM_PLUGIN_FILES claim/claim.c claim/claim.h @@ -884,23 +871,6 @@ set(MONGODB_EXPORTING_FILES exporting/mongodb/mongodb.h ) -set(KINESIS_BACKEND_FILES - backends/aws_kinesis/aws_kinesis.c - backends/aws_kinesis/aws_kinesis.h - backends/aws_kinesis/aws_kinesis_put_record.cc - backends/aws_kinesis/aws_kinesis_put_record.h - ) - -set(PROMETHEUS_REMOTE_WRITE_BACKEND_FILES - backends/prometheus/remote_write/remote_write.cc - backends/prometheus/remote_write/remote_write.h - ) - -set(MONGODB_BACKEND_FILES - backends/mongodb/mongodb.c - backends/mongodb/mongodb.h - ) - set(DAEMON_FILES daemon/buildinfo.c daemon/buildinfo.h @@ -960,7 +930,6 @@ set(NETDATA_FILES collectors/all.h ${DAEMON_FILES} ${API_PLUGIN_FILES} - ${BACKENDS_PLUGIN_FILES} ${EXPORTING_ENGINE_FILES} ${CHECKS_PLUGIN_FILES} ${HEALTH_PLUGIN_FILES} @@ -997,25 +966,25 @@ add_definitions( ) # ----------------------------------------------------------------------------- -# kinesis backend +# kinesis exporting connector IF(KINESIS_LIBRARIES AND AWS_CORE_LIBRARIES AND HAVE_AWS_EVENT_STREAM AND HAVE_AWS_COMMON AND HAVE_AWS_CHECKSUMS AND CRYPTO_LIBRARIES AND SSL_LIBRARIES AND CURL_LIBRARIES) - SET(ENABLE_BACKEND_KINESIS True) + SET(ENABLE_EXPORTING_KINESIS True) ELSE() - SET(ENABLE_BACKEND_KINESIS False) + SET(ENABLE_EXPORTING_KINESIS False) ENDIF() -IF(ENABLE_BACKEND_KINESIS) - message(STATUS "kinesis backend: enabled") - list(APPEND NETDATA_FILES ${KINESIS_BACKEND_FILES} ${KINESIS_EXPORTING_FILES}) +IF(ENABLE_EXPORTING_KINESIS) + message(STATUS "kinesis exporting: enabled") + list(APPEND NETDATA_FILES ${KINESIS_EXPORTING_FILES}) list(APPEND NETDATA_COMMON_LIBRARIES ${KINESIS_LIBRARIES} ${AWS_CORE_LIBRARIES} ${CRYPTO_LIBRARIES} ${SSL_LIBRARIES} ${CURL_LIBRARIES}) list(APPEND NETDATA_COMMON_INCLUDE_DIRS ${KINESIS_INCLUDE_DIRS} ${AWS_CORE_INCLUDE_DIRS} ${CRYPTO_INCLUDE_DIRS} ${SSL_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS}) list(APPEND NETDATA_COMMON_CFLAGS ${CRYPTO_CFLAGS_OTHER} ${SSL_CFLAGS_OTHER} ${CURL_CFLAGS_OTHER}) ELSE() - message(STATUS "kinesis backend: disabled (requires AWS SDK for C++)") + message(STATUS "kinesis exporting: disabled (requires AWS SDK for C++)") ENDIF() # ----------------------------------------------------------------------------- @@ -1038,16 +1007,16 @@ ELSE() ENDIF() # ----------------------------------------------------------------------------- -# prometheus remote write backend +# prometheus remote write exporting connector IF(PROTOBUF_LIBRARIES AND SNAPPY_LIBRARIES) - SET(ENABLE_BACKEND_PROMETHEUS_REMOTE_WRITE True) + SET(ENABLE_EXPORTING_PROMETHEUS_REMOTE_WRITE True) ELSE() - SET(ENABLE_BACKEND_PROMETHEUS_REMOTE_WRITE False) + SET(ENABLE_EXPORTING_PROMETHEUS_REMOTE_WRITE False) ENDIF() -IF(ENABLE_BACKEND_PROMETHEUS_REMOTE_WRITE) - message(STATUS "prometheus remote write backend: enabled") +IF(ENABLE_EXPORTING_PROMETHEUS_REMOTE_WRITE) + message(STATUS "prometheus remote write exporting: enabled") find_package(Protobuf REQUIRED) @@ -1083,26 +1052,26 @@ IF(ENABLE_BACKEND_PROMETHEUS_REMOTE_WRITE) protobuf_remote_write_generate_cpp(PROTO_SRCS PROTO_HDRS exporting/prometheus/remote_write/remote_write.proto) - list(APPEND NETDATA_FILES ${PROMETHEUS_REMOTE_WRITE_BACKEND_FILES} ${PROMETHEUS_REMOTE_WRITE_EXPORTING_FILES} ${PROTO_SRCS} ${PROTO_HDRS}) + list(APPEND NETDATA_FILES ${PROMETHEUS_REMOTE_WRITE_EXPORTING_FILES} ${PROTO_SRCS} ${PROTO_HDRS}) list(APPEND NETDATA_COMMON_LIBRARIES ${PROTOBUF_LIBRARIES} ${SNAPPY_LIBRARIES}) list(APPEND NETDATA_COMMON_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS} ${SNAPPY_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) list(APPEND NETDATA_COMMON_CFLAGS ${PROTOBUF_CFLAGS_OTHER} ${SNAPPY_CFLAGS_OTHER}) ELSE() - message(STATUS "prometheus remote write backend: disabled (requires protobuf and snappy libraries)") + message(STATUS "prometheus remote write exporting: disabled (requires protobuf and snappy libraries)") ENDIF() # ----------------------------------------------------------------------------- -# mongodb backend +# mongodb exporting connector IF(MONGOC_LIBRARIES) - message(STATUS "mongodb backend: enabled") + message(STATUS "mongodb exporting: enabled") - list(APPEND NETDATA_FILES ${MONGODB_BACKEND_FILES} ${MONGODB_EXPORTING_FILES}) + list(APPEND NETDATA_FILES ${MONGODB_EXPORTING_FILES}) list(APPEND NETDATA_COMMON_LIBRARIES ${MONGOC_LIBRARIES}) list(APPEND NETDATA_COMMON_INCLUDE_DIRS ${MONGOC_INCLUDE_DIRS}) list(APPEND NETDATA_COMMON_CFLAGS ${MONGOC_CFLAGS_OTHER}) ELSE() - message(STATUS "mongodb backend: disabled (requires mongoc library)") + message(STATUS "mongodb exporting: disabled (requires mongoc library)") ENDIF() set(NETDATA_COMMON_LIBRARIES ${NETDATA_COMMON_LIBRARIES} m ${CMAKE_THREAD_LIBS_INIT}) @@ -1223,7 +1192,7 @@ ELSEIF(MACOS) ENDIF() -IF(ENABLE_BACKEND_KINESIS OR ENABLE_EXPORTING_PUBSUB OR ENABLE_BACKEND_PROMETHEUS_REMOTE_WRITE) +IF(ENABLE_EXPORTING_KINESIS OR ENABLE_EXPORTING_PUBSUB OR ENABLE_EXPORTING_PROMETHEUS_REMOTE_WRITE) set_property(TARGET netdata PROPERTY CXX_STANDARD 11) set_property(TARGET netdata PROPERTY CMAKE_CXX_STANDARD_REQUIRED ON) ENDIF() @@ -1397,7 +1366,7 @@ if(BUILD_TESTING) set(KINESIS_LINK_OPTIONS) set(PUBSUB_LINK_OPTIONS) set(MONGODB_LINK_OPTIONS) -if(ENABLE_BACKEND_PROMETHEUS_REMOTE_WRITE) +if(ENABLE_EXPORTING_PROMETHEUS_REMOTE_WRITE) list(APPEND EXPORTING_ENGINE_FILES ${PROMETHEUS_REMOTE_WRITE_EXPORTING_FILES} ${PROTO_SRCS} ${PROTO_HDRS}) list( APPEND PROMETHEUS_REMOTE_WRITE_LINK_OPTIONS @@ -1407,7 +1376,7 @@ if(ENABLE_BACKEND_PROMETHEUS_REMOTE_WRITE) -Wl,--wrap=add_metric ) endif() -if(ENABLE_BACKEND_KINESIS) +if(ENABLE_EXPORTING_KINESIS) list(APPEND EXPORTING_ENGINE_FILES ${KINESIS_EXPORTING_FILES}) list( APPEND KINESIS_LINK_OPTIONS diff --git a/Makefile.am b/Makefile.am index c3160bf78d..808b7015d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -99,7 +99,6 @@ dist_noinst_SCRIPTS = \ # Compile netdata binaries SUBDIRS += \ - backends \ collectors \ daemon \ database \ @@ -580,19 +579,6 @@ WEB_PLUGIN_FILES = \ web/server/static/static-threaded.h \ $(NULL) -BACKENDS_PLUGIN_FILES = \ - backends/backends.c \ - backends/backends.h \ - backends/graphite/graphite.c \ - backends/graphite/graphite.h \ - backends/json/json.c \ - backends/json/json.h \ - backends/opentsdb/opentsdb.c \ - backends/opentsdb/opentsdb.h \ - backends/prometheus/backend_prometheus.c \ - backends/prometheus/backend_prometheus.h \ - $(NULL) - CLAIM_FILES = \ claim/claim.c \ claim/claim.h \ @@ -831,23 +817,6 @@ MONGODB_EXPORTING_FILES = \ exporting/mongodb/mongodb.h \ $(NULL) -KINESIS_BACKEND_FILES = \ - backends/aws_kinesis/aws_kinesis.c \ - backends/aws_kinesis/aws_kinesis.h \ - backends/aws_kinesis/aws_kinesis_put_record.cc \ - backends/aws_kinesis/aws_kinesis_put_record.h \ - $(NULL) - -PROMETHEUS_REMOTE_WRITE_BACKEND_FILES = \ - backends/prometheus/remote_write/remote_write.cc \ - backends/prometheus/remote_write/remote_write.h \ - $(NULL) - -MONGODB_BACKEND_FILES = \ - backends/mongodb/mongodb.c \ - backends/mongodb/mongodb.h \ - $(NULL) - DAEMON_FILES = \ daemon/buildinfo.c \ daemon/buildinfo.h \ @@ -877,7 +846,6 @@ NETDATA_FILES = \ $(DAEMON_FILES) \ $(LIBNETDATA_FILES) \ $(API_PLUGIN_FILES) \ - $(BACKENDS_PLUGIN_FILES) \ $(EXPORTING_ENGINE_FILES) \ $(CHECKS_PLUGIN_FILES) \ $(HEALTH_PLUGIN_FILES) \ @@ -1065,8 +1033,8 @@ if ENABLE_PLUGIN_SLABINFO $(NULL) endif -if ENABLE_BACKEND_KINESIS - netdata_SOURCES += $(KINESIS_BACKEND_FILES) $(KINESIS_EXPORTING_FILES) +if ENABLE_EXPORTING_KINESIS + netdata_SOURCES += $(KINESIS_EXPORTING_FILES) netdata_LDADD += $(OPTIONAL_KINESIS_LIBS) endif @@ -1075,17 +1043,17 @@ if ENABLE_EXPORTING_PUBSUB netdata_LDADD += $(OPTIONAL_PUBSUB_LIBS) endif -if ENABLE_BACKEND_PROMETHEUS_REMOTE_WRITE - netdata_SOURCES += $(PROMETHEUS_REMOTE_WRITE_BACKEND_FILES) $(PROMETHEUS_REMOTE_WRITE_EXPORTING_FILES) +if ENABLE_EXPORTING_PROMETHEUS_REMOTE_WRITE + netdata_SOURCES += $(PROMETHEUS_REMOTE_WRITE_EXPORTING_FILES) netdata_LDADD += $(OPTIONAL_PROMETHEUS_REMOTE_WRITE_LIBS) \ $(OPTIONAL_PROTOBUF_LIBS) \ $(NULL) - BACKEND_PROMETHEUS_BUILT_SOURCES = \ + EXPORTING_PROMETHEUS_BUILT_SOURCES = \ exporting/prometheus/remote_write/remote_write.pb.cc \ exporting/prometheus/remote_write/remote_write.pb.h \ $(NULL) - BUILT_SOURCES += $(BACKEND_PROMETHEUS_BUILT_SOURCES) - nodist_netdata_SOURCES += $(BACKEND_PROMETHEUS_BUILT_SOURCES) + BUILT_SOURCES += $(EXPORTING_PROMETHEUS_BUILT_SOURCES) + nodist_netdata_SOURCES += $(EXPORTING_PROMETHEUS_BUILT_SOURCES) exporting/prometheus/remote_write/remote_write.pb.cc \ exporting/prometheus/remote_write/remote_write.pb.h: exporting/prometheus/remote_write/remote_write.proto @@ -1093,8 +1061,8 @@ exporting/prometheus/remote_write/remote_write.pb.h: exporting/prometheus/remote endif -if ENABLE_BACKEND_MONGODB - netdata_SOURCES += $(MONGODB_BACKEND_FILES) $(MONGODB_EXPORTING_FILES) +if ENABLE_EXPORTING_MONGODB + netdata_SOURCES += $(MONGODB_EXPORTING_FILES) netdata_LDADD += $(OPTIONAL_MONGOC_LIBS) endif @@ -1217,7 +1185,7 @@ if ENABLE_UNITTESTS $(TEST_LDFLAGS) \ $(NULL) exporting_tests_exporting_engine_testdriver_LDADD = $(NETDATA_COMMON_LIBS) $(TEST_LIBS) -if ENABLE_BACKEND_PROMETHEUS_REMOTE_WRITE +if ENABLE_EXPORTING_PROMETHEUS_REMOTE_WRITE exporting_tests_exporting_engine_testdriver_SOURCES += $(PROMETHEUS_REMOTE_WRITE_EXPORTING_FILES) exporting_tests_exporting_engine_testdriver_LDADD += \ $(OPTIONAL_PROMETHEUS_REMOTE_WRITE_LIBS) \ @@ -1229,9 +1197,9 @@ if ENABLE_BACKEND_PROMETHEUS_REMOTE_WRITE -Wl,--wrap=add_label \ -Wl,--wrap=add_metric \ $(NULL) - nodist_exporting_tests_exporting_engine_testdriver_SOURCES = $(BACKEND_PROMETHEUS_BUILT_SOURCES) + nodist_exporting_tests_exporting_engine_testdriver_SOURCES = $(EXPORTING_PROMETHEUS_BUILT_SOURCES) endif -if ENABLE_BACKEND_KINESIS +if ENABLE_EXPORTING_KINESIS |