Skip to content

PMM-7: Fix CI checks #1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 22, 2025
Merged

PMM-7: Fix CI checks #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa2e9fe
bump version file
idoqo Sep 17, 2025
a4d81f6
update test images
idoqo Sep 19, 2025
43668b8
surpress histogram metrics
idoqo Sep 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?=
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.47.0
v0.47.1
28 changes: 14 additions & 14 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -270,15 +270,15 @@ 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

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:
Expand Down
4 changes: 4 additions & 0 deletions exporter/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test-setup/mongodb-auth.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down