Sync Repos and small fixes

.dockerfiles/build.sh

@@ -6,13 +6,13 @@ build() {
   echo "[XXX]: Preparing kernel headers for ${KERNEL_VERSION}..."
   (
     if [ "${KERNEL_VERSION}" !=  "3.10.0-1160.108.1.el7" ]; then
-       make defconfig -C /usr/src/linux
+       make LOCALVERSION="${KERNEL_LOCALVERSION:-}" defconfig -C /usr/src/linux
     else
-       make silentoldconfig -C /usr/src/linux
+       make LOCALVERSION="${KERNEL_LOCALVERSION:-}" silentoldconfig -C /usr/src/linux
     fi   
-    make scripts -C /usr/src/linux
-    make prepare -C /usr/src/linux
-    make headers_install -C /usr/src/linux
+    make LOCALVERSION="${KERNEL_LOCALVERSION:-}" scripts -C /usr/src/linux
+    make LOCALVERSION="${KERNEL_LOCALVERSION:-}" prepare -C /usr/src/linux
+    make LOCALVERSION="${KERNEL_LOCALVERSION:-}" headers_install -C /usr/src/linux
   ) || return 1
   echo "[XXX]: Building against Kernel ${KERNEL_VERSION} for libc ${_LIBC} ..."
   (

.github/workflows/build.yml

@@ -12,9 +12,11 @@ jobs:
       fail-fast: false
       matrix:
         kernel_version:
+          - '7.2.8'
           - '6.16.2'
           - '6.8.2'
           - '5.16.18'
+          - '5.17.15'
           - '5.15.63'
           - '5.14.0'
           - '5.11.19'
@@ -33,6 +35,10 @@ jobs:
             libc: static
           - kernel_version: 5.4.17
             libc: musl
+        include:
+          - kernel_version: '7.2.8'
+            libc: glibc
+            kernel_localversion: '-15-generic'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -51,7 +57,7 @@ jobs:
           else
             os=generic
           fi
-          ./build.sh ${{ matrix.kernel_version }} ${{ matrix.libc }} "${os}"
+          KERNEL_LOCALVERSION='${{ matrix.kernel_localversion }}' ./build.sh ${{ matrix.kernel_version }} ${{ matrix.libc }} "${os}"
       - name: List Artifacts
         run: |
           ls -lah artifacts

.github/workflows/release.yml

@@ -14,9 +14,11 @@
     strategy:
       matrix:
         kernel_version:
+          - '7.2.8'
           - '6.16.2'
           - '6.8.2'
           - '5.16.18'
+          - '5.17.15'
           - '5.15.63'
           - '5.14.0'
           - '5.11.19'
@@ -89,12 +91,12 @@
           merge-multiple: true
       - name: Set release_tag
         run: |
           echo "RELEASE_TAG=${GITHUB_REF##*/}" >> $GITHUB_ENV
       - name: Consolidate Artifacts
         run: |
           mkdir -p final-artifacts
           for libc in static glibc musl; do
             for pkg in artifacts/netdata_ebpf-*_*-${libc}.tar; do
               mkdir -p "packages/netdata-kernel-collector-${libc}-${RELEASE_TAG}"
               tar -C "packages/netdata-kernel-collector-${libc}-${RELEASE_TAG}" -xvf "${pkg}"
             done

Dockerfile.glibc.centos8

@@ -13,7 +13,7 @@ ENV _LIBC=glibc
 
 # hadolint ignore=DL3040,DL3041
 RUN dnf update -y && \
-    dnf install -y gcc make gcc-c++ libtool rpm-build-libs bison && \
+    dnf install -y gcc make gcc-c++ libtool rpm-build-libs bison git && \
     dnf install -y asciidoc audit-libs-devel bash bc binutils binutils-devel \
                    diffutils elfutils elfutils-devel \
                    elfutils-libelf-devel findutils gawk \

Dockerfile.glibc.centos9

@@ -13,7 +13,7 @@ ENV _LIBC=glibc
 
 # hadolint ignore=DL3040,DL3041
 RUN dnf update -y && \
-    dnf install -y gcc make gcc-c++ libtool rpm-build-libs bison && \
+    dnf install -y gcc make gcc-c++ libtool rpm-build-libs bison git && \
     dnf install -y asciidoc audit-libs-devel bash bc binutils binutils-devel \
                    diffutils elfutils elfutils-devel \
                    elfutils-libelf-devel findutils gawk \

Dockerfile.glibc.generic

@@ -5,14 +5,16 @@ ENV ARCH=$ARCH
 
 ARG KERNEL_VERSION=5.4.20
 ENV KERNEL_VERSION=$KERNEL_VERSION
+ARG KERNEL_LOCALVERSION=
+ENV KERNEL_LOCALVERSION=$KERNEL_LOCALVERSION
 
 ENV _LIBC=glibc
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
     apt-get install -y build-essential autoconf automake coreutils pkg-config \
                        bc libelf-dev libssl-dev clang-tools-18 libclang-18-dev \
-                       clang-18 llvm-18 rsync bison flex tar xz-utils wget
+                       clang-18 llvm-18 rsync bison flex tar xz-utils wget git
 
 RUN mkdir -p /usr/src && \
     cd /usr/src && \

Dockerfile.glibc.oracle8

@@ -13,7 +13,7 @@ ENV _LIBC=glibc
 
 # hadolint ignore=DL3040,DL3041
 RUN dnf update -y && \
-    dnf install -y gcc make gcc-c++ libtool rpm-build-libs bison && \
+    dnf install -y gcc make gcc-c++ libtool rpm-build-libs bison git && \
     dnf install -y asciidoc audit-libs-devel bash bc binutils binutils-devel \
                    diffutils elfutils elfutils-devel \
                    elfutils-libelf-devel findutils gawk \

Dockerfile.musl.centos8

@@ -10,7 +10,7 @@ ENV _LIBC=static
 # hadolint ignore=DL3018
 RUN apk add --no-cache -U build-base autoconf automake coreutils pkgconfig \
                           bc elfutils-dev openssl-dev clang clang-dev llvm \
-                          rsync bison flex tar xz bash rpm ssl_client linux-headers
+                          rsync bison flex tar xz bash git rpm ssl_client linux-headers
 
 # hadolint ignore=DL3003,SC3009
 RUN mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} && \

Dockerfile.musl.centos9

@@ -10,7 +10,7 @@ ENV _LIBC=static
 # hadolint ignore=DL3018
 RUN apk add --no-cache -U build-base autoconf automake coreutils pkgconfig \
                           bc elfutils-dev openssl-dev clang clang-dev llvm \
-                          rsync bison flex tar xz bash rpm ssl_client linux-headers
+                          rsync bison flex tar xz bash git rpm ssl_client linux-headers
 
 # hadolint ignore=DL3003,SC3009
 RUN mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} && \

