Skip to content

Fix PMM #4330

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

Merged
sougou merged 2 commits into from
Oct 31, 2018
Merged

Fix PMM #4330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abf0e51
Let PMM client wait for mysql.sock
Oct 31, 2018
b0c06ba
Update pmm-client with procps fix
Oct 31, 2018
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
1 change: 1 addition & 0 deletions docker/k8s/pmm-client/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ COPY --from=k8s /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificate

RUN apt-get update && \
apt-get upgrade -qq && \
apt-get install -y procps && \
apt-get install wget -qq --no-install-recommends && \
wget https://www.percona.com/redir/downloads/pmm-client/1.15.0/binary/debian/stretch/x86_64/pmm-client_1.15.0-1.stretch_amd64.deb && \
dpkg -i pmm-client_1.15.0-1.stretch_amd64.deb && \
Expand Down
9 changes: 6 additions & 3 deletions helm/vitess/templates/_pmm.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,11 @@ spec:
pmm-admin config --server pmm.{{ $namespace }} --force

# creates a systemd service
# TODO: remove "|| true" after https://jira.percona.com/projects/PMM/issues/PMM-1985 is resolved
pmm-admin add mysql:metrics --user root --socket /vtdataroot/tabletdata/mysql.sock --force || true
until [ -e /vtdataroot/tabletdata/mysql.sock ]; do
echo "Waiting for mysql.sock"
sleep 1
done
pmm-admin add mysql:metrics --user root --socket /vtdataroot/tabletdata/mysql.sock --force

# keep the container alive but still responsive to stop requests
trap : TERM INT; sleep infinity & wait
Expand All @@ -183,4 +186,4 @@ spec:
- name: vtdataroot
mountPath: /vtdataroot

{{- end -}}
{{- end -}}