From fa2e9fe1ad2ac6543571518ec05a1d7c4160399d Mon Sep 17 00:00:00 2001 From: idoko Date: Wed, 17 Sep 2025 22:30:19 +0100 Subject: [PATCH 1/3] bump version file --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0131a133c..1a765e8a8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.47.0 +v0.47.1 From a4d81f6425787101307f6a7e3f80e76dcba5359e Mon Sep 17 00:00:00 2001 From: idoko Date: Fri, 19 Sep 2025 11:50:11 +0100 Subject: [PATCH 2/3] update test images --- Makefile | 2 +- README.md | 2 +- docker-compose.yml | 28 ++++++++++++++-------------- test-setup/mongodb-auth.dockerfile | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 585b87cca..2b0bb3f65 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ REPO ?= percona/$(NAME) GORELEASER_FLAGS ?= UID ?= $(shell id -u) -export TEST_MONGODB_IMAGE?=mongo:4.4 +export TEST_MONGODB_IMAGE?=mongo:6.0 export TEST_MONGODB_ADMIN_USERNAME?= export TEST_MONGODB_ADMIN_PASSWORD?= export TEST_MONGODB_USERNAME?= diff --git a/README.md b/README.md index 8abe7670c..4a9917a9c 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Currently, these metric sources are implemented: ## Supported MongoDB versions -The exporter works with Percona Server for MongoDB and MongoDB Community or Enterprise Edition versions 4.4 and newer. Older versions might also work but are not tested anymore. +The exporter works with Percona Server for MongoDB and MongoDB Community or Enterprise Edition versions 6.0 and newer. Older versions might also work but are not tested anymore. ## Info on Percona MongoDB exporter versions diff --git a/docker-compose.yml b/docker-compose.yml index 48a06239b..492d61df0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: mongo-1-1: container_name: "mongo-1-1" - image: ${TEST_MONGODB_IMAGE:-mongo:4.4} + image: ${TEST_MONGODB_IMAGE:-mongo:6.0} ports: - "${TEST_MONGODB_S1_PRIMARY_PORT:-17001}:27017" command: mongod --replSet rs1 --shardsvr --port 27017 --oplogSize 16 --bind_ip 0.0.0.0 @@ -14,7 +14,7 @@ services: mongo-1-2: container_name: "mongo-1-2" - image: ${TEST_MONGODB_IMAGE:-mongo:4.4} + image: ${TEST_MONGODB_IMAGE:-mongo:6.0} ports: - "${TEST_MONGODB_S1_SECONDARY1_PORT:-17002}:27017" command: mongod --replSet rs1 --shardsvr --port 27017 --oplogSize 16 --bind_ip 0.0.0.0 @@ -23,7 +23,7 @@ services: mongo-1-3: container_name: "mongo-1-3" - image: ${TEST_MONGODB_IMAGE:-mongo:4.4} + image: ${TEST_MONGODB_IMAGE:-mongo:6.0} ports: - "${TEST_MONGODB_S1_SECONDARY2_PORT:-17003}:27017" command: mongod --replSet rs1 --shardsvr --port 27017 --oplogSize 16 --bind_ip 0.0.0.0 @@ -32,7 +32,7 @@ services: mongo-1-arbiter: container_name: "mongo-1-arbiter" - image: ${TEST_MONGODB_IMAGE:-mongo:4.4} + image: ${TEST_MONGODB_IMAGE:-mongo:6.0} ports: - "${TEST_MONGODB_S1_ARBITER:-17011}:27017" command: mongod --replSet rs1 --shardsvr --port 27017 --oplogSize 16 @@ -41,7 +41,7 @@ services: mongo-rs1-setup: container_name: "mongo-rs1-setup" - image: ${TEST_MONGODB_IMAGE:-mongo:4.4} + image: ${TEST_MONGODB_IMAGE:-mongo:6.0} depends_on: - "mongo-1-1" - "mongo-1-2" @@ -150,7 +150,7 @@ services: mongo-rs2-setup: container_name: "mongo-rs2-setup" - image: ${TEST_MONGODB_IMAGE:-mongo:4.4} + image: ${TEST_MONGODB_IMAGE:-mongo:6.0} depends_on: - "mongo-2-1" - "mongo-2-2" @@ -174,7 +174,7 @@ services: # Config servers mongo-cnf-2: container_name: "mongo-cnf-2" - image: ${TEST_MONGODB_IMAGE:-mongo:4.4} + image: ${TEST_MONGODB_IMAGE:-mongo:6.0} ports: - "${TEST_MONGODB_CONFIGSVR2_PORT:-17008}:27017" command: mongod --dbpath /data/db --replSet cnf-serv --configsvr --port 27017 --oplogSize 16 @@ -183,7 +183,7 @@ services: mongo-cnf-3: container_name: "mongo-cnf-3" - image: ${TEST_MONGODB_IMAGE:-mongo:4.4} + image: ${TEST_MONGODB_IMAGE:-mongo:6.0} ports: - "${TEST_MONGODB_CONFIGSVR3_PORT:-17009}:27017" command: mongod --dbpath /data/db --replSet cnf-serv --configsvr --port 27017 --oplogSize 16 @@ -192,7 +192,7 @@ services: mongo-cnf-1: container_name: "mongo-cnf-1" - image: ${TEST_MONGODB_IMAGE:-mongo:4.4} + image: ${TEST_MONGODB_IMAGE:-mongo:6.0} ports: - "${TEST_MONGODB_CONFIGSVR1_PORT:-17007}:27017" command: mongod --dbpath /data/db --replSet cnf-serv --configsvr --port 27017 --oplogSize 16 @@ -204,7 +204,7 @@ services: mongo-cnf-setup: container_name: "mongo-cnf-setup" - image: ${TEST_MONGODB_IMAGE:-mongo:4.4} + image: ${TEST_MONGODB_IMAGE:-mongo:6.0} depends_on: - "mongo-cnf-1" - "mongo-cnf-2" @@ -224,7 +224,7 @@ services: mongos: container_name: "mongos" - image: ${TEST_MONGODB_IMAGE:-mongo:4.4} + image: ${TEST_MONGODB_IMAGE:-mongo:6.0} ports: - "${TEST_MONGODB_MONGOS_PORT:-17000}:27017" networks: @@ -240,7 +240,7 @@ services: mongo-shard-setup: container_name: "mongo-shard-setup" - image: ${TEST_MONGODB_IMAGE:-mongo:4.4} + image: ${TEST_MONGODB_IMAGE:-mongo:6.0} depends_on: - "mongos" networks: @@ -270,7 +270,7 @@ services: standalone: container_name: "standalone" - image: ${TEST_MONGODB_IMAGE:-mongo:4.4} + image: ${TEST_MONGODB_IMAGE:-mongo:6.0} ports: - "${TEST_MONGODB_STANDALONE_PORT:-27017}:27017" command: mongod --port 27017 --oplogSize 16 @@ -278,7 +278,7 @@ services: standalone-encrypted: user: root container_name: "standalone-encrypted" - image: ${TEST_MONGODB_IMAGE:-mongo:4.4} + image: ${TEST_MONGODB_IMAGE:-mongo:6.0} ports: - "${TEST_MONGODB_STANDALONE_ENCRYPTED_PORT:-27027}:27017" volumes: diff --git a/test-setup/mongodb-auth.dockerfile b/test-setup/mongodb-auth.dockerfile index 905eadfda..1f2b52149 100644 --- a/test-setup/mongodb-auth.dockerfile +++ b/test-setup/mongodb-auth.dockerfile @@ -1,4 +1,4 @@ -ARG TEST_MONGODB_IMAGE=mongo:4.4 +ARG TEST_MONGODB_IMAGE=mongo:6.0 FROM ${TEST_MONGODB_IMAGE} USER root COPY test-setup/secret/keyfile /opt/keyfile From 43668b84334284572fd3d45fa9408e1ff13ef531 Mon Sep 17 00:00:00 2001 From: idoko Date: Sun, 21 Sep 2025 20:09:30 +0100 Subject: [PATCH 3/3] surpress histogram metrics --- exporter/metrics.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/exporter/metrics.go b/exporter/metrics.go index 6cf9a2f66..d4e28dc18 100644 --- a/exporter/metrics.go +++ b/exporter/metrics.go @@ -309,6 +309,10 @@ func makeMetrics(prefix string, m bson.M, labels map[string]string, compatibleMo } for k, val := range m { + // histogram metrics are currently unsupported (PMM-14337) + if k == "histograms" { + continue + } nextPrefix := prefix + k l := make(map[string]string)