Skip to content

Commit ba08108

Browse files
yurkovychvyurkovychv
authored
PMM-14185 handle gssapi (#158)
* PMM-14185 handle gssapi * PMM-14185 handle gssapi * PMM-14185 handle gssapi * PMM-14185 handle gssapi * PMM-14185 handle gssapi * PMM-14185 handle gssapi * PMM-14185 handle gssapi * PMM-14185 handle gssapi * PMM-14185 handle gssapi * PMM-14185 handle gssapi * PMM-14185 handle gssapi * PMM-14185 handle gssapi * PMM-14185 handle gssapi * PMM-14185 handle gssapi
1 parent f946db9 commit ba08108

File tree

2 files changed

+36
-13
lines changed

2 files changed

+36
-13
lines changed

‎pmm_psmdb-pbm_setup/configure-agents.sh‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,21 @@ mongo_setup_type=${MONGO_SETUP_TYPE:-pss}
99
gssapi_enabled=${GSSAPI:-false}
1010
gssapi_username=${GSSAPI_USERNAME:-pmm@PERCONATEST.COM}
1111
gssapi_password=${GSSAPI_PASSWORD:-password1}
12+
client_credentials_flags="--username=${pmm_mongo_user} --password=${pmm_mongo_user_pass}"
13+
gssapi_service_name_part=""
14+
15+
if [[ $gssapi_enabled == "true" ]]; then
16+
client_credentials_flags=(
17+
--username="$gssapi_username"
18+
--password="$gssapi_password"
19+
--authentication-mechanism=GSSAPI
20+
--authentication-database='$external'
21+
)
22+
gssapi_service_name_part="_gssapi"
23+
fi
24+
25+
echo
26+
echo "gssapi enabled: $gssapi_enabled. Using credentials: ${client_credentials_flags[*]}"
1227

1328
echo
1429
echo "configuring pbm agents"
@@ -33,16 +48,13 @@ random_number=$RANDOM
3348
nodes="rs101 rs102 rs103"
3449
for node in $nodes
3550
do
36-
echo "congiguring pmm agent on $node"
51+
echo "configuring pmm agent on $node"
3752
docker compose -f docker-compose-rs.yaml exec -T -e PMM_AGENT_SETUP_NODE_NAME=${node}._${random_number} $node pmm-agent setup
3853
if [[ $mongo_setup_type == "psa" && $node == "rs103" ]]; then
39-
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
54+
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 --host=${node} --port=27017 ${node}${gssapi_service_name_part}_${random_number}
4055
else
41-
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
42-
43-
if [[ $gssapi_enabled == "true" ]]; then
44-
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=${gssapi_username} --password=${gssapi_password} --authentication-mechanism=GSSAPI --authentication-database="$external" --host=${node} --port=27017 ${node}_gssapi_${random_number}
45-
fi
56+
echo
57+
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 ${client_credentials_flags[*]} --host=${node} --port=27017 ${node}${gssapi_service_name_part}_${random_number}
4658
fi
4759
done
4860
echo

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

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,21 @@ mongo_setup_type=${MONGO_SETUP_TYPE:-pss}
99
gssapi_enabled=${GSSAPI:-false}
1010
gssapi_username=${GSSAPI_USERNAME:-pmm@PERCONATEST.COM}
1111
gssapi_password=${GSSAPI_PASSWORD:-password1}
12+
client_credentials_flags="--username=${pmm_mongo_user} --password=${pmm_mongo_user_pass}"
13+
gssapi_service_name_part=""
14+
15+
if [[ $gssapi_enabled == "true" ]]; then
16+
client_credentials_flags=(
17+
--username="$gssapi_username"
18+
--password="$gssapi_password"
19+
--authentication-mechanism=GSSAPI
20+
--authentication-database='$external'
21+
)
22+
gssapi_service_name_part="_gssapi"
23+
fi
24+
25+
echo
26+
echo "gssapi enabled: $gssapi_enabled. Using credentials: ${client_credentials_flags[*]}"
1227

1328
echo
1429
echo "configuring pbm agents"
@@ -34,12 +49,8 @@ do
3449
echo "configuring pmm agent on $node"
3550
docker compose -f docker-compose-rs.yaml exec -T -e PMM_AGENT_SETUP_NODE_NAME=${node}._${random_number} $node pmm-agent setup
3651
if [[ $mongo_setup_type == "psa" && $node == "rs203" ]]; then
37-
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
52+
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 --host=${node} --port=27017 ${node}${gssapi_service_name_part}_${random_number}
3853
else
39-
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
40-
41-
if [[ $gssapi_enabled == "true" ]]; then
42-
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=${gssapi_username} --password=${gssapi_password} --authentication-mechanism=GSSAPI --authentication-database="$external" --host=${node} --port=27017 ${node}_gssapi_${random_number}
43-
fi
54+
docker compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --agent-password=mypass --cluster=replicaset ${client_credentials_flags[*]} --host=${node} --port=27017 ${node}${gssapi_service_name_part}_${random_number}
4455
fi
4556
done

0 commit comments

Comments
 (0)