Skip to content

Commit 2858221

Browse files
authored
Merge pull request #618 from nautobot/release-v3.3.0
Release v3.3.0
2 parents 5850f86 + ec6000c commit 2858221

File tree

131 files changed

+9246
-1062
lines changed

Some content is hidden

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

131 files changed

+9246
-1062
lines changed

.cookiecutter.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"max_nautobot_version": "2.9999",
1515
"camel_name": "NautobotSSOTApp",
1616
"project_short_description": "Nautobot Single Source of Truth",
17-
"model_class_name": "None",
17+
"model_class_name": "Sync",
1818
"open_source_license": "Apache-2.0",
1919
"docs_base_url": "https://docs.nautobot.com",
2020
"docs_app_url": "https://docs.nautobot.com/projects/ssot/en/latest",

.github/CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33
/nautobot_ssot/integrations/aci/ @chadell @nautobot/plugin-ssot
44
/nautobot_ssot/integrations/aristacv/ @qduk @jdrew82 @nautobot/plugin-ssot
55
/nautobot_ssot/integrations/bootstrap/ @bile0026 @nautobot/plugin-ssot
6+
/nautobot_ssot/integrations/citrix_adm/ @jdrew82 @nautobot/plugin-ssot
67
/nautobot_ssot/integrations/device42/ @jdrew82 @nautobot/plugin-ssot
8+
/nautobot_ssot/integrations/dna_center/ @jdrew82 @nautobot/plugin-ssot
79
/nautobot_ssot/integrations/infoblox/ @qduk @jdrew82 @nautobot/plugin-ssot
810
/nautobot_ssot/integrations/ipfabric/ @alhogan @nautobot/plugin-ssot
11+
/nautobot_ssot/integrations/itential/ @jtdub @nautobot/plugin-ssot
12+
/nautobot_ssot/integrations/meraki/ @jdrew82 @nautobot/plugin-ssot
913
/nautobot_ssot/integrations/servicenow/ @glennmatthews @qduk @nautobot/plugin-ssot
14+
/nautobot_ssot/integrations/slurpit/ @lpconsulting321 @pietos @nautobot/plugin-ssot

README.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ The Nautobot SSoT app builds atop the [DiffSync](https://github.com/networktocod
2727
This Nautobot application framework includes the following integrations:
2828

2929
- Cisco ACI
30+
- Bootstrap
31+
- Citrix ADM
3032
- Arista CloudVision
3133
- Device42
3234
- Cisco DNA Center
@@ -35,6 +37,7 @@ This Nautobot application framework includes the following integrations:
3537
- Itential
3638
- Cisco Meraki
3739
- ServiceNow
40+
- Slurpit
3841

3942
Read more about integrations [here](https://docs.nautobot.com/projects/ssot/en/latest/user/integrations). To enable and configure integrations follow the instructions from [the install guide](https://docs.nautobot.com/projects/ssot/en/latest/admin/install/#integrations-configuration).
4043

@@ -82,13 +85,16 @@ Full documentation for this app can be found over on the [Nautobot Docs](https:/
8285
The SSoT framework includes a number of integrations with external Systems of Record:
8386

8487
* Cisco ACI
88+
* Bootstrap
89+
* Citrix ADM
8590
* Arista CloudVision
8691
* Device42
8792
* Cisco DNA Center
8893
* Infoblox
8994
* Itential
9095
* Cisco Meraki
9196
* ServiceNow
97+
* Slurpit
9298

9399
> 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.
94100
@@ -114,6 +120,12 @@ This project includes code originally written in separate Nautobot apps, which h
114120
[@dnewood](https://github.com/dnewood),
115121
[@progala](https://github.com/progala),
116122
[@ubajze](https://github.com/ubajze)
123+
- [nautobot-plugin-ssot-bootstrap](https://github.com/nautobot/nautobot-plugin-ssot-bootstrap):
124+
Thanks
125+
[@bile0026](https://github.com/bile0026)
126+
- [nautobot-plugin-ssot-citrix-adm](https://github.com/nautobot/nautobot-plugin-ssot-citrix-adm):
127+
Thanks
128+
[@jdrew82](https://github.com/jdrew82)
117129
- [nautobot-plugin-ssot-arista-cloudvision](https://github.com/nautobot/nautobot-plugin-ssot-arista-cloudvision):
118130
Thanks
119131
[@burnyd](https://github.com/burnyd),
@@ -151,6 +163,12 @@ This project includes code originally written in separate Nautobot apps, which h
151163
[@pke11y](https://github.com/pke11y),
152164
[@ubajze](https://github.com/ubajze)
153165
[@whitej6](https://github.com/whitej6),
166+
- [nautobot-plugin-ssot-device42](https://github.com/nautobot/nautobot-plugin-ssot-itential):
167+
Thanks
168+
[@jtdub](https://github.com/jtdub)
169+
- [nautobot-plugin-ssot-meraki](https://github.com/nautobot/nautobot-plugin-ssot-meraki):
170+
Thanks
171+
[@jdrew82](https://github.com/jdrew82)
154172
- [nautobot-plugin-ssot-servicenow](https://github.com/nautobot/nautobot-plugin-ssot-servicenow):
155173
Thanks
156174
[@chadell](https://github.com/chadell),

development/creds.example.env

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ NAUTOBOT_ARISTACV_CVP_TOKEN="changeme"
3131

3232
NAUTOBOT_SSOT_DEVICE42_PASSWORD="changeme"
3333

34+
NAUTOBOT_SSOT_CITRIX_ADM_USERNAME="admin"
35+
NAUTOBOT_SSOT_CITRIX_ADM_PASSWORD="changeme"
36+
3437
NAUTOBOT_SSOT_INFOBLOX_PASSWORD="changeme"
3538

3639
# ACI Credentials. Append friendly name to the end to identify each APIC.
@@ -49,9 +52,5 @@ SERVICENOW_PASSWORD="changeme"
4952

5053
IPFABRIC_API_TOKEN=secrettoken
5154

52-
NAUTOBOT_SSOT_ENABLE_BOOTSTRAP="False"
53-
NAUTOBOT_BOOTSTRAP_SSOT_ENVIRONMENT_BRANCH=develop
54-
NAUTOBOT_BOOTSTRAP_SSOT_LOAD_SOURCE=file # or git
55-
5655
MERAKI_ORG_ID='123456'
5756
MERAKI_TOKEN='vtx01710aa0fn452740055y1hs60ns8c107ho168'

development/development.env

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ NAUTOBOT_ARISTACV_IMPORT_ACTIVE="False"
6969
NAUTOBOT_ARISTACV_IMPORT_TAG="False"
7070
NAUTOBOT_ARISTACV_VERIFY=True
7171

72+
NAUTOBOT_SSOT_ENABLE_BOOTSTRAP="False"
73+
NAUTOBOT_BOOTSTRAP_SSOT_ENVIRONMENT_BRANCH=develop
74+
NAUTOBOT_BOOTSTRAP_SSOT_LOAD_SOURCE=file # or git
75+
7276
NAUTOBOT_SSOT_ENABLE_DEVICE42="False"
7377
NAUTOBOT_SSOT_DEVICE42_HOST=""
7478
NAUTOBOT_SSOT_DEVICE42_USERNAME=""
@@ -80,6 +84,9 @@ NAUTOBOT_DNAC_SSOT_DNA_CENTER_IMPORT_MERAKIS="False"
8084
NAUTOBOT_DNAC_SSOT_DNA_CENTER_UPDATE_LOCATIONS="True"
8185
NAUTOBOT_DNAC_SSOT_DNA_CENTER_SHOW_FAILURES="True"
8286

87+
NAUTOBOT_SSOT_ENABLE_CITRIX_ADM="False"
88+
NAUTOBOT_SSOT_CITRIX_ADM_UPDATE_SITES="True"
89+
8390
NAUTOBOT_SSOT_ENABLE_INFOBLOX="False"
8491
NAUTOBOT_SSOT_INFOBLOX_DEFAULT_STATUS="Active"
8592
NAUTOBOT_SSOT_INFOBLOX_ENABLE_SYNC_TO_INFOBLOX="True"
@@ -106,3 +113,6 @@ IPFABRIC_SSL_VERIFY="True"
106113
IPFABRIC_TIMEOUT=15
107114

108115
NAUTOBOT_SSOT_ENABLE_ITENTIAL="True"
116+
117+
NAUTOBOT_SSOT_ENABLE_SLURPIT="False"
118+
SLURPIT_HOST="https://sandbox.slurpit.io"

development/nautobot_config.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,16 +219,19 @@
219219
"vrf": True,
220220
"prefix": True,
221221
},
222+
"citrix_adm_update_sites": is_truthy(os.getenv("NAUTOBOT_SSOT_CITRIX_ADM_UPDATE_SITES", "true")),
222223
"enable_aci": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_ACI")),
223224
"enable_aristacv": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_ARISTACV")),
224225
"enable_bootstrap": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_BOOTSTRAP", "false")),
226+
"enable_citrix_adm": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_CITRIX_ADM")),
225227
"enable_device42": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_DEVICE42")),
226228
"enable_dna_center": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_DNA_CENTER")),
227229
"enable_infoblox": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_INFOBLOX")),
228230
"enable_ipfabric": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_IPFABRIC")),
229231
"enable_itential": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_ITENTIAL")),
230232
"enable_meraki": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_MERAKI")),
231233
"enable_servicenow": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_SERVICENOW")),
234+
"enable_slurpit": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_SLURPIT")),
232235
"hide_example_jobs": is_truthy(os.getenv("NAUTOBOT_SSOT_HIDE_EXAMPLE_JOBS")),
233236
"device42_defaults": {
234237
"site_status": "Active",

docs/admin/compatibility_matrix.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ While that last supported version will not be strictly enforced--via the max_ver
2929
| 3.0.1 | 2.1.0 | 2.99.99 |
3030
| 3.1.0 | 2.1.0 | 2.99.99 |
3131
| 3.2.0 | 2.1.0 | 2.99.99 |
32+
| 3.3.0 | 2.1.0 | 2.99.99 |

docs/admin/install.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,4 @@ Set up each integration using the specific guides:
9999
- [Itential](./integrations/itential_setup.md)
100100
- [Cisco Meraki](./integrations/meraki_setup.md)
101101
- [ServiceNow](./integrations/servicenow_setup.md)
102+
- [Slurpit](./integrations/slurpit_setup.md)

docs/admin/integrations/bootstrap_setup.md

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Bootstrap
22

3-
43
## Description
54

65
This App will sync data from YAML files into Nautobot to create baseline environments. Most items will receive a custom field associated with them called "System of Record", which will be set to "Bootstrap". These items are then the only ones managed by the Bootstrap SSoT App. Other items within the Nautobot instance will not be affected unless there's items with overlapping names. There is currently two exceptions to this and those are the ComputedField, and GraphQLQuery models since they can't have a custom field associated. If you choose to manage ComputedField or GraphQLQuery objects with the Bootstrap SSoT App, make sure to define them all within the YAML file, since any "locally defined" Computed Fields and GraphQL Queries within Nautobot will end up getting deleted when the job runs. If an item exists in Nautobot by it's identifiers but it does not have the "System of Record" custom field on it, the item will be updated with "Bootstrap" (or `SYSTEM_OF_RECORD` environment variable value) when the App runs. This way no duplicates are created, and the App will not delete any items that are not defined in the Bootstrap data but were manually created in Nautobot.
@@ -13,17 +12,17 @@ Before configuring the integration, please ensure, that `nautobot-ssot` app was
1312
pip install nautobot-ssot[bootstrap]
1413
```
1514

15+
## Configuration
1616

17-
### nautobot_config.py
18-
19-
The settings here are pretty straightforward, `nautobot_environment_branch` will be loaded from the environment variable `NAUTOBOT_BOOTSTRAP_SSOT_ENVIRONMENT_BRANCH`, or default to develop. The rest of the settings define which models/objects you want to have the App sync to Nautobot. There are a couple of caveats to these. For example, for DynamicGroup objects to sync, the filter criteria need to already exist in Nautobot. So, if you are going to have groups that are filtered on platforms/regions/sites/etc make sure not to include DynamicGroup objects in the "models_to_sync" until those items exist. Same for Git Repositories when you want to sync Golden Config-related repositories. The Golden Config App needs to be installed, for the `provided_contents` items to be able to be found. This also goes for the Lifecycle Management app with `Software/ValidatedSoftware` models.
17+
Once the SSoT package has been installed you simply need to enable the integration by setting `enable_bootstrap` to True. There are additional settings that allow you to control which Nautobot objects are defined in your data. The settings are pretty straightforward. Assuming that you're copying the example settings below, the `bootstrap_nautobot_environment_branch` setting will be loaded from the environment variable `NAUTOBOT_BOOTSTRAP_SSOT_ENVIRONMENT_BRANCH`, or default to develop. The `bootstrap_models_to_sync` setting defines which models/objects you want to have the App sync to Nautobot. There are a couple of caveats to this functionality. For example, for DynamicGroup objects to sync, the filter criteria need to already exist in Nautobot. So, if you are going to have groups that are filtered on Platforms, Locations, etc, make sure not to include DynamicGroup objects in your Bootstrap Data until those items exist in Nautobot. If these items are also being synchronized in your Bootstrap Data, they will be created in the correct order. The same goes for Golden Config-related Git Repositories. It should go without saying, but the [Golden Config App](https://github.com/nautobot/nautobot-app-golden-config) must be installed, for the backup, intended, and template `provided_contents` items to be available options in your Bootstrap Data along with support of the `SoftwareLCM, SoftwareImageLCM, and ValidatedSoftware` models from the [Device Lifecycle Management app](https://github.com/nautobot/nautobot-app-device-lifecycle-mgmt).
2018

2119
```python
2220
PLUGINS = ["nautobot_ssot"]
2321

2422
PLUGINS_CONFIG = {
2523
"nautobot_ssot": {
2624
# Other nautobot_ssot settings ommitted.
25+
"enable_bootstrap": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_BOOTSTRAP", "true")),
2726
"bootstrap_nautobot_environment_branch": os.getenv("NAUTOBOT_BOOTSTRAP_SSOT_ENVIRONMENT_BRANCH", "develop"),
2827
"bootstrap_models_to_sync": {
2928
"secret": True,
@@ -57,20 +56,17 @@ PLUGINS_CONFIG = {
5756
"vrf": True,
5857
"prefix": True,
5958
},
60-
"enable_bootstrap": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_BOOTSTRAP", "false")),
6159
}
6260
}
6361
```
6462

65-
## Configuration
66-
67-
### Bootstrap data
63+
### Bootstrap Data
6864

6965
Bootstrap data can be stored in 2 fashions.
7066

71-
1. (Recommended) Bootstrap data can be stored in a Git Repository and referenced in the app as a Git Datasource. A user should create a Git Repository in Nautobot (including any necessary Secrets and SecretsGroups for access) with the word "Bootstrap" in the name, and with a provided content type of `config contexts`. This is how the App will locate the correct repository. The data structure is flat files, and there is a naming scheme to these files. The first one required is `global_settings.yml`. This contains the main data structures of what data can be loaded `Secrets,SecretsGroups,GitRepository,DynamicGroup,Tag,etc`. You can then create additional `.yml` files with naming of your CI environments, i.e. production, development, etc for default values for specific items. This is where the environment variables described below would be matched to pull in additional data from the other YAML files defined in the directory.
67+
1. __Recommended__ Bootstrap data can be stored in a Git Repository and referenced in the app as a Git Datasource. A user should create a Git Repository in Nautobot (including any necessary Secrets and SecretsGroups for access) with the word "Bootstrap" in the name, and with a provided content type of `config contexts`. This is how the App will locate the correct repository. The data structure is flat files, and there is a naming scheme to these files. The first one required is `global_settings.yml`. This contains the main data structures of what data can be loaded. ie `Secrets, SecretsGroups, GitRepository, DynamicGroup, Tag, etc`. You can then create additional `.yml` files with naming of your CI environments, ie `production`, `development`, etc for default values for specific items. This is where the environment variables described below would be matched to pull in additional data from the other YAML files defined in the directory.
7268

73-
2. Bootstrap data can be stored within the `nautobot_ssot/bootstrap/fixtures` directory. Using local files is not recommended as this requires a fork of the plugin and locally editing the YAML data files in the fixtures folder.
69+
2. Bootstrap data can be stored within the `nautobot_ssot/integrations/bootstrap/fixtures` directory. Using local files is not recommended as this requires a fork of the plugin and locally editing the YAML data files in the fixtures folder.
7470

7571
A simple structure would look something like this:
7672

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Citrix ADM Integration Setup
2+
3+
This guide will walk you through the steps to set up Citrix ADM integration with the `nautobot_ssot` app.
4+
5+
## Prerequisites
6+
7+
Before configuring the integration, please ensure, that the `nautobot-ssot` app was [installed with the Citrix ADM integration extra dependencies](../install.md#install-guide).
8+
9+
```shell
10+
pip install nautobot-ssot[citrix-adm]
11+
```
12+
13+
## Configuration
14+
15+
Access to your Citrix ADM instance is defined using the [ExternalIntegration](https://docs.nautobot.com/projects/core/en/stable/user-guide/platform-functionality/externalintegration/) model which allows you to utilize this integration with multiple instances concurrently. Please bear in mind that it will synchronize all data 1:1 with the specified instance to match exactly, meaning it will delete data missing from an instance. Each ExternalIntegration must specify a SecretsGroup with Secrets that contain the Citrix ADM Username and Password to authenticate with. You can find Secrets and SecretsGroups available under the Secrets menu.
16+
17+
![Citrix ADM Username](../../images/citrix_adm_username.png)
18+
19+
![Citrix ADM Password](../../images/citrix_adm_password.png)
20+
21+
![Citrix ADM SecretsGroup](../../images/citrix_adm_secretsgroup.png)
22+
23+
The Secrets Group linked to the Citrix ADM ExternalIntegration must contain Secrets defined as per the below:
24+
25+
| Access Type | Secret Type |
26+
| ----------- | ----------- |
27+
| HTTP(S) | Username |
28+
| HTTP(S) | Password |
29+
30+
Once the SecretsGroup is created you'll need to create the ExternalIntegration. You'll find this under the Extensibility menu.
31+
32+
![Citrix ADM ExternalIntegration](../../images/citrix_adm_externalintegration.png)
33+
34+
> The only required portions are the Name, Remote URL, Verify SSL, and Secrets Group.
35+
36+
When utilizing multiple SSoT integrations that contain differing Locations you might want to ensure that your existing Locations aren't updated by another integration. You can control whether these updates are made with the `citrix_adm_update_sites` setting in your `nautobot_config.py` file.
37+
38+
| Configuration Variable | Type | Usage | Default |
39+
| --------------------------------------------------- | ------- | ---------------------------------------------------------- | -------------------- |
40+
| citrix_adm_update_sites | boolean | Whether to update loaded Datacenter Locations. | True |
41+
42+
Below is an example snippet from `nautobot_config.py` that demonstrates how to enable and configure the Citrix ADM integration:
43+
44+
```python
45+
PLUGINS_CONFIG = {
46+
"nautobot_ssot": {
47+
"enable_citrix_adm": is_truthy(os.getenv("NAUTOBOT_SSOT_ENABLE_CITRIX_ADM", "true")),
48+
"citrix_adm_update_sites": os.getenv("NAUTOBOT_SSOT_CITRIX_ADM_UPDATE_SITES", "true"),
49+
}
50+
```
51+
52+
Once the integration has been enabled you can find instructions on using it in the [Usage instructions](../../user/integrations/citrix_adm.md#usage).

0 commit comments

Comments
 (0)