Skip to content

Commit aaaa20b

Browse files
jdrew82jdrew82
authored
Merge pull request #381 from nautobot/release-v2.4.0
Release v2.4.0
2 parents 7869108 + 3fb7ec1 commit aaaa20b

File tree

21 files changed

+1312
-945
lines changed

21 files changed

+1312
-945
lines changed

‎development/nautobot_config.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
),
228228
"infoblox_import_objects_vlan_views": is_truthy(os.getenv("NAUTOBOT_SSOT_INFOBLOX_IMPORT_OBJECTS_VLAN_VIEWS")),
229229
"infoblox_import_objects_vlans": is_truthy(os.getenv("NAUTOBOT_SSOT_INFOBLOX_IMPORT_OBJECTS_VLANS")),
230-
"infoblox_import_subnets": os.getenv("NAUTOBOT_SSOT_INFOBLOX_IMPORT_SUBNETS", "").split(","),
230+
"infoblox_import_subnets": [x for x in os.getenv("NAUTOBOT_SSOT_INFOBLOX_IMPORT_SUBNETS", "").split(",") if x],
231231
"infoblox_password": os.getenv("NAUTOBOT_SSOT_INFOBLOX_PASSWORD"),
232232
"infoblox_url": os.getenv("NAUTOBOT_SSOT_INFOBLOX_URL"),
233233
"infoblox_username": os.getenv("NAUTOBOT_SSOT_INFOBLOX_USERNAME"),
@@ -242,6 +242,11 @@
242242
"servicenow_password": os.getenv("SERVICENOW_PASSWORD", ""),
243243
"servicenow_username": os.getenv("SERVICENOW_USERNAME", ""),
244244
},
245+
"nautobot_device_lifecycle_mgmt": {
246+
"barchart_bar_width": float(os.environ.get("BARCHART_BAR_WIDTH", 0.1)),
247+
"barchart_width": int(os.environ.get("BARCHART_WIDTH", 12)),
248+
"barchart_height": int(os.environ.get("BARCHART_HEIGHT", 5)),
249+
},
245250
}
246251

247252
METRICS_ENABLED = True

‎docs/admin/integrations/infoblox_setup.md‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,24 @@ pip install nautobot-ssot[infoblox]
1414

1515
Integration behavior can be controlled with the following settings:
1616

17-
| Setting | Default | Description |
18-
| ------------------------------------------ | ------- | ---------------------------------------------------------------------- |
19-
| infoblox_url | N/A | URL of the Infoblox instance to sync with. |
20-
| infoblox_username | N/A | The username to authenticate against Infoblox with. |
21-
| infoblox_password | N/A | The password to authenticate against Infblox with. |
22-
| infoblox_verify_ssl | True | Toggle SSL verification when syncing data with Infoblox. |
23-
| infoblox_wapi_version | v2.12 | The version of the Infoblox API. |
24-
| infoblox_enable_sync_to_infoblox | False | Add job to sync data from Nautobot into Infoblox. |
25-
| infoblox_enable_rfc1918_network_containers | False | Add job to sync network containers to Nautobot (top level aggregates). |
26-
| infoblox_default_status | active | Default Status to be assigned to imported objects. |
27-
| infoblox_import_objects_ip_addresses | False | Import IP addresses from Infoblox to Nautobot. |
28-
| infoblox_import_objects_subnets | False | Import subnets from Infoblox to Nautobot. |
29-
| infoblox_import_objects_subnets_ipv6 | False | Import IPv6 subnets from Infoblox to Nautobot. |
30-
| infoblox_import_objects_vlan_views | False | Import VLAN views from Infoblox to Nautobot. |
31-
| infoblox_import_objects_vlans | False | Import VLANs from Infoblox to Nautobot. |
32-
| infoblox_import_subnets | N/A | List of Subnets in CIDR string notation to filter import to. |
33-
| infoblox_network_view | N/A | Only load IPAddresses from a specific Infoblox Network View. |
17+
| Setting | Default | Description |
18+
| ------------------------------------------ | ------- | ----------------------------------------------------------------------------- |
19+
| infoblox_url | N/A | URL of the Infoblox instance to sync with. |
20+
| infoblox_username | N/A | The username to authenticate against Infoblox with. |
21+
| infoblox_password | N/A | The password to authenticate against Infblox with. |
22+
| infoblox_verify_ssl | True | Toggle SSL verification when syncing data with Infoblox. |
23+
| infoblox_wapi_version | v2.12 | The version of the Infoblox API. |
24+
| infoblox_enable_sync_to_infoblox | False | Add job to sync data from Nautobot into Infoblox. |
25+
| infoblox_enable_rfc1918_network_containers | False | Add job to sync network containers to Nautobot (top level aggregates). |
26+
| infoblox_default_status | active | Default Status to be assigned to imported objects. |
27+
| infoblox_import_objects_ip_addresses | False | Import IP addresses from Infoblox to Nautobot. |
28+
| infoblox_import_objects_subnets | False | Import subnets from Infoblox to Nautobot. |
29+
| infoblox_import_objects_subnets_ipv6 | False | Import IPv6 subnets from Infoblox to Nautobot. |
30+
| infoblox_import_objects_vlan_views | False | Import VLAN views from Infoblox to Nautobot. |
31+
| infoblox_import_objects_vlans | False | Import VLANs from Infoblox to Nautobot. |
32+
| infoblox_import_subnets | N/A | List of Subnets in CIDR string notation to filter import to. |
33+
| infoblox_network_view | N/A | Only load IPAddresses from a specific Infoblox Network View. |
34+
| infoblox_request_timeout | 60 | How long HTTP requests to Infoblox should wait for a response before failing. |
3435

