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

make the SNMP Browser faster and colour branches with data

Browse Source
This commit is contained in:
Oliver Gorwits
2022-08-04 22:56:23 +01:00
parent bbc4674213
commit 2ae86b9fcd
7 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/App/Netdisco/DB/Result/Virtual/FilteredSNMPObject.pm
View File

@@ -12,11 +12,20 @@ __PACKAGE__->table("filtered_snmp_object");
__PACKAGE__->result_source_instance->is_virtual(1);
__PACKAGE__->result_source_instance->view_definition(<<ENDSQL
SELECT oid, oid_parts, mib, leaf, type, access, index
FROM snmp_object
WHERE oid LIKE ?::text || '.%'
AND oid_parts[?] = ANY (?)
AND array_length(oid_parts,1) = ?
SELECT so.oid, so.oid_parts, so.mib, so.leaf, so.type, so.access, so.index, so.num_children,
count(db.oid) AS browser
FROM snmp_object so
LEFT JOIN device_browser db ON
(db.ip = ? AND
((so.oid = db.oid)
OR (array_length(db.oid_parts,1) > ?
AND db.oid LIKE so.oid || '.%')))
WHERE array_length(so.oid_parts,1) = ?
AND so.oid LIKE ?::text || '.%'
GROUP BY so.oid, so.oid_parts, so.mib, so.leaf, so.type, so.access, so.index, so.num_children
ENDSQL
);
@@ -29,6 +38,8 @@ __PACKAGE__->add_columns(
'type' => { data_type => 'text' },
'access' => { data_type => 'text' },
'index' => { data_type => 'text[]' },
'num_children' => { data_type => 'integer' },
'browser' => { data_type => 'integer' },
);
1;

4
lib/App/Netdisco/DB/Result/Virtual/OidChildren.pm
View File

@@ -8,6 +8,10 @@ use base 'DBIx::Class::Core';
__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
# NO LONGER USED BY NETDISCO
# (PostgreSQL cannot handle GROUP BY using ARRAY element where
# element ID is a bind value)
__PACKAGE__->table("oid_children");
__PACKAGE__->result_source_instance->is_virtual(1);
__PACKAGE__->result_source_instance->view_definition(<<ENDSQL