Skip to content

Commit d8f8260

Browse files
committed
PMM-14375 add env var into pmm-agent systemd process
1 parent e96b9fb commit d8f8260

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

pmm_psmdb-pbm_setup/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ RUN if [[ "$PMM_CLIENT_VERSION" == http* ]]; then \
8181
systemctl enable mongod && \
8282
systemctl enable pbm-agent && \
8383
sed -i '/ExecStart/a StandardError=file:/var/log/pmm-agent.log' /usr/lib/systemd/system/pmm-agent.service && \
84+
sed -i '/\[Service\]/a Environment="KRB5_CLIENT_KTNAME=/keytabs/mongodb.keytab"' /usr/lib/systemd/system/pmm-agent.service && \
8485
systemctl enable pmm-agent && \
8586
curl -Lf -o /tmp/mgodatagen.tar.gz https://github.com/feliixx/mgodatagen/releases/download/v0.11.2/mgodatagen_0.11.2_Linux_x86_64.tar.gz && \
8687
tar -xf /tmp/mgodatagen.tar.gz -C /usr/bin && \

pmm_psmdb-pbm_setup/configure-agents.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ do
5151
echo "configuring pmm agent on $node"
5252
docker compose -f docker-compose-rs.yaml exec -T -e PMM_AGENT_SETUP_NODE_NAME=${node}._${random_number} $node pmm-agent setup
5353
if [[ $mongo_setup_type == "psa" && $node == "rs103" ]]; then
54-
docker compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --agent-password=mypass --environment=psmdb-dev --cluster=replicaset --replication-set=rs --host=${node} --port=27017 ${node}${gssapi_service_name_part}_${random_number}
54+
docker compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --agent-password=mypass --environment=psmdb-dev --cluster=replicaset --replication-set=rs --agent-env-vars="KRB5_CLIENT_KTNAME" --host=${node} --port=27017 ${node}${gssapi_service_name_part}_${random_number}
5555
else
5656
echo
57-
docker compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --agent-password=mypass --environment=psmdb-dev --cluster=replicaset --replication-set=rs ${client_credentials_flags[*]} --host=${node} --port=27017 ${node}${gssapi_service_name_part}_${random_number}
57+
docker compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --agent-password=mypass --environment=psmdb-dev --cluster=replicaset --replication-set=rs ${client_credentials_flags[*]} --agent-env-vars="KRB5_CLIENT_KTNAME" --host=${node} --port=27017 ${node}${gssapi_service_name_part}_${random_number}
5858
fi
5959
done
6060
echo

pmm_psmdb-pbm_setup/configure-extra-agents.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ do
4949
echo "configuring pmm agent on $node"
5050
docker compose -f docker-compose-rs.yaml exec -T -e PMM_AGENT_SETUP_NODE_NAME=${node}._${random_number} $node pmm-agent setup
5151
if [[ $mongo_setup_type == "psa" && $node == "rs203" ]]; then
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}
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 --agent-env-vars="KRB5_CLIENT_KTNAME" --host=${node} --port=27017 ${node}${gssapi_service_name_part}_${random_number}
5353
else
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}
54+
docker compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --agent-password=mypass --cluster=replicaset --agent-env-vars="KRB5_CLIENT_KTNAME" ${client_credentials_flags[*]} --host=${node} --port=27017 ${node}${gssapi_service_name_part}_${random_number}
5555
fi
5656
done

pmm_psmdb-pbm_setup/docker-compose-rs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,4 +289,4 @@ networks:
289289

290290
volumes:
291291
keytabs:
292-
driver: local
292+
driver: local

0 commit comments

Comments
 (0)