[pull] master from netdata:master

.github/data/distros.yml

@@ -40,7 +40,7 @@ arch_data:  # Mapping of per-architecture matrix behavior.
   aarch64: *arm64
   ppc64le:
     qemu: true
-    runner: *arm-runner
+    runner: *x86-runner
 static_arches:  # Static build architectures
   - x86_64
   - armv6l

CHANGELOG.md

@@ -2,10 +2,15 @@
 
 ## [**Next release**](https://github.com/netdata/netdata/tree/HEAD)
 
-[Full Changelog](https://github.com/netdata/netdata/compare/v2.2.5...HEAD)
+[Full Changelog](https://github.com/netdata/netdata/compare/v2.2.6...HEAD)
 
 **Merged pull requests:**
 
+- Switch back to x86 hosts for POWER8+ builds. [\#19686](https://github.com/netdata/netdata/pull/19686) ([Ferroin](https://github.com/Ferroin))
+- allow parsing empty json arrays and objects [\#19685](https://github.com/netdata/netdata/pull/19685) ([ktsaou](https://github.com/ktsaou))
+- improve dyncfg src type anon message [\#19684](https://github.com/netdata/netdata/pull/19684) ([ilyam8](https://github.com/ilyam8))
+- fix\(go.d/mysql\): handle Cpu\_time in microseconds in v10.11.11+ [\#19683](https://github.com/netdata/netdata/pull/19683) ([ilyam8](https://github.com/ilyam8))
+- build: change go.mod version to 1.23.4 to fix win ci builds [\#19681](https://github.com/netdata/netdata/pull/19681) ([ilyam8](https://github.com/ilyam8))
 - build: change go.mod version to 1.23.6 [\#19680](https://github.com/netdata/netdata/pull/19680) ([ilyam8](https://github.com/ilyam8))
 - build\(deps\): bump github.com/go-sql-driver/mysql from 1.8.1 to 1.9.0 in /src/go [\#19679](https://github.com/netdata/netdata/pull/19679) ([dependabot[bot]](https://github.com/apps/dependabot))
 - initial setup of custom OpenTelemetry Collector distribution [\#19678](https://github.com/netdata/netdata/pull/19678) ([ilyam8](https://github.com/ilyam8))
@@ -184,6 +189,10 @@
 - Modify eBPF.plugin integration \(Part I\) [\#19219](https://github.com/netdata/netdata/pull/19219) ([thiagoftsm](https://github.com/thiagoftsm))
 - Add CLR Remoting metadata [\#19203](https://github.com/netdata/netdata/pull/19203) ([thiagoftsm](https://github.com/thiagoftsm))
 
+## [v2.2.6](https://github.com/netdata/netdata/tree/v2.2.6) (2025-02-20)
+
+[Full Changelog](https://github.com/netdata/netdata/compare/v2.2.5...v2.2.6)
+
 ## [v2.2.5](https://github.com/netdata/netdata/tree/v2.2.5) (2025-02-12)
 
 [Full Changelog](https://github.com/netdata/netdata/compare/v2.2.4...v2.2.5)
@@ -480,12 +489,6 @@
 - chore\(go.d.plugin\): simplify main [\#19146](https://github.com/netdata/netdata/pull/19146) ([ilyam8](https://github.com/ilyam8))
 - chore\(go.d.plugin\): simplify netdataapi pkg [\#19145](https://github.com/netdata/netdata/pull/19145) ([ilyam8](https://github.com/ilyam8))
 - chore\(go.d.plugin\): improve function parser [\#19143](https://github.com/netdata/netdata/pull/19143) ([ilyam8](https://github.com/ilyam8))
-- docs: fix a typo in aclk readme [\#19141](https://github.com/netdata/netdata/pull/19141) ([ilyam8](https://github.com/ilyam8))
-- docs: Plans and ACLK docs edits [\#19140](https://github.com/netdata/netdata/pull/19140) ([Ancairon](https://github.com/Ancairon))
-- docs: Edits in the main Netdata Cloud readme [\#19139](https://github.com/netdata/netdata/pull/19139) ([Ancairon](https://github.com/Ancairon))
-- ci: fix build/create release [\#19138](https://github.com/netdata/netdata/pull/19138) ([ilyam8](https://github.com/ilyam8))
-- Streaming improvements No 1 [\#19137](https://github.com/netdata/netdata/pull/19137) ([ktsaou](https://github.com/ktsaou))
-- fixed bug in streaming sender read [\#19136](https://github.com/netdata/netdata/pull/19136) ([ktsaou](https://github.com/ktsaou))
 
 ## [v2.0.3](https://github.com/netdata/netdata/tree/v2.0.3) (2024-11-22)
 

packaging/version

@@ -1 +1 @@
-v2.2.0-209-nightly
+v2.2.0-215-nightly

src/collectors/log2journal/log2journal-json.c

@@ -513,6 +513,12 @@ static inline bool json_parse_array(LOG_JSON_STATE *js) {
 
     size_t index = 0;
     do {
+        const char *s = json_current_pos(js);
+        if(*s == ']') {
+            json_consume_char(js);
+            break;
+        }
+
         if(!json_key_index_and_push(js, index))
             return false;
 
@@ -524,7 +530,7 @@ static inline bool json_parse_array(LOG_JSON_STATE *js) {
         if(!json_expect_char_after_white_space(js, ",]"))
             return false;
 
-        const char *s = json_current_pos(js);
+        s = json_current_pos(js);
         json_consume_char(js);
         if(*s == ',') {
             index++;
@@ -545,6 +551,12 @@ static inline bool json_parse_object(LOG_JSON_STATE *js) {
     json_consume_char(js);
 
     do {
+        const char *s = json_current_pos(js);
+        if(*s == '}') {
+            json_consume_char(js);
+            break;
+        }
+
         if (!json_expect_char_after_white_space(js, "\""))
             return false;
 
@@ -564,7 +576,7 @@ static inline bool json_parse_object(LOG_JSON_STATE *js) {
         if(!json_expect_char_after_white_space(js, ",}"))
             return false;
 
-        const char *s = json_current_pos(js);
+        s = json_current_pos(js);
         json_consume_char(js);
         if(*s == ',')
             continue;

src/daemon/dyncfg/dyncfg-tree.c

@@ -34,7 +34,7 @@ static void dyncfg_to_json(DYNCFG *df, const char *id, BUFFER *wb, bool anonymou
         }
         buffer_json_object_close(wb);
         buffer_json_member_add_string(wb, "source_type", dyncfg_id2source_type(df->current.source_type));
-        buffer_json_member_add_string(wb, "source", df->current.source_type == DYNCFG_SOURCE_TYPE_DYNCFG && anonymous ? "anonymous access does not present sensitive user info" : string2str(df->current.source));
+        buffer_json_member_add_string(wb, "source", df->current.source_type == DYNCFG_SOURCE_TYPE_DYNCFG && anonymous ? "User details hidden in anonymous mode. Sign in to access configuration details." : string2str(df->current.source));
         buffer_json_member_add_boolean(wb, "sync", df->sync);
         buffer_json_member_add_boolean(wb, "user_disabled", df->dyncfg.user_disabled);
         buffer_json_member_add_boolean(wb, "restart_required", df->dyncfg.restart_required);
@@ -45,7 +45,7 @@ static void dyncfg_to_json(DYNCFG *df, const char *id, BUFFER *wb, bool anonymou
                 buffer_json_member_add_boolean(wb, "available", true);
                 buffer_json_member_add_string(wb, "status", dyncfg_id2status(df->dyncfg.status));
                 buffer_json_member_add_string(wb, "source_type", dyncfg_id2source_type(df->dyncfg.source_type));
-                buffer_json_member_add_string(wb, "source", df->dyncfg.source_type == DYNCFG_SOURCE_TYPE_DYNCFG && anonymous ? "anonymous access does not present sensitive user info" :string2str(df->dyncfg.source));
+                buffer_json_member_add_string(wb, "source", df->dyncfg.source_type == DYNCFG_SOURCE_TYPE_DYNCFG && anonymous ? "User details hidden in anonymous mode. Sign in to access configuration details." :string2str(df->dyncfg.source));
                 buffer_json_member_add_uint64(wb, "created_ut", df->dyncfg.created_ut);
                 buffer_json_member_add_uint64(wb, "modified_ut", df->dyncfg.modified_ut);
                 buffer_json_member_add_string(wb, "content_type", content_type_id2string(df->dyncfg.payload->content_type));

src/go/go.mod

@@ -1,6 +1,6 @@
 module github.com/netdata/netdata/go/plugins
 
-go 1.23.6
+go 1.23.4
 
 replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.50.1
 

src/go/otel-collector/exporter/journaldexporter/go.mod

@@ -1,6 +1,6 @@
 module github.com/netdata/netdata/otel-collector/exporter/journaldexporter
 
-go 1.23.6
+go 1.23.4
 
 require (
 	github.com/stretchr/testify v1.10.0

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

@@ -27,13 +27,18 @@ func (c *Collector) collectUserStatistics(mx map[string]int64) error {
 				c.addUserStatisticsCharts(user)
 			}
 		case "Cpu_time":
-			if c.isMariaDB && c.version.GTE(semver.Version{Major: 11, Minor: 4, Patch: 5}) {
+			needsDivision := c.isMariaDB &&
+				((c.version.Major == 10 && c.version.GTE(semver.Version{Major: 10, Minor: 11, Patch: 11})) ||
+					c.version.GTE(semver.Version{Major: 11, Minor: 4, Patch: 5}))
+
+			key := strings.ToLower(prefix + column)
+			if needsDivision {
 				// TODO: theoretically should divide by 1e6 to convert to seconds,
 				// but empirically need 1e7 to match pre-11.4.5 values.
 				// Needs investigation - possible unit reporting inconsistency in MariaDB
-				mx[strings.ToLower(prefix+column)] = int64(parseFloat(value) / 1e7 * 1000)
+				mx[key] = int64(parseFloat(value) / 1e7 * 1000)
 			} else {
-				mx[strings.ToLower(prefix+column)] = int64(parseFloat(value) * 1000)
+				mx[key] = int64(parseFloat(value) * 1000)
 			}
 		case
 			"Total_connections",