Merge branch 'dev' into ACLP-logs-support

Author: sjer-akamai

linode_api4/objects/monitor.py

@@ -482,7 +482,6 @@ class AlertDefinition(DerivedBase):
         "severity": Property(mutable=True),
         "type": Property(mutable=True),
         "status": Property(mutable=True),
-        "has_more_resources": Property(),  # Deprecated; use entities.has_more_resources.
         "rule_criteria": Property(mutable=True, json_object=RuleCriteria),
         "trigger_conditions": Property(
             mutable=True, json_object=TriggerConditions
@@ -498,6 +497,7 @@ class AlertDefinition(DerivedBase):
         "scope": Property(AlertScope),
         "regions": Property(mutable=True),
         "entities": Property(json_object=AlertEntities),
+        "channel_ids": Property(mutable=True),
     }
 
 

test/fixtures/monitor_alert-definitions.json

@@ -9,7 +9,6 @@
       "description": "A test alert for dbaas service",
       "scope": "entity",
       "regions": [],
-      "entity_ids": ["13217"],
       "entities": {
         "url": "/monitor/services/dbaas/alert-definitions/12345/entities",
         "count": 1,
@@ -23,7 +22,6 @@
           "url": "/monitor/alert-channels/10000"
         }
       ],
-      "has_more_resources": false,
       "rule_criteria": null,
       "trigger_conditions": null,
       "class": "alert",

test/fixtures/monitor_services_dbaas_alert-definitions.json

@@ -9,9 +9,6 @@
       "description": "A test alert for dbaas service",
       "scope": "entity",
       "regions": [],
-      "entity_ids": [
-        "13217"
-      ],
       "entities": {
         "url": "/monitor/services/dbaas/alert-definitions/12345/entities",
         "count": 1,
@@ -25,7 +22,6 @@
           "url": "/monitor/alert-channels/10000"
         }
       ],
-      "has_more_resources": false,
       "rule_criteria": {
         "rules": [
           {

test/fixtures/monitor_services_dbaas_alert-definitions_12345.json

@@ -7,9 +7,6 @@
   "description": "A test alert for dbaas service",
   "scope": "entity",
   "regions": [],
-  "entity_ids": [
-    "13217"
-  ],
   "entities": {
     "url": "/monitor/services/dbaas/alert-definitions/12345/entities",
     "count": 1,
@@ -23,7 +20,6 @@
       "url": "/monitor/alert-channels/10000"
     }
   ],
-  "has_more_resources": false,
   "rule_criteria": {
     "rules": [
       {