Added version in debian/changelog, fixed tests for ubuntu and silent tests output on success

Author: rkoliada-cl

debian/changelog

@@ -1,3 +1,10 @@
+cl-node-exporter (1.2.0-1) stable; urgency=medium
+
+  [ Ruslan Koliada ]
+  * CLPRO-2902: Sync node_exporter with upstream
+
+ -- Ruslan Koliada <rkoliada@cloudlinux.com>  Mon, 1 Dec 2025 10:00:00 +0000
+
 cl-node-exporter (1.1.0-3) stable; urgency=medium
 
   [ Yehor Komarov ]

debian/rules

@@ -32,6 +32,7 @@ override_dh_auto_build:
 	curl https://dl.google.com/go/go1.24.0.linux-amd64.tar.gz --output /tmp/go.tar.gz
 	tar xzf /tmp/go.tar.gz -C /tmp/
 	make build
+	make tools
 	make test
 	rm -rf collector/fixtures/sys
 	./ttar -C collector/fixtures -x -f collector/fixtures/sys.ttar
@@ -43,10 +44,12 @@ override_dh_auto_install:
 	install -D -m 755 node_exporter $(buildroot)$(_clshare_plus)/node_exporter
 
 	# Install tests
-	mkdir -p $(buildroot)/opt/node_exporter_tests/collector
-	cp -r collector/fixtures $(buildroot)/opt/node_exporter_tests/collector/
+	mkdir -p $(buildroot)/opt/node_exporter_tests/
+	cp -r collector $(buildroot)/opt/node_exporter_tests/
 	install -D -m 755 end-to-end-test.sh $(buildroot)/opt/node_exporter_tests/end-to-end-test.sh
 	install -D -m 755 node_exporter $(buildroot)/opt/node_exporter_tests/node_exporter
+	mkdir -p $(buildroot)/opt/node_exporter_tests/tools
+	install -D -m 755 tools/tools $(buildroot)/opt/node_exporter_tests/tools/tools
 
 	echo "$(version)-$(release)" > $(buildroot)/usr/share/cloudlinux/cl_version
 
@@ -57,7 +60,8 @@ override_dh_auto_install:
 	dh_movefiles -p$(name)-tests \
 		./opt/node_exporter_tests/collector/ \
 		./opt/node_exporter_tests/end-to-end-test.sh \
-		./opt/node_exporter_tests/node_exporter
+		./opt/node_exporter_tests/node_exporter \
+		./opt/node_exporter_tests/tools/
 
 	dh_installdirs -p$(name) \
 		.$(_clshare_plus)

end-to-end-test.sh

@@ -253,17 +253,17 @@ for flag in ${collector_flags}; do
   fi
 done
 
-echo "ENABLED COLLECTORS======="
-echo "${supported_enabled_collectors:1}" | tr ' ' '\n' | sort
-echo "========================="
+echo "ENABLED COLLECTORS=======" >&2
+echo "${supported_enabled_collectors:1}" | tr ' ' '\n' | sort >&2
+echo "=========================" >&2
 
-echo "DISABLED COLLECTORS======"
-echo "${supported_disabled_collectors:1}" | tr ' ' '\n' | sort
-echo "========================="
+echo "DISABLED COLLECTORS======" >&2
+echo "${supported_disabled_collectors:1}" | tr ' ' '\n' | sort >&2
+echo "=========================" >&2
 
-echo "IGNORED FLAGS============"
-echo "${ignored_flags:1}"| tr ' ' '\n' | sort | uniq
-echo "========================="
+echo "IGNORED FLAGS============" >&2
+echo "${ignored_flags:1}"| tr ' ' '\n' | sort | uniq >&2
+echo "=========================" >&2
 
 if [ ${socket} -ne 0 ]; then
   touch "${unix_socket}"
@@ -313,7 +313,7 @@ EOF
     pid=$(cat "${tmpdir}/node_exporter.pid")
     kill "$pid"
     # Wait for the process to exit gracefully to allow socket cleanup
-    for i in {1..50}; do
+    for i in {1..100}; do
       if ! kill -0 "$pid" 2>/dev/null; then
         break
       fi