Mirror
/
muninlite
mirror of https://github.com/munin-monitoring/muninlite.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Mirror:346185c163618004a2349a2f5a891a4600bb10f8
Branches Tags
Mirror:master
Mirror:2.1.2
Mirror:2.1.1
Mirror:2.1.0
Mirror:2.0.1
Mirror:1.0.4
Mirror:1.0.3
Mirror:1.0.2
Mirror:1.0.1
Mirror:1.0.0
Mirror:0.9.16
Mirror:2.0.0
..
compare: Mirror:78df1f77f6a3d768cf872bd4f1823707601dd045
Branches Tags
Mirror:master
Mirror:2.1.2
Mirror:2.1.1
Mirror:2.1.0
Mirror:2.0.1
Mirror:1.0.4
Mirror:1.0.3
Mirror:1.0.2
Mirror:1.0.1
Mirror:1.0.0
Mirror:0.9.16
Mirror:2.0.0

4 Commits
346185c163 ... 78df1f77f6

Author SHA1 Message Date
Christian 78df1f77f6
Merge eadf11e04d into 3b6ef20dc1 2024-03-04 20:23:00 +08:00
Steve Schnepp 3b6ef20dc1
Merge pull request #17 from daald/improve-df 
Improve df
 2023-12-14 14:33:37 +01:00
Daniel Alder c2b8d7315d Fix previous change. The key for config and values was the mountpoint 
I accidently changed this to dev. This also works but breaks existing history
 2023-12-14 13:26:47 +01:00
Daniel Alder f55b83fdbd Improve df 
Before, there were 1+n calls of df where n is the number of output values. I introduced some script magic to use the values from the
first call. Motivation was, there was a very complex sed call which failed to process some of my df output lines. The new code is much
safer.

Actually, the original problem obviously was that the sed regex didn't cover capital letters which I had in my mountpoints.
 2023-12-13 14:58:34 +01:00
1 changed files with 7 additions and 9 deletions
Show Stats Expand all files Collapse all files

16
plugins/df
View File

@ -4,21 +4,19 @@ graph_args --upper-limit 100 -l 0
graph_vlabel %
graph_category disk
graph_info This graph shows disk usage on the machine."
for PART in $(df -PT | grep '^/' | grep -vwE "$DF_IGNORE_FILESYSTEM_REGEX" | sed '/\/[a-z0-9]*$/!d;s/.* \([a-z0-9\/]\{1,\}\)$/\1/g')
df -PT | grep '^/' | grep -vwE "$DF_IGNORE_FILESYSTEM_REGEX" | while read dev type blocks used avail pct mp
do
PINFO=$(df -P "$PART" | tail -1);
PNAME=$(clean_fieldname "$(echo "$PINFO" | cut -d " " -f 1)")
echo "$PNAME.label $PART"
echo "$PNAME.info $PNAME -> $PART"
PNAME=$(clean_fieldname "$mp")
echo "$PNAME.label $mp"
echo "$PNAME.info $dev -> $mp"
echo "$PNAME.warning 92"
echo "$PNAME.critical 98"
done
}
fetch_df() {
for PART in $(df -PT | grep '^/' | grep -vwE "$DF_IGNORE_FILESYSTEM_REGEX" | sed '/\/[a-z0-9]*$/!d;s/.* \([a-z0-9\/]\{1,\}\)$/\1/g')
df -PT | grep '^/' | grep -vwE "$DF_IGNORE_FILESYSTEM_REGEX" | while read dev type blocks used avail pct mp
do
PINFO=$(df -P "$PART" | tail -1);
PNAME=$(clean_fieldname "$(echo "$PINFO" | cut -d " " -f 1)")
echo "$PNAME.value" "$(echo "$PINFO" | sed -e 's/\%//g' -e 's/ */ /g' | cut -d " " -f 5)"
PNAME=$(clean_fieldname "$mp")
echo "$PNAME.value" "${pct%\%}"
done
}