Skip to content

refactor: using http sink for flows ingestion #1678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Tbaile wants to merge 2 commits into
base: nethsecurity-8.8
Choose a base branch
from
Draft

refactor: using http sink for flows ingestion #1678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e71d70c
refactor: moved ns-flows from socket to http
Tbaile May 12, 2026
7ba72cd
chore(ns-monitoring): version bump
Tbaile May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/ns-monitoring/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...files/netifyd/netify-proc-core-flows.json → ...g/files/netifyd/netify-ns-flows-proc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"format": "json",
"compressor": "none",
"sinks": {
"sink-socket-flows": {
"flows": {
"sink-ns-flows": {
"default": {
"enable": true,
"types": [ "stream-flows", "stream-stats" ]
}
Expand Down
12 changes: 12 additions & 0 deletions packages/ns-monitoring/files/netifyd/netify-ns-flows-sink.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
8 changes: 0 additions & 8 deletions packages/ns-monitoring/files/netifyd/netify-sink-socket-flows.json
View file
Open in desktop

This file was deleted.

14 changes: 8 additions & 6 deletions packages/ns-monitoring/files/netifyd/plugins.d/10-ns-flows.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 :
Loading