From 63b7cbe08a511efc77f7248b2395fd4c44fe2bfb Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Fri, 6 May 2016 18:25:22 +0000 Subject: [PATCH] and on the 5th day he ran out of tylenol and motrin. --- roles/web-data-analysis/files/mirrors-data.gp | 29 +++++++++---------- roles/web-data-analysis/tasks/main.yml | 3 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/roles/web-data-analysis/files/mirrors-data.gp b/roles/web-data-analysis/files/mirrors-data.gp index bb1fbde4a6..bdc006a882 100644 --- a/roles/web-data-analysis/files/mirrors-data.gp +++ b/roles/web-data-analysis/files/mirrors-data.gp @@ -64,14 +64,7 @@ plot ["2007-05-17":"2016-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:53 title 'ppc_f' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:54 title 'unknown' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:55 title 'centos' with lines lw 3,\ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:56 title 'rhel' with lines lw 3,\ -unset output - -set output "/var/www/html/csv-reports/images/fedora-and-epel.png" -set title "Fedora Epel Totals Unique IPs" -plot ["2007-05-17":"2016-12-31"] \ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:35 title 'EPEL' with lines lw 3,\ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:36 title 'Fedora' with lines lw 3 + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:56 title 'rhel' with lines lw 3 unset output set output "/var/www/html/csv-reports/images/fedora-daily.png" @@ -111,7 +104,7 @@ plot ["2007-05-17":"2016-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:31 title 'fed28' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:32 title 'fed29' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:33 title 'rawhide' with lines lw 3,\ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:34 title 'unk_rel' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:34 title 'unk_rel' with lines lw 3 unset output set output "/var/www/html/csv-reports/images/fedora-os-latest.png" @@ -155,8 +148,8 @@ plot ["2007-05-17":"2016-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:43 title 's390' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:44 title 'sparc' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:45 title 'tilegx' with lines lw 3,\ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:49 title 'x86_32' with lines lw 3,\ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:51 title 'x86_64' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:49 title 'x86_32_f' with lines lw 3,\ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:51 title 'x86_64_f' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:54 title 'unknown' with lines lw 3 unset output @@ -252,10 +245,10 @@ set output "/var/www/html/csv-reports/images/fedora-select-stacked.png" set title "Fedora Epel Yum Unique IPs" plot ["2007-05-17":"2016-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.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.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 'fed20-24' w filledcurves x1, \ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19+$20+$21+$22) title 'fed15-19' w filledcurves x1, \ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($6+$7+$8+$9+$10+$11+$12+$13+$14+$15+$16+$17) title 'fed08-14' w filledcurves x1, \ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($6+$7+$8+$9+$10) title 'fed03-07' w filledcurves x1 + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.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.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.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.csv' using 1:($6+$7+$8+$9+$10+$11) title 'fed03-07' w filledcurves x1 unset output ## @@ -272,6 +265,12 @@ plot ["2007-05-17":"2016-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:35 title 'EPEL' with lines lw 3 unset output +set output "/var/www/html/csv-reports/images/epel-daily.png" +set title "Fedora Epel Totals Unique IPs" +plot ["2007-05-17":"2016-12-31"] \ + '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:35 title 'EPEL' with lines lw 3,\ +unset output + set output "/var/www/html/csv-reports/images/epel-arch.png" set title "Epel ARCH Unique IPs" diff --git a/roles/web-data-analysis/tasks/main.yml b/roles/web-data-analysis/tasks/main.yml index fbf5313e70..6e83870f77 100644 --- a/roles/web-data-analysis/tasks/main.yml +++ b/roles/web-data-analysis/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: install awstats package +- name: install python-pandas package yum: state=present name=python-pandas tags: - packages @@ -40,6 +40,7 @@ - name: python scripts to calculate various data copy: src=mirrorlist.py dest=/usr/local/bin mode=0755 + with_items: [mirrorlist.py, mirrors-moving_avg.py] tags: - web-data