|
...
|
...
|
@@ -12,8 +12,17 @@
|
|
12
|
12
|
# Retrieve log directory as argument from calling script.
|
|
13
|
13
|
LOGDIR=$1
|
|
14
|
14
|
|
|
|
15
|
+DSTAT_TOP_OPTS="--top-cpu-adv --top-io-adv --top-mem"
|
|
|
16
|
+if dstat --version | grep -q 'pcp-dstat' ; then
|
|
|
17
|
+ # dstat is unmaintained, and moving to a plugin of performance
|
|
|
18
|
+ # co-pilot. Fedora 29 for example has rolled this out. It's
|
|
|
19
|
+ # mostly compatible, except for a few options which are not
|
|
|
20
|
+ # implemented (yet?)
|
|
|
21
|
+ DSTAT_TOP_OPTS=""
|
|
|
22
|
+fi
|
|
|
23
|
+
|
|
15
|
24
|
# Command line arguments for primary DStat process.
|
|
16
|
|
-DSTAT_OPTS="-tcmndrylpg --top-cpu-adv --top-io-adv --top-mem --swap --tcp"
|
|
|
25
|
+DSTAT_OPTS="-tcmndrylpg ${DSTAT_TOP_OPTS} --swap --tcp"
|
|
17
|
26
|
|
|
18
|
27
|
# Command-line arguments for secondary background DStat process.
|
|
19
|
28
|
DSTAT_CSV_OPTS="-tcmndrylpg --tcp --output $LOGDIR/dstat-csv.log"
|