diff --git a/packages/ns-monitoring/Makefile b/packages/ns-monitoring/Makefile index be816340e..dfa8d139c 100644 --- a/packages/ns-monitoring/Makefile +++ b/packages/ns-monitoring/Makefile @@ -12,7 +12,7 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/nethserver/nethsecurity-monitoring.git -PKG_SOURCE_VERSION:=v$(PKG_VERSION) +PKG_SOURCE_VERSION:=fded6cb978027837fd86b2cc48311b2a68f86842 PKG_SOURCE_SUBDIR:=nethsecurity-monitoring-$(PKG_SOURCE_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) PKG_MIRROR_HASH:=skip @@ -38,7 +38,7 @@ define Package/ns-monitoring CATEGORY:=NethServer TITLE:=Nethsecurity Monitoring URL:=https://github.com/nethserver/nethsecurity-monitoring - DEPENDS:=$(GO_ARCH_DEPENDS) + DEPENDS:=$(GO_ARCH_DEPENDS) netifyd endef define Package/ns-monitoring/conffiles @@ -64,8 +64,8 @@ define Package/ns-monitoring/install $(INSTALL_DIR) $(1)/etc/netifyd/plugins.d ## ns-flows $(INSTALL_CONF) ./files/netifyd/plugins.d/10-ns-flows.conf $(1)/etc/netifyd/plugins.d/10-ns-flows.conf - $(INSTALL_CONF) ./files/netifyd/netify-sink-socket-flows.json $(1)/etc/netifyd/netify-sink-socket-flows.json - $(INSTALL_CONF) ./files/netifyd/netify-proc-core-flows.json $(1)/etc/netifyd/netify-proc-core-flows.json + $(INSTALL_CONF) ./files/netifyd/netify-ns-flows-sink.json $(1)/etc/netifyd/netify-ns-flows-sink.json + $(INSTALL_CONF) ./files/netifyd/netify-ns-flows-proc.json $(1)/etc/netifyd/netify-ns-flows-proc.json ## ns-stats $(INSTALL_CONF) ./files/netifyd/plugins.d/10-ns-stats.conf $(1)/etc/netifyd/plugins.d/10-ns-stats.conf $(INSTALL_CONF) ./files/netifyd/netify-ns-stats-proc.json $(1)/etc/netifyd/netify-ns-stats-proc.json diff --git a/packages/ns-monitoring/files/netifyd/netify-proc-core-flows.json b/packages/ns-monitoring/files/netifyd/netify-ns-flows-proc.json similarity index 77% rename from packages/ns-monitoring/files/netifyd/netify-proc-core-flows.json rename to packages/ns-monitoring/files/netifyd/netify-ns-flows-proc.json index d68711ca3..e36b2996f 100644 --- a/packages/ns-monitoring/files/netifyd/netify-proc-core-flows.json +++ b/packages/ns-monitoring/files/netifyd/netify-ns-flows-proc.json @@ -2,8 +2,8 @@ "format": "json", "compressor": "none", "sinks": { - "sink-socket-flows": { - "flows": { + "sink-ns-flows": { + "default": { "enable": true, "types": [ "stream-flows", "stream-stats" ] } diff --git a/packages/ns-monitoring/files/netifyd/netify-ns-flows-sink.json b/packages/ns-monitoring/files/netifyd/netify-ns-flows-sink.json new file mode 100644 index 000000000..4383e23df --- /dev/null +++ b/packages/ns-monitoring/files/netifyd/netify-ns-flows-sink.json @@ -0,0 +1,12 @@ +{ + "timeout_connect": 30, + "timeout_transfer": 300, + "tls_verify": false, + "tls_version1": false, + "channels": { + "default": { + "enable": true, + "url": "http://127.0.0.1:8080/flows" + } + } +} diff --git a/packages/ns-monitoring/files/netifyd/netify-sink-socket-flows.json b/packages/ns-monitoring/files/netifyd/netify-sink-socket-flows.json deleted file mode 100644 index a456a5bad..000000000 --- a/packages/ns-monitoring/files/netifyd/netify-sink-socket-flows.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "channels": { - "flows": { - "enable": true, - "bind_address": "unix://${path_state_volatile}/flows.sock" - } - } -} \ No newline at end of file diff --git a/packages/ns-monitoring/files/netifyd/plugins.d/10-ns-flows.conf b/packages/ns-monitoring/files/netifyd/plugins.d/10-ns-flows.conf index b974796fe..f0061da73 100644 --- a/packages/ns-monitoring/files/netifyd/plugins.d/10-ns-flows.conf +++ b/packages/ns-monitoring/files/netifyd/plugins.d/10-ns-flows.conf @@ -1,13 +1,15 @@ -# Flows analysis for ns-monitoring +# ns-flows configuration +# +############################################################################## -[proc-core-flows] +[proc-ns-flows] enable = yes plugin_library = ${path_plugin_libdir}/libnetify-proc-core.so.0.0.0 -conf_filename = ${path_state_persistent}/netify-proc-core-flows.json +conf_filename = ${path_state_persistent}/netify-ns-flows-proc.json -[sink-socket-flows] +[sink-ns-flows] enable = yes -plugin_library = ${path_plugin_libdir}/libnetify-sink-socket.so.0.0.0 -conf_filename = ${path_state_persistent}/netify-sink-socket-flows.json +plugin_library = ${path_plugin_libdir}/libnetify-sink-http.so.0.0.0 +conf_filename = ${path_state_persistent}/netify-ns-flows-sink.json # vim: set ft=dosini :