Skip to content

Commit d67d4b1

Browse files
committed
Merge branch 'dev' of https://github.com/linode/linode_api4-python into feat/clone_and_group_by
2 parents 3527e51 + e12230d commit d67d4b1

15 files changed

Lines changed: 644 additions & 187 deletions

File tree

linode_api4/groups/monitor.py

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ def dashboards(
4747
dashboard = client.load(MonitorDashboard, 1)
4848
dashboards_by_service = client.monitor.dashboards(service_type="dbaas")
4949
50-
.. note:: This endpoint is in beta. This will only function if base_url is set to `https://api.linode.com/v4beta`.
51-
5250
API Documentation:
5351
- All Dashboards: https://techdocs.akamai.com/linode-api/reference/get-dashboards-all
5452
- Dashboards by Service: https://techdocs.akamai.com/linode-api/reference/get-dashboards
@@ -83,8 +81,6 @@ def services(
8381
supported_services = client.monitor.services()
8482
service_details = client.monitor.load(MonitorService, "dbaas")
8583
86-
.. note:: This endpoint is in beta. This will only function if base_url is set to `https://api.linode.com/v4beta`.
87-
8884
API Documentation: https://techdocs.akamai.com/linode-api/reference/get-monitor-services
8985
API Documentation: https://techdocs.akamai.com/linode-api/reference/get-monitor-services-for-service-type
9086
@@ -110,7 +106,6 @@ def metric_definitions(
110106
Returns metrics for a specific service type.
111107
112108
metrics = client.monitor.list_metric_definitions(service_type="dbaas")
113-
.. note:: This endpoint is in beta. This will only function if base_url is set to `https://api.linode.com/v4beta`.
114109
115110
API Documentation: https://techdocs.akamai.com/linode-api/reference/get-monitor-information
116111
@@ -136,8 +131,6 @@ def create_token(
136131
Returns a JWE Token for a specific service type.
137132
token = client.monitor.create_token(service_type="dbaas", entity_ids=[1234])
138133
139-
.. note:: This endpoint is in beta. This will only function if base_url is set to `https://api.linode.com/v4beta`.
140-
141134
API Documentation: https://techdocs.akamai.com/linode-api/reference/post-get-token
142135
143136
:param service_type: The service type to create token for.
@@ -175,7 +168,6 @@ def alert_definitions(
175168
176169
alerts = client.monitor.alert_definitions()
177170
alerts_by_service = client.monitor.alert_definitions(service_type="dbaas")
178-
.. note:: This endpoint is in beta and requires using the v4beta base URL.
179171
180172
API Documentation:
181173
https://techdocs.akamai.com/linode-api/reference/get-alert-definitions
@@ -212,8 +204,6 @@ def alert_channels(self, *filters) -> PaginatedList:
212204
Examples:
213205
channels = client.monitor.alert_channels()
214206
215-
.. note:: This endpoint is in beta and requires using the v4beta base URL.
216-
217207
API Documentation: https://techdocs.akamai.com/linode-api/reference/get-notification-channels
218208
219209
:param filters: Optional filter expressions to apply to the collection.
@@ -243,8 +233,6 @@ def create_alert_definition(
243233
The alert definition configures when alerts are fired and which channels
244234
are notified.
245235
246-
.. note:: This endpoint is in beta and requires using the v4beta base URL.
247-
248236
API Documentation: https://techdocs.akamai.com/linode-api/reference/post-alert-definition-for-service-type
249237
250238
:param service_type: Service type for which to create the alert definition
@@ -414,9 +402,7 @@ def alert_definition_entities(
414402
415403
This endpoint supports pagination fields (`page`, `page_size`) in the API.
416404
417-
.. note:: This endpoint is in beta and requires using the v4beta base URL.
418-
419-
API Documentation: TODO
405+
API Documentation: https://techdocs.akamai.com/linode-api/reference/get-alert-definition-entities
420406
421407
:param service_type: Service type for the alert definition (e.g. `dbaas`).
422408
:type service_type: str

linode_api4/groups/object_storage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ def global_quotas(self, *filters):
539539
"""
540540
Lists the active account-level Object Storage quotas applied to your account.
541541
542-
API Documentation: TBD
542+
API Documentation: https://techdocs.akamai.com/linode-api/reference/get-object-storage-global-quotas
543543
544544
:param filters: Any number of filters to apply to this query.
545545
See :doc:`Filtering Collections</linode_api4/objects/filtering>`

linode_api4/objects/monitor.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ class MonitorDashboard(Base):
278278
"label": Property(),
279279
"service_type": Property(ServiceType),
280280
"type": Property(DashboardType),
281+
"group_by": Property(),
281282
"widgets": Property(json_object=DashboardWidget),
282283
"updated": Property(is_datetime=True),
283284
}

linode_api4/objects/object_storage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ class ObjectStorageGlobalQuota(Base):
622622
"""
623623
An account-level Object Storage quota.
624624
625-
API documentation: TBD
625+
API documentation: https://techdocs.akamai.com/linode-api/reference/get-object-storage-global-quota
626626
"""
627627

628628
api_endpoint = "/object-storage/global-quotas/{quota_id}"

linode_api4/objects/region.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class Capability(StrEnum):
3939
lke_control_plane_acl = "LKE Network Access Control List (IP ACL)"
4040
aclb = "Akamai Cloud Load Balancer"
4141
support_ticket_severity = "Support Ticket Severity"
42+
support_live_chat = "Support Live Chat"
4243
backups = "Backups"
4344
placement_group = "Placement Group"
4445
disk_encryption = "Disk Encryption"
@@ -58,6 +59,7 @@ class Capability(StrEnum):
5859
maintenance_policy = "Maintenance Policy"
5960
vpc_dual_stack = "VPC Dual Stack"
6061
vpc_ipv6_stack = "VPC IPv6 Stack"
62+
vpc_custom_ipv4_ranges = "Custom VPC IPv4 Ranges"
6163
nlb = "Network LoadBalancer"
6264
natgateway = "NAT Gateway"
6365
lke_e_byovpc = "Kubernetes Enterprise BYO VPC"

0 commit comments

Comments
 (0)