Split network viewer plugin to it’s own package. (#16949)

* Split network viewer plugin to it’s own package.

* Fix typos in RPM changelog.

* Add soft dep on ebpf plugin.

4 files changed, 50 insertions, 3 deletions

diff --git a/contrib/debian/control b/contrib/debian/control
index f513b7eef3..31b2b95244 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -58,7 +58,8 @@ Conflicts: netdata-core,
 Suggests: netdata-plugin-cups (= ${source:Version}),
           netdata-plugin-freeipmi (= ${source:Version})
 Recommends: netdata-plugin-systemd-journal (= ${source:Version}),
-            netdata-plugin-logs-management (= ${source:Version})
+            netdata-plugin-logs-management (= ${source:Version}),
+            netdata-plugin-network-viewer (= ${source:Version})
 Description: real-time charts for system monitoring
  Netdata is a daemon that collects data in realtime (per second)
  and presents a web site to view and analyze them. The presentation
@@ -223,3 +224,14 @@ Conflicts: netdata (<< ${source:Version})
 Description: The logs-management plugin for the Netdata Agent
  This plugin allows the Netdata Agent to collect logs from the system
  and parse them to extract metrics.
+
+Package: netdata-plugin-network-viewer
+Architecture: any
+Depends: ${shlibs:Depends},
+         netdata (= ${source:Version})
+Pre-Depends: libcap2-bin, adduser
+Recommends: netdata-plugin-ebpf (= ${source:Version} )
+Conflicts: netdata (<< ${source:Version})
+Description: The network viewer plugin for the Netdata Agent
+ This plugin allows the Netdata Agent to provide network connection
+ mapping functionality for use in netdata Cloud.
diff --git a/contrib/debian/netdata-plugin-network-viewer-plugin.postinst b/contrib/debian/netdata-plugin-network-viewer-plugin.postinst
new file mode 100644
index 0000000000..6f2289e435
--- /dev/null
+++ b/contrib/debian/netdata-plugin-network-viewer-plugin.postinst
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  configure|reconfigure)
+    chown root:netdata /usr/libexec/netdata/plugins.d/network-viewer.plugin
+    chmod 0750 /usr/libexec/netdata/plugins.d/network-viewer.plugin
+    if ! setcap "cap_dac_read_search,cap_sys_admin,cap_sys_ptrace=eip" /usr/libexec/netdata/plugins.d/network-viewer.plugin; then
+        chmod -f 4750 /usr/libexec/netdata/plugins.d/network-viewer.plugin
+    fi
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/contrib/debian/netdata-plugin-network-viewer-plugin.preinst b/contrib/debian/netdata-plugin-network-viewer-plugin.preinst
new file mode 100644
index 0000000000..fcabb415aa
--- /dev/null
+++ b/contrib/debian/netdata-plugin-network-viewer-plugin.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  install)
+    if ! getent group netdata > /dev/null; then
+      addgroup --quiet --system netdata
+    fi
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/contrib/debian/rules b/contrib/debian/rules
index 722d607598..8f337adad2 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -124,7 +124,7 @@ override_dh_install:
 	mv -f $(TEMPTOP)/usr/libexec/netdata/plugins.d/freeipmi.plugin \
 	$(TOP)-plugin-freeipmi/usr/libexec/netdata/plugins.d/freeipmi.plugin
 
-	# Add free IPMI plugin install rules
+	# Add NFACCT plugin install rules
 	#
 	mkdir -p $(TOP)-plugin-nfacct/usr/libexec/netdata/plugins.d
 	mv -f $(TEMPTOP)/usr/libexec/netdata/plugins.d/nfacct.plugin \
@@ -222,6 +222,11 @@ override_dh_install:
 	mv -f $(TEMPTOP)/usr/lib/netdata/conf.d/go.d \
 	$(TOP)-plugin-go/usr/lib/netdata/conf.d/go.d
 
+	# Add network-viewer plugin install rules
+	mkdir -p $(TOP)-plugin-network-viewer/usr/libexec/netdata/plugins.d/
+	mv -f $(TEMPTOP)/usr/libexec/netdata/plugins.d/network-viewer.plugin \
+	$(TOP)-plugin-network-viewer/usr/libexec/netdata/plugins.d/network-viewer.plugin
+
 	# Set the rest of the software in the main package
 	#
 	cp -rp $(TEMPTOP)/usr $(TOP)
@@ -294,7 +299,7 @@ override_dh_fixperms:
 	chmod 4750 $(TOP)/usr/libexec/netdata/plugins.d/local-listeners
 
 	# network-viewer
-	chmod 4750 $(TOP)/usr/libexec/netdata/plugins.d/network-viewer.plugin
+	chmod 4750 $(TOP)-plugin-network-viewer/usr/libexec/netdata/plugins.d/network-viewer.plugin
 
 	# systemd-journal
 	chmod 4750 $(TOP)-plugin-systemd-journal/usr/libexec/netdata/plugins.d/systemd-journal.plugin