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

#912 use new all_oids format with additional status,enum,descr

Browse Source
This commit is contained in:
Oliver Gorwits
2022-08-07 22:53:40 +01:00
parent 83996046ae
commit 1e2d9f36bf
9 changed files with 80 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/App/Netdisco/DB/Result/SNMPObject.pm
View File

@@ -23,6 +23,12 @@ __PACKAGE__->add_columns(
{ data_type => "text[]", is_nullable => 1, default_value => \"'{}'::text[]" },
"num_children",
{ data_type => "integer", is_nullable => 0, default_value => \'0' },
"status",
{ data_type => "text", is_nullable => 1 },
"enum",
{ data_type => "text[]", is_nullable => 1, default_value => \"'{}'::text[]" },
"descr",
{ data_type => "text", is_nullable => 1 },
);
__PACKAGE__->set_primary_key("oid");

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

@@ -12,7 +12,7 @@ __PACKAGE__->table("filtered_snmp_object");
__PACKAGE__->result_source_instance->is_virtual(1);
__PACKAGE__->result_source_instance->view_definition(<<ENDSQL
SELECT so.oid, so.oid_parts, so.mib, so.leaf, so.type, so.access, so.index, so.num_children,
SELECT so.oid, so.oid_parts, so.mib, so.leaf, so.type, so.access, so.index, so.status, so.enum, so.descr, so.num_children,
count(db.oid) AS browser
FROM snmp_object so
@@ -25,7 +25,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
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
GROUP BY so.oid, so.oid_parts, so.mib, so.leaf, so.type, so.access, so.index, so.status, so.enum, so.descr, so.num_children
ENDSQL
);
@@ -38,6 +38,9 @@ __PACKAGE__->add_columns(
'type' => { data_type => 'text' },
'access' => { data_type => 'text' },
'index' => { data_type => 'text[]' },
'status' => { data_type => 'text' },
'enum' => { data_type => 'text[]' },
'descr' => { data_type => 'text' },
'num_children' => { data_type => 'integer' },
'browser' => { data_type => 'integer' },
);