chiark
/
gitweb
/
~ijackson
/
rrd-graphs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b76d12
)
better grouping of news entries
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 11 Sep 2013 13:20:38 +0000
(14:20 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 11 Sep 2013 13:20:38 +0000
(14:20 +0100)
cgi
patch
|
blob
|
history
diff --git
a/cgi
b/cgi
index 489037409d73010192f5ae2d803988084aef01af..c35a5b2fd2d06483db0b646a45876285957bc5d7 100755
(executable)
--- a/
cgi
+++ b/
cgi
@@
-206,13
+206,17
@@
our @news_graphs;
foreach my $site (keys %news_sources) {
my $sk= $site;
foreach my $site (keys %news_sources) {
my $sk= $site;
+ $sk =~ s/^[.0-9]+$/~$&/;
for (;;) {
last unless $sk =~
for (;;) {
last unless $sk =~
-
s/^[^. ]*\b(?:chiark|greenend|news
|nntp|peer|feed|in|out)\b[^.]*\.//;
+
s/^[^. ]*\b(?:chiark|greenend|news|newsfeed
|nntp|peer|feed|in|out)\b[^.]*\.//;
$sk .= " $&";
}
$sk .= " $&";
}
+print STDERR "$site => $sk\n";
foreach my $inout (keys %{ $news_sources{$site} }) {
foreach my $inout (keys %{ $news_sources{$site} }) {
- push @news_graphs, [ "$sk $inout", $site, $inout ];
+ my $skio = $sk;
+ $skio =~ s/ / [$inout]/;
+ push @news_graphs, [ $skio, $site, $inout ];
}
}
}
}
@@
-238,7
+242,10
@@
foreach my $siteinfo (sort { $a->[0] cmp $b->[0] } @news_graphs) {
push @defs, "CDEF:kb_$`=$val,1024,/";
}
}
push @defs, "CDEF:kb_$`=$val,1024,/";
}
}
- graph_of_group("News", $site, $inout,
+ my $group = $sortkey;
+ $group =~ s/ .*//;
+ $group = $site unless length $group;
+ graph_of_group("News", $group, "$site $inout",
{
Units => '[art/s]',
TimeRanges => [ map { $_*86400 } qw(1 7 31), 366, 366*3 ]
{
Units => '[art/s]',
TimeRanges => [ map { $_*86400 } qw(1 7 31), 366, 366*3 ]
@@
-260,7
+267,8
@@
foreach my $siteinfo (sort { $a->[0] cmp $b->[0] } @news_graphs) {
"CDEF:kb_accepted_smooth=kb_accepted,<interval/60>,TREND",
"LINE:kb_duplicate#ff0:kb dupe",
"LINE:kb_accepted_smooth#008:~kb",
"CDEF:kb_accepted_smooth=kb_accepted,<interval/60>,TREND",
"LINE:kb_duplicate#ff0:kb dupe",
"LINE:kb_accepted_smooth#008:~kb",
- ]);
+ ],
+ "$site $inout");
}
our %disk_rdev2rrd;
}
our %disk_rdev2rrd;