Update cephpingmon.sh

src/metric-generators/cephpingmon.sh

@@ -8,16 +8,26 @@ if [[ -z "${MTU_SIZE}" ]]; then
   MTU_SIZE=8972
 fi
 
-function publish_metrics {
-  local ip
+function publish_metrics_nofrag {
+  local ping_result
   local loss_percent
   local success_ratio
+  local fragmentation="no"
 
-  if [[ $2 == "fragmentation" ]]; then
-    local fragmentation="yes"
-  else
-    local fragmentation="no"
-  fi
+  for ip in $CEPH_IPS; do
+    ping_result=$(ping -q -c4 -W 1 -s $MTU_SIZE -M do $ip)
+    loss_percent=$(echo ${ping_result} | sed -n -e 's/^.*, \(.*\)% packet.*/\1/p')
+    success_ratio=$(echo "scale=2 ; 1 - ${loss_percent} / 100" | bc)
+    LC_NUMERIC=C printf '%s{ip="%s", fragmentation="%s"} %.2f\n' \
+      "${METRIC_NAME}" $ip $fragmentation "${success_ratio}"
+  done
+}
+
+function publish_metrics_frag {
+  local ip
+  local loss_percent
+  local success_ratio
+  local fragmentation="yes"
 
   while IFS= read -r line; do
     ip=$(echo $line | cut -d' ' -f1)
@@ -29,7 +39,6 @@ function publish_metrics {
 }
 
 printf '# HELP %s: Ceph endpoint ping success ratio. (1 ~ no loss, 0 ~ complete loss)\n' $METRIC_NAME
-ping_result=$(fping -q -c4 --size $MTU_SIZE $CEPH_IPS 2>&1)
-publish_metrics "${ping_result}" fragmentation
-ping_result=$(fping -q -c4 --size $MTU_SIZE --dontfrag $CEPH_IPS 2>&1)
-publish_metrics "${ping_result}"
+ping_result=$(fping -q -c4 -b $MTU_SIZE $CEPH_IPS 2>&1)
+publish_metrics_frag "${ping_result}"
+publish_metrics_nofrag