Skip to content

Commit bb97e67

Browse files
saikumar-vssaikumar-vs
authored
Updates fix docker-compose search replace (#80)
1 parent 6bde793 commit bb97e67

File tree

10 files changed

+82
-82
lines changed

10 files changed

+82
-82
lines changed

‎pmm_psmdb-pbm_setup/configure-agents.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ nodes="rs101 rs102 rs103"
1313
for node in $nodes
1414
do
1515
echo "congiguring pbm agent on $node"
16-
docker compose -f docker compose-rs.yaml exec -T $node bash -c "echo \"PBM_MONGODB_URI=mongodb://${pbm_user}:${pbm_pass}@127.0.0.1:27017\" > /etc/sysconfig/pbm-agent"
16+
docker compose -f docker-compose-rs.yaml exec -T $node bash -c "echo \"PBM_MONGODB_URI=mongodb://${pbm_user}:${pbm_pass}@127.0.0.1:27017\" > /etc/sysconfig/pbm-agent"
1717
echo "restarting pbm agent on $node"
18-
docker compose -f docker compose-rs.yaml exec -T $node systemctl restart pbm-agent
18+
docker compose -f docker-compose-rs.yaml exec -T $node systemctl restart pbm-agent
1919
done
2020

2121
if [[ $mongo_setup_type == "psa" ]]; then
2222
echo "stop pbm agent for arbiter node"
23-
docker compose -f docker compose-rs.yaml exec -T rs103 systemctl stop pbm-agent
23+
docker compose -f docker-compose-rs.yaml exec -T rs103 systemctl stop pbm-agent
2424
fi
2525
echo
2626
echo "configuring pmm agents"
@@ -29,17 +29,17 @@ nodes="rs101 rs102 rs103"
2929
for node in $nodes
3030
do
3131
echo "congiguring pmm agent on $node"
32-
docker compose -f docker compose-rs.yaml exec -T -e PMM_AGENT_SETUP_NODE_NAME=${node}._${random_number} $node pmm-agent setup
32+
docker compose -f docker-compose-rs.yaml exec -T -e PMM_AGENT_SETUP_NODE_NAME=${node}._${random_number} $node pmm-agent setup
3333
if [[ $mongo_setup_type == "psa" && $node == "rs103" ]]; then
34-
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
34+
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
3535
else
36-
docker compose -f docker compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --cluster=replicaset --replication-set=rs --username=${pmm_mongo_user} --password=${pmm_mongo_user_pass} ${node}_${random_number} 127.0.0.1:27017
36+
docker compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --cluster=replicaset --replication-set=rs --username=${pmm_mongo_user} --password=${pmm_mongo_user_pass} ${node}_${random_number} 127.0.0.1:27017
3737
fi
3838
done
3939
echo
4040
echo "adding some data"
41-
docker compose -f docker compose-rs.yaml exec -T rs101 mgodatagen -f /etc/datagen/replicaset.json --uri=mongodb://${pmm_mongo_user}:${pmm_mongo_user_pass}@127.0.0.1:27017/?replicaSet=rs
42-
docker compose -f docker compose-rs.yaml exec -T rs101 mongo "mongodb://${pmm_mongo_user}:${pmm_mongo_user_pass}@localhost/?replicaSet=rs" --quiet << EOF
41+
docker compose -f docker-compose-rs.yaml exec -T rs101 mgodatagen -f /etc/datagen/replicaset.json --uri=mongodb://${pmm_mongo_user}:${pmm_mongo_user_pass}@127.0.0.1:27017/?replicaSet=rs
42+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://${pmm_mongo_user}:${pmm_mongo_user_pass}@localhost/?replicaSet=rs" --quiet << EOF
4343
use students;
4444
db.students.insertMany([
4545
{

‎pmm_psmdb-pbm_setup/configure-extra-agents.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ nodes="rs201 rs202 rs203"
1313
for node in $nodes
1414
do
1515
echo "configuring pbm agent on $node"
16-
docker compose -f docker compose-rs.yaml exec -T $node bash -c "echo \"PBM_MONGODB_URI=mongodb://${pbm_user}:${pbm_pass}@127.0.0.1:27017\" > /etc/sysconfig/pbm-agent"
16+
docker compose -f docker-compose-rs.yaml exec -T $node bash -c "echo \"PBM_MONGODB_URI=mongodb://${pbm_user}:${pbm_pass}@127.0.0.1:27017\" > /etc/sysconfig/pbm-agent"
1717
echo "restarting pbm agent on $node"
18-
docker compose -f docker compose-rs.yaml exec -T $node systemctl restart pbm-agent
18+
docker compose -f docker-compose-rs.yaml exec -T $node systemctl restart pbm-agent
1919
done
2020

2121
if [[ $mongo_setup_type == "psa" ]]; then
2222
echo "stop pbm agent for arbiter node rs203"
23-
docker compose -f docker compose-rs.yaml exec -T rs203 systemctl stop pbm-agent
23+
docker compose -f docker-compose-rs.yaml exec -T rs203 systemctl stop pbm-agent
2424
fi
2525
echo
2626
echo "configuring pmm agents"
@@ -29,10 +29,10 @@ nodes="rs201 rs202 rs203"
2929
for node in $nodes
3030
do
3131
echo "configuring pmm agent on $node"
32-
docker compose -f docker compose-rs.yaml exec -T -e PMM_AGENT_SETUP_NODE_NAME=${node}._${random_number} $node pmm-agent setup
32+
docker compose -f docker-compose-rs.yaml exec -T -e PMM_AGENT_SETUP_NODE_NAME=${node}._${random_number} $node pmm-agent setup
3333
if [[ $mongo_setup_type == "psa" && $node == "rs203" ]]; then
34-
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
34+
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
3535
else
36-
docker compose -f docker compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --cluster=replicaset --replication-set=rs1 --username=${pmm_mongo_user} --password=${pmm_mongo_user_pass} ${node}_${random_number} 127.0.0.1:27017
36+
docker compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --cluster=replicaset --replication-set=rs1 --username=${pmm_mongo_user} --password=${pmm_mongo_user_pass} ${node}_${random_number} 127.0.0.1:27017
3737
fi
3838
done

‎pmm_psmdb-pbm_setup/configure-extra-psa.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pbm_pass=${PBM_PASS:-pbmpass}
88

99
echo
1010
echo "configuring extra PSA replicaset with members priorities"
11-
docker compose -f docker compose-rs.yaml exec -T rs201 mongo --quiet << EOF
11+
docker compose -f docker-compose-rs.yaml exec -T rs201 mongo --quiet << EOF
1212
config = {
1313
"_id" : "rs",
1414
"members" : [
@@ -35,12 +35,12 @@ echo
3535
sleep 60
3636
echo
3737
echo "configuring root user on primary"
38-
docker compose -f docker compose-rs.yaml exec -T rs201 mongo --quiet << EOF
38+
docker compose -f docker-compose-rs.yaml exec -T rs201 mongo --quiet << EOF
3939
db.getSiblingDB("admin").createUser({ user: "root", pwd: "root", roles: [ "root", "userAdminAnyDatabase", "clusterAdmin" ] });
4040
EOF
4141
echo
4242
echo "configuring pbm and pmm roles"
43-
docker compose -f docker compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
43+
docker compose -f docker-compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
4444
db.getSiblingDB("admin").createRole({
4545
"role": "pbmAnyAction",
4646
"privileges": [{
@@ -70,7 +70,7 @@ db.getSiblingDB("admin").createRole({
7070
EOF
7171
echo
7272
echo "creating pbm user"
73-
docker compose -f docker compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
73+
docker compose -f docker-compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
7474
db.getSiblingDB("admin").createUser({
7575
user: "${pbm_user}",
7676
pwd: "${pbm_pass}",
@@ -85,7 +85,7 @@ db.getSiblingDB("admin").createUser({
8585
EOF
8686
echo
8787
echo "creating pmm user"
88-
docker compose -f docker compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
88+
docker compose -f docker-compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
8989
db.getSiblingDB("admin").createUser({
9090
user: "${pmm_mongo_user}",
9191
pwd: "${pmm_mongo_user_pass}",

‎pmm_psmdb-pbm_setup/configure-extra-replset.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pbm_pass=${PBM_PASS:-pbmpass}
88

99
echo
1010
echo "configuring replicaset with members priorities"
11-
docker compose -f docker compose-rs.yaml exec -T rs201 mongo --quiet << EOF
11+
docker compose -f docker-compose-rs.yaml exec -T rs201 mongo --quiet << EOF
1212
config = {
1313
"_id" : "rs",
1414
"members" : [
@@ -35,12 +35,12 @@ echo
3535
sleep 60
3636
echo
3737
echo "configuring root user on primary"
38-
docker compose -f docker compose-rs.yaml exec -T rs201 mongo --quiet << EOF
38+
docker compose -f docker-compose-rs.yaml exec -T rs201 mongo --quiet << EOF
3939
db.getSiblingDB("admin").createUser({ user: "root", pwd: "root", roles: [ "root", "userAdminAnyDatabase", "clusterAdmin" ] });
4040
EOF
4141
echo
4242
echo "configuring pbm and pmm roles"
43-
docker compose -f docker compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
43+
docker compose -f docker-compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
4444
db.getSiblingDB("admin").createRole({
4545
"role": "pbmAnyAction",
4646
"privileges": [{
@@ -70,7 +70,7 @@ db.getSiblingDB("admin").createRole({
7070
EOF
7171
echo
7272
echo "creating pbm user"
73-
docker compose -f docker compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
73+
docker compose -f docker-compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
7474
db.getSiblingDB("admin").createUser({
7575
user: "${pbm_user}",
7676
pwd: "${pbm_pass}",
@@ -85,7 +85,7 @@ db.getSiblingDB("admin").createUser({
8585
EOF
8686
echo
8787
echo "creating pmm user"
88-
docker compose -f docker compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
88+
docker compose -f docker-compose-rs.yaml exec -T rs201 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
8989
db.getSiblingDB("admin").createUser({
9090
user: "${pmm_mongo_user}",
9191
pwd: "${pmm_mongo_user_pass}",

‎pmm_psmdb-pbm_setup/configure-psa.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pbm_pass=${PBM_PASS:-pbmpass}
88

99
echo
1010
echo "configuring PSA replicaset with members priorities"
11-
docker compose -f docker compose-rs.yaml exec -T rs101 mongo --quiet << EOF
11+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo --quiet << EOF
1212
config = {
1313
"_id" : "rs",
1414
"members" : [
@@ -35,12 +35,12 @@ echo
3535
sleep 60
3636
echo
3737
echo "configuring root user on primary"
38-
docker compose -f docker compose-rs.yaml exec -T rs101 mongo --quiet << EOF
38+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo --quiet << EOF
3939
db.getSiblingDB("admin").createUser({ user: "root", pwd: "root", roles: [ "root", "userAdminAnyDatabase", "clusterAdmin" ] });
4040
EOF
4141
echo
4242
echo "configuring pbm and pmm roles"
43-
docker compose -f docker compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
43+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
4444
db.getSiblingDB("admin").createRole({
4545
"role": "pbmAnyAction",
4646
"privileges": [{
@@ -70,7 +70,7 @@ db.getSiblingDB("admin").createRole({
7070
EOF
7171
echo
7272
echo "creating pbm user"
73-
docker compose -f docker compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
73+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
7474
db.getSiblingDB("admin").createUser({
7575
user: "${pbm_user}",
7676
pwd: "${pbm_pass}",
@@ -85,7 +85,7 @@ db.getSiblingDB("admin").createUser({
8585
EOF
8686
echo
8787
echo "creating pmm user"
88-
docker compose -f docker compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
88+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
8989
db.getSiblingDB("admin").createUser({
9090
user: "${pmm_mongo_user}",
9191
pwd: "${pmm_mongo_user_pass}",

‎pmm_psmdb-pbm_setup/configure-replset.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pbm_pass=${PBM_PASS:-pbmpass}
88

99
echo
1010
echo "configuring replicaset with members priorities"
11-
docker compose -f docker compose-rs.yaml exec -T rs101 mongo --quiet << EOF
11+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo --quiet << EOF
1212
config = {
1313
"_id" : "rs",
1414
"members" : [
@@ -35,12 +35,12 @@ echo
3535
sleep 60
3636
echo
3737
echo "configuring root user on primary"
38-
docker compose -f docker compose-rs.yaml exec -T rs101 mongo --quiet << EOF
38+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo --quiet << EOF
3939
db.getSiblingDB("admin").createUser({ user: "root", pwd: "root", roles: [ "root", "userAdminAnyDatabase", "clusterAdmin" ] });
4040
EOF
4141
echo
4242
echo "configuring pbm and pmm roles"
43-
docker compose -f docker compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
43+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
4444
db.getSiblingDB("admin").createRole({
4545
"role": "pbmAnyAction",
4646
"privileges": [{
@@ -70,7 +70,7 @@ db.getSiblingDB("admin").createRole({
7070
EOF
7171
echo
7272
echo "creating pbm user"
73-
docker compose -f docker compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
73+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
7474
db.getSiblingDB("admin").createUser({
7575
user: "${pbm_user}",
7676
pwd: "${pbm_pass}",
@@ -85,7 +85,7 @@ db.getSiblingDB("admin").createUser({
8585
EOF
8686
echo
8787
echo "creating pmm user"
88-
docker compose -f docker compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
88+
docker compose -f docker-compose-rs.yaml exec -T rs101 mongo "mongodb://root:root@localhost/?replicaSet=rs" --quiet << EOF
8989
db.getSiblingDB("admin").createUser({
9090
user: "${pmm_mongo_user}",
9191
pwd: "${pmm_mongo_user_pass}",

‎pmm_psmdb-pbm_setup/start-rs-only.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ docker network create pmm2-ui-tests_pmm-network || true
1313
export COMPOSE_PROFILES=${profile}
1414
export MONGO_SETUP_TYPE=${mongo_setup_type}
1515

16-
docker compose -f docker compose-rs.yaml down -v --remove-orphans
17-
docker compose -f docker compose-rs.yaml build --no-cache
18-
docker compose -f docker compose-rs.yaml up -d
16+
docker compose -f docker-compose-rs.yaml down -v --remove-orphans
17+
docker compose -f docker-compose-rs.yaml build --no-cache
18+
docker compose -f docker-compose-rs.yaml up -d
1919
echo
2020
echo "waiting 60 seconds for replica set members to start"
2121
sleep 60

‎pmm_psmdb-pbm_setup/start-rs.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ docker network create pmm2-ui-tests_pmm-network || true
1414
export COMPOSE_PROFILES=${profile}
1515
export MONGO_SETUP_TYPE=${mongo_setup_type}
1616

17-
docker compose -f docker compose-rs.yaml -f docker compose-pmm.yaml down -v --remove-orphans
18-
docker compose -f docker compose-rs.yaml -f docker compose-pmm.yaml build
19-
docker compose -f docker compose-pmm.yaml -f docker compose-rs.yaml up -d
17+
docker compose -f docker-compose-rs.yaml -f docker-compose-pmm.yaml down -v --remove-orphans
18+
docker compose -f docker-compose-rs.yaml -f docker-compose-pmm.yaml build
19+
docker compose -f docker-compose-pmm.yaml -f docker-compose-rs.yaml up -d
2020
echo
2121
echo "waiting 30 seconds for pmm-server to start"
2222
sleep 30
2323
echo "configuring pmm-server"
24-
docker compose -f docker compose-pmm.yaml exec -T pmm-server change-admin-password $pmm_server_admin_pass
24+
docker compose -f docker-compose-pmm.yaml exec -T pmm-server change-admin-password $pmm_server_admin_pass
2525
echo "restarting pmm-server"
26-
docker compose -f docker compose-pmm.yaml restart pmm-server
26+
docker compose -f docker-compose-pmm.yaml restart pmm-server
2727
echo "waiting 30 seconds for pmm-server to start"
2828
sleep 30
2929
if [ $mongo_setup_type == "pss" ]; then
@@ -36,8 +36,8 @@ tests=${TESTS:-yes}
3636
if [ $tests != "no" ]; then
3737
echo
3838
echo "running tests"
39-
docker compose -f docker compose-pmm.yaml run test pytest -s -x --verbose test.py
40-
docker compose -f docker compose-pmm.yaml run test chmod -R 777 .
39+
docker compose -f docker-compose-pmm.yaml run test pytest -s -x --verbose test.py
40+
docker compose -f docker-compose-pmm.yaml run test chmod -R 777 .
4141
else
4242
echo
4343
echo "skipping tests"
@@ -46,7 +46,7 @@ cleanup=${CLEANUP:-yes}
4646
if [ $cleanup != "no" ]; then
4747
echo
4848
echo "cleanup"
49-
docker compose -f docker compose-rs.yaml -f docker compose-pmm.yaml down -v --remove-orphans
49+
docker compose -f docker-compose-rs.yaml -f docker-compose-pmm.yaml down -v --remove-orphans
5050
else
5151
echo
5252
echo "skipping cleanup"

0 commit comments

Comments
 (0)