3536
Below is an example snippet from `nautobot_config.py` that demonstrates how to enable and configure Infoblox integration:
3637

@@ -50,12 +51,13 @@ PLUGINS_CONFIG = {
5051
"infoblox_import_objects_subnets_ipv6": is_truthy(os.getenv("NAUTOBOT_SSOT_INFOBLOX_IMPORT_OBJECTS_SUBNETS_IPV6")),
5152
"infoblox_import_objects_vlan_views": is_truthy(os.getenv("NAUTOBOT_SSOT_INFOBLOX_IMPORT_OBJECTS_VLAN_VIEWS")),
5253
"infoblox_import_objects_vlans": is_truthy(os.getenv("NAUTOBOT_SSOT_INFOBLOX_IMPORT_OBJECTS_VLANS")),
53-
"infoblox_import_subnets": os.getenv("NAUTOBOT_SSOT_INFOBLOX_IMPORT_SUBNETS", "").split(","),
54+
"infoblox_import_subnets": [x for x in os.getenv("NAUTOBOT_SSOT_INFOBLOX_IMPORT_SUBNETS", "").split(",") if x],
5455
"infoblox_password": os.getenv("NAUTOBOT_SSOT_INFOBLOX_PASSWORD"),
5556
"infoblox_url": os.getenv("NAUTOBOT_SSOT_INFOBLOX_URL"),
5657
"infoblox_username": os.getenv("NAUTOBOT_SSOT_INFOBLOX_USERNAME"),
5758
"infoblox_verify_ssl": is_truthy(os.getenv("NAUTOBOT_SSOT_INFOBLOX_VERIFY_SSL", True)),
5859
"infoblox_wapi_version": os.getenv("NAUTOBOT_SSOT_INFOBLOX_WAPI_VERSION", "v2.12"),
60+
"infoblox_request_timeout": 120,
5961
}
6062
}
6163
```
@@ -118,7 +120,7 @@ PLUGINS_CONFIG = {
118120
"infoblox_import_objects_subnets_ipv6": is_truthy(os.getenv("NAUTOBOT_SSOT_INFOBLOX_IMPORT_OBJECTS_SUBNETS_IPV6")),
119121
"infoblox_import_objects_vlan_views": is_truthy(os.getenv("NAUTOBOT_SSOT_INFOBLOX_IMPORT_OBJECTS_VLAN_VIEWS")),
120122
"infoblox_import_objects_vlans": is_truthy(os.getenv("NAUTOBOT_SSOT_INFOBLOX_IMPORT_OBJECTS_VLANS")),
121-
"infoblox_import_subnets": os.getenv("NAUTOBOT_SSOT_INFOBLOX_IMPORT_SUBNETS", "").split(","),
123+
"infoblox_import_subnets": [x for x in os.getenv("NAUTOBOT_SSOT_INFOBLOX_IMPORT_SUBNETS", "").split(",") if x],
122124
"infoblox_password": os.getenv("NAUTOBOT_SSOT_INFOBLOX_PASSWORD"),
123125
"infoblox_url": os.getenv("NAUTOBOT_SSOT_INFOBLOX_URL"),
124126
"infoblox_username": os.getenv("NAUTOBOT_SSOT_INFOBLOX_USERNAME"),

‎docs/admin/release_notes/version_2.4.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
# v2.3 Release Notes
3+
4+
## v2.3.0 - 2024-02-21
5+
6+
## Added
7+
8+
- [375](https://github.com/nautobot/nautobot-app-ssot/pull/375) - Add support to IPFabric for VirtualChassis/Stacks by @jmcgill298
9+
- [379](https://github.com/nautobot/nautobot-app-ssot/pull/379) - Add LCM plugin config. Fix 'infoblox_import_subnets` setting. by @progala
10+
11+
## Fixes
12+
13+
- [368](https://github.com/nautobot/nautobot-app-ssot/pull/368) - Import Optional from typing directly by @jmcgill298
14+
- [374](https://github.com/nautobot/nautobot-app-ssot/pull/374) - Improve error handling in contrib by @Kircheneer
15+
16+
## Changed
17+
18+
- [360](https://github.com/nautobot/nautobot-app-ssot/pull/360) - Contrib Updates Part 1 by @Renrut5
19+
- [369](https://github.com/nautobot/nautobot-app-ssot/pull/369) - Allow for Infoblox to configure HTTP timeout by @jmcgill298
20+
- [371](https://github.com/nautobot/nautobot-app-ssot/pull/371) - Change contrib.NautobotModel.get_from_db to use a PK by @Kircheneer

‎mkdocs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ nav:
128128
- Compatibility Matrix: "admin/compatibility_matrix.md"
129129
- Release Notes:
130130
- "admin/release_notes/index.md"
131+
- v2.4: "admin/release_notes/version_2.4.md"
131132
- v2.3: "admin/release_notes/version_2.3.md"
132133
- v2.2: "admin/release_notes/version_2.2.md"
133134
- v2.1: "admin/release_notes/version_2.1.md"

0 commit comments

Comments
 (0)