From 8ad78cfb404a76cc003f33039a651e23e3e4b4d0 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Sat, 7 May 2016 15:29:18 +0000 Subject: [PATCH] and we have moving averages --- .../files/condense-mirrorlogs.sh | 6 + .../web-data-analysis/files/mirrors-moving.gp | 292 ++++++++++++++++++ .../files/mirrors-moving_avg.py | 2 +- 3 files changed, 299 insertions(+), 1 deletion(-) create mode 100644 roles/web-data-analysis/files/mirrors-moving.gp diff --git a/roles/web-data-analysis/files/condense-mirrorlogs.sh b/roles/web-data-analysis/files/condense-mirrorlogs.sh index 2dec40aa45..eec0fbfa5d 100644 --- a/roles/web-data-analysis/files/condense-mirrorlogs.sh +++ b/roles/web-data-analysis/files/condense-mirrorlogs.sh @@ -93,5 +93,11 @@ done gnuplot ${LSHARE}/${PROJECT}-data.gp +# Make the seven day moving average file +/usr/local/bin/mirrors-moving_avg.py > mirrorsdata-all-7day-ma.csv + +gnuplot ${LSHARE}/${PROJECT}-data-ma.gp +gnuplot ${LSHARE}/${PROJECT}-moving.gp + # cleanup the temp data rm -rf ${TEMPDIR} diff --git a/roles/web-data-analysis/files/mirrors-moving.gp b/roles/web-data-analysis/files/mirrors-moving.gp new file mode 100644 index 0000000000..d259fae9e1 --- /dev/null +++ b/roles/web-data-analysis/files/mirrors-moving.gp @@ -0,0 +1,292 @@ +set grid +set xdata time +set format x "%Y-%m-%d" +set timefmt "%Y-%m-%d" + +set datafile separator "," +set term png size 1600,1200 + +## +set output "/var/www/html/csv-reports/images/mirrors-all-points-ma.png" +set title "Fedora+Epel Yum Unique IPs" +plot ["2007-05-17":"2016-12-31"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:2 title 'epel4' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:3 title 'epel5' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:4 title 'epel6' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:5 title 'epel7' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:6 title 'fed03' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:7 title 'fed04' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:8 title 'fed05' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:9 title 'fed06' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:10 title 'fed07' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:11 title 'fed08' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:12 title 'fed09' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:13 title 'fed10' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:14 title 'fed11' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:15 title 'fed12' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:16 title 'fed13' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:17 title 'fed14' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:18 title 'fed15' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:19 title 'fed16' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:20 title 'fed17' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:21 title 'fed18' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:22 title 'fed19' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:23 title 'fed20' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:24 title 'fed21' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:25 title 'fed22' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:26 title 'fed23' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:27 title 'fed24' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:28 title 'fed25' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:29 title 'fed26' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:30 title 'fed27' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:31 title 'fed28' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:32 title 'fed29' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:33 title 'rawhide' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:34 title 'unk_rel' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:35 title 'EPEL' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:36 title 'Fedora' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:37 title 'alpha' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:38 title 'ARM' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:39 title 'ARM64' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:40 title 'ia64' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:41 title 'mips' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:42 title 'ppc' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:43 title 's390' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:44 title 'sparc' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:45 title 'tilegx' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:46 title 'x86_32' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:47 title 'x86_64' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:48 title 'x86_32_e' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:49 title 'x86_32_f' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:50 title 'x86_64_e' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:51 title 'x86_64_f' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:52 title 'ppc_e' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:53 title 'ppc_f' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:54 title 'unknown' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:55 title 'centos' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:56 title 'rhel' with lines lw 3 +unset output + +set output "/var/www/html/csv-reports/images/fedora-daily-ma.png" +set title "Fedora Daily Totals Unique IPs" +plot ["2007-05-17":"2016-12-31"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:36 title 'Fedora' with lines lw 3 +unset output + +set output "/var/www/html/csv-reports/images/fedora-os-all-ma.png" +set title "Fedora OS Yum Unique IPs" +plot ["2007-05-17":"2016-12-31"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:6 title 'fed03' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:7 title 'fed04' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:8 title 'fed05' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:9 title 'fed06' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:10 title 'fed07' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:11 title 'fed08' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:12 title 'fed09' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:13 title 'fed10' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:14 title 'fed11' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:15 title 'fed12' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:16 title 'fed13' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:17 title 'fed14' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:18 title 'fed15' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:19 title 'fed16' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:20 title 'fed17' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:21 title 'fed18' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:22 title 'fed19' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:23 title 'fed20' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:24 title 'fed21' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:25 title 'fed22' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:26 title 'fed23' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:27 title 'fed24' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:28 title 'fed25' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:29 title 'fed26' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:30 title 'fed27' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:31 title 'fed28' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:32 title 'fed29' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:33 title 'rawhide' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:34 title 'unk_rel' with lines lw 3 +unset output + +set output "/var/www/html/csv-reports/images/fedora-os-latest-ma.png" +set title "Fedora Selected Versions Unique IPs" +plot ["2014-01-01":"2016-12-31"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:31 title 'Fedora' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:23 title 'fed20' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:24 title 'fed21' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:25 title 'fed22' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:26 title 'fed23' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:27 title 'fed24' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:28 title 'fed25' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:33 title 'rawhide' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:34 title 'unk_rel' with lines lw 3 +unset output + +set output "/var/www/html/csv-reports/images/fedora-os-latest-stacked-ma.png" +set title "Fedora Selected Versions Unique IPs" +plot ["2013-01-01":"2016-12-31"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:31 title 'Fedora' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($21+$22+$23+$24+$25+$26+$27+$28+$33) title 'fed18' with filledcurves x1,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($22+$23+$24+$25+$26+$27+$28+$33) title 'fed19' with filledcurves x1,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($23+$24+$25+$26+$27+$28+$33) title 'fed20' with filledcurves x1,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($24+$25+$26+$27+$28+$33) title 'fed21' with filledcurves x1,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($25+$26+$27+$28+$33) title 'fed22' with filledcurves x1,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($26+$27+$28+$33) title 'fed23' with filledcurves x1,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($27+$28+$33) title 'fed24' with filledcurves x1,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($28+$33) title 'fed25' with filledcurves x1,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($33) title 'rawhide' with filledcurves x1 +unset output + +set output "/var/www/html/csv-reports/images/fedora-hardware-full-ma.png" +set title "Fedora Hardware via Unique IPs" +plot ["2007-05-17":"2016-12-31"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:37 title 'alpha' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:38 title 'ARM' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:39 title 'ARM64' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:40 title 'ia64' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:41 title 'mips' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:42 title 'ppc' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:43 title 's390' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:44 title 'sparc' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:45 title 'tilegx' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:49 title 'x86_32_f' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:51 title 'x86_64_f' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:54 title 'unknown' with lines lw 3 +unset output + +set output "/var/www/html/csv-reports/images/fedora-hardware-2nd-ma.png" +set title "Fedora Secondary via Unique IPs" +plot ["2007-05-17":"2016-12-31"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:37 title 'alpha' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:38 title 'ARM' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:39 title 'ARM64' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:40 title 'ia64' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:41 title 'mips' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:42 title 'ppc' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:43 title 's390' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:44 title 'sparc' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:45 title 'tilegx' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:54 title 'unknown' with lines lw 3 +unset output + +set output "/var/www/html/csv-reports/images/fedora-epel-stacked-ma.png" +set title "Fedora Yum Unique IPs" +plot ["2007-05-17":"2016-12-31"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32+$33+$34) title 'unknown-release' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32+$33) title 'rawhide' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32) title 'fed29' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31) title 'fed28' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30) title 'fed27' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29) title 'fed26' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28) title 'fed25' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27) title 'fed24' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26) title 'fed23' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25) title 'fed22' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24) title 'fed21' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23) title 'fed20' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22) title 'fed19' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21) title 'fed18' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20) title 'fed17' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19) title 'fed16' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18) title 'fed15' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17) title 'fed14' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16) title 'fed13' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15) title 'fed12' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13+$14) title 'fed11' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12+$13) title 'fed10' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11+$12) title 'fed09' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10+$11) title 'fed08' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9+$10) title 'fed07' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9) title 'fed06' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7+$8) title 'fed05' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6+$7) title 'fed04' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$6) title 'fed03' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5) title 'epel7' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4) title 'epel6' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3) title 'epel5' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2) title 'epel4' w filledcurves x1 +unset output + + +set output "/var/www/html/csv-reports/images/fedora-stacked-ma.png" +set title "Fedora Epel Yum Unique IPs" +plot ["2007-05-17":"2016-12-31"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32+$33+$34) title 'unknown-release' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32+$33) title 'rawhide' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32) title 'fed29' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31) title 'fed28' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30) title 'fed27' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29) title 'fed26' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28) title 'fed25' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27) title 'fed24' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26) title 'fed23' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25) title 'fed22' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24) title 'fed21' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23) title 'fed20' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22) title 'fed19' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21) title 'fed18' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20) title 'fed17' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19) title 'fed16' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18) title 'fed15' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17) title 'fed14' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16) title 'fed13' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15) title 'fed12' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14) title 'fed11' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13) title 'fed10' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12) title 'fed09' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11) title 'fed08' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10) title 'fed07' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9) title 'fed06' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8) title 'fed05' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7) title 'fed04' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6) title 'fed03' w filledcurves x1 +unset output + +set output "/var/www/html/csv-reports/images/fedora-select-stacked-ma.png" +set title "Fedora Epel Yum Unique IPs" +plot ["2007-05-17":"2016-12-31"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27+$28+$29+$30+$31+$32+$33) title 'fedora-future' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23+$24+$25+$26+$27) title 'fed21-24' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22+$23) title 'fed16-20' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18) title 'fed09-15' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($6+$7+$8+$9+$10+$11) title 'fed03-07' w filledcurves x1 +unset output + +## +## EPEL +## + +set output "/var/www/html/csv-reports/images/epel-all-ma.png" +set title "Epel Yum Unique IPs" +plot ["2007-05-17":"2016-12-31"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:2 title 'epel4' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:3 title 'epel5' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:4 title 'epel6' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:5 title 'epel7' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:35 title 'EPEL' with lines lw 3 +unset output + +set output "/var/www/html/csv-reports/images/epel-daily-ma.png" +set title "Fedora Epel Totals Unique IPs" +plot ["2007-05-17":"2016-12-31"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:35 title 'EPEL' with lines lw 3 +unset output + + +set output "/var/www/html/csv-reports/images/epel-arch-ma.png" +set title "Epel ARCH Unique IPs" +plot ["2007-05-17":"2016-12-31"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:48 title 'x86_32' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:50 title 'x86_64' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:52 title 'ppc' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:35 title 'EPEL' with lines lw 3 +unset output + +set output "/var/www/html/csv-reports/images/epel-stacked-ma.png" +set title "Epel Releases Unique IPs" +plot ["2007-05-17":"2016-12-31"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5) title 'epel7' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4) title 'epel6' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3) title 'epel5' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2) title 'epel4' w filledcurves x1 +unset output + diff --git a/roles/web-data-analysis/files/mirrors-moving_avg.py b/roles/web-data-analysis/files/mirrors-moving_avg.py index dd53718980..cd834bf365 100644 --- a/roles/web-data-analysis/files/mirrors-moving_avg.py +++ b/roles/web-data-analysis/files/mirrors-moving_avg.py @@ -30,7 +30,7 @@ rolling = 7 tree = {} -df = pandas.read_csv("/var/www/html/csv-reports/mirrors/mirrordata-all.csv") +df = pandas.read_csv("/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv") dates = df['1970-01-01'] epel4 = pandas.rolling_mean(df['02-epel4'],rolling)