Skip to content
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

Fixing rke2-etcd metrics collection #332

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixing rke2-etcd metrics collection #332

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5139da
Fixing rke2-etcd metrics collection
mlaguilharre Dec 30, 2024
1fd9049
Merge pull request #1 from mlaguilharre/Fix-rke2-etcd-metrics
mlaguilharre Jan 2, 2025
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
8 changes: 3 additions & 5 deletions collection/rancher/v2.x/logs-collector/rancher2_logs_collector.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,11 +987,9 @@ rke2-etcd() {
${RKE2_DATA_DIR}/bin/crictl exec ${RKE2_ETCD} etcdctl --cert ${ETCD_CERT} --key ${ETCD_KEY} --cacert ${ETCD_CACERT} --endpoints=$ETCDCTL_ENDPOINTS alarm list > $TMPDIR/etcd/alarmlist 2>&1

techo "Collecting rke2 etcd metrics"
ETCD_ENDPOINTS=$(grep -oE '\b([0-9]{1,3}\.){3}[0-9]{1,3}:2379\b' $TMPDIR/etcd/memberlist | uniq)
for ENDPOINT in ${ETCD_ENDPOINTS}
do
curl -sL --connect-timeout 5 --cacert ${ETCD_CACERT} --key ${ETCD_KEY} --cert ${ETCD_CERT} https://$ENDPOINT/metrics > $TMPDIR/etcd/etcd-metrics-$ENDPOINT.txt
done
ETCD_ENDPOINTS=$(cat /var/lib/rancher/rke2/server/db/etcd/config|grep listen-metrics-urls:|awk '{print $2}')
curl $ETCD_ENDPOINTS/metrics > $TMPDIR/etcd/etcd-metrics-$ENDPOINT.txt

fi
else
techo "[!] Containerd is offline, skipping etcd collection"
Expand Down