From 4766e57e53facb025a54f4ea9f63717c1979de42 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Fri, 31 Jul 2020 13:17:35 -0400 Subject: [PATCH] fix the data-analysis graphs to plot past 2019-12-31 to 2020-12-31 --- .../web-data-analysis/files/getfedora-data.gp | 14 ++++---- .../web-data-analysis/files/getstuff-data.gp | 18 +++++----- roles/web-data-analysis/files/hotspot.gp | 4 +-- roles/web-data-analysis/files/mirrors-data.gp | 34 +++++++++---------- .../web-data-analysis/files/mirrors-moving.gp | 34 +++++++++---------- 5 files changed, 52 insertions(+), 52 deletions(-) diff --git a/roles/web-data-analysis/files/getfedora-data.gp b/roles/web-data-analysis/files/getfedora-data.gp index 347bbc655e..2a762f902e 100644 --- a/roles/web-data-analysis/files/getfedora-data.gp +++ b/roles/web-data-analysis/files/getfedora-data.gp @@ -9,7 +9,7 @@ set term png size 1600,1200 ## set output "/var/www/html/csv-reports/images/getfedora-allpoints.png" set title "Daily Editions Total Unique IPs" -plot ["2014-12-01":"2019-12-31"] \ +plot ["2014-12-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total downloads' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:3 title 'Editions' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:4 title 'Atomic' with lines lw 4,\ @@ -41,7 +41,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-editions.png" set title "Daily Editions Total Unique IPs" -plot ["2014-12-01":"2019-12-31"] \ +plot ["2014-12-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total downloads' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:3 title 'Editions' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:4 title 'Atomic' with lines lw 4,\ @@ -54,7 +54,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-editions-filled.png" set title "Daily Editions Total Unique IPs" -plot ["2014-12-01":"2019-12-31"] \ +plot ["2014-12-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total downloads' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:3 title 'Editions' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($4+$5+$6+$7+$8) title 'Atomic' with filledcurves x1,\ @@ -67,7 +67,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-versions-filled.png" set title "Daily Version Totals" -plot ["2014-12-01":"2019-12-31"] \ +plot ["2014-12-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total number' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19) title 'Fedora-20' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:( $10+$11+$12+$13+$14+$15+$16+$17+$18+$19) title 'Fedora-21' with filledcurves x1,\ @@ -85,7 +85,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-arch.png" set title "Daily x86 Architectures Filled Totals" -plot ["2014-12-01":"2019-12-31"] \ +plot ["2014-12-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total number' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($25+$26) title 'x86_32' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($26) title 'x86_64' with filledcurves x1 @@ -94,7 +94,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-netinstalls.png" set title "Daily Netinstalls Total" -plot ["2014-01-01":"2019-12-31"] \ +plot ["2014-01-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:28 title 'Total Netinstalls' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:29 title 'Server' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:30 title 'Workstation' with lines lw 4,\ @@ -104,7 +104,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-netinstalls-filled.png" set title "Daily Netinstalls Total" -plot ["2014-01-01":"2019-12-31"] \ +plot ["2014-01-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:28 title 'Total Netinstalls' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($29+$30+$31) title 'Server' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($30+$31) title 'Workstation' with filledcurves x1,\ diff --git a/roles/web-data-analysis/files/getstuff-data.gp b/roles/web-data-analysis/files/getstuff-data.gp index d904f570de..2d4b4bb290 100644 --- a/roles/web-data-analysis/files/getstuff-data.gp +++ b/roles/web-data-analysis/files/getstuff-data.gp @@ -9,7 +9,7 @@ set term png size 1600,1200 ## set output "/var/www/html/csv-reports/images/getfedora-allpoints.png" set title "Daily Editions Total Unique IPs" -plot ["2014-12-01":"2019-12-31"] \ +plot ["2014-12-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total downloads' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:3 title 'Editions' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:4 title 'Atomic' with lines lw 4,\ @@ -60,7 +60,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-editions.png" set title "Daily Editions Total Unique IPs" -plot ["2014-12-01":"2019-12-31"] \ +plot ["2014-12-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total downloads' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:3 title 'Editions' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:4 title 'Atomic' with lines lw 4,\ @@ -73,7 +73,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-editions-filled.png" set title "Daily Editions Total Unique IPs" -plot ["2014-12-01":"2019-12-31"] \ +plot ["2014-12-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total downloads' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:3 title 'Editions' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($4+$5+$6+$7+$8) title 'Atomic' with filledcurves x1,\ @@ -86,7 +86,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-versions-filled.png" set title "Daily Version Totals" -plot ["2014-12-01":"2019-12-31"] \ +plot ["2014-12-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total number' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($9+$10+$11+$12+$13+$14+$15+$16+$17+$18+$19) title 'Fedora-20' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:( $10+$11+$12+$13+$14+$15+$16+$17+$18+$19) title 'Fedora-21' with filledcurves x1,\ @@ -104,7 +104,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-arch.png" set title "Daily Architectures Totals" -plot ["2014-12-01":"2019-12-31"] \ +plot ["2014-12-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total number' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:20 title 'Arm 32' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:21 title 'Arm 64' with lines lw 4,\ @@ -119,7 +119,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-arch-top2-filled.png" set title "Daily x86 Architectures Filled Totals" -plot ["2014-12-01":"2019-12-31"] \ +plot ["2014-12-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:2 title 'Total number' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($25+$26) title 'x86_32' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($26) title 'x86_64' with filledcurves x1 @@ -128,7 +128,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-arch-less-filled.png" set title "Daily Other Architectures Totals" -plot ["2014-01-01":"2019-12-31"] \ +plot ["2014-01-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($20+$21+$22+$23+$24+$25) title 'arm_32' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($21+$22+$23+$24+$25) title 'arm_64' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($22+$23+$24+$25) title 'ppc_le' with filledcurves x1,\ @@ -140,7 +140,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-netinstalls.png" set title "Daily Netinstalls Total" -plot ["2014-01-01":"2019-12-31"] \ +plot ["2014-01-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:28 title 'Total Netinstalls' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:29 title 'Server' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:30 title 'Workstation' with lines lw 4,\ @@ -150,7 +150,7 @@ unset output ## set output "/var/www/html/csv-reports/images/getfedora-netinstalls-filled.png" set title "Daily Netinstalls Total" -plot ["2014-01-01":"2019-12-31"] \ +plot ["2014-01-01":"2020-12-31"] \ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:28 title 'Total Netinstalls' with lines lw 4,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($29+$30+$31) title 'Server' with filledcurves x1,\ '/var/www/html/csv-reports/getfedora/getfedoradata-all.csv' using 1:($30+$31) title 'Workstation' with filledcurves x1,\ diff --git a/roles/web-data-analysis/files/hotspot.gp b/roles/web-data-analysis/files/hotspot.gp index 3541745826..8f20a0584e 100644 --- a/roles/web-data-analysis/files/hotspot.gp +++ b/roles/web-data-analysis/files/hotspot.gp @@ -9,7 +9,7 @@ set term png size 1600,1200 ## set output "/var/www/html/csv-reports/images/hotspot-all.png" set title "IPs grabbing hotspot per day" -plot ["2014-12-01":"2019-12-31"] \ +plot ["2014-12-01":"2020-12-31"] \ '/var/www/html/csv-reports/hotspot/hotspotdata-all.csv' using 1:2 title 'Average every 5min' with lines lw 4, \ '/var/www/html/csv-reports/hotspot/hotspotdata-all.csv' using 1:3 title 'Least 5min' with lines lw 4, \ '/var/www/html/csv-reports/hotspot/hotspotdata-all.csv' using 1:4 title 'Max 5min' with lines lw 4 @@ -18,7 +18,7 @@ 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":"2019-12-31"] \ +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 diff --git a/roles/web-data-analysis/files/mirrors-data.gp b/roles/web-data-analysis/files/mirrors-data.gp index dc9e34c055..de2412d11a 100644 --- a/roles/web-data-analysis/files/mirrors-data.gp +++ b/roles/web-data-analysis/files/mirrors-data.gp @@ -10,7 +10,7 @@ set key outside right top Right title 'Legend' box 3 ## set output "/var/www/html/csv-reports/images/mirrors-all-points.png" set title "Fedora+Epel Yum Unique IPs" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:2 title 'epel4' with lines lw 3,\ '/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,\ @@ -86,13 +86,13 @@ unset output set output "/var/www/html/csv-reports/images/fedora-daily.png" set title "Fedora Daily Totals Unique IPs" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:36 title 'Fedora' with lines lw 3 unset output set output "/var/www/html/csv-reports/images/fedora-os-all.png" set title "Fedora OS Yum Unique IPs" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-12-31"] \ '/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,\ @@ -132,7 +132,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-os-modular.png" set title "Fedora Modular Users Unique IPs" -plot ["2018-01-01":"2019-12-31"] \ +plot ["2018-01-01":"2020-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:59 title 'modular' with lines lw 3, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:60 title 'modular_rawhide' with lines lw 3, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:61 title 'modular_f27' with lines lw 3, \ @@ -143,7 +143,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-os-latest.png" set title "Fedora Selected Versions Unique IPs" -plot ["2015-01-01":"2019-12-31"] \ +plot ["2015-01-01":"2020-12-31"] \ '/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:30 title 'fed27' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:31 title 'fed28' with lines lw 3,\ @@ -163,7 +163,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-os-latest-stacked.png" set title "Fedora Selected Versions Unique IPs" -plot ["2015-01-01":"2019-12-31"] \ +plot ["2015-01-01":"2020-12-31"] \ '/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:($31+$32+$65+$66+$33) title 'fed28' with filledcurves x1,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($32+$66+$65+$33) title 'fed29' with filledcurves x1,\ @@ -174,7 +174,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-hardware-full.png" set title "Fedora Hardware via Unique IPs" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:37 title 'alpha' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:38 title 'ARM' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:39 title 'ARM64' with lines lw 3,\ @@ -193,7 +193,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-hardware-2nd.png" set title "Fedora Secondary via Unique IPs" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:37 title 'alpha' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:38 title 'ARM' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:39 title 'ARM64' with lines lw 3,\ @@ -210,7 +210,7 @@ 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-12-31"] \ +plot ["2007-05-17":"2020-12-31"] \ '/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, \ @@ -250,7 +250,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-stacked.png" set title "Fedora Yum Unique IPs" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-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+$34) title 'unknown-release' 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+$28+$29+$30+$31+$32+$33) title 'rawhide' 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+$28+$29+$30+$31+$32) title 'fed29' w filledcurves x1, \ @@ -284,7 +284,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-rev-all-stacked.png" set title "Fedora Yum Reverse Unique IPs" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($34+$33+$32+$31+$30+$29+$28+$27+$26+$25+$24+$23+$22+$21+$20+$19+$18+$17+$16+$15+$14+$13+$12+$11+$10+$9+$8+$7+$6) title 'fed03' w filledcurves x1 lc rgb "#F0F0F0", \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($34+$33+$32+$31+$30+$29+$28+$27+$26+$25+$24+$23+$22+$21+$20+$19+$18+$17+$16+$15+$14+$13+$12+$11+$10+$9+$8+$7) title 'fed04' w filledcurves x1 lc rgb "#F0F0F0", \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($34+$33+$32+$31+$30+$29+$28+$27+$26+$25+$24+$23+$22+$21+$20+$19+$18+$17+$16+$15+$14+$13+$12+$11+$10+$9+$8) title 'fed05' w filledcurves x1 lc rgb "#F0F0F0", \ @@ -318,7 +318,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-rev-latest-stacked.png" set title "Fedora Yum Unique IPs" -plot ["2015-01-01":"2019-12-31"] \ +plot ["2015-01-01":"2020-12-31"] \ '/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:($31+$32+$65+$66+$33) title 'fed28' with filledcurves x1,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($32+$66+$65+$33) title 'fed29' with filledcurves x1,\ @@ -330,7 +330,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-select-stacked.png" set title "Fedora Yum Unique IPs" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-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+$28+$29+$30+$31+$32) title 'fed25-30' 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 'fed19-24' w filledcurves x1, \ @@ -345,7 +345,7 @@ unset output set output "/var/www/html/csv-reports/images/epel-all.png" set title "Epel Yum Unique IPs" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:2 title 'epel4' with lines lw 3,\ '/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,\ @@ -356,14 +356,14 @@ unset output set output "/var/www/html/csv-reports/images/epel-daily.png" set title "Fedora Epel Totals Unique IPs" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-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" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:48 title 'x86_32' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:50 title 'x86_64' with lines lw 3,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:52 title 'ppc' with lines lw 3,\ @@ -372,7 +372,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-12-31"] \ +plot ["2007-05-17":"2020-12-31"] \ '/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, \ diff --git a/roles/web-data-analysis/files/mirrors-moving.gp b/roles/web-data-analysis/files/mirrors-moving.gp index 0665665a31..df45e12014 100644 --- a/roles/web-data-analysis/files/mirrors-moving.gp +++ b/roles/web-data-analysis/files/mirrors-moving.gp @@ -10,7 +10,7 @@ set key outside right top Right title 'Legend' box 3 ## set output "/var/www/html/csv-reports/images/mirrors-all-points-ma.png" set title "Fedora+Epel Yum Unique IPs" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-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,\ @@ -92,13 +92,13 @@ 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":"2019-12-31"] \ +plot ["2007-05-17":"2020-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":"2019-12-31"] \ +plot ["2007-05-17":"2020-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,\ @@ -142,7 +142,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-os-modular-ma.png" set title "Fedora Modular Users Unique IPs" -plot ["2018-01-01":"2019-12-31"] \ +plot ["2018-01-01":"2020-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:59 title 'modular' with lines lw 3, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:60 title 'modular_rawhide' with lines lw 3, \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:61 title 'modular_f27' with lines lw 3, \ @@ -153,7 +153,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-os-latest-ma.png" set title "Fedora Selected Versions Unique IPs" -plot ["2015-01-01":"2019-12-31"] \ +plot ["2015-01-01":"2020-12-31"] \ '/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: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,\ @@ -177,7 +177,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-os-latest-stacked-ma.png" set title "Fedora Selected Versions Unique IPs" -plot ["2015-01-01":"2019-12-31"] \ +plot ["2015-01-01":"2020-12-31"] \ '/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:($31+$32+$65+$66+$33) title 'fed28' with filledcurves x1,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($32+$66+$65+$33) title 'fed29' with filledcurves x1,\ @@ -188,7 +188,7 @@ 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":"2019-12-31"] \ +plot ["2007-05-17":"2020-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,\ @@ -207,7 +207,7 @@ 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":"2019-12-31"] \ +plot ["2007-05-17":"2020-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,\ @@ -224,7 +224,7 @@ 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-12-31"] \ +plot ["2007-05-17":"2020-12-31"] \ '/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, \ @@ -264,7 +264,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-stacked-ma.png" set title "Fedora Yum Unique IPs" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-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, \ @@ -298,7 +298,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-rev-all-stacked-ma.png" set title "Fedora Yum Reverse Unique IPs" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($34+$33+$32+$31+$30+$29+$28+$27+$26+$25+$24+$23+$22+$21+$20+$19+$18+$17+$16+$15+$14+$13+$12+$11+$10+$9+$8+$7+$6) title 'fed03' w filledcurves x1 lc rgb "#F0F0F0", \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($34+$33+$32+$31+$30+$29+$28+$27+$26+$25+$24+$23+$22+$21+$20+$19+$18+$17+$16+$15+$14+$13+$12+$11+$10+$9+$8+$7) title 'fed04' w filledcurves x1 lc rgb "#F0F0F0", \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($34+$33+$32+$31+$30+$29+$28+$27+$26+$25+$24+$23+$22+$21+$20+$19+$18+$17+$16+$15+$14+$13+$12+$11+$10+$9+$8) title 'fed05' w filledcurves x1 lc rgb "#F0F0F0", \ @@ -332,7 +332,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-rev-latest-stacked-ma.png" set title "Fedora Yum Unique IPs" -plot ["2015-01-01":"2019-12-31"] \ +plot ["2015-01-01":"2020-12-31"] \ '/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:($31+$32+$65+$66+$33) title 'fed28' with filledcurves x1,\ '/var/www/html/csv-reports/mirrors/mirrorsdata-all-7day-ma.csv' using 1:($32+$66+$65+$33) title 'fed29' with filledcurves x1,\ @@ -344,7 +344,7 @@ unset output set output "/var/www/html/csv-reports/images/fedora-select-stacked-ma.png" set title "Fedora Yum Unique IPs" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-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+$28+$29+$30+$31+$32) title 'fed25-30' 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 'fed19-24' w filledcurves x1, \ @@ -359,7 +359,7 @@ unset output set output "/var/www/html/csv-reports/images/epel-all-ma.png" set title "Epel Yum Unique IPs" -plot ["2007-05-17":"2019-12-31"] \ +plot ["2007-05-17":"2020-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,\ @@ -370,14 +370,14 @@ 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":"2019-12-31"] \ +plot ["2007-05-17":"2020-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":"2019-12-31"] \ +plot ["2007-05-17":"2020-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,\ @@ -386,7 +386,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-12-31"] \ +plot ["2007-05-17":"2020-12-31"] \ '/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, \