135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use daterange for IP Subnets

Browse Source
This commit is contained in:
Oliver Gorwits
2014-03-10 23:08:53 +00:00
parent 211f5f1623
commit 3d9be3c9ac
4 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Netdisco/Changes
View File

@@ -1,3 +1,9 @@
2.025000 -
[ENHANCEMENTS]
* Use daterange for IP Subnets (same as IP Inventory)
2.024004 - 2014-03-04
[BUG FIXES]

9
Netdisco/lib/App/Netdisco/DB/Result/Virtual/SubnetUtilization.pm
View File

@@ -20,15 +20,16 @@ __PACKAGE__->result_source_instance->view_definition(<<'ENDSQL');
FROM subnets s1, node_ip ni
WHERE s1.net <<= ?::cidr
AND ni.ip <<= s1.net
AND ni.time_last > (now() - ?::interval)
AND s1.last_discover > (now() - ?::interval)
AND ni.time_last >= ?
AND ni.time_last <= ?
AND s1.last_discover >= ?
UNION
SELECT DISTINCT net, di.alias as ip
FROM subnets s2, device_ip di JOIN device d USING (ip)
WHERE s2.net <<= ?::cidr
AND di.alias <<= s2.net
AND s2.last_discover > (now() - ?::interval)
AND d.last_discover > (now() - ?::interval)
AND s2.last_discover >= ?
AND d.last_discover >= ?
) as joined
GROUP BY net
ORDER BY percent ASC

16
Netdisco/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm
View File

@@ -5,7 +5,6 @@ use Dancer::Plugin::DBIC;
use Dancer::Plugin::Auth::Extensible;
use App::Netdisco::Web::Plugin;
use App::Netdisco::Util::Web (); # for interval_to_daterange
register_report({
category => 'IP',
@@ -16,19 +15,22 @@ register_report({
get '/ajax/content/report/subnets' => require_login sub {
my $subnet = param('subnet') || '0.0.0.0/32';
my $age = param('age') || '7 days';
$age = '7 days' unless $age =~ m/^(?:\d+)\s+(?:day|week|month|year)s?$/;
my $agenot = param('age_invert') || '0';
my ( $start, $end ) = param('daterange') =~ /(\d+-\d+-\d+)/gmx;
my $daterange = App::Netdisco::Util::Web::interval_to_daterange($age);
if ($agenot) {
my $tmp = $end;
$end = $start;
$start = $tmp;
}
my $set = schema('netdisco')->resultset('Virtual::SubnetUtilization')
->search(undef,{
bind => [ $subnet, $age, $age, $subnet, $age, $age ],
bind => [ $subnet, $start, $end, $end, $subnet, $end, $end ],
});
if ( request->is_ajax ) {
template 'ajax/report/subnets.tt',
{ results => $set, daterange => $daterange },
template 'ajax/report/subnets.tt', { results => $set },
{ layout => undef };
}
else {

24
Netdisco/share/views/sidebar/report/subnets.tt
View File

@@ -8,19 +8,21 @@
<fieldset>
<legend class="nd_sidebar-legend">
<label><em><strong>Options</strong></em></label>
<label><em><strong>Date Range</strong></em></label>
</legend>
<div class="clearfix input-prepend">
<label class="add-on">
<input type="checkbox" id="age_invert"
name="age_invert"[% ' checked="checked"' IF params.age_invert %]/>
</label>
<label class="nd_checkboxlabel" for="age_invert">
<span class="nd_searchcheckbox uneditable-input">Not within...</span>
</label>
</div>
<div class="clearfix">
<ul class="unstyled">
<li>
<em class="muted">Activity Period:</em><br/>
<select id="nd_mac-format" class="nd_side-select" name="age">
[% FOREACH size IN [ '7 days', '14 days', '30 days', '3 months', '1 year', '5 years' ] %]
<option[% ' selected="selected"' IF params.age == size %]>[% size %]</option>
[% END %]
</select>
</li>
</ul>
<input class="nd_side-input" id="daterange"
type="text" name="daterange" value="[%
(params.exists('daterange') ? params.daterange : to_daterange('30 days')) | html_entity %]"/>
</div>
</fieldset>