Skip to content
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

Jump to bottom

PMM-13027 dot for PMM Agent node name #46

Merged
merged 4 commits into from
Apr 24, 2024
Merged

PMM-13027 dot for PMM Agent node name #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
250a8a8
PMM-13027 dot for PMM Agent node name
yurkovychv Apr 17, 2024
16b8d51
Merge branch 'v3' into PMM-13027-dot-in-node-name
yurkovychv Apr 22, 2024
e924c84
PMM-13027 fix external and haproxy
yurkovychv Apr 22, 2024
293109b
PMM-13027 external setup ports
yurkovychv Apr 24, 2024
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 pmm_psmdb-pbm_setup/configure-agents.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ nodes="rs101 rs102 rs103"
for node in $nodes
do
echo "congiguring pmm agent on $node"
docker-compose -f docker-compose-rs.yaml exec -T -e PMM_AGENT_SETUP_NODE_NAME=${node}_${random_number} $node pmm-agent setup
docker-compose -f docker-compose-rs.yaml exec -T -e PMM_AGENT_SETUP_NODE_NAME=${node}._${random_number} $node pmm-agent setup
if [[ $mongo_setup_type == "psa" && $node == "rs103" ]]; then
docker-compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --cluster=replicaset --replication-set=rs ${node}_${random_number} 127.0.0.1:27017
else
Expand Down
2 changes: 1 addition & 1 deletion pmm_psmdb-pbm_setup/configure-extra-agents.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ nodes="rs201 rs202 rs203"
for node in $nodes
do
echo "configuring pmm agent on $node"
docker-compose -f docker-compose-rs.yaml exec -T -e PMM_AGENT_SETUP_NODE_NAME=${node}_${random_number} $node pmm-agent setup
docker-compose -f docker-compose-rs.yaml exec -T -e PMM_AGENT_SETUP_NODE_NAME=${node}._${random_number} $node pmm-agent setup
if [[ $mongo_setup_type == "psa" && $node == "rs203" ]]; then
docker-compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --cluster=replicaset --replication-set=rs1 ${node}_${random_number} 127.0.0.1:27017
else
Expand Down
2 changes: 1 addition & 1 deletion pmm_qa/external_setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

- name: Prepare Container for External Exporters
shell: >
sudo docker run -d -p 42100:42100 --name={{ external_container }}
sudo docker run -d -p 43100:43100 --name={{ external_container }}
phusion/baseimage:focal-1.1.0

- name: Copy all required Artifacts to the docker external_container
Expand Down
4 changes: 2 additions & 2 deletions pmm_qa/pmm-framework.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ def setup_haproxy(db_type, db_version=None, db_config=None, args=None):
'HAPROXY_CONTAINER': 'haproxy_pmm',
'CLIENT_VERSION': get_value('CLIENT_VERSION', db_type, args, db_config),
'ADMIN_PASSWORD': os.getenv('ADMIN_PASSWORD') or args.pmm_server_password or 'admin',
'PMM_QA_GIT_BRANCH': os.getenv('ADMIN_PASSWORD') or 'v3'
'PMM_QA_GIT_BRANCH': os.getenv('PMM_QA_GIT_BRANCH') or 'v3'
}

# Ansible playbook filename
Expand Down Expand Up @@ -304,7 +304,7 @@ def setup_external(db_type, db_version=None, db_config=None, args=None):
'EXTERNAL_CONTAINER': 'external_pmm',
'CLIENT_VERSION': get_value('CLIENT_VERSION', db_type, args, db_config),
'ADMIN_PASSWORD': os.getenv('ADMIN_PASSWORD') or args.pmm_server_password or 'admin',
'PMM_QA_GIT_BRANCH': os.getenv('ADMIN_PASSWORD') or 'v3'
'PMM_QA_GIT_BRANCH': os.getenv('PMM_QA_GIT_BRANCH') or 'v3'
}

# Ansible playbook filename
Expand Down
Loading