Skip to content

Commit b7113e0

Browse files
yurkovychvyurkovychv
authored
PMM-13890 add agent password argument (#122)
* PMM-13890 add agent password argument * PMM-13890 update tests * PMM-13890 update setup * PMM-13890 update setup * PMM-13890 update test * PMM-13890 update test
1 parent 74182d6 commit b7113e0

File tree

7 files changed

+18
-17
lines changed

7 files changed

+18
-17
lines changed

‎pmm_psmdb-pbm_setup/configure-agents.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ do
1818
docker compose -f docker-compose-rs.yaml exec -T $node systemctl restart pbm-agent
1919
done
2020

21+
docker compose -f docker-compose-rs.yaml exec -T rs101 pbm config --file /etc/pbm/minio.yaml
22+
2123
if [[ $mongo_setup_type == "psa" ]]; then
2224
echo "stop pbm agent for arbiter node"
2325
docker compose -f docker-compose-rs.yaml exec -T rs103 systemctl stop pbm-agent
@@ -31,9 +33,9 @@ do
3133
echo "congiguring pmm agent on $node"
3234
docker compose -f docker-compose-rs.yaml exec -T -e PMM_AGENT_SETUP_NODE_NAME=${node}._${random_number} $node pmm-agent setup
3335
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
36+
docker compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --agent-password=mypass --cluster=replicaset --replication-set=rs ${node}_${random_number} 127.0.0.1:27017
3537
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
38+
docker compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --agent-password=mypass --cluster=replicaset --replication-set=rs --username=${pmm_mongo_user} --password=${pmm_mongo_user_pass} ${node}_${random_number} 127.0.0.1:27017
3739
fi
3840
done
3941
echo

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ do
3131
echo "configuring pmm agent on $node"
3232
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 --agent-password=mypass --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 --agent-password=mypass --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/docker-compose-rs.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ services:
3333
- ./conf/datagen:/etc/datagen:ro
3434
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3535
- /tmp/backup_data:/tmp/backup_data:rw
36-
- /tmp/mongodb:/tmp
3736
privileged: true
3837
cgroup: host
3938
environment:

‎pmm_psmdb-pbm_setup/start-sharded.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,10 @@ do
237237
echo "congiguring pmm agent on $node"
238238
rs=$(echo $node | awk -F "0" '{print $1}')
239239
docker compose -f docker-compose-sharded.yaml exec -T -e PMM_AGENT_SETUP_NODE_NAME=${node}_${random_number} $node pmm-agent setup
240-
docker compose -f docker-compose-sharded.yaml exec -T $node pmm-admin add mongodb --cluster=sharded --username=${pmm_user} --password=${pmm_pass} ${node}_${random_number} 127.0.0.1:27017
240+
docker compose -f docker-compose-sharded.yaml exec -T $node pmm-admin add mongodb --agent-password=mypass --cluster=sharded --username=${pmm_user} --password=${pmm_pass} ${node}_${random_number} 127.0.0.1:27017
241241
done
242242
echo "configuring pmm-agent on primary rscfg01 for mongos instance"
243-
docker compose -f docker-compose-sharded.yaml exec -T rscfg01 pmm-admin add mongodb --cluster=sharded --username=${pmm_user} --password=${pmm_pass} mongos_${random_number} mongos:27017
243+
docker compose -f docker-compose-sharded.yaml exec -T rscfg01 pmm-admin add mongodb --agent-password=mypass --cluster=sharded --username=${pmm_user} --password=${pmm_pass} mongos_${random_number} mongos:27017
244244

245245
echo "adding some data"
246246
docker compose -f docker-compose-sharded.yaml exec -T mongos mgodatagen -f /etc/datagen/sharded.json --uri=mongodb://root:root@127.0.0.1:27017

‎pmm_psmdb-pbm_setup/test/test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ def test_metrics():
173173
pmm_admin_list = json.loads(docker_rs101.check_output('pmm-admin list --json', timeout=30))
174174
for agent in pmm_admin_list['agent']:
175175
if agent['agent_type'] == 'AGENT_TYPE_MONGODB_EXPORTER':
176-
agent_id = agent['agent_id']
176+
agent_id = "mypass"
177177
agent_port = agent['port']
178178
break
179179
try:

‎pmm_psmdb_diffauth_setup/test-auth.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ done
6868

6969
#Add Mongo Service
7070
random_number=$RANDOM
71-
docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server pmm-admin add mongodb psmdb-server_${random_number} --username=pmm_mongodb --password="5M](Q%q/U+YQ<^m" --host psmdb-server --port 27017 --tls --tls-certificate-key-file=/mongodb_certs/client.pem --tls-ca-file=/mongodb_certs/ca-certs.pem --cluster=mycluster
71+
docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server pmm-admin add mongodb psmdb-server_${random_number} --agent-password=mypass --username=pmm_mongodb --password="5M](Q%q/U+YQ<^m" --host psmdb-server --port 27017 --tls --tls-certificate-key-file=/mongodb_certs/client.pem --tls-ca-file=/mongodb_certs/ca-certs.pem --cluster=mycluster
7272
#Add some data
7373
docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server mgodatagen -f /etc/datagen/replicaset.json --username=pmm_mongodb --password="5M](Q%q/U+YQ<^m" --host psmdb-server --port 27017 --tlsCertificateKeyFile=/mongodb_certs/client.pem --tlsCAFile=/mongodb_certs/ca-certs.pem
7474

‎pmm_psmdb_diffauth_setup/test/test.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def run_test(add_db_command):
2626
pmm_admin_list = json.loads(docker_pmm_client.check_output('pmm-admin list --json', timeout=30))
2727
for agent in pmm_admin_list['agent']:
2828
if agent['agent_type'] == 'AGENT_TYPE_MONGODB_EXPORTER':
29-
agent_id = agent['agent_id']
29+
agent_id = "mypass"
3030
agent_port = agent['port']
3131
break
3232
try:
@@ -48,33 +48,33 @@ def run_test(add_db_command):
4848

4949

5050
def test_simple_auth_wo_tls():
51-
run_test('pmm-admin add mongodb psmdb-server --username=pmm_mongodb --password="5M](Q%q/U+YQ<^m" ''--host '
51+
run_test('pmm-admin add mongodb psmdb-server --agent-password=mypass --username=pmm_mongodb --password="5M](Q%q/U+YQ<^m" ''--host '
5252
'psmdb-server --port 27017')
5353

5454

5555
def test_simple_auth_tls():
56-
run_test('pmm-admin add mongodb psmdb-server --username=pmm_mongodb --password="5M](Q%q/U+YQ<^m" '
56+
run_test('pmm-admin add mongodb psmdb-server --agent-password=mypass --username=pmm_mongodb --password="5M](Q%q/U+YQ<^m" '
5757
'--host psmdb-server --port 27017 '
5858
'--tls --tls-certificate-key-file=/mongodb_certs/client.pem --tls-ca-file=/mongodb_certs/ca-certs.pem '
5959
'--cluster=mycluster')
6060

6161

6262
def test_x509_auth():
63-
run_test('pmm-admin add mongodb psmdb-server --host=psmdb-server --port 27017 '
63+
run_test('pmm-admin add mongodb psmdb-server --agent-password=mypass --host=psmdb-server --port 27017 '
6464
'--tls --tls-certificate-key-file=/mongodb_certs/client.pem --tls-ca-file=/mongodb_certs/ca-certs.pem '
6565
'--authentication-mechanism=MONGODB-X509 --authentication-database=\'$external\' '
6666
'--cluster=mycluster')
6767

6868

6969
def test_ldap_auth_wo_tls():
70-
run_test('pmm-admin add mongodb psmdb-server --username="CN=pmm-test" --password=password1 '
70+
run_test('pmm-admin add mongodb psmdb-server --agent-password=mypass --username="CN=pmm-test" --password=password1 '
7171
'--host=psmdb-server --port 27017 '
7272
'--authentication-mechanism=PLAIN --authentication-database=\'$external\' '
7373
'--cluster=mycluster')
7474

7575

7676
def test_ldap_auth_tls():
77-
run_test('pmm-admin add mongodb psmdb-server --username="CN=pmm-test" --password=password1 '
77+
run_test('pmm-admin add mongodb psmdb-server --agent-password=mypass --username="CN=pmm-test" --password=password1 '
7878
'--host=psmdb-server --port 27017 '
7979
'--authentication-mechanism=PLAIN --authentication-database=\'$external\' '
8080
'--tls --tls-certificate-key-file=/mongodb_certs/client.pem --tls-ca-file=/mongodb_certs/ca-certs.pem '
@@ -85,7 +85,7 @@ def test_ldap_auth_tls():
8585
any(not os.environ.get(var) for var in env_vars) or os.environ.get('SKIP_AWS_TESTS') == 'true',
8686
reason=f"One or more of AWS env var isn't defined or SKIP_AWS_TESTS is set to true")
8787
def test_aws_auth_wo_tls():
88-
run_test(f'pmm-admin add mongodb psmdb-server --username={os.environ.get("AWS_ACCESS_KEY_ID")}'
88+
run_test(f'pmm-admin add mongodb psmdb-server --agent-password=mypass --username={os.environ.get("AWS_ACCESS_KEY_ID")}'
8989
f'--password={os.environ.get("AWS_SECRET_ACCESS_KEY")}'
9090
'--host=psmdb-server --port 27017 '
9191
'--authentication-mechanism=MONGODB-AWS --authentication-database=\'$external\' '
@@ -96,7 +96,7 @@ def test_aws_auth_wo_tls():
9696
any(not os.environ.get(var) for var in env_vars) or os.environ.get('SKIP_AWS_TESTS') == 'true',
9797
reason=f"One or more of AWS env var isn't defined or SKIP_AWS_TESTS is set to true")
9898
def test_aws_auth_tls():
99-
run_test(f'pmm-admin add mongodb psmdb-server --username={os.environ.get("AWS_ACCESS_KEY_ID")}'
99+
run_test(f'pmm-admin add mongodb psmdb-server --agent-password=mypass --username={os.environ.get("AWS_ACCESS_KEY_ID")}'
100100
f'--password={os.environ.get("AWS_SECRET_ACCESS_KEY")}'
101101
'--host=psmdb-server --port 27017 '
102102
'--authentication-mechanism=MONGODB-AWS --authentication-database=\'$external\' '

0 commit comments

Comments
 (0)