mirror of
https://github.com/pstadler/metrics.sh.git
synced 2025-02-28 13:59:12 -05:00
fixes for dash
This commit is contained in:
parent
3ba708dcfb
commit
515c21d3f8
@ -3,7 +3,8 @@
|
|||||||
load_reporter_with_prefix () {
|
load_reporter_with_prefix () {
|
||||||
local prefix=$1
|
local prefix=$1
|
||||||
local file=$2
|
local file=$2
|
||||||
# dash will error if this variable is defined as `local`
|
local content
|
||||||
|
|
||||||
content=$(sed \
|
content=$(sed \
|
||||||
-e 's/^[[:space:]]*\(init[ ]*()[ ]*{\)/'"$prefix"'\1/' \
|
-e 's/^[[:space:]]*\(init[ ]*()[ ]*{\)/'"$prefix"'\1/' \
|
||||||
-e 's/^[[:space:]]*\(report[ ]*()[ ]*{\)/'"$prefix"'\1/' \
|
-e 's/^[[:space:]]*\(report[ ]*()[ ]*{\)/'"$prefix"'\1/' \
|
||||||
@ -16,6 +17,7 @@ load_reporter_with_prefix () {
|
|||||||
load_metric_with_prefix () {
|
load_metric_with_prefix () {
|
||||||
local prefix=$1
|
local prefix=$1
|
||||||
local file=$2
|
local file=$2
|
||||||
|
local content
|
||||||
|
|
||||||
# dash will error if this variable is defined as `local`
|
# dash will error if this variable is defined as `local`
|
||||||
content=$(sed \
|
content=$(sed \
|
||||||
|
@ -21,7 +21,7 @@ if is_osx; then
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
__disk_io_bgproc () {
|
__disk_io_bgproc () {
|
||||||
iostat -y -m -d 1 $DISK_IO_MOUNTPOINT | while read line; do
|
iostat -y -m -d $INTERVAL $DISK_IO_MOUNTPOINT | while read line; do
|
||||||
echo $line | awk '/[0-9.]/{ print $3 }' > $__disk_io_fifo
|
echo $line | awk '/[0-9.]/{ print $3 }' > $__disk_io_fifo
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,8 @@ __network_io_calc_kBps() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
collect () {
|
collect () {
|
||||||
local sample=$(__network_io_collect)
|
local sample
|
||||||
|
sample=$(__network_io_collect)
|
||||||
if [ ! -z "$__network_io_sample" ]; then
|
if [ ! -z "$__network_io_sample" ]; then
|
||||||
report "in" $(__network_io_calc_kBps $(echo $sample | awk '{print $1}') \
|
report "in" $(__network_io_calc_kBps $(echo $sample | awk '{print $1}') \
|
||||||
$(echo $__network_io_sample | awk '{print $1}'))
|
$(echo $__network_io_sample | awk '{print $1}'))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user