From 8d17ae6c6ba742cce99b8d48b20da0dbf5e217a6 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 19 Jun 2024 16:29:42 +0000 Subject: [PATCH] make sure that graphs actually generate, remove old files Signed-off-by: Stephen Smoogen --- roles/web-data-analysis/files/mirrors-data.gp | 12 ------------ roles/web-data-analysis/tasks/main.yml | 5 +++++ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/roles/web-data-analysis/files/mirrors-data.gp b/roles/web-data-analysis/files/mirrors-data.gp index ac059afc46..c59e63bcb3 100644 --- a/roles/web-data-analysis/files/mirrors-data.gp +++ b/roles/web-data-analysis/files/mirrors-data.gp @@ -363,18 +363,6 @@ plot ["2007-05-17":"2024-12-31"] \ '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($33) title 'rawhide' w filledcurves x1 lc rgb "#FF0000" unset output -set output "/var/www/html/csv-reports/images/fedora-rev-latest-stacked.png" -set title "Fedora Yum Unique IPs" -plot ["2018-01-01":"2024-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:($33) title 'rawhide' with filledcurves x1 - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($33+$79) title 'fed39' with filledcurves x1,\ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($33+$79+$78) title 'fed38' with filledcurves x1,\ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($33+$79+$78+$77) title 'fed37' with filledcurves x1,\ - '/var/www/html/csv-reports/mirrors/mirrorsdata-all.csv' using 1:($33+$79+$78+$77+$76) title 'fed36' with filledcurves x1,\ -unset output - - set output "/var/www/html/csv-reports/images/fedora-select-stacked.png" set title "Fedora Yum Unique IPs" plot ["2007-05-17":"2024-12-31"] \ diff --git a/roles/web-data-analysis/tasks/main.yml b/roles/web-data-analysis/tasks/main.yml index 4b3752edf4..006861d868 100644 --- a/roles/web-data-analysis/tasks/main.yml +++ b/roles/web-data-analysis/tasks/main.yml @@ -54,6 +54,11 @@ tags: - web-data +- name: clean out non-useful images + ansible.builtin.file: path=/var/www/html/csv-reports/images/{{item}} + state: abscent + with_items: [ hotspot-all.png, fedora-rev-latest-stacked.png ] + - name: scripts to condense data down for further processing copy: src={{item}} dest=/usr/local/bin/ mode=0755 with_items: [condense-mirrorlogs.sh]