...
 
...@@ -90,9 +90,10 @@ LoadPlugin logfile ...@@ -90,9 +90,10 @@ LoadPlugin logfile
AccessMode 0 # 1 for accessdaemon, 0 for direct access (only as root or with perf) AccessMode 0 # 1 for accessdaemon, 0 for direct access (only as root or with perf)
Mtime 15 Mtime 15
Groups "pika_metrics_1,pika_metrics_2" Groups "pika_metrics_1,pika_metrics_2"
# by default metrics are reported per core # by default metrics are reported per hardware thread
PerSocketMetrics "mem_bw,rapl_power" PerSocketMetrics "mem_bw,rapl_power"
MaxValues "ipc:10,flops:1e11,mem_bw:1e12" MaxValues "ipc:10,flops:1e11,mem_bw:1e12"
PerCore true
Verbose 1 Verbose 1
</Plugin> #likwid_end </Plugin> #likwid_end
...@@ -115,6 +116,7 @@ LoadPlugin logfile ...@@ -115,6 +116,7 @@ LoadPlugin logfile
batch_size 500 batch_size 500
cache_size 2000 cache_size 2000
StoreRates true StoreRates true
PerCore "cpu:avg" #"likwid_cpu:sum" #plugin1:aggregate,plugin2.aggregate
ssl false ssl false
</Module> </Module>
......
...@@ -73,11 +73,11 @@ group_count=`ls -l $LIKWID_INST_PATH/share/likwid/perfgroups/$arch_dir | grep -c ...@@ -73,11 +73,11 @@ group_count=`ls -l $LIKWID_INST_PATH/share/likwid/perfgroups/$arch_dir | grep -c
if [ "$group_count" -gt 0 ]; then if [ "$group_count" -gt 0 ]; then
# assuming that not more than 5 groups are measured # assuming that not more than 5 groups are measured
if [ "$group_count" -eq 1 ]; then if [ "$group_count" -eq 1 ]; then
mtime=50 mtime=58
elif [ "$group_count" -eq 2 ]; then elif [ "$group_count" -eq 2 ]; then
mtime=25 mtime=29
elif [ "$group_count" -eq 3 ]; then elif [ "$group_count" -eq 3 ]; then
mtime=15 mtime=19
else else
mtime=10 mtime=10
fi fi
...@@ -97,9 +97,14 @@ if [ "$group_count" -gt 0 ]; then ...@@ -97,9 +97,14 @@ if [ "$group_count" -gt 0 ]; then
# set the socket file from PIKA configuration # set the socket file from PIKA configuration
sed -i '/<Plugin unixsock>/,/Plugin>/'" s|SocketFile.*|SocketFile \"${PIKA_COLLECTD_SOCKET}\"|" ${PIKA_COLLECTD_CONF} sed -i '/<Plugin unixsock>/,/Plugin>/'" s|SocketFile.*|SocketFile \"${PIKA_COLLECTD_SOCKET}\"|" ${PIKA_COLLECTD_CONF}
# FIX for moving from PIKA 1.0 to 1.1 (PerCore option is not known in 1.0)
if [ $PIKA_VERSION = "1.0" ]; then
sed -i '/<Plugin likwid>/,/Plugin>/'" s|PerCore.*|#&|" ${PIKA_COLLECTD_CONF}
fi
else else
echo -e "Error: No PIKA group definitions for LIKWID found! Disable LIKWID and unixsock plugins." >> $DEBUG_PATH 2>&1 echo -e "Error: No PIKA group definitions for LIKWID found! Disable LIKWID and unixsock plugins." >> $DEBUG_PATH 2>&1
sed -i "/likwid/,/likwid_end/"' s/^/#/' "${PIKA_COLLECTD_CONF}" sed -i "/LoadPlugin likwid/,/Plugin>/"' s/^/#/' "${PIKA_COLLECTD_CONF}"
sed -i "/LoadPlugin unixsock/,/Plugin>/"' s/^/#/' "${PIKA_COLLECTD_CONF}" sed -i "/LoadPlugin unixsock/,/Plugin>/"' s/^/#/' "${PIKA_COLLECTD_CONF}"
fi fi
...@@ -114,6 +119,9 @@ export HOME="workaroundLIKWIDbug" ...@@ -114,6 +119,9 @@ export HOME="workaroundLIKWIDbug"
echo -e "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $DEBUG_PATH 2>&1 echo -e "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $DEBUG_PATH 2>&1
# add Likwid bin path to PATH (required by InfluxDB write plugin, which calls likwid-topology)
export PATH=${LIKWID_INST_PATH}/bin:${PATH}
$DAEMON >> $DEBUG_PATH 2>&1 $DAEMON >> $DEBUG_PATH 2>&1
# check if collectd is up and running # check if collectd is up and running
......