Dockerfile.musl.generic

@@ -5,13 +5,15 @@ ENV ARCH=$ARCH
 
 ARG KERNEL_VERSION=5.4.20
 ENV KERNEL_VERSION=$KERNEL_VERSION
+ARG KERNEL_LOCALVERSION=
+ENV KERNEL_LOCALVERSION=$KERNEL_LOCALVERSION
 
 ENV _LIBC=musl
 
 # hadolint ignore=DL3018
 RUN apk add --no-cache -U build-base autoconf automake coreutils pkgconfig \
                           bc elfutils-dev openssl-dev clang clang-dev llvm \
-                          rsync bison flex tar xz bash linux-headers
+                          rsync bison flex tar xz bash git linux-headers
 
 # hadolint ignore=DL3003,SC3009
 RUN mkdir -p /usr/src && \

Dockerfile.musl.oracle8

@@ -10,7 +10,7 @@ ENV _LIBC=static
 # hadolint ignore=DL3018
 RUN apk add --no-cache -U build-base autoconf automake coreutils pkgconfig \
                           bc elfutils-dev openssl-dev clang clang-dev llvm \
-                          rsync bison flex tar xz bash rpm ssl_client linux-headers
+                          rsync bison flex tar xz bash git rpm ssl_client linux-headers
 
 # hadolint ignore=DL3003,SC3009
 RUN mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} && \

Dockerfile.static.centos8

@@ -10,7 +10,7 @@ ENV _LIBC=static
 # hadolint ignore=DL3018
 RUN apk add --no-cache -U build-base autoconf automake coreutils pkgconfig \
                           bc elfutils-dev openssl-dev clang clang-dev llvm \
-                          rsync bison flex tar xz bash rpm ssl_client linux-headers
+                          rsync bison flex tar xz bash git rpm ssl_client linux-headers
 
 # hadolint ignore=DL3003,SC3009
 RUN mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} && \

Dockerfile.static.centos9

@@ -10,7 +10,7 @@ ENV _LIBC=static
 # hadolint ignore=DL3018
 RUN apk add --no-cache -U build-base autoconf automake coreutils pkgconfig \
                           bc elfutils-dev openssl-dev clang clang-dev llvm \
-                          rsync bison flex tar xz bash rpm ssl_client linux-headers
+                          rsync bison flex tar xz bash git rpm ssl_client linux-headers
 
 # hadolint ignore=DL3003,SC3009
 RUN mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} && \

Dockerfile.static.generic

@@ -5,13 +5,15 @@ ENV ARCH=$ARCH
 
 ARG KERNEL_VERSION=5.4.20
 ENV KERNEL_VERSION=$KERNEL_VERSION
+ARG KERNEL_LOCALVERSION=
+ENV KERNEL_LOCALVERSION=$KERNEL_LOCALVERSION
 
 ENV _LIBC=static
 
 # hadolint ignore=DL3018
 RUN apk add --no-cache -U build-base autoconf automake coreutils pkgconfig \
                           bc elfutils-dev openssl-dev clang clang-dev llvm \
-                          rsync bison flex tar xz bash linux-headers
+                          rsync bison flex tar xz bash git linux-headers
 
 # hadolint ignore=DL3003,SC3009
 RUN mkdir -p /usr/src && \

Dockerfile.static.oracle8

@@ -10,7 +10,7 @@ ENV _LIBC=static
 # hadolint ignore=DL3018
 RUN apk add --no-cache -U build-base autoconf automake coreutils pkgconfig \
                           bc elfutils-dev openssl-dev clang clang-dev llvm \
-                          rsync bison flex tar xz bash rpm ssl_client linux-headers
+                          rsync bison flex tar xz bash git rpm ssl_client linux-headers
 
 # hadolint ignore=DL3003,SC3009
 RUN mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} && \

build.sh

@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
-set -e
+set -euo pipefail
 
 log() {
   printf "%s\n" "${1}"
@@ -34,10 +34,16 @@ fi
 
 git clean -d -f -x
 
+docker_build_args=()
+if [ "${OS}" = "generic" ]; then
+  docker_build_args+=(--build-arg "KERNEL_VERSION=${KERNEL_VERSION}")
+  docker_build_args+=(--build-arg "KERNEL_LOCALVERSION=${KERNEL_LOCALVERSION:-}")
+fi
+
 docker build \
   -f Dockerfile."${LIBC}"."${OS}" \
   -t "${TAG}" \
-  --build-arg KERNEL_VERSION="${KERNEL_VERSION}" \
+  "${docker_build_args[@]}" \
   ./ | tee prepare.log
 
 if [ -t 1 ]; then

gotests/cgo_helpers.go

@@ -1,7 +1,7 @@
 package main
 
 /*
-#cgo CFLAGS: -I../.local_libbpf -I../libbpf/include -I../libbpf/include/uapi -I../libbpf/src
+#cgo CFLAGS: -I../.local_libbpf
 #cgo LDFLAGS: -L../.local_libbpf -lbpf -lz -lelf
 
 #include <errno.h>

gotests/dns.go

@@ -505,7 +505,8 @@ func (c *dnsCollector) processResponse(packet dnsPacket, nowUsec uint64) {
 	}
 }
 
-func dnsWritePortsJSON(w io.Writer, meta mapMeta, ports []uint16) {
+func dnsWritePortsJSON(w io.Writer, meta mapMeta, ports []uint16, members *jsonMemberState) {
+	members.prefix(w)
 	fmt.Fprintf(w,
 		"        \"dns_ports\" : {\n"+
 			"            \"Info\" : { \"Length\" : { \"Key\" : %d, \"Value\" : %d},\n"+
@@ -542,7 +543,8 @@ func dnsWriteRcodesJSON(w io.Writer, rcodes []dnsRcodeCounter) {
 	fmt.Fprint(w, " }")
 }
 
-func dnsWriteResultsJSON(w io.Writer, collector *dnsCollector, captureSeconds int) {
+func dnsWriteResultsJSON(w io.Writer, collector *dnsCollector, captureSeconds int, members *jsonMemberState) {
+	members.prefix(w)
 	fmt.Fprintf(w,
 		"        \"dns_results\" : {\n"+
 			"            \"Info\" : { \"Collection Seconds\" : %d,\n"+
@@ -580,7 +582,8 @@ func dnsWriteResultsJSON(w io.Writer, collector *dnsCollector, captureSeconds in
 			"        }")
 }
 
-func dnsWriteFailureDebug(w io.Writer, ports []uint16, debug dnsDebug) {
+func dnsWriteFailureDebug(w io.Writer, ports []uint16, debug dnsDebug, members *jsonMemberState) {
+	members.prefix(w)
 	fmt.Fprintf(w,
 		"        \"Debug\" : {\n"+
 			"            \"Info\" : { \"Stage\" : \"%s\",\n"+
@@ -614,7 +617,7 @@ func dnsWriteFailureDebug(w io.Writer, ports []uint16, debug dnsDebug) {
 	fmt.Fprint(w, "]\n                      }\n        }\n")
 }
 
-func runDNSSocketFilterTester(obj *bpfObject, maps bool, w io.Writer, iterations int, ports []uint16) string {
+func runDNSSocketFilterTester(obj *bpfObject, maps bool, w io.Writer, iterations int, ports []uint16, members *jsonMemberState) string {
 	const (
 		success = "Success"
 		failure = "Fail"
@@ -625,7 +628,7 @@ func runDNSSocketFilterTester(obj *bpfObject, maps bool, w io.Writer, iterations
 		operation:      "initialize",
 		mapsRequested:  maps,
 		iterations:     iterations,
-		captureSeconds: iterations * dnsCaptureInterval,
+		captureSeconds: dnsCaptureInterval,
 		programFD:      -1,
 		sockFD:         -1,
 		dnsPortsFD:     -1,
@@ -635,7 +638,7 @@ func runDNSSocketFilterTester(obj *bpfObject, maps bool, w io.Writer, iterations
 		debug.stage = "load_object"
 		debug.operation = "bpf_object__load"
 		debug.errorCode = loadErr
-		dnsWriteFailureDebug(w, ports, debug)
+		dnsWriteFailureDebug(w, ports, debug, members)
 		return failure
 	}
 
@@ -644,7 +647,7 @@ func runDNSSocketFilterTester(obj *bpfObject, maps bool, w io.Writer, iterations
 		debug.stage = "find_socket_filter_program"
 		debug.operation = "bpf_object__next_program"
 		debug.errorCode = -int(syscall.ENOENT)
-		dnsWriteFailureDebug(w, ports, debug)
+		dnsWriteFailureDebug(w, ports, debug, members)
 		return failure
 	}
 
@@ -655,7 +658,7 @@ func runDNSSocketFilterTester(obj *bpfObject, maps bool, w io.Writer, iterations
 		debug.stage = "configure_ports"
 		debug.operation = "find_dns_ports_map"
 		debug.errorCode = -int(syscall.ENOENT)
-		dnsWriteFailureDebug(w, ports, debug)
+		dnsWriteFailureDebug(w, ports, debug, members)
 		return failure
 	}
 
@@ -678,7 +681,7 @@ func runDNSSocketFilterTester(obj *bpfObject, maps bool, w io.Writer, iterations
 			debug.stage = "configure_ports"
 			debug.operation = "bpf_map_update_elem"
 			debug.errorCode = err
-			dnsWriteFailureDebug(w, ports, debug)
+			dnsWriteFailureDebug(w, ports, debug, members)
 			return failure
 		}
 	}
@@ -688,7 +691,7 @@ func runDNSSocketFilterTester(obj *bpfObject, maps bool, w io.Writer, iterations
 		debug.stage = "open_capture_socket"
 		debug.operation = "netdata_open_capture_socket"
 		debug.errorCode = sockErr
-		dnsWriteFailureDebug(w, ports, debug)
+		dnsWriteFailureDebug(w, ports, debug, members)
 		return failure
 	}
 	defer closeFD(sockFD)
@@ -698,10 +701,10 @@ func runDNSSocketFilterTester(obj *bpfObject, maps bool, w io.Writer, iterations
 	if maps {
 		collector := &dnsCollector{}
 		dnsCollectPackets(sockFD, collector, debug.captureSeconds)
-		dnsWritePortsJSON(w, meta, ports)
-		fmt.Fprint(w, ",\n")
-		dnsWriteResultsJSON(w, collector, debug.captureSeconds)
-		fmt.Fprint(w, ",\n        \"Total tables\" : 2\n")
+		dnsWritePortsJSON(w, meta, ports, members)
+		dnsWriteResultsJSON(w, collector, debug.captureSeconds, members)
+		members.prefix(w)
+		fmt.Fprint(w, "        \"Total tables\" : 2")
 	}
 
 	return success

gotests/dns_test.go

@@ -371,7 +371,7 @@ func TestDNSCollectorStateManagement(t *testing.T) {
 func TestDNSJSONWriters(t *testing.T) {
 	t.Run("ports writer includes metadata and ports", func(t *testing.T) {
 		var out bytes.Buffer
-		dnsWritePortsJSON(&out, mapMeta{KeySize: 2, ValueSize: 4, Type: 1, FD: 9, MaxEntries: 8}, []uint16{53, 5353})
+		dnsWritePortsJSON(&out, mapMeta{KeySize: 2, ValueSize: 4, Type: 1, FD: 9, MaxEntries: 8}, []uint16{53, 5353}, &jsonMemberState{first: true})
 
 		got := out.String()
 		for _, want := range []string{
@@ -412,7 +412,7 @@ func TestDNSJSONWriters(t *testing.T) {
 			}},
 		}
 
-		dnsWriteResultsJSON(&out, collector, 5)
+		dnsWriteResultsJSON(&out, collector, 5, &jsonMemberState{first: true})
 		got := out.String()
 		for _, want := range []string{
 			`"Collection Seconds" : 5`,