Skip to content

Commit 0186b8b

Browse files
committed
1.60.0 api updates
1 parent 0164979 commit 0186b8b

File tree

59 files changed

+285
-108
lines changed

Some content is hidden

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

59 files changed

+285
-108
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
- Add support for importing specific item IDs of bulk resources
44
- Make `force_delete` attribute of `meraki_network_group_policies` resource "importable"
55
- Fix issue with attempting to delete non-existent items from bulk resources
6+
- Add support for more than 2 WAN links to `meraki_appliance_traffic_shaping_uplink_selection` resource
7+
- Add `multi_exit_discriminator`, `weight` and `path_prepend` attributes to `meraki_appliance_vpn_bgp` resource
8+
- Add support for `custom-role` access privilege to `meraki_organization_saml_role` resource
9+
- Add `vrf_name` attribute to `meraki_switch_routing_multicast_rendezvous_point` resource
610

711
## 1.4.2
812

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ All resources and data sources have been tested with the following API releases.
1212

1313
| API | Version |
1414
| ---------------- | ------- |
15-
| Meraki Dashboard | 1.59.0 |
15+
| Meraki Dashboard | 1.60.0 |
1616

1717
Documentation: <https://registry.terraform.io/providers/CiscoDevNet/meraki/latest>
1818

docs/data-sources/appliance_traffic_shaping_uplink_selection.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ data "meraki_appliance_traffic_shaping_uplink_selection" "example" {
2828
### Read-Only
2929

3030
- `active_active_auto_vpn_enabled` (Boolean) Toggle for enabling or disabling active-active AutoVPN
31-
- `default_uplink` (String) The default uplink. Must be one of: `wan1` or `wan2`
31+
- `default_uplink` (String) The default uplink. Must be a WAN interface `wanX`
3232
- `failover_and_failback_immediate_enabled` (Boolean) Toggle for enabling or disabling immediate WAN failover and failback
3333
- `id` (String) The id of the object
3434
- `load_balancing_enabled` (Boolean) Toggle for enabling or disabling load balancing
@@ -44,7 +44,7 @@ Read-Only:
4444
- `custom_performance_class_id` (String) ID of created custom performance class, must be present when performanceClass type is `custom`
4545
- `fail_over_criterion` (String) Fail over criterion for this uplink preference rule. Must be one of: `poorPerformance` or `uplinkDown`
4646
- `performance_class_type` (String) Type of this performance class. Must be one of: `builtin` or `custom`
47-
- `preferred_uplink` (String) Preferred uplink for this uplink preference rule. Must be one of: `wan1`, `wan2`, `bestForVoIP`, `loadBalancing` or `defaultUplink`
47+
- `preferred_uplink` (String) Preferred uplink for uplink preference rule. Must be one of: `wan1`, `wan2`, `bestForVoIP`, `loadBalancing` or `defaultUplink`, or any other valid uplink(`wanX`) if it applies to the network
4848
- `traffic_filters` (Attributes List) Array of traffic filters for this uplink preference rule (see [below for nested schema](#nestedatt--vpn_traffic_uplink_preferences--traffic_filters))
4949

5050
<a id="nestedatt--vpn_traffic_uplink_preferences--traffic_filters"></a>
@@ -74,7 +74,7 @@ Read-Only:
7474

7575
Read-Only:
7676

77-
- `preferred_uplink` (String) Preferred uplink for this uplink preference rule. Must be one of: `wan1` or `wan2`
77+
- `preferred_uplink` (String) Preferred uplink for uplink preference rule. Must be one of: `wan1` or `wan2`, or any other valid uplink(`wanX`) if it applies to the network
7878
- `traffic_filters` (Attributes List) Array of traffic filters for this uplink preference rule (see [below for nested schema](#nestedatt--wan_traffic_uplink_preferences--traffic_filters))
7979

8080
<a id="nestedatt--wan_traffic_uplink_preferences--traffic_filters"></a>

docs/data-sources/appliance_vpn_bgp.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,11 @@ Read-Only:
4444
- `ebgp_multihop` (Number) Configure this if the neighbor is not adjacent. The eBGP multi-hop must be an integer between 1 and 255.
4545
- `ip` (String) The IPv4 address of the neighbor
4646
- `ipv6_address` (String) The IPv6 address of the neighbor.
47+
- `multi_exit_discriminator` (Number) Configures the local metric associated with routes received from the remote peer. Routes from peers with lower metrics are will be preferred. Must be an integer between 0 and 4294967295. MED is 6th in the decision tree when identical routes from multiple peers exist.
4748
- `next_hop_ip` (String) The IPv4 address of the remote BGP peer that will establish a TCP session with the local MX.
49+
- `path_prepend` (List of Number) Prepends the AS_PATH BGP Attribute associated with routes received from the remote peer. Configurable value of ASNs to prepend. Length of the array may not exceed 10, and each ASN in the array must be an integer between 1 and 4294967295. AS_PATH is 4th in the decision tree when identical routes from multiple peers exist.
4850
- `receive_limit` (Number) The receive limit is the maximum number of routes that can be received from any BGP peer. The receive limit must be an integer between 0 and 2147483647. When absent, it defaults to 0.
4951
- `remote_as_number` (Number) Remote ASN of the neighbor. The remote ASN must be an integer between 1 and 4294967295.
5052
- `source_interface` (String) The output interface for peering with the remote BGP peer. Valid values are: `wan1`, `wan2` or `vlan{VLAN ID}`(e.g. `vlan123`).
5153
- `ttl_security_enabled` (Boolean) Boolean value to enable or disable BGP TTL security.
54+
- `weight` (Number) Sets the local weight for routes received from the remote peer. Routes from peers with higher weights will be preferred. Must be an integer between 0 and 49.

docs/data-sources/organization_saml_role.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ data "meraki_organization_saml_role" "example" {
3030
### Read-Only
3131

3232
- `networks` (Attributes List) The list of networks that the SAML administrator has privileges on (see [below for nested schema](#nestedatt--networks))
33-
- `org_access` (String) The privilege of the SAML administrator on the organization. Can be one of `none`, `read-only`, `full` or `enterprise`
33+
- `org_access` (String) The privilege of the SAML administrator on the organization. Can be one of `none`, `read-only`, `full` or `enterprise` or a custom role in the format custom-role:ID:NAME.
3434
- `role` (String) The role of the SAML administrator
3535
- `tags` (Attributes List) The list of tags that the SAML administrator has privileges on (see [below for nested schema](#nestedatt--tags))
3636

@@ -39,7 +39,7 @@ data "meraki_organization_saml_role" "example" {
3939

4040
Read-Only:
4141

42-
- `access` (String) The privilege of the SAML administrator on the network. Can be one of `full`, `read-only`, `guest-ambassador`, `monitor-only` or `ssid-admin`
42+
- `access` (String) The privilege of the SAML administrator on the network. Can be one of `full', `read-only', `guest-ambassador', `monitor-only', `ssid-admin', `port-tags' or `custom-role'
4343
- `id` (String) The network ID
4444

4545

@@ -48,5 +48,5 @@ Read-Only:
4848

4949
Read-Only:
5050

51-
- `access` (String) The privilege of the SAML administrator on the tag. Can be one of `full`, `read-only`, `guest-ambassador` or `monitor-only`
51+
- `access` (String) The privilege of the SAML administrator on the tag. Can be one of 'full', 'read-only', 'guest-ambassador', 'monitor-only' or 'custom-role'
5252
- `tag` (String) The name of the tag

docs/data-sources/organization_saml_roles.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Read-Only:
3636

3737
- `id` (String) The id of the object
3838
- `networks` (Attributes List) The list of networks that the SAML administrator has privileges on (see [below for nested schema](#nestedatt--items--networks))
39-
- `org_access` (String) The privilege of the SAML administrator on the organization. Can be one of `none`, `read-only`, `full` or `enterprise`
39+
- `org_access` (String) The privilege of the SAML administrator on the organization. Can be one of `none`, `read-only`, `full` or `enterprise` or a custom role in the format custom-role:ID:NAME.
4040
- `role` (String) The role of the SAML administrator
4141
- `tags` (Attributes List) The list of tags that the SAML administrator has privileges on (see [below for nested schema](#nestedatt--items--tags))
4242

@@ -45,7 +45,7 @@ Read-Only:
4545

4646
Read-Only:
4747

48-
- `access` (String) The privilege of the SAML administrator on the network. Can be one of `full`, `read-only`, `guest-ambassador`, `monitor-only` or `ssid-admin`
48+
- `access` (String) The privilege of the SAML administrator on the network. Can be one of `full', `read-only', `guest-ambassador', `monitor-only', `ssid-admin', `port-tags' or `custom-role'
4949
- `id` (String) The network ID
5050

5151

@@ -54,5 +54,5 @@ Read-Only:
5454

5555
Read-Only:
5656

57-
- `access` (String) The privilege of the SAML administrator on the tag. Can be one of `full`, `read-only`, `guest-ambassador` or `monitor-only`
57+
- `access` (String) The privilege of the SAML administrator on the tag. Can be one of 'full', 'read-only', 'guest-ambassador', 'monitor-only' or 'custom-role'
5858
- `tag` (String) The name of the tag

docs/data-sources/sensor_alerts_profile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ data "meraki_sensor_alerts_profile" "example" {
4848
Read-Only:
4949

5050
- `direction` (String) If `above`, an alert will be sent when a sensor reads above the threshold. If `below`, an alert will be sent when a sensor reads below the threshold. Only applicable for temperature, humidity, realPower, apparentPower, powerFactor, voltage, current, and frequency thresholds.
51-
- `duration` (Number) Length of time in seconds that the triggering state must persist before an alert is sent. Available options are 0 seconds, 1 minute, 2 minutes, 3 minutes, 4 minutes, 5 minutes, 10 minutes, 15 minutes, 30 minutes, 1 hour, 2 hours, 4 hours, and 8 hours. Default is 0.
51+
- `duration` (Number) Length of time in seconds that the triggering state must persist before an alert is sent. Available options are 0 seconds, 1 minute, 2 minutes, 3 minutes, 4 minutes, 5 minutes, 10 minutes, 15 minutes, 30 minutes, 1 hour, 1 hour and 30 minutes, 2 hours, 4 hours, and 8 hours. Default is 0.
5252
- `metric` (String) The type of sensor metric that will be monitored for changes.
5353
- `threshold_apparent_power_draw` (Number) Alerting threshold in volt-amps. Must be between 0 and 3750.
5454
- `threshold_co2_concentration` (Number) Alerting threshold as CO2 parts per million.

docs/data-sources/sensor_alerts_profiles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Read-Only:
5151
Read-Only:
5252

5353
- `direction` (String) If `above`, an alert will be sent when a sensor reads above the threshold. If `below`, an alert will be sent when a sensor reads below the threshold. Only applicable for temperature, humidity, realPower, apparentPower, powerFactor, voltage, current, and frequency thresholds.
54-
- `duration` (Number) Length of time in seconds that the triggering state must persist before an alert is sent. Available options are 0 seconds, 1 minute, 2 minutes, 3 minutes, 4 minutes, 5 minutes, 10 minutes, 15 minutes, 30 minutes, 1 hour, 2 hours, 4 hours, and 8 hours. Default is 0.
54+
- `duration` (Number) Length of time in seconds that the triggering state must persist before an alert is sent. Available options are 0 seconds, 1 minute, 2 minutes, 3 minutes, 4 minutes, 5 minutes, 10 minutes, 15 minutes, 30 minutes, 1 hour, 1 hour and 30 minutes, 2 hours, 4 hours, and 8 hours. Default is 0.
5555
- `metric` (String) The type of sensor metric that will be monitored for changes.
5656
- `threshold_apparent_power_draw` (Number) Alerting threshold in volt-amps. Must be between 0 and 3750.
5757
- `threshold_co2_concentration` (Number) Alerting threshold as CO2 parts per million.

docs/data-sources/switch_access_policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Read-Only:
5353
- `radius_critical_auth_data_group_policy_id` (String) Group policy Number for data VLAN
5454
- `radius_critical_auth_data_sgt_id` (Number) Security Group Tag ID for data VLAN
5555
- `radius_critical_auth_data_vlan_id` (Number) VLAN that clients who use data will be placed on when RADIUS authentication fails. Will be null if hostMode is Multi-Auth
56-
- `radius_critical_auth_suspend_port_bounce` (Boolean) Enable to suspend port bounce when RADIUS servers are unreachable
56+
- `radius_critical_auth_suspend_port_bounce` (Boolean) Disable port bounce when RADIUS servers are unreachable
5757
- `radius_critical_auth_voice_group_policy_id` (String) Group policy Number for voice VLAN
5858
- `radius_critical_auth_voice_sgt_id` (Number) Security Group Tag ID for voice VLAN
5959
- `radius_critical_auth_voice_vlan_id` (Number) VLAN that clients who use voice will be placed on when RADIUS authentication fails. Will be null if hostMode is Multi-Auth

docs/data-sources/switch_access_policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ data "meraki_switch_access_policy" "example" {
5050
- `radius_critical_auth_data_group_policy_id` (String) Group policy Number for data VLAN
5151
- `radius_critical_auth_data_sgt_id` (Number) Security Group Tag ID for data VLAN
5252
- `radius_critical_auth_data_vlan_id` (Number) VLAN that clients who use data will be placed on when RADIUS authentication fails. Will be null if hostMode is Multi-Auth
53-
- `radius_critical_auth_suspend_port_bounce` (Boolean) Enable to suspend port bounce when RADIUS servers are unreachable
53+
- `radius_critical_auth_suspend_port_bounce` (Boolean) Disable port bounce when RADIUS servers are unreachable
5454
- `radius_critical_auth_voice_group_policy_id` (String) Group policy Number for voice VLAN
5555
- `radius_critical_auth_voice_sgt_id` (Number) Security Group Tag ID for voice VLAN
5656
- `radius_critical_auth_voice_vlan_id` (Number) VLAN that clients who use voice will be placed on when RADIUS authentication fails. Will be null if hostMode is Multi-Auth

0 commit comments

Comments
 (0)