[pull] master from netdata:master

CHANGELOG.md

@@ -2,10 +2,14 @@
 
 ## [**Next release**](https://github.com/netdata/netdata/tree/HEAD)
 
-[Full Changelog](https://github.com/netdata/netdata/compare/v1.47.4...HEAD)
+[Full Changelog](https://github.com/netdata/netdata/compare/v1.47.5...HEAD)
 
 **Merged pull requests:**
 
+- Prevent memory corruption during ACLK OTP decode [\#18863](https://github.com/netdata/netdata/pull/18863) ([stelfrag](https://github.com/stelfrag))
+- Do not build H2O by default. [\#18861](https://github.com/netdata/netdata/pull/18861) ([vkalintiris](https://github.com/vkalintiris))
+- Regenerate integrations.js [\#18860](https://github.com/netdata/netdata/pull/18860) ([netdatabot](https://github.com/netdatabot))
+- feat\(go.d.plugin\): add MaxScale collector [\#18859](https://github.com/netdata/netdata/pull/18859) ([ilyam8](https://github.com/ilyam8))
 - fix\(apps.plugin\): add tini to Linux managers [\#18856](https://github.com/netdata/netdata/pull/18856) ([ilyam8](https://github.com/ilyam8))
 - feat\(proc/numa\): add numa node mem activity [\#18855](https://github.com/netdata/netdata/pull/18855) ([ilyam8](https://github.com/ilyam8))
 - build\(deps\): bump github.com/vmware/govmomi from 0.44.1 to 0.45.0 in /src/go [\#18854](https://github.com/netdata/netdata/pull/18854) ([dependabot[bot]](https://github.com/apps/dependabot))
@@ -355,6 +359,10 @@
 - remove python.d/boinc [\#18397](https://github.com/netdata/netdata/pull/18397) ([ilyam8](https://github.com/ilyam8))
 - fix warnings in Dockerfile [\#18395](https://github.com/netdata/netdata/pull/18395) ([NicolasCARPi](https://github.com/NicolasCARPi))
 
+## [v1.47.5](https://github.com/netdata/netdata/tree/v1.47.5) (2024-10-24)
+
+[Full Changelog](https://github.com/netdata/netdata/compare/v1.47.4...v1.47.5)
+
 ## [v1.47.4](https://github.com/netdata/netdata/tree/v1.47.4) (2024-10-09)
 
 [Full Changelog](https://github.com/netdata/netdata/compare/v1.47.3...v1.47.4)
@@ -438,9 +446,6 @@
 - Regenerate integrations.js [\#18317](https://github.com/netdata/netdata/pull/18317) ([netdatabot](https://github.com/netdatabot))
 - remove python.d/nvidia\_smi [\#18316](https://github.com/netdata/netdata/pull/18316) ([ilyam8](https://github.com/ilyam8))
 - go.d nvidia\_smi: enable by default [\#18315](https://github.com/netdata/netdata/pull/18315) ([ilyam8](https://github.com/ilyam8))
-- go.d nvidia\_smi: add loop mode [\#18313](https://github.com/netdata/netdata/pull/18313) ([ilyam8](https://github.com/ilyam8))
-- Regenerate integrations.js [\#18312](https://github.com/netdata/netdata/pull/18312) ([netdatabot](https://github.com/netdatabot))
-- go.d nvidia\_smi remove "csv" mode [\#18311](https://github.com/netdata/netdata/pull/18311) ([ilyam8](https://github.com/ilyam8))
 
 ## [v1.46.3](https://github.com/netdata/netdata/tree/v1.46.3) (2024-07-23)
 

CMakeLists.txt

@@ -195,7 +195,7 @@ option(ENABLE_BUNDLED_PROTOBUF "Use a vendored copy of protobuf" False)
 # Experimental features
 option(ENABLE_WEBRTC "Enable WebRTC dashboard communications (experimental)" False)
 mark_as_advanced(ENABLE_WEBRTC)
-option(ENABLE_H2O "Enable H2O web server (experimental)" True)
+option(ENABLE_H2O "Enable H2O web server (experimental)" False)
 mark_as_advanced(ENABLE_H2O)
 
 # Other optional functionality

packaging/version

@@ -1 +1 @@
-v1.99.0-416-nightly
+v1.99.0-421-nightly

src/aclk/aclk_otp.c

@@ -324,7 +324,7 @@ int aclk_get_otp_challenge(url_t *target, const char *agent_id, unsigned char **
         goto cleanup_json;
     }
 
-    *challenge = mallocz(CHALLENGE_LEN);
+    *challenge = mallocz((CHALLENGE_LEN_BASE64 / 4) * 3 + 1);
     *challenge_bytes = netdata_base64_decode(*challenge, (const unsigned char *) challenge_base64, CHALLENGE_LEN_BASE64);
 
     if (*challenge_bytes != CHALLENGE_LEN) {

src/collectors/COLLECTORS.md

@@ -237,6 +237,8 @@ If you don't see the app/service you'd like to monitor in this list:
 
 - [MariaDB](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/modules/mysql/integrations/mariadb.md)
 
+- [MaxScale](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/modules/maxscale/integrations/maxscale.md)
+
 - [Memcached (community)](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/modules/prometheus/integrations/memcached_community.md)
 
 - [Memcached](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/modules/memcached/integrations/memcached.md)

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

@@ -89,6 +89,7 @@ see the appropriate collector readme.
 | [logind](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/logind)                         |        systemd-logind         |
 | [logstash](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/logstash)                     |           Logstash            |
 | [lvm](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/lvm)                               |      LVM logical volumes      |
+| [maxscale](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/maxscale)                     |           MaxScale            |
 | [megacli](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/megacli)                       |     MegaCli Hardware Raid     |
 | [memcached](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/memcached)                   |           Memcached           |
 | [mongoDB](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/mongodb)                       |            MongoDB            |

src/go/plugin/go.d/config/go.d.conf

@@ -64,6 +64,7 @@ modules:
 #  logind: yes
 #  logstash: yes
 #  lvm: yes
+#  maxscale: yes
 #  megacli: yes
 #  memcached: yes
 #  mongodb: yes

src/go/plugin/go.d/config/go.d/maxscale.conf

@@ -0,0 +1,6 @@
+## All available configuration options, their descriptions and default values:
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/maxscale#readme
+
+#jobs:
+#  - name: local
+#    url: http://127.0.0.1:8989

src/go/plugin/go.d/config/go.d/sd/docker.conf

@@ -50,6 +50,8 @@ classify:
         expr: '{{ and (eq .PrivatePort "5001") (match "sp" .Image "ipfs/kubo ipfs/kubo:*") }}'
       - tags: "lighttpd"
         expr: '{{ match "sp" .Image "*/lighttpd */lighttpd:*" }}'
+      - tags: "maxscale"
+        expr: '{{ or (eq .PrivatePort "8989") (match "sp" .Image "mariadb/maxscale mariadb/maxscale:*") }}'
       - tags: "memcached"
         expr: '{{ or (eq .PrivatePort "11211") (match "sp" .Image "memcached memcached:* */memcached */memcached:*") }}'
       - tags: "mongodb"
@@ -175,6 +177,11 @@ compose:
           module: lighttpd
           name: docker_{{.Name}}
           url: http://{{.Address}}/server-status?auto
+      - selector: "maxscale"
+        template: |
+          module: maxscale
+          name: docker_{{.Name}}
+          url: http://{{.Address}}
       - selector: "memcached"
         template: |
           module: memcached

src/go/plugin/go.d/config/go.d/sd/net_listeners.conf

@@ -82,6 +82,8 @@ classify:
         expr: '{{ and (eq .Port "80" "8080") (eq .Comm "lighttpd") }}'
       - tags: "logstash"
         expr: '{{ and (eq .Port "9600") (glob .Cmdline "*logstash*") }}'
+      - tags: "maxscale"
+        expr: '{{ or (eq .Port "8989") (eq .Comm "maxscale") }}'
       - tags: "memcached"
         expr: '{{ or (eq .Port "11211") (eq .Comm "memcached") }}'
       - tags: "mongodb"
@@ -359,6 +361,11 @@ compose:
           module: logstash
           name: local
           url: http://{{.Address}}
+      - selector: "maxscale"
+        template: |
+          module: maxscale
+          name: local
+          url: http://{{.Address}}
       - selector: "memcached"
         template: |
           module: memcached

src/go/plugin/go.d/modules/ceph/integrations/ceph.md

@@ -25,7 +25,7 @@ This collector monitors the overall health status and performance of your Ceph c
 It gathers key metrics for the entire cluster, individual Pools, and OSDs.
 
 
-It collects metrics by periodically issuing HTTP GET requests to the Ceph Manager [RESP API](https://docs.ceph.com/en/reef/mgr/ceph_api/#):
+It collects metrics by periodically issuing HTTP GET requests to the Ceph Manager [REST API](https://docs.ceph.com/en/reef/mgr/ceph_api/#):
 
 - [/api/monitor](https://docs.ceph.com/en/reef/mgr/ceph_api/#get--api-monitor) (only once to get the Ceph cluster id (fsid))          
 - [/api/health/minimal](https://docs.ceph.com/en/reef/mgr/ceph_api/#get--api-health-minimal)
@@ -49,7 +49,7 @@ The collector can automatically detect Ceph Manager instances running on:
 - localhost that are listening on port 8443
 - within Docker containers
 
-> **Note that the Ceph RESP API requires a username and password**. 
+> **Note that the Ceph REST API requires a username and password**. 
 > While Netdata can automatically detect Ceph Manager instances and create data collection jobs, these jobs will fail unless you provide the necessary credentials.
 
 

src/go/plugin/go.d/modules/ceph/metadata.yaml

@@ -24,7 +24,7 @@ modules:
           This collector monitors the overall health status and performance of your Ceph clusters.
           It gathers key metrics for the entire cluster, individual Pools, and OSDs.
         method_description: |
-          It collects metrics by periodically issuing HTTP GET requests to the Ceph Manager [RESP API](https://docs.ceph.com/en/reef/mgr/ceph_api/#):
+          It collects metrics by periodically issuing HTTP GET requests to the Ceph Manager [REST API](https://docs.ceph.com/en/reef/mgr/ceph_api/#):
 
           - [/api/monitor](https://docs.ceph.com/en/reef/mgr/ceph_api/#get--api-monitor) (only once to get the Ceph cluster id (fsid))          
           - [/api/health/minimal](https://docs.ceph.com/en/reef/mgr/ceph_api/#get--api-health-minimal)
@@ -44,7 +44,7 @@ modules:
             - localhost that are listening on port 8443
             - within Docker containers
 
-            > **Note that the Ceph RESP API requires a username and password**. 
+            > **Note that the Ceph REST API requires a username and password**. 
             > While Netdata can automatically detect Ceph Manager instances and create data collection jobs, these jobs will fail unless you provide the necessary credentials.
         limits:
           description: ""

src/go/plugin/go.d/modules/init.go

@@ -55,6 +55,7 @@ import (
 	_ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/logind"
 	_ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/logstash"
 	_ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/lvm"
+	_ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/maxscale"
 	_ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/megacli"
 	_ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/memcached"
 	_ "github.com/netdata/netdata/go/plugins/plugin/go.d/modules/mongodb"

src/go/plugin/go.d/modules/maxscale/README.md

@@ -0,0 +1 @@
+integrations/maxscale.md