Skip to content

Commit 58f925c

Browse files
committed
Closes #14503: Include additional display attributes for search indexers
1 parent 326b54b commit 58f925c

File tree

5 files changed

+22
-16
lines changed

5 files changed

+22
-16
lines changed

netbox/core/search.py

+1
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ class DataFileIndex(SearchIndex):
2020
fields = (
2121
('path', 200),
2222
)
23+
display_attrs = ('source',)

netbox/dcim/search.py

+16-13
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ConsolePortIndex(SearchIndex):
2222
('description', 500),
2323
('speed', 2000),
2424
)
25-
display_attrs = ('device', 'label', 'description')
25+
display_attrs = ('device', 'label', 'type', 'description')
2626

2727

2828
@register_search
@@ -34,7 +34,7 @@ class ConsoleServerPortIndex(SearchIndex):
3434
('description', 500),
3535
('speed', 2000),
3636
)
37-
display_attrs = ('device', 'label', 'description')
37+
display_attrs = ('device', 'label', 'type', 'description')
3838

3939

4040
@register_search
@@ -48,7 +48,8 @@ class DeviceIndex(SearchIndex):
4848
('comments', 5000),
4949
)
5050
display_attrs = (
51-
'site', 'location', 'rack', 'device_type', 'role', 'tenant', 'platform', 'serial', 'asset_tag', 'description',
51+
'site', 'location', 'rack', 'status', 'device_type', 'role', 'tenant', 'platform', 'serial', 'asset_tag',
52+
'description',
5253
)
5354

5455

@@ -94,7 +95,7 @@ class FrontPortIndex(SearchIndex):
9495
('label', 200),
9596
('description', 500),
9697
)
97-
display_attrs = ('device', 'label', 'description')
98+
display_attrs = ('device', 'label', 'type', 'description')
9899

99100

100101
@register_search
@@ -109,7 +110,7 @@ class InterfaceIndex(SearchIndex):
109110
('mtu', 2000),
110111
('speed', 2000),
111112
)
112-
display_attrs = ('device', 'label', 'description')
113+
display_attrs = ('device', 'label', 'type', 'mac_address', 'wwn', 'description')
113114

114115

115116
@register_search
@@ -123,7 +124,7 @@ class InventoryItemIndex(SearchIndex):
123124
('description', 500),
124125
('part_id', 2000),
125126
)
126-
display_attrs = ('device', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description')
127+
display_attrs = ('device', 'manufacturer', 'parent', 'part_id', 'serial', 'asset_tag', 'description')
127128

128129

129130
@register_search
@@ -213,7 +214,7 @@ class PowerOutletIndex(SearchIndex):
213214
('label', 200),
214215
('description', 500),
215216
)
216-
display_attrs = ('device', 'label', 'description')
217+
display_attrs = ('device', 'label', 'type', 'description')
217218

218219

219220
@register_search
@@ -237,7 +238,7 @@ class PowerPortIndex(SearchIndex):
237238
('maximum_draw', 2000),
238239
('allocated_draw', 2000),
239240
)
240-
display_attrs = ('device', 'label', 'description')
241+
display_attrs = ('device', 'label', 'type', 'description')
241242

242243

243244
@register_search
@@ -251,7 +252,9 @@ class RackIndex(SearchIndex):
251252
('description', 500),
252253
('comments', 5000),
253254
)
254-
display_attrs = ('site', 'location', 'facility_id', 'tenant', 'status', 'role', 'description')
255+
display_attrs = (
256+
'site', 'location', 'facility_id', 'tenant', 'status', 'role', 'serial', 'asset_tag', 'description',
257+
)
255258

256259

257260
@register_search
@@ -272,7 +275,7 @@ class RackRoleIndex(SearchIndex):
272275
('slug', 110),
273276
('description', 500),
274277
)
275-
display_attrs = ('device', 'label', 'description',)
278+
display_attrs = ('description',)
276279

277280

278281
@register_search
@@ -283,7 +286,7 @@ class RearPortIndex(SearchIndex):
283286
('label', 200),
284287
('description', 500),
285288
)
286-
display_attrs = ('device', 'label', 'description')
289+
display_attrs = ('device', 'label', 'type', 'description')
287290

288291

289292
@register_search
@@ -309,7 +312,7 @@ class SiteIndex(SearchIndex):
309312
('shipping_address', 2000),
310313
('comments', 5000),
311314
)
312-
display_attrs = ('region', 'group', 'status', 'description')
315+
display_attrs = ('region', 'group', 'status', 'tenant', 'facility', 'description')
313316

314317

315318
@register_search
@@ -344,4 +347,4 @@ class VirtualDeviceContextIndex(SearchIndex):
344347
('description', 500),
345348
('comments', 5000),
346349
)
347-
display_attrs = ('device', 'status', 'identifier', 'description')
350+
display_attrs = ('device', 'status', 'identifier', 'tenant', 'description')

netbox/extras/search.py

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ class JournalEntryIndex(SearchIndex):
99
('comments', 5000),
1010
)
1111
category = 'Journal'
12+
display_attrs = ('kind', 'created_by')
1213

1314

1415
@register_search
@@ -18,3 +19,4 @@ class WebhookEntryIndex(SearchIndex):
1819
('name', 100),
1920
('description', 500),
2021
)
22+
display_attrs = ('description',)

netbox/virtualization/search.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class VMInterfaceIndex(SearchIndex):
5555
('description', 500),
5656
('mtu', 2000),
5757
)
58-
display_attrs = ('virtual_machine', 'description')
58+
display_attrs = ('virtual_machine', 'mac_address', 'description')
5959

6060

6161
@register_search
@@ -65,4 +65,4 @@ class VirtualDiskIndex(SearchIndex):
6565
('name', 100),
6666
('description', 500),
6767
)
68-
display_attrs = ('virtual_machine', 'description')
68+
display_attrs = ('virtual_machine', 'size', 'description')

netbox/vpn/search.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class TunnelIndex(SearchIndex):
1111
('description', 500),
1212
('comments', 5000),
1313
)
14-
display_attrs = ('status', 'encapsulation', 'tenant', 'description')
14+
display_attrs = ('group', 'status', 'encapsulation', 'tenant', 'tunnel_id', 'description')
1515

1616

1717
@register_search

0 commit comments

Comments
 (0)