diff --git a/roles/base/tasks/postfix.yml b/roles/base/tasks/postfix.yml index e6c93a98d6..ca081320a4 100644 --- a/roles/base/tasks/postfix.yml +++ b/roles/base/tasks/postfix.yml @@ -68,7 +68,7 @@ - name: install /etc/pki/tls/certs/gateway.crt copy: - src="{{private}}/files/smtpd/gateway.complete.crt" + src="{{private}}/files/smtpd/gateway.complete.20190901.crt" dest=/etc/pki/tls/certs/gateway.crt owner=root group=root @@ -81,7 +81,7 @@ - name: Copy gateway.key copy: - src="{{private}}/files/smtpd/gateway.key" + src="{{private}}/files/smtpd/gateway.20190901.key" dest=/etc/pki/tls/private/ owner=root group=postfix diff --git a/roles/web-data-analysis/files/html/summary.html b/roles/web-data-analysis/files/html/summary.html index ddd009996d..6170d34342 100644 --- a/roles/web-data-analysis/files/html/summary.html +++ b/roles/web-data-analysis/files/html/summary.html @@ -51,6 +51,6 @@ - + diff --git a/roles/web-data-analysis/files/mirrors-data.awk b/roles/web-data-analysis/files/mirrors-data.awk index e71c1c1393..d70154fa87 100644 --- a/roles/web-data-analysis/files/mirrors-data.awk +++ b/roles/web-data-analysis/files/mirrors-data.awk @@ -6,6 +6,7 @@ BEGIN{ epel5=0; epel6=0; epel7=0; + epel8=0; f03=0; f04=0; f05=0; @@ -72,7 +73,7 @@ BEGIN{ unknown_arch = 0; centos = 0; rhel = 0; - print olddate ",02-epel4,03-epel5,04-epel6,05-epel7,06-f03,07-f04,08-f05,09-f06,10-f07,11-f08,12-f09,13-f10,14-f11,15-f12,16-f13,17-f14,18-f15,19-f16,20-f17,21-f18,22-f19,23-f20,24-f21,25-f22,26-f23,27-f24,28-f25,29-f26,30-f27,31-f28,32-f29,33-rawhide,34-unk_rel,35-epel,36-fedora,37-alpha,38-arm,39-arm64,40-ia64,41-mips,42-ppc,43-s390,44-sparc,45-tilegx,46-x86_32,47-x86_64,48-x86_32_e,49-x86_32_f,50-x86_64_e,51-x86_64_f,52-ppc_e,53-ppc_f,54-unk_arc,55-centos,56-rhel,57-ppc64,58-ppc64le,59-modular,60-modular_rawhide,61-modular_f27,62-modular_f28,63-modular_f29,64-modular_f30,65-f30,66-f31,67-f32,68-f33,69-modular_f31,70-modular_f32,71-modular_f33"; + print olddate ",02-epel4,03-epel5,04-epel6,05-epel7,06-f03,07-f04,08-f05,09-f06,10-f07,11-f08,12-f09,13-f10,14-f11,15-f12,16-f13,17-f14,18-f15,19-f16,20-f17,21-f18,22-f19,23-f20,24-f21,25-f22,26-f23,27-f24,28-f25,29-f26,30-f27,31-f28,32-f29,33-rawhide,34-unk_rel,35-epel,36-fedora,37-alpha,38-arm,39-arm64,40-ia64,41-mips,42-ppc,43-s390,44-sparc,45-tilegx,46-x86_32,47-x86_64,48-x86_32_e,49-x86_32_f,50-x86_64_e,51-x86_64_f,52-ppc_e,53-ppc_f,54-unk_arc,55-centos,56-rhel,57-ppc64,58-ppc64le,59-modular,60-modular_rawhide,61-modular_f27,62-modular_f28,63-modular_f29,64-modular_f30,65-f30,66-f31,67-f32,68-f33,69-modular_f31,70-modular_f32,71-modular_f33,72-epel8"; olddate="1970-01-02"; } @@ -82,6 +83,7 @@ BEGIN{ else if ($3 ~"epel5") { epel5=epel5+1; epel=epel+1} else if ($3 ~"epel6") { epel6=epel6+1; epel=epel+1} else if ($3 ~"epel7") { epel7=epel7+1; epel=epel+1} + else if ($3 ~"epel8") { epel8=epel8+1; epel=epel+1} else if ($3 ~"modular_f27") { modular_f27=modular_f27+1; modular=modular+1; } else if ($3 ~"modular_f28") { modular_f28=modular_f28+1; modular=modular+1; } else if ($3 ~"modular_f29") { modular_f29=modular_f29+1; modular=modular+1; } @@ -163,7 +165,7 @@ BEGIN{ else {unknown_arch = unknown_arch +1; }; } else { if ( olddate !~ "1970-01-01" ) { - print olddate "," epel4 "," epel5 "," epel6 "," epel7 "," f03 "," f04 "," f05 "," f06 "," f07 "," f08 "," f09 "," f10 "," f11 "," f12 "," f13 "," f14 "," f15 "," f16 "," f17 "," f18 "," f19 "," f20 "," f21 "," f22 "," f23 "," f24 "," f25 "," f26 "," f27 "," f28 "," f29 "," rawhide "," unknown_release "," epel "," fedora "," alpha "," arm "," arm64 "," ia64 "," mips "," ppc "," s390 "," sparc "," tilegx "," x86_32 "," x86_64 "," x86_32_e "," x86_32_f "," x86_64_e "," x86_64_f "," ppc_e "," ppc_f "," unknown_arch "," centos "," rhel "," ppc64 "," ppc64le "," modular "," rawhide_modular "," modular_f27 "," modular_f28 "," modular_f29 "," modular_f30 "," f30 "," f31 "," f32 "," f33 "," modular_f31 "," modular_f32 "," modular_f33 ; + print olddate "," epel4 "," epel5 "," epel6 "," epel7 "," f03 "," f04 "," f05 "," f06 "," f07 "," f08 "," f09 "," f10 "," f11 "," f12 "," f13 "," f14 "," f15 "," f16 "," f17 "," f18 "," f19 "," f20 "," f21 "," f22 "," f23 "," f24 "," f25 "," f26 "," f27 "," f28 "," f29 "," rawhide "," unknown_release "," epel "," fedora "," alpha "," arm "," arm64 "," ia64 "," mips "," ppc "," s390 "," sparc "," tilegx "," x86_32 "," x86_64 "," x86_32_e "," x86_32_f "," x86_64_e "," x86_64_f "," ppc_e "," ppc_f "," unknown_arch "," centos "," rhel "," ppc64 "," ppc64le "," modular "," rawhide_modular "," modular_f27 "," modular_f28 "," modular_f29 "," modular_f30 "," f30 "," f31 "," f32 "," f33 "," modular_f31 "," modular_f32 "," modular_f33 "," epel8 ; }; olddate=$1 epel=0; @@ -172,6 +174,7 @@ BEGIN{ epel5=0; epel6=0; epel7=0; + epel8=0; f03=0; f04=0; f05=0; @@ -243,7 +246,7 @@ BEGIN{ } END { - print olddate "," epel4 "," epel5 "," epel6 "," epel7 "," f03 "," f04 "," f05 "," f06 "," f07 "," f08 "," f09 "," f10 "," f11 "," f12 "," f13 "," f14 "," f15 "," f16 "," f17 "," f18 "," f19 "," f20 "," f21 "," f22 "," f23 "," f24 "," f25 "," f26 "," f27 "," f28 "," f29 "," rawhide "," unknown_release "," epel "," fedora "," alpha "," arm "," arm64 "," ia64 "," mips "," ppc "," s390 "," sparc "," tilegx "," x86_32 "," x86_64 "," x86_32_e "," x86_32_f "," x86_64_e "," x86_64_f "," ppc_e "," ppc_f "," unknown_arch "," centos "," rhel "," ppc64 "," ppc64le "," modular "," rawhide_modular "," modular_f27 "," modular_f28 "," modular_f29 "," modular_f30 "," f30 "," f31 "," f32 "," f33 "," modular_f31 "," modular_f32 "," modular_f33 ; + print olddate "," epel4 "," epel5 "," epel6 "," epel7 "," f03 "," f04 "," f05 "," f06 "," f07 "," f08 "," f09 "," f10 "," f11 "," f12 "," f13 "," f14 "," f15 "," f16 "," f17 "," f18 "," f19 "," f20 "," f21 "," f22 "," f23 "," f24 "," f25 "," f26 "," f27 "," f28 "," f29 "," rawhide "," unknown_release "," epel "," fedora "," alpha "," arm "," arm64 "," ia64 "," mips "," ppc "," s390 "," sparc "," tilegx "," x86_32 "," x86_64 "," x86_32_e "," x86_32_f "," x86_64_e "," x86_64_f "," ppc_e "," ppc_f "," unknown_arch "," centos "," rhel "," ppc64 "," ppc64le "," modular "," rawhide_modular "," modular_f27 "," modular_f28 "," modular_f29 "," modular_f30 "," f30 "," f31 "," f32 "," f33 "," modular_f31 "," modular_f32 "," modular_f33 "," epel8 ; } diff --git a/roles/web-data-analysis/files/mirrors-data.gp b/roles/web-data-analysis/files/mirrors-data.gp index f04ab02439..5623781fe3 100644 --- a/roles/web-data-analysis/files/mirrors-data.gp +++ b/roles/web-data-analysis/files/mirrors-data.gp @@ -15,6 +15,7 @@ plot ["2007-05-17":"2019-06-30"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:3 title 'epel5' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:4 title 'epel6' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:5 title 'epel7' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:72 title 'epel8' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:6 title 'fed03' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:7 title 'fed04' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:8 title 'fed05' with lines lw 3,\ @@ -212,35 +213,36 @@ unset output set output "/var/www/html/csv-reports/images/fedora-epel-stacked.png" set title "Fedora Yum Unique IPs" plot ["2007-05-17":"2019-06-30"] \ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.csv' using 1:($2+$3+$4+$5+$6+$7+$8+$9) title 'fed06' w filledcurves x1, \ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$6+$7+$8) title 'fed05' w filledcurves x1, \ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$6+$7) title 'fed04' w filledcurves x1, \ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$6) title 'fed03' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$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.csv' using 1:($2+$3+$4+$5+$72+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16) title 'fed13' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$72+$6+$7+$8+$9+$10+$11+$12+$13+$14+$15) title 'fed12' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$72+$6+$7+$8+$9+$10+$11+$12+$13+$14) title 'fed11' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$72+$6+$7+$8+$9+$10+$11+$12+$13) title 'fed10' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$72+$6+$7+$8+$9+$10+$11+$12) title 'fed09' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$72+$6+$7+$8+$9+$10+$11) title 'fed08' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$72+$6+$7+$8+$9+$10) title 'fed07' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$72+$6+$7+$8+$9) title 'fed06' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$72+$6+$7+$8) title 'fed05' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$72+$6+$7) title 'fed04' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$72+$6) title 'fed03' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$72) title 'epel8' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5) title 'epel7' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4) title 'epel6' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3) title 'epel5' w filledcurves x1, \ @@ -352,6 +354,7 @@ plot ["2007-05-17":"2019-06-30"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:3 title 'epel5' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:4 title 'epel6' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:5 title 'epel7' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:72 title 'epel8' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:35 title 'EPEL' with lines lw 3 unset output @@ -374,6 +377,7 @@ unset output set output "/var/www/html/csv-reports/images/epel-stacked.png" set title "Epel Releases Unique IPs" plot ["2007-05-17":"2019-06-30"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5+$72) title 'epel8' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4+$5) title 'epel7' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3+$4) title 'epel6' w filledcurves x1, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($2+$3) title 'epel5' w filledcurves x1, \ diff --git a/roles/web-data-analysis/files/mirrors-moving.gp b/roles/web-data-analysis/files/mirrors-moving.gp index 058f7a6a79..65b6bfb975 100644 --- a/roles/web-data-analysis/files/mirrors-moving.gp +++ b/roles/web-data-analysis/files/mirrors-moving.gp @@ -15,6 +15,7 @@ plot ["2007-05-17":"2019-06-30"] \ '/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:72 title 'epel8' 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,\ @@ -226,35 +227,36 @@ 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":"2019-06-30"] \ - '/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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$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+$72+$6+$7) title 'fed04' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$72+$6) title 'fed03' w filledcurves x1, \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$72) title 'epel8' 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, \ @@ -366,6 +368,7 @@ plot ["2007-05-17":"2019-06-30"] \ '/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:72 title 'epel8' 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 @@ -388,6 +391,7 @@ unset output set output "/var/www/html/csv-reports/images/epel-stacked-ma.png" set title "Epel Releases Unique IPs" plot ["2007-05-17":"2019-06-30"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($2+$3+$4+$5+$72) title 'epel8' 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, \ diff --git a/roles/web-data-analysis/files/mirrors-moving_avg.py b/roles/web-data-analysis/files/mirrors-moving_avg.py index 07ef301193..befaffa711 100644 --- a/roles/web-data-analysis/files/mirrors-moving_avg.py +++ b/roles/web-data-analysis/files/mirrors-moving_avg.py @@ -103,12 +103,14 @@ modular_f30 = pandas.rolling_mean(df['64-modular_f30'], rolling) modular_f31 = pandas.rolling_mean(df['69-modular_f31'], rolling) modular_f32 = pandas.rolling_mean(df['70-modular_f32'], rolling) modular_f33 = pandas.rolling_mean(df['71-modular_f33'], rolling) +epel8 = pandas.rolling_mean(df['72-epel8'],rolling) -print "1970-01-01,02-epel4,03-epel5,04-epel6,05-epel7,06-f03,07-f04,08-f05,09-f06,10-f07,11-f08,12-f09,13-f10,14-f11,15-f12,16-f13,17-f14,18-f15,19-f16,20-f17,21-f18,22-f19,23-f20,24-f21,25-f22,26-f23,27-f24,28-f25,29-f26,30-f27,31-f28,32-f29,33-rawhide,34-unk_rel,35-epel,36-fedora,37-alpha,38-arm,39-arm64,40-ia64,41-mips,42-ppc,43-s390,44-sparc,45-tilegx,46-x86_32,47-x86_64,48-x86_32_e,49-x86_32_f,50-x86_64_e,51-x86_64_f,52-ppc_e,53-ppc_f,54-unk_arc,55-centos,56-rhel,57-ppc64,58-ppc64le,59-modular,60-modular_rawhide,61-modular_f27,62-modular_f28,63-modular_f29,64-modular_f30,65-f30,66-f31,67-f32,68-f33,69-modular_f31,70-modular_f32,71-modular_f33"; + +print "1970-01-01,02-epel4,03-epel5,04-epel6,05-epel7,06-f03,07-f04,08-f05,09-f06,10-f07,11-f08,12-f09,13-f10,14-f11,15-f12,16-f13,17-f14,18-f15,19-f16,20-f17,21-f18,22-f19,23-f20,24-f21,25-f22,26-f23,27-f24,28-f25,29-f26,30-f27,31-f28,32-f29,33-rawhide,34-unk_rel,35-epel,36-fedora,37-alpha,38-arm,39-arm64,40-ia64,41-mips,42-ppc,43-s390,44-sparc,45-tilegx,46-x86_32,47-x86_64,48-x86_32_e,49-x86_32_f,50-x86_64_e,51-x86_64_f,52-ppc_e,53-ppc_f,54-unk_arc,55-centos,56-rhel,57-ppc64,58-ppc64le,59-modular,60-modular_rawhide,61-modular_f27,62-modular_f28,63-modular_f29,64-modular_f30,65-f30,66-f31,67-f32,68-f33,69-modular_f31,70-modular_f32,71-modular_f33,72-epel8"; for i in xrange(0,len(dates)): if math.isnan(epel4[i]): - csv_line = ",".join([dates[i],"0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"]) + csv_line = ",".join([dates[i],"0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0","0"]) else: - csv_line = ",".join([dates[i],str(int(epel4[i])),str(int(epel5[i])),str(int(epel6[i])),str(int(epel7[i])),str(int(fed03[i])),str(int(fed04[i])),str(int(fed05[i])),str(int(fed06[i])),str(int(fed07[i])),str(int(fed08[i])),str(int(fed09[i])),str(int(fed10[i])),str(int(fed11[i])),str(int(fed12[i])),str(int(fed13[i])),str(int(fed14[i])),str(int(fed15[i])),str(int(fed16[i])),str(int(fed17[i])),str(int(fed18[i])),str(int(fed19[i])),str(int(fed20[i])),str(int(fed21[i])),str(int(fed22[i])),str(int(fed23[i])),str(int(fed24[i])),str(int(fed25[i])),str(int(fed26[i])),str(int(fed27[i])),str(int(fed28[i])),str(int(fed29[i])),str(int(rawhide[i])),str(int(unk_rel[i])),str(int(EPEL[i])),str(int(Fedora[i])),str(int(alpha[i])),str(int(ARM[i])),str(int(ARM64[i])),str(int(ia64[i])),str(int(mips[i])),str(int(ppc[i])),str(int(s390[i])),str(int(sparc[i])),str(int(tilegx[i])),str(int(x86_32[i])),str(int(x86_64[i])), str(int(x86_32_e[i])),str(int(x86_32_f[i])),str(int(x86_64_e[i])),str(int(x86_64_f[i])),str(int(ppc_e[i])),str(int(ppc_f[i])), str(int(unk_arc[i])),str(int(centos[i])),str(int(rhel[i])),str(int(ppc64[i])),str(int(ppc64le[i])),str(int(modular[i])),str(int(modular_rawhide[i])),str(int(modular_f27[i])),str(int(modular_f28[i])),str(int(modular_f29[i])),str(int(modular_f30[i])),str(int(fed30[i])),str(int(fed31[i])),str(int(fed32[i])),str(int(fed33[i])),str(int(modular_f31[i])),str(int(modular_f32[i])),str(int(modular_f33[i]))]) + csv_line = ",".join([dates[i],str(int(epel4[i])),str(int(epel5[i])),str(int(epel6[i])),str(int(epel7[i])),str(int(fed03[i])),str(int(fed04[i])),str(int(fed05[i])),str(int(fed06[i])),str(int(fed07[i])),str(int(fed08[i])),str(int(fed09[i])),str(int(fed10[i])),str(int(fed11[i])),str(int(fed12[i])),str(int(fed13[i])),str(int(fed14[i])),str(int(fed15[i])),str(int(fed16[i])),str(int(fed17[i])),str(int(fed18[i])),str(int(fed19[i])),str(int(fed20[i])),str(int(fed21[i])),str(int(fed22[i])),str(int(fed23[i])),str(int(fed24[i])),str(int(fed25[i])),str(int(fed26[i])),str(int(fed27[i])),str(int(fed28[i])),str(int(fed29[i])),str(int(rawhide[i])),str(int(unk_rel[i])),str(int(EPEL[i])),str(int(Fedora[i])),str(int(alpha[i])),str(int(ARM[i])),str(int(ARM64[i])),str(int(ia64[i])),str(int(mips[i])),str(int(ppc[i])),str(int(s390[i])),str(int(sparc[i])),str(int(tilegx[i])),str(int(x86_32[i])),str(int(x86_64[i])), str(int(x86_32_e[i])),str(int(x86_32_f[i])),str(int(x86_64_e[i])),str(int(x86_64_f[i])),str(int(ppc_e[i])),str(int(ppc_f[i])), str(int(unk_arc[i])),str(int(centos[i])),str(int(rhel[i])),str(int(ppc64[i])),str(int(ppc64le[i])),str(int(modular[i])),str(int(modular_rawhide[i])),str(int(modular_f27[i])),str(int(modular_f28[i])),str(int(modular_f29[i])),str(int(modular_f30[i])),str(int(fed30[i])),str(int(fed31[i])),str(int(fed32[i])),str(int(fed33[i])),str(int(modular_f31[i])),str(int(modular_f32[i])),str(int(modular_f33[i])),str(int(epel8[i]))]) print csv_line