diff --git a/roles/web-data-analysis/files/condense-hotspot.sh b/roles/web-data-analysis/files/condense-hotspot.sh index 1f5976c4b9..5ae1c06542 100644 --- a/roles/web-data-analysis/files/condense-hotspot.sh +++ b/roles/web-data-analysis/files/condense-hotspot.sh @@ -80,7 +80,7 @@ find ${WORKDIR} -type f | grep raw- | xargs cat | sort -u | awk 'BEGIN{x=0; y=0 awk -f ${LSHARE}/${PROJECT}-data.awk ${WORKDIR}/worked-all | grep -v "1970-01-01,0,0,0" | sort -u > ${WEBDIR}/${PROJECT}data-all.csv # Make the seven day moving average file -/usr/local/bin/hotspot-moving_avg.py > ${WEBDIR}/${PROJECT}data-all-7day-ma.csv +#/usr/local/bin/hotspot-moving_avg.py > ${WEBDIR}/${PROJECT}data-all-7day-ma.csv gnuplot ${LSHARE}/${PROJECT}.gp diff --git a/roles/web-data-analysis/files/hotspot.gp b/roles/web-data-analysis/files/hotspot.gp index 8f20a0584e..c281a695ff 100644 --- a/roles/web-data-analysis/files/hotspot.gp +++ b/roles/web-data-analysis/files/hotspot.gp @@ -16,10 +16,10 @@ plot ["2014-12-01":"2020-12-31"] \ unset output ## -set output "/var/www/html/csv-reports/images/hotspot-all-ma.png" -set title "Moving Average of IPs grabbing hotspot" -plot ["2014-12-01":"2020-12-31"] \ - '/var/www/html/csv-reports/hotspot/hotspotdata-all-7day-ma.csv' using 1:2 title 'Average every 5min' with lines lw 4, \ - '/var/www/html/csv-reports/hotspot/hotspotdata-all-7day-ma.csv' using 1:3 title 'Least 5min' with lines lw 4, \ - '/var/www/html/csv-reports/hotspot/hotspotdata-all-7day-ma.csv' using 1:4 title 'Max 5min' with lines lw 4 -unset output +# set output "/var/www/html/csv-reports/images/hotspot-all-ma.png" +# set title "Moving Average of IPs grabbing hotspot" +# plot ["2014-12-01":"2020-12-31"] \ +# '/var/www/html/csv-reports/hotspot/hotspotdata-all-7day-ma.csv' using 1:2 title 'Average every 5min' with lines lw 4, \ +# '/var/www/html/csv-reports/hotspot/hotspotdata-all-7day-ma.csv' using 1:3 title 'Least 5min' with lines lw 4, \ +# '/var/www/html/csv-reports/hotspot/hotspotdata-all-7day-ma.csv' using 1:4 title 'Max 5min' with lines lw 4 +# unset output