Skip to content

Commit cb0f86d

Browse files
authored
Merge pull request #971 from netbox-community/devel
Release 3.12.0
2 parents 3d8b1ad + de5e7c2 commit cb0f86d

File tree

108 files changed

+4125
-468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+4125
-468
lines changed

CHANGELOG.rst

+40
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,46 @@ NetBox.NetBox Release Notes
55
.. contents:: Topics
66

77

8+
v3.12.0
9+
=======
10+
11+
Minor Changes
12+
-------------
13+
14+
- netbox_aggregate - Add tenant as parameter to module [#968](https://github.com/netbox-community/ansible_modules/pull/968)
15+
- netbox_asn - Add module [#947](https://github.com/netbox-community/ansible_modules/pull/947)
16+
- netbox_fhrp_group - Add module [#957](https://github.com/netbox-community/ansible_modules/pull/957)
17+
- netbox_journal_entry - Add module [#961](https://github.com/netbox-community/ansible_modules/pull/961)
18+
19+
Bugfixes
20+
--------
21+
22+
- Fix partial updates of custom_fields [#944](https://github.com/netbox-community/ansible_modules/pull/944)
23+
- nb_inventory - Fix nb_inventory group_by by site_group [#952](https://github.com/netbox-community/ansible_modules/pull/952)
24+
- netbox_location - Add multiple filter options to make sure we find the unique location [#963](https://github.com/netbox-community/ansible_modules/pull/963)
25+
26+
New Modules
27+
-----------
28+
29+
- netbox.netbox.netbox_asn - Create, update or delete ASN in NetBox
30+
- netbox.netbox.netbox_fhrp_group - Create, update or delete FHRP groups in NetBox
31+
- netbox.netbox.netbox_journal_entry - Create journal entries in NetBox
32+
33+
v3.11.0
34+
=======
35+
36+
Minor Changes
37+
-------------
38+
39+
- nb_inventory - Add serial and asset tag to extracted attributes [#826](https://github.com/netbox-community/ansible_modules/pull/826)
40+
41+
Bugfixes
42+
--------
43+
44+
- nb_lookup - Fix pynetbox 7.0.1 compatibility [#934](https://github.com/netbox-community/ansible_modules/pull/934)
45+
- netbox_cable - Fix NetBox 3.3 compatibility [#938](https://github.com/netbox-community/ansible_modules/pull/938)
46+
- netbox_webhook - Fix conditions bug [#926](https://github.com/netbox-community/ansible_modules/pull/926)
47+
848
v3.10.0
949
=======
1050

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ To keep the code simple, we only officially support the two latest releases of N
1111

1212
## Requirements
1313

14-
- NetBox 2.11+ or the two latest NetBox releases
14+
- The two latest NetBox releases
1515
- Python 3.8+
1616
- Python modules:
1717
- `pytz`
18-
- `pynetbox 5.0.4+`, `pynetbox 6.4.0+` if using 3.1 features
18+
- `pynetbox`
1919
- `packaging` if using Ansible < 2.10, as it's included in Ansible 2.10+
20-
- Ansible 2.10+
20+
- Ansible 2.12+
2121
- NetBox write-enabled token when using modules or read-only token for `nb_lookup/nb_inventory`
2222

2323
## Docs

changelogs/changelog.yaml

+23-1
Original file line numberDiff line numberDiff line change
@@ -765,4 +765,26 @@ releases:
765765
- nb_lookup - Fix pynetbox 7.0.1 compatibility [#934](https://github.com/netbox-community/ansible_modules/pull/934)
766766
minor_changes:
767767
- nb_inventory - Add serial and asset tag to extracted attributes [#826](https://github.com/netbox-community/ansible_modules/pull/826)
768-
release_date: '2023-02-12'
768+
release_date: '2023-02-12'
769+
3.12.0:
770+
changes:
771+
bugfixes:
772+
- nb_inventory - Fix nb_inventory group_by by site_group [#952](https://github.com/netbox-community/ansible_modules/pull/952)
773+
- netbox_location - Add multiple filter options to make sure we find the unique location [#963](https://github.com/netbox-community/ansible_modules/pull/963)
774+
- Fix partial updates of custom_fields [#944](https://github.com/netbox-community/ansible_modules/pull/944)
775+
minor_changes:
776+
- netbox_asn - Add module [#947](https://github.com/netbox-community/ansible_modules/pull/947)
777+
- netbox_journal_entry - Add module [#961](https://github.com/netbox-community/ansible_modules/pull/961)
778+
- netbox_fhrp_group - Add module [#957](https://github.com/netbox-community/ansible_modules/pull/957)
779+
- netbox_aggregate - Add tenant as parameter to module [#968](https://github.com/netbox-community/ansible_modules/pull/968)
780+
modules:
781+
- description: Create journal entries in NetBox
782+
name: netbox_journal_entry
783+
namespace: ''
784+
- description: Create, update or delete FHRP groups in NetBox
785+
name: netbox_fhrp_group
786+
namespace: ''
787+
- description: Create, update or delete ASN in NetBox
788+
name: netbox_asn
789+
namespace: ''
790+
release_date: '2023-04-04'

changelogs/fragments/issue-951.yml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
bugfixes:
3+
- Fix nb_inventory group_by by site_group (#951)

docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
author = "Mikhail Yohman <@FragmentedPacket>"
2828

2929
# The full version, including alpha/beta/rc tags
30-
release = "3.11.0"
30+
release = "3.12.0"
3131

3232

3333
# -- General configuration ---------------------------------------------------

docs/plugins/index.rst

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Netbox.Netbox
77
=============
88

9-
Collection version 3.8.1
9+
Collection version 3.12.0
1010

1111
.. contents::
1212
:local:
@@ -49,6 +49,7 @@ Modules
4949
~~~~~~~
5050

5151
* :ref:`netbox_aggregate module <ansible_collections.netbox.netbox.netbox_aggregate_module>` -- Creates or removes aggregates from NetBox
52+
* :ref:`netbox_asn module <ansible_collections.netbox.netbox.netbox_asn_module>` -- Create, update or delete ASNs within NetBox
5253
* :ref:`netbox_cable module <ansible_collections.netbox.netbox.netbox_cable_module>` -- Create, update or delete cables within NetBox
5354
* :ref:`netbox_circuit module <ansible_collections.netbox.netbox.netbox_circuit_module>` -- Create, update or delete circuits within NetBox
5455
* :ref:`netbox_circuit_termination module <ansible_collections.netbox.netbox.netbox_circuit_termination_module>` -- Create, update or delete circuit terminations within NetBox
@@ -74,12 +75,14 @@ Modules
7475
* :ref:`netbox_device_role module <ansible_collections.netbox.netbox.netbox_device_role_module>` -- Create, update or delete devices roles within NetBox
7576
* :ref:`netbox_device_type module <ansible_collections.netbox.netbox.netbox_device_type_module>` -- Create, update or delete device types within NetBox
7677
* :ref:`netbox_export_template module <ansible_collections.netbox.netbox.netbox_export_template_module>` -- Creates, updates or deletes export templates within NetBox
78+
* :ref:`netbox_fhrp_group module <ansible_collections.netbox.netbox.netbox_fhrp_group_module>` -- Create, update or delete FHRP groups within NetBox
7779
* :ref:`netbox_front_port module <ansible_collections.netbox.netbox.netbox_front_port_module>` -- Create, update or delete front ports within NetBox
7880
* :ref:`netbox_front_port_template module <ansible_collections.netbox.netbox.netbox_front_port_template_module>` -- Create, update or delete front port templates within NetBox
7981
* :ref:`netbox_inventory_item module <ansible_collections.netbox.netbox.netbox_inventory_item_module>` -- Creates or removes inventory items from NetBox
8082
* :ref:`netbox_inventory_item_role module <ansible_collections.netbox.netbox.netbox_inventory_item_role_module>` -- Create, update or delete devices roles within NetBox
8183
* :ref:`netbox_ip_address module <ansible_collections.netbox.netbox.netbox_ip_address_module>` -- Creates or removes IP addresses from NetBox
8284
* :ref:`netbox_ipam_role module <ansible_collections.netbox.netbox.netbox_ipam_role_module>` -- Creates or removes ipam roles from NetBox
85+
* :ref:`netbox_journal_entry module <ansible_collections.netbox.netbox.netbox_journal_entry_module>` -- Creates a journal entry
8386
* :ref:`netbox_l2vpn module <ansible_collections.netbox.netbox.netbox_l2vpn_module>` -- Create, update or delete L2VPNs within NetBox
8487
* :ref:`netbox_location module <ansible_collections.netbox.netbox.netbox_location_module>` -- Create, update or delete locations within NetBox
8588
* :ref:`netbox_manufacturer module <ansible_collections.netbox.netbox.netbox_manufacturer_module>` -- Create or delete manufacturers within NetBox
@@ -141,6 +144,7 @@ Lookup Plugins
141144
nb_inventory_inventory
142145
nb_lookup_lookup
143146
netbox_aggregate_module
147+
netbox_asn_module
144148
netbox_cable_module
145149
netbox_circuit_module
146150
netbox_circuit_termination_module
@@ -166,12 +170,14 @@ Lookup Plugins
166170
netbox_device_role_module
167171
netbox_device_type_module
168172
netbox_export_template_module
173+
netbox_fhrp_group_module
169174
netbox_front_port_module
170175
netbox_front_port_template_module
171176
netbox_inventory_item_module
172177
netbox_inventory_item_role_module
173178
netbox_ip_address_module
174179
netbox_ipam_role_module
180+
netbox_journal_entry_module
175181
netbox_l2vpn_module
176182
netbox_location_module
177183
netbox_manufacturer_module

docs/plugins/nb_inventory_inventory.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ netbox.netbox.nb_inventory inventory -- NetBox inventory source
4242
.. Collection note
4343
4444
.. note::
45-
This inventory plugin is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.8.1).
45+
This inventory plugin is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.12.0).
4646

4747
To install it, use: :code:`ansible-galaxy collection install netbox.netbox`.
4848

docs/plugins/nb_lookup_lookup.rst

+1-19
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ netbox.netbox.nb_lookup lookup -- Queries and returns elements from NetBox
4242
.. Collection note
4343
4444
.. note::
45-
This lookup plugin is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.8.1).
45+
This lookup plugin is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.12.0).
4646

4747
To install it, use: :code:`ansible-galaxy collection install netbox.netbox`.
4848
You need further requirements to be able to use this lookup plugin,
@@ -534,24 +534,6 @@ Examples
534534
api_filter='role=management tag=Dell'),
535535
token='<redacted>') }}"
536536

537-
# Obtain a secret for R1-device
538-
tasks:
539-
- name: "Obtain secrets for R1-Device"
540-
debug:
541-
msg: "{{ query('netbox.netbox.nb_lookup', 'secrets', api_filter='device=R1-Device', api_endpoint='http://localhost/', token='<redacted>', key_file='~/.ssh/id_rsa') }}"
542-
543-
# Fetch bgp sessions for R1-device
544-
tasks:
545-
- name: "Obtain bgp sessions for R1-Device"
546-
debug:
547-
msg: "{{ query('netbox.netbox.nb_lookup', 'bgp_sessions',
548-
api_filter='device=R1-Device',
549-
api_endpoint='http://localhost/',
550-
token='<redacted>',
551-
plugin='mycustomstuff') }}"
552-
553-
msg: "{{ query('netbox.netbox.nb_lookup', 'secrets', api_filter='device=R1-Device', api_endpoint='http://localhost/', token='<redacted>', key_file='~/.ssh/id_rsa') }}"
554-
555537

556538

557539

docs/plugins/netbox_aggregate_module.rst

+38-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ netbox.netbox.netbox_aggregate module -- Creates or removes aggregates from NetB
4242
.. Collection note
4343
4444
.. note::
45-
This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.8.1).
45+
This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.12.0).
4646

4747
To install it, use: :code:`ansible-galaxy collection install netbox.netbox`.
4848
You need further requirements to be able to use this module,
@@ -410,6 +410,43 @@ Parameters
410410
Any tags that the aggregate may need to be associated with
411411

412412

413+
.. raw:: html
414+
415+
</div>
416+
417+
* - .. raw:: html
418+
419+
<div class="ansible-option-indent"></div><div class="ansible-option-cell">
420+
<div class="ansibleOptionAnchor" id="parameter-data/tenant"></div>
421+
422+
.. _ansible_collections.netbox.netbox.netbox_aggregate_module__parameter-data/tenant:
423+
424+
.. rst-class:: ansible-option-title
425+
426+
**tenant**
427+
428+
.. raw:: html
429+
430+
<a class="ansibleOptionLink" href="#parameter-data/tenant" title="Permalink to this option"></a>
431+
432+
.. rst-class:: ansible-option-type-line
433+
434+
:ansible-option-type:`any`
435+
436+
:ansible-option-versionadded:`added in netbox.netbox 3.12.0`
437+
438+
439+
.. raw:: html
440+
441+
</div>
442+
443+
- .. raw:: html
444+
445+
<div class="ansible-option-indent-desc"></div><div class="ansible-option-cell">
446+
447+
Tenant the aggregate will be assigned to.
448+
449+
413450
.. raw:: html
414451

415452
</div>

0 commit comments

Comments
 (0)