foreach my $site (keys %news_sources) {
my $sk= $site;
+ $sk =~ s/^[.0-9]+$/~$&/;
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 .= " $&";
}
+print STDERR "$site => $sk\n";
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 ];
}
}
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 ]
"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;