Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ DOCKER_HTTPS_PORT=8443 # 443 for version 2 and 8443 for version 3
PMM_AGENT_CONFIG_FILE=./setup/pmm/agent.yaml
PMM_DUMP_PASS=""
PMM_DUMP_PASS_FILEPATH=""
PMM_INTERNAL_QAN=1 # The default value is 0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It missing empty line

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also there is typo. It should be: PMM_ENABLE_INTERNAL_PG_QAN. Like on other places

2 changes: 2 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ services:
- "${CLICKHOUSE_PORT_HTTP}:8123"
volumes:
- pmm-server-data:/srv
environment:
- PMM_ENABLE_INTERNAL_PG_QAN=${PMM_INTERNAL_QAN}

pmm-client:
image: ${PMM_CLIENT_IMAGE}:${PMM_VERSION}
Expand Down
4 changes: 4 additions & 0 deletions internal/test/deployment/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ func (pmm *PMM) CreatePMMServer(ctx context.Context, dockerCli *client.Client, n

var ports []string
var env []string

// the default value is 0, but leaving it as 0 will cause the QAN test to fail.
env = append(env, "PMM_ENABLE_INTERNAL_PG_QAN=1")

if pkgUtil.CheckVer(pmm.GetVersion(), "< 3.0.0") {
ports = []string{defaultHTTPPortv2, defaultHTTPSPortv2, defaultClickhousePort, defaultClickhouseHTTPPort}
} else {
Expand Down
Loading