Merge branch 'develop' into grafana-0005-reversable

changes/311.documentation

@@ -0,0 +1 @@
+Update Account Link docs to refer to `fallback_chatops_user` option.

changes/314.dependencies

@@ -0,0 +1 @@
+Pin Meraki to 1.45.0 due to Meraki removing support for Python <3.10 in 1.46.0

development/docker-compose.mysql.yml

@@ -19,7 +19,6 @@ services:
   db:
     image: "mysql:8"
     command:
-      - "--default-authentication-plugin=mysql_native_password"
       - "--max_connections=1000"
     env_file:
       - "development.env"

docs/models/chatopsaccountlink.md

@@ -3,7 +3,7 @@
 <!--account-link-->
 +++ 3.0.0
 
-Nautobot ChatOps now uses the built-in Nautobot permissions for Nautobot Objects (Devices, Locations, Racks, etc.). Each user will need to link their Nautobot Account with their Chat Platform User Account. Login to Nautobot then access the Link ChatOps Account within the Plugins menu. Here you can provide your email address and select the ChatOps Platform you are using, then click the Look up User ID from Email to get your Chat User ID.
+Nautobot ChatOps now uses the built-in Nautobot permissions for Nautobot Objects (Devices, Locations, Racks, etc.). You can still fall back to the previous behavior by setting the `fallback_chatops_user` setting, otherwise each user will need to link their Nautobot Account with their Chat Platform User Account. Login to Nautobot then access the Link ChatOps Account within the Plugins menu. Here you can provide your email address and select the ChatOps Platform you are using, then click the Look up User ID from Email to get your Chat User ID.
 
 A Nautobot user can have multiple Chat users connected, but the Chat User can only be linked to one Nautobot user. As an example my team is transitioning from Slack to Mattermost. My Slack User ID and my Mattermost User ID can both be connected to the same Nautobot User.
 
@@ -12,3 +12,5 @@ A Nautobot user can have multiple Chat users connected, but the Chat User can on
 ## Configuring Account Link for many users
 
 Admins have the ability to access the Nautobot Admin page and can use `ChatOps Account Links` page to link multiple accounts, but you will need to know the Chat Platforms user IDs for each user you are linking.
+
+If you would like to set a single account for all users, see the [configuration guide](../admin/install.md#configuration-guide) for more details on the `fallback_chatops_user` option.

pyproject.toml

@@ -54,7 +54,7 @@ ipaddr = { version = "^2.2.0", optional = true }
 ipfabric = { version = "~6.0.9", optional = true }
 ipfabric-diagrams = { version = "~6.0.2", optional = true }
 isodate =  { version = "^0.6.1", optional = true }
-meraki = { version = "^1.7.2", optional = true }
+meraki = { version = ">=1.7.2,<=1.45.0", optional = true }
 nautobot = "^2.0.0"
 nautobot-capacity-metrics = "^3.0.0"
 netmiko = { version = "^4.0.0", optional = true }