Apply automatic changes

Author: kcantrel

Monitoring/monitor-ontap-services/cloudformation.yaml

@@ -612,8 +612,8 @@ Resources:
           # "matching conditions."  It is intended to be run as a Lambda function, but
           # can be run as a standalone program.
           #
-          # Version: v2.15
-          # Date: 2025-05-19-08:28:59
+          # Version: v2.1
+          # Date: 2025-05-20-01:22:58
           ################################################################################
           
           import json
@@ -929,7 +929,7 @@ Resources:
                   event["refresh"] -= 1
               #
               # Run the API call to get the current list of EMS events.
-              endpoint = f'https://{config["OntapAdminServer"]}/api/support/ems/events'
+              endpoint = f'https://{config["OntapAdminServer"]}/api/support/ems/events?return_timeout=15'
               response = http.request('GET', endpoint, headers=headers)
               if response.status == 200:
                   data = json.loads(response.data)
@@ -1059,7 +1059,7 @@ Resources:
               daysOfWeek = ""
               #
               # Run the API call to get the schedule information.
-              endpoint = f'https://{config["OntapAdminServer"]}/api/cluster/schedules/{scheduleUUID}?fields=*'
+              endpoint = f'https://{config["OntapAdminServer"]}/api/cluster/schedules/{scheduleUUID}?fields=*&return_timeout=15'
               response = http.request('GET', endpoint, headers=headers)
               if response.status == 200:
                   schedule = json.loads(response.data)
@@ -1111,7 +1111,7 @@ Resources:
               global config, http, headers, clusterName, clusterVersion, logger
           
               # Run the API call to get the policy information.
-              endpoint = f'https://{config["OntapAdminServer"]}/api/snapmirror/policies/{policyUUID}?fields=*'
+              endpoint = f'https://{config["OntapAdminServer"]}/api/snapmirror/policies/{policyUUID}?fields=*&return_timeout=15'
               response = http.request('GET', endpoint, headers=headers)
               if response.status == 200:
                   data = json.loads(response.data)
@@ -1214,7 +1214,7 @@ Resources:
                           logger.warning(f'Unknown snapmirror alert type: "{key}".')
               #
               # Run the API call to get the current state of all the snapmirror relationships.
-              endpoint = f'https://{config["OntapAdminServer"]}/api/snapmirror/relationships?fields=*'
+              endpoint = f'https://{config["OntapAdminServer"]}/api/snapmirror/relationships?fields=*&return_timeout=15'
               response = http.request('GET', endpoint, headers=headers)
               if response.status == 200:
                   data = json.loads(response.data)
@@ -1388,18 +1388,29 @@ Resources:
                   event["refresh"] -= 1
               #
               # Run the API call to get the physical storage used.
-              endpoint = f'https://{config["OntapAdminServer"]}/api/storage/aggregates?fields=space'
+              endpoint = f'https://{config["OntapAdminServer"]}/api/storage/aggregates?fields=space&return_timeout=15'
               aggrResponse = http.request('GET', endpoint, headers=headers)
               if aggrResponse.status != 200:
                   logger.error(f'API call to {endpoint} failed. HTTP status code {aggrResponse.status}.')
                   aggrResponse = None
               #
               # Run the API call to get the volume information.
-              endpoint = f'https://{config["OntapAdminServer"]}/api/storage/volumes?fields=space,files,svm,state'
+              endpoint = f'https://{config["OntapAdminServer"]}/api/storage/volumes?fields=space,files,svm,state&return_timeout=15'
               volumeResponse = http.request('GET', endpoint, headers=headers)
               if volumeResponse.status != 200:
                   logger.error(f'API call to {endpoint} failed. HTTP status code {volumeResponse.status}.')
                   volumeResponse = None
+                  volumeRecords = None
+              else:
+                  volumeRecords = json.loads(volumeResponse.data).get("records")
+                  #
+                  # Now get the constituent volumes.
+                  endpoint = f'https://{config["OntapAdminServer"]}/api/storage/volumes?is_constituent=true&fields=space,files,svm,state&return_timeout=15'
+                  volumeResponse = http.request('GET', endpoint, headers=headers)
+                  if volumeResponse.status != 200:
+                      logger.error(f'API call to {endpoint} failed. HTTP status code {volumeResponse.status}.')
+                  else:
+                      volumeRecords.extend(json.loads(volumeResponse.data).get("records"))
               #
               # If both API calls failed, no point on continuing.
               if volumeResponse is None and aggrResponse is None:
@@ -1428,8 +1439,7 @@ Resources:
                                           events.append(event)
                       elif lkey == "volumewarnpercentused" or lkey == "volumecriticalpercentused":
                           if volumeResponse is not None:
-                              data = json.loads(volumeResponse.data)
-                              for record in data["records"]:
+                              for record in volumeRecords:
                                   if record["space"].get("percent_used"):
                                       if record["space"]["percent_used"] >= rule[key]:
                                           uniqueIdentifier = record["uuid"] + "_" + key
@@ -1446,8 +1456,7 @@ Resources:
                                               events.append(event)
                       elif lkey == "volumewarnfilespercentused" or lkey == "volumecriticalfilespercentused":
                           if volumeResponse is not None:
-                              data = json.loads(volumeResponse.data)
-                              for record in data["records"]:
+                              for record in volumeRecords:
                                   #
                                   # If a volume is offline, the API will not report the "files" information.
                                   if record.get("files") is not None:
@@ -1469,8 +1478,7 @@ Resources:
                                                       }
                                                   events.append(event)
                       elif lkey == "offline":
-                          data = json.loads(volumeResponse.data)
-                          for record in data["records"]:
+                          for record in volumeRecords:
                               if rule[key] and record["state"].lower() == "offline":
                                   uniqueIdentifier = f'{record["uuid"]}_{key}_{rule[key]}'
                                   if not eventExist(events, uniqueIdentifier):  # This resets the "refresh" field if found.
@@ -1510,7 +1518,6 @@ Resources:
           def sendAlert(message, severity):
               global config, snsClient, logger, cloudWatchClient
           
-          
               if severity == "CRITICAL":
                   logger.critical(message)
               elif severity == "ERROR":
@@ -1579,7 +1586,7 @@ Resources:
                   event["refresh"] -= 1
               #
               # Run the API call to get the quota report.
-              endpoint = f'https://{config["OntapAdminServer"]}/api/storage/quota/reports?fields=*'
+              endpoint = f'https://{config["OntapAdminServer"]}/api/storage/quota/reports?fields=*&return_timeout=30'
               response = http.request('GET', endpoint, headers=headers)
               if response.status == 200:
                   data = json.loads(response.data)
@@ -1744,7 +1751,7 @@ Resources:
               if vserverState is not None and vserverState:
                   #
                   # Run the API call to get the vserver state for each vserver.
-                  endpoint = f'https://{config["OntapAdminServer"]}/api/svm/svms?fields=state'
+                  endpoint = f'https://{config["OntapAdminServer"]}/api/svm/svms?fields=state&return_timeout=15'
                   response = http.request('GET', endpoint, headers=headers)
                   if response.status == 200:
                       data = json.loads(response.data)
@@ -1767,7 +1774,7 @@ Resources:
               if nfsProtocolState is not None and nfsProtocolState:
                   #
                   # Run the API call to get the NFS protocol state for each vserver.
-                  endpoint = f'https://{config["OntapAdminServer"]}/api/protocols/nfs/services?fields=state'
+                  endpoint = f'https://{config["OntapAdminServer"]}/api/protocols/nfs/services?fields=state&return_timeout=15'
                   response = http.request('GET', endpoint, headers=headers)
                   if response.status == 200:
                       data = json.loads(response.data)
@@ -1790,7 +1797,7 @@ Resources:
               if cifsProtocolState is not None and cifsProtocolState:
                   #
                   # Run the API call to get the NFS protocol state for each vserver.
-                  endpoint = f'https://{config["OntapAdminServer"]}/api/protocols/cifs/services?fields=enabled'
+                  endpoint = f'https://{config["OntapAdminServer"]}/api/protocols/cifs/services?fields=enabled&return_timeout=15'
                   response = http.request('GET', endpoint, headers=headers)
                   if response.status == 200:
                       data = json.loads(response.data)