Merge pull request #765 from nautobot/release-v3.6.0

Release v3.6.0

Author: jdrew82

.cookiecutter.json

@@ -21,7 +21,7 @@
         "_drift_manager": {
             "template": "https://github.com/nautobot/cookiecutter-nautobot-app.git",
             "template_dir": "nautobot-app",
-            "template_ref": "refs/tags/nautobot-app-v2.4.1",
+            "template_ref": "refs/tags/nautobot-app-v2.4.2",
             "cookie_dir": "",
             "branch_prefix": "drift-manager",
             "pull_request_strategy": "create",
@@ -30,7 +30,7 @@
                 "poetry"
             ],
             "draft": false,
-            "baked_commit_ref": "1c99457b09d05553ef7193e0dda021b2d1caa407"
+            "baked_commit_ref": "a9ba090fb8fb08d173c3c720a6dbe92a59f4c6f8"
         }
     }
 }

.github/workflows/ci.yml

@@ -139,7 +139,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.8", "3.12"]
+        python-version: ["3.9", "3.12"]
         db-backend: ["postgresql"]
         nautobot-version: ["stable"]
         include:

README.md

@@ -100,8 +100,6 @@ The SSoT framework includes a number of integrations with external Systems of Re
 * Slurpit
 * SolarWinds
 
-> Note that the Arista CloudVision integration is currently incompatible with the [Arista Labs](https://labs.arista.com/) environment due to a TLS issue. It has been confirmed to work in on-prem environments previously.
-
 ### Contributing to the Documentation
 
 You can find all the Markdown source for the App documentation under the [`docs`](https://github.com/nautobot/nautobot-app-ssot/tree/develop/docs) folder in this repository. For simple edits, a Markdown capable editor is sufficient: clone the repository and edit away.
@@ -179,3 +177,7 @@ This project includes code originally written in separate Nautobot apps, which h
     [@glennmatthews](https://github.com/glennmatthews),
     [@qduk](https://github.com/qduk),
     [@ubajze](https://github.com/ubajze)
+- [nautobot-plugin-ssot-solarwinds](https://github.com/nautobot/nautobot-app-ssot-solarwinds):
+    Thanks
+    [@jdrew82](https://github.com/jdrew82),
+    [@nopg](https://github.com/nopg)

development/nautobot_config.py

@@ -211,6 +211,7 @@
             "vrf": True,
             "prefix": True,
             "scheduled_job": True,
+            "custom_field": True,
         },
         "citrix_adm_update_sites": is_truthy(os.getenv("NAUTOBOT_SSOT_CITRIX_ADM_UPDATE_SITES", "true")),
         "enable_aci": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_ACI")),

docs/admin/compatibility_matrix.md

@@ -31,4 +31,5 @@ While that last supported version will not be strictly enforced--via the max_ver
 | 3.2.0                          | 2.1.0                          | 2.99.99                       |
 | 3.3.0                          | 2.1.0                          | 2.99.99                       |
 | 3.4.0                          | 2.1.0                          | 2.99.99                       |
-| 3.5.0                          | 2.1.0                          | 2.99.99                       |
+| 3.5.0                          | 2.1.0                          | 2.99.99                       |
+| 3.6.0                          | 2.1.0                          | 2.99.99                       |

docs/admin/integrations/bootstrap_setup.md

@@ -30,6 +30,7 @@ PLUGINS_CONFIG = {
             "git_repository": True,
             "dynamic_group": True,
             "computed_field": True,
+            "custom_field": True,
             "tag": True,
             "graph_ql_query": True,
             "software": False,

docs/admin/integrations/infoblox_setup.md

@@ -128,6 +128,24 @@ The above filters will allow the loading of the following data from Infoblox and
 - Only IPv4 prefixes and IP addresses, contained within the `192.168.0.0/16` container, located in Infoblox network view "dev" and Nautobot namespace "dev". All IPv6 prefixes and IP addresses in the Infoblox network view "dev" and Nautobot namespace "dev".
 - Only IPv4 prefixes and IP addresses, contained within the `10.0.0.0/8` container, located in Infoblox network view "test" and Nautobot namespace "test".  Only IPv6 prefixes and IP addresses contained withing the `2001:5b0:4100::/40` container that are located in the Infoblox network view "test" and Nautobot namespace "test".
 
+### Configuring Infoblox Network Views to Nautbot Namespace map
+
+This setting allows you to create mappings between Infoblox network views and Nautobot namespaces. By default, the **default** network view maps to the **Global** Nautobot namespace.
+
+The purpose of this setting is to provide flexibility, enabling you to:
+
+- Assign a different namespace instead of **Global** for the default Infoblox network view.
+- Define additional mappings based on your environment’s requirements.
+
+The setting is represented as a dictionary, where the keys are Infoblox network views, and the values are the corresponding Nautobot namespaces.
+
+```json
+[
+    {
+        "default": "Global"
+    }
+]
+```
 
 ### Configuring Infoblox DNS View Mapping
 

docs/admin/release_notes/version_3.4.md

@@ -5,7 +5,7 @@ This document describes all new features and changes in the release. The format
 
 ## Release Overview
 
-This release adds two new integrations to the project, one for Solarwinds Orion and one for LibreNMS! There are also a lot of bug fixes for various integrations.
+This release adds two new integrations to the project, one for SolarWinds Orion and one for LibreNMS! There are also a lot of bug fixes for various integrations.
 
 ## [v3.4.0 (2025-01-14)](https://github.com/nautobot/nautobot-app-ssot/releases/tag/v3.4.0)
 

docs/admin/release_notes/version_3.6.md

@@ -0,0 +1,65 @@
+
+# v3.6 Release Notes
+
+This document describes all new features and changes in the release. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## Release Overview
+
+The major thing to note about this release is that we've removed support for Python 3.8 from the project. There have been some additional features added to the Bootstrap and DNA Center integrations. In addition there have been a multitude of bugfixes and tweaks made to the project.
+
+## [v3.6.0 (2025-04-04)](https://github.com/nautobot/nautobot-app-ssot/releases/tag/v3.6.0)
+
+### Added
+
+- [#632](https://github.com/nautobot/nautobot-app-ssot/issues/632) - Added support for Object Metadata to track last synchronization from DNA Center to imported Locations, Devices, Prefixes, and IPAddresses.
+- [#705](https://github.com/nautobot/nautobot-app-ssot/issues/705) - Added custom_field creation to Bootstrap integration.
+- [#744](https://github.com/nautobot/nautobot-app-ssot/issues/744) - Added extra check when determiming device_type for 'wireless' in Cisco model names.
+- [#745](https://github.com/nautobot/nautobot-app-ssot/issues/745) - Added enabled option for ScheduledJob in Bootstrap SSOT.
+
+### Changed
+
+- [#692](https://github.com/nautobot/nautobot-app-ssot/issues/692) - Improve the replace_dashed_custom_fields migration (0007_replace_dashed_custom_fields.py) by iterating over a generator instead of loading all objects into a list.
+- [#726](https://github.com/nautobot/nautobot-app-ssot/issues/726) - Create a new setting in the SSoT Infoblox integration that allows users to define mappings between Infoblox network views and Nautobot namespaces.
+- [#731](https://github.com/nautobot/nautobot-app-ssot/issues/731) - Changed Aruba/Cisco Platform values to enable better differentation between Operating Systems.
+- [#732](https://github.com/nautobot/nautobot-app-ssot/issues/732) - Allowed custom_property to be used for filtering without requiring location_override.
+- [#732](https://github.com/nautobot/nautobot-app-ssot/issues/732) - Added location_override ability to be used without requiring custom_property.
+
+### Fixed
+
+- [#687](https://github.com/nautobot/nautobot-app-ssot/issues/687) - Fixed Location structure being imported incorrectly in DNA Center.
+- [#695](https://github.com/nautobot/nautobot-app-ssot/issues/695) - Add check for parent of Location before looking for parent of parent.
+- [#697](https://github.com/nautobot/nautobot-app-ssot/issues/697) - ACI integration: Change _tag.validated_save() to _tag.save()
+- [#702](https://github.com/nautobot/nautobot-app-ssot/issues/702) - Fixed handling of timezones in scheduled jobs when timezone is specified in the yaml.
+- [#703](https://github.com/nautobot/nautobot-app-ssot/issues/703) - Added catching of `ValueError` on `validated_save` in contrib models.
+- [#707](https://github.com/nautobot/nautobot-app-ssot/issues/707) - Added exception handling to Slurpit functions to catch if an object already exists.
+- [#708](https://github.com/nautobot/nautobot-app-ssot/issues/708) - Fixed bug that was causing all Devices to be assigned to same Building when Location structure included multiple Buildings of same name under differing Areas.
+- [#710](https://github.com/nautobot/nautobot-app-ssot/issues/710) - Allowed Slurpit sync to be scheduled.
+- [#710](https://github.com/nautobot/nautobot-app-ssot/issues/710) - Fix issue with duplicate prefixes from Nautobot causing exception during sync with Slurpit.
+- [#710](https://github.com/nautobot/nautobot-app-ssot/issues/710) - Enable custom fields to accept `None` in the Slurpit models.
+- [#710](https://github.com/nautobot/nautobot-app-ssot/issues/710) - Remove Napalm driver sync
+- [#710](https://github.com/nautobot/nautobot-app-ssot/issues/710) - Add exception catch ObjectDoesNotExist
+- [#717](https://github.com/nautobot/nautobot-app-ssot/issues/717) - Fixed missing import of Interfaces and IPAddresses for uplink Interfaces on small selection of APs in Meraki.
+- [#721](https://github.com/nautobot/nautobot-app-ssot/issues/721) - Updated source and destination labels for Infoblox "Prefix -> VLAN" relationship
+- [#729](https://github.com/nautobot/nautobot-app-ssot/issues/729) - Fixed the synchronization of the prefix location from Infoblox extensibility attributes.
+- [#732](https://github.com/nautobot/nautobot-app-ssot/issues/732) - Fixed failure scenario with a user-friendly error message, if neither a location_type or location_override was specified.
+- [#732](https://github.com/nautobot/nautobot-app-ssot/issues/732) - Fixed missing container name error, if comma separated container names included a space before or after a comma.
+- [#734](https://github.com/nautobot/nautobot-app-ssot/issues/734) - Fixed bug where non-existing Building ID is found in SiteHierarchy for a device.
+- [#737](https://github.com/nautobot/nautobot-app-ssot/issues/737) - Fixed Meraki AP port not being loaded and created correctly.
+- [#737](https://github.com/nautobot/nautobot-app-ssot/issues/737) - Fixed Meraki location_map feature not updating Locations parent and name as expected.
+- [#739](https://github.com/nautobot/nautobot-app-ssot/issues/739) - Fixes key errors if keys don't exist in global_settings.yaml and are enabled in models_to_sync.
+- [#740](https://github.com/nautobot/nautobot-app-ssot/issues/740) - Added migration for SolarWinds integration to update CustomFields from Solarwinds to SolarWinds to match update in #696.
+- [#748](https://github.com/nautobot/nautobot-app-ssot/issues/748) - Fixes handling empty keys in tag and location models
+- [#750](https://github.com/nautobot/nautobot-app-ssot/issues/750) - Fixed ServiceNow instance configuration loading.
+
+### Dependencies
+
+- [#762](https://github.com/nautobot/nautobot-app-ssot/issues/762) - Removed support for Python 3.8.
+
+### Documentation
+
+- [#696](https://github.com/nautobot/nautobot-app-ssot/issues/696) - Corrected spelling of SolarWinds and removed note about Arista Labs.
+- [#743](https://github.com/nautobot/nautobot-app-ssot/issues/743) - Added Mermaid diagrams for SSoT models to documentation.
+
+### Housekeeping
+
+- Rebaked from the cookie `nautobot-app-v2.4.2`.

docs/dev/diagrams.md

@@ -0,0 +1,59 @@
+# Model Diagrams
+
+To aide developers in understanding the various models and how they interoperate for the SSoT project.
+
+```mermaid
+erDiagram
+DiffSyncModel{
+    ClassVar[str] _modelname
+    ClassVar[Tuple[str]] _identifiers
+    ClassVar[Tuple[str]] _shortname
+    ClassVar[Tuple[str]] _attributes
+    ClassVar[Dict[str]] _children
+    DiffSyncModelFlags model_flags
+    Optional[Adapter] adapter
+    DiffSyncStatus _status
+    string _status_message
+    ConfigDict model_config
+}
+Adapter{
+    Optional[str] type
+    ClassVar[List[str]] top_level
+}
+"nautobot_app_ssot.Sync"[Sync]{
+    string source
+    string target
+    datetime start_time
+    duration source_load_time
+    duration target_load_time
+    duration diff_time
+    duration sync_time
+    PositiveBigIntegerField source_load_memory_final
+    PositiveBigIntegerField source_load_memory_peak
+    PositiveBigIntegerField target_load_memory_final
+    PositiveBigIntegerField target_load_memory_peak
+    PositiveBigIntegerField diff_memory_final
+    PositiveBigIntegerField diff_memory_peak
+    PositiveBigIntegerField sync_memory_final
+    PositiveBigIntegerField sync_memory_peak
+    boolean dry_run
+    json diff
+    JobResult job_result FK
+}
+"nautobot_app_ssot.SyncLogEntry"[SyncLogEntry]{
+    Sync sync FK
+    datetime timestamp
+    string action
+    string status
+    json diff
+    ContentType synced_object_type FK
+    uuid synced_object_id
+    GenericForeignKey synced_object
+    string object_repr
+    string message
+}
+"extras.JobResult"[JobResult]{}
+"nautobot_app_ssot.SyncLogEntry" }o--|| "nautobot_app_ssot.Sync" : "must have"
+"nautobot_app_ssot.Sync" }o--o| "extras.JobResult" : "may have"
+DiffSyncModel||--|{Adapter : adapter
+```