[pull] master from netdata:master

CMakeLists.txt

@@ -2179,7 +2179,7 @@ if(ENABLE_LIBUNWIND)
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(amd64)")
       target_link_libraries(libnetdata PUBLIC PkgConfig::LIBUNWIND -lunwind-x86_64)
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i?.86")
-      target_link_libraries(libnetdata PUBLIC PkgCOnfig::LIBUNWIND -lunwind-x86)
+      target_link_libraries(libnetdata PUBLIC PkgConfig::LIBUNWIND -lunwind-x86)
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(arm64)|(aarch64)")
       target_link_libraries(libnetdata PUBLIC PkgConfig::LIBUNWIND -lunwind-aarch64)
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm")

netdata.spec.in

@@ -160,6 +160,7 @@ BuildRequires: pkgconfig(libcurl)
 BuildRequires: pkgconfig(liblz4)
 BuildRequires: pkgconfig(yaml-0.1)
 BuildRequires: pkgconfig(json-c)
+BuildRequires: pkgconfig(libunwind)
 %if %{_have_log2journal}
 BuildRequires: pkgconfig(libpcre2-8)
 %endif
@@ -406,7 +407,8 @@ happened, on your systems and applications.
 	-DENABLE_PLUGIN_SYSTEMD_JOURNAL=On \
 	-DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=On \
 	-DENABLE_BUNDLED_JSONC=Off \
-	-DENABLE_BUNDLED_YAML=Off
+	-DENABLE_BUNDLED_YAML=Off \
+	-DENABLE_LBIUNWIND=On
 
 # Build step
 %{cmake_build}

packaging/build-package.sh

@@ -51,6 +51,8 @@ add_cmake_option ENABLE_BUNDLED_PROTOBUF Off
 add_cmake_option ENABLE_BUNDLED_JSONC Off
 add_cmake_option ENABLE_BUNDLED_YAML Off
 
+add_cmake_option ENABLE_LIBUNWIND On
+
 add_cmake_option BUILD_FOR_PACKAGING On
 
 case "${PKG_TYPE}" in
@@ -64,6 +66,10 @@ case "${PKG_TYPE}" in
                 add_cmake_option ENABLE_PLUGIN_XENSTAT On
                 add_cmake_option ENABLE_PLUGIN_EBPF Off
                 ;;
+            armhf)
+                add_cmake_option ENABLE_PLUGIN_XENSTAT Off
+                add_cmake_option ENABLE_PLUGIN_EBPF Off
+                ;;
             *)
                 add_cmake_option ENABLE_PLUGIN_XENSTAT Off
                 add_cmake_option ENABLE_PLUGIN_EBPF Off

packaging/docker/Dockerfile

@@ -27,6 +27,7 @@ WORKDIR /opt/netdata.git
 RUN chmod +x netdata-installer.sh && \
    cp -rp /deps/* /usr/local/ && \
    /bin/echo -e "INSTALL_TYPE='oci'\nPREBUILT_ARCH='$(uname -m)'" > ./system/.install-type && \
+   NETDATA_CMAKE_OPTIONS="-DENABLE_LIBUNWIND=On" \
    CFLAGS="$(packaging/docker/gen-cflags.sh)" LDFLAGS="-Wl,--gc-sections" ./netdata-installer.sh --dont-wait --dont-start-it --use-system-protobuf \
    ${EXTRA_INSTALL_OPTS} --disable-ebpf --install-no-prefix / "$([ "$RELEASE_CHANNEL" = stable ] && echo --stable-channel)"
 

src/database/rrd.c

@@ -113,24 +113,25 @@ int rrd_init(const char *hostname, struct rrdhost_system_info *system_info, bool
         }
     }
 
-    if(!unittest)
+    if(!unittest) {
         metadata_sync_init();
+        health_load_config_defaults();
+    }
 
     localhost = rrdhost_create(
         hostname
         , registry_get_this_machine_hostname()
-            , registry_get_this_machine_guid()
-            , os_type
+        , registry_get_this_machine_guid()
+        , os_type
         , netdata_configured_timezone
         , netdata_configured_abbrev_timezone
         , netdata_configured_utc_offset
         , program_name
         , NETDATA_VERSION
-        ,
-        nd_profile.update_every, default_rrd_history_entries
+        , nd_profile.update_every, default_rrd_history_entries
         , default_rrd_memory_mode
         , health_plugin_enabled()
-            , stream_send.enabled
+        , stream_send.enabled
         , stream_send.parents.destination
         , stream_send.api_key
         , stream_send.send_charts_matching

src/database/rrdhost.c

@@ -305,7 +305,7 @@ RRDHOST *rrdhost_create(
         const char *prog_version,
         int update_every,
         long entries,
-    RRD_DB_MODE memory_mode,
+        RRD_DB_MODE memory_mode,
         bool health,
         bool stream,
         STRING *parents,
@@ -349,8 +349,8 @@ RRDHOST *rrdhost_create(
 
     rrdhost_init_hostname(host, hostname, false);
 
-    host->rrd_history_entries        = align_entries_to_pagesize(memory_mode, entries);
-    host->health.enabled = ((memory_mode == RRD_DB_MODE_NONE)) ? 0 : health;
+    host->rrd_history_entries = align_entries_to_pagesize(memory_mode, entries);
+    host->health.enabled = ((memory_mode == RRD_DB_MODE_NONE)) ? false : health;
 
     spinlock_init(&host->receiver_lock);
 

src/go/plugin/go.d/collector/mysql/charts.go

@@ -1202,6 +1202,12 @@ func (c *Collector) addInnoDBOSLogCharts() {
 	}
 }
 
+func (c *Collector) addInnoDBOSLogIOChart() {
+	if err := c.Charts().Add(chartInnoDBOSLogIO.Copy()); err != nil {
+		c.Warning(err)
+	}
+}
+
 func (c *Collector) addMyISAMCharts() {
 	if err := c.Charts().Add(*chartsMyISAM.Copy()...); err != nil {
 		c.Warning(err)

src/go/plugin/go.d/collector/mysql/collect.go

@@ -38,6 +38,10 @@ func (c *Collector) collect() (map[string]int64, error) {
 
 	if hasInnodbOSLog(mx) {
 		c.addInnoDBOSLogOnce.Do(c.addInnoDBOSLogCharts)
+	} else if hasInnodbOSLogIO(mx) {
+		// most of Innodb_os_log_* status variables was removed in MariaDB 10.8
+		// but InnoDB_os_log_written was preserved
+		c.addInnoDBOSLogOnce.Do(c.addInnoDBOSLogIOChart)
 	}
 	if hasInnodbDeadlocks(mx) {
 		c.addInnodbDeadlocksOnce.Do(c.addInnodbDeadlocksChart)
@@ -127,6 +131,11 @@ func hasInnodbOSLog(collected map[string]int64) bool {
 	return ok
 }
 
+func hasInnodbOSLogIO(collected map[string]int64) bool {
+	_, ok := collected["innodb_os_log_written"]
+	return ok
+}
+
 func hasInnodbDeadlocks(collected map[string]int64) bool {
 	_, ok := collected["innodb_deadlocks"]
 	return ok

src/go/plugin/go.d/pkg/iprange/README.md

@@ -11,6 +11,7 @@ type Range interface {
 	Family() Family
 	Contains(ip net.IP) bool
 	Size() *big.Int
+	Iterate() iter.Seq[net.IP]
 	fmt.Stringer
 }
 ```  

src/go/plugin/go.d/pkg/iprange/iterator.go

@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package iprange
+
+import (
+	"iter"
+	"net"
+)
+
+func iterate(r Range) iter.Seq[net.IP] {
+	ipCopy := make(net.IP, len(r.getStart()))
+	nextBuf := make(net.IP, len(r.getStart()))
+
+	return func(yield func(net.IP) bool) {
+		for ip := r.getStart(); ip != nil; ip = nextIP(ip, nextBuf) {
+			copy(ipCopy, ip)
+			if !yield(ipCopy) {
+				return
+			}
+			if ip.Equal(r.getEnd()) {
+				break
+			}
+		}
+	}
+}
+
+func nextIP(ip net.IP, buf net.IP) net.IP {
+	ip = ip.To16()
+	if ip == nil {
+		return nil
+	}
+	copy(buf, ip)
+
+	for i := len(buf) - 1; i >= 0; i-- {
+		buf[i]++
+		if buf[i] != 0 {
+			break
+		}
+	}
+	return buf
+}

src/go/plugin/go.d/pkg/iprange/range.go

@@ -5,6 +5,7 @@ package iprange
 import (
 	"bytes"
 	"fmt"
+	"iter"
 	"math/big"
 	"net"
 )
@@ -24,7 +25,11 @@ type Range interface {
 	Family() Family
 	Contains(ip net.IP) bool
 	Size() *big.Int
+	Iterate() iter.Seq[net.IP]
 	fmt.Stringer
+
+	getStart() net.IP
+	getEnd() net.IP
 }
 
 // New returns new IP Range.
@@ -45,6 +50,13 @@ type v4Range struct {
 	end   net.IP
 }
 
+func (r v4Range) getStart() net.IP { return r.start }
+func (r v4Range) getEnd() net.IP   { return r.end }
+
+func (r v4Range) Iterate() iter.Seq[net.IP] {
+	return iterate(r)
+}
+
 // String returns the string form of the range.
 func (r v4Range) String() string {
 	return fmt.Sprintf("%s-%s", r.start, r.end)
@@ -70,6 +82,13 @@ type v6Range struct {
 	end   net.IP
 }
 
+func (r v6Range) getStart() net.IP { return r.start }
+func (r v6Range) getEnd() net.IP   { return r.end }
+
+func (r v6Range) Iterate() iter.Seq[net.IP] {
+	return iterate(r)
+}
+
 // String returns the string form of the range.
 func (r v6Range) String() string {
 	return fmt.Sprintf("%s-%s", r.start, r.end)

src/go/plugin/go.d/pkg/iprange/range_test.go

@@ -108,6 +108,29 @@ func TestV4Range_Contains(t *testing.T) {
 	}
 }
 
+func TestV4Range_Iterate(t *testing.T) {
+	tests := map[string]struct {
+		input string
+	}{
+		"Single IP": {input: "192.0.2.0"},
+		"IP range":  {input: "192.0.2.0-192.0.2.10"},
+		"IP CIDR":   {input: "192.0.2.0/24"},
+	}
+
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			r, err := ParseRange(test.input)
+			require.NoError(t, err)
+
+			var n int64
+			for range r.Iterate() {
+				n++
+			}
+			assert.Equal(t, r.Size().Int64(), n)
+		})
+	}
+}
+
 func TestV6Range_String(t *testing.T) {
 	tests := map[string]struct {
 		input      string
@@ -198,3 +221,26 @@ func TestV6Range_Contains(t *testing.T) {
 		})
 	}
 }
+
+func TestV6Range_Iterate(t *testing.T) {
+	tests := map[string]struct {
+		input string
+	}{
+		"Single IP": {input: "2001:db8::5"},
+		"IP range":  {input: "2001:db8::-2001:db8::10"},
+		"IP CIDR":   {input: "2001:db8::/124"},
+	}
+
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			r, err := ParseRange(test.input)
+			require.NoError(t, err)
+
+			var n int64
+			for range r.Iterate() {
+				n++
+			}
+			assert.Equal(t, r.Size().Int64(), n)
+		})
+	}
+}

src/health/health.c

@@ -36,7 +36,11 @@ void health_plugin_disable(void) {
 }
 
 
-static void health_load_config_defaults(void) {
+void health_load_config_defaults(void) {
+    static bool done = false;
+    if(done) return;
+    done = true;
+
     char filename[FILENAME_MAX + 1];
 
     health_globals.config.enabled =

src/health/health.h

@@ -103,4 +103,6 @@ uint64_t health_evloop_current_iteration(void);
 void rrdhost_set_health_evloop_iteration(RRDHOST *host);
 uint64_t rrdhost_health_evloop_last_iteration(RRDHOST *host);
 
+void health_load_config_defaults(void);
+
 #endif //NETDATA_HEALTH_H