X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=dograph;h=889a696c98857b00e256f133adfd4c2eef745602;hp=00be2d3b33d74f90c8fcc54f94ce4bc48b6d1a3b;hb=da9bc4d89556c3c089f33525461c746403532627;hpb=0a8a6839c3fbeb4a67a4e43704861c3af8b35214

diff --git a/dograph b/dograph
index 00be2d3..889a696 100755
--- a/dograph
+++ b/dograph
@@ -8,11 +8,11 @@ tmp=`tempfile`
 tmp2=`tempfile`
 tmp3=`tempfile`
 
-find counts -type f | sort | xargs grep '^' /dev/null |
+find counts -type f -not -iname '*.bad'| sort | xargs grep '^' /dev/null |
     sed 's/^.*count-//;s/ .*$//;s/:/ /' >"$tmp"
-find counts -type f | sort | xargs egrep '^(.* ){6}' /dev/null | tr ":-" " " |
+find counts -type f -not -iname '*.bad'| sort | xargs egrep '^(.* ){6}' /dev/null | tr ":-" " " |
     cut -d" " -f2,9 >"$tmp2"
-find counts -type f | sort | xargs egrep '^(.* ){7}' /dev/null | tr ":-" " " |
+find counts -type f -not -iname '*.bad'| sort | xargs egrep '^(.* ){7}' /dev/null | tr ":-" " " |
     cut -d" " -f2,10 >"$tmp3"
 
 #for i in counts/count-[0-9]* ; do
@@ -21,6 +21,12 @@ find counts -type f | sort | xargs egrep '^(.* ){7}' /dev/null | tr ":-" " " |
 #	echo $date $count >> ${tmp}2
 #done
 
+# This is the date of the stretch release
+previous_release="201706170000"
+
+# And this is a month ago
+previous_month=`date +"%Y%m%d%H%M" --date="1 month ago"`
+
 cat <<EOF | gnuplot
 set xdata time
 set timefmt "%Y%m%d%H%M"
@@ -31,7 +37,24 @@ set terminal png
 set yrange [0:]
 #set xtics 2678400
 #set nomxtics
-set output "/org/bugs.debian.org/www/bugscan/graph.png"
+set linetype  1 lc rgb "dark-violet" lw 1
+set linetype  2 lc rgb "#009e73" lw 1
+set linetype  3 lc rgb "#56b4e9" lw 1
+set linetype  4 lc rgb "#e69f00" lw 1
+set linetype  5 lc rgb "#f0e442" lw 1
+set linetype  6 lc rgb "#0072b2" lw 1
+set linetype  7 lc rgb "#e51e10" lw 1
+set linetype  8 lc rgb "black"   lw 1
+set linetype  9 lc rgb "gray50"  lw 1
+set linetype cycle  9
+set output "/srv/bugs.debian.org/www/bugscan/graph.png"
+plot "$tmp" using 1:2 with lines, "$tmp2" using 1:2 with lines, "$tmp3" using 1:2 with lines
+set xrange ["$previous_release":]
+set output "/srv/bugs.debian.org/www/bugscan/graph-release.png"
+plot "$tmp" using 1:2 with lines, "$tmp2" using 1:2 with lines, "$tmp3" using 1:2 with lines
+set xrange ["$previous_month":]
+set format x "%d\n%m\n%Y"
+set output "/srv/bugs.debian.org/www/bugscan/graph-month.png"
 plot "$tmp" using 1:2 with lines, "$tmp2" using 1:2 with lines, "$tmp3" using 1:2 with lines
 quit
 EOF