Merge branch 'main' into add_cf_ext_samples

Author: kcantrel

Monitoring/auto-add-cw-alarms/auto_add_cw_alarms.py

@@ -556,9 +556,9 @@ def usage():
 dryRun = False
 #
 # Check to see if there any any environment variables set.
-customerId = os.environ.get('customerId', '')
-accountId  = os.environ.get('accountId', '')
-SNStopic   = os.environ.get('SNStopic', '')
+customerId = os.environ.get('customerId', customerId)
+accountId  = os.environ.get('accountId', accountId)
+SNStopic   = os.environ.get('SNStopic', SNStopic)
 onlyFilesystemId = None
 defaultCPUThreshold    = int(os.environ.get('defaultCPUThreshold',    defaultCPUThreshold))
 defaultSSDThreshold    = int(os.environ.get('defaultSSDThreshold',    defaultSSDThreshold))

Monitoring/auto-add-cw-alarms/cloudformation.yaml

@@ -190,8 +190,8 @@ Resources:
           # Lastly, you can create an override for the SSD alarm, by creating a tag
           # with the name "SSD_Alarm_Threshold" on the file system resource.
           #
-          # Version: v2.13
-          # Date: 2024-10-03-12:30:21
+          # Version: v2.1
+          # Date: 2025-01-31-20:33:33
           #
           ################################################################################
           #
@@ -719,9 +719,9 @@ Resources:
           dryRun = False
           #
           # Check to see if there any any environment variables set.
-          customerId = os.environ.get('customerId', '')
-          accountId  = os.environ.get('accountId', '')
-          SNStopic   = os.environ.get('SNStopic', '')
+          customerId = os.environ.get('customerId', customerId)
+          accountId  = os.environ.get('accountId', accountId)
+          SNStopic   = os.environ.get('SNStopic', SNStopic)
           onlyFilesystemId = None
           defaultCPUThreshold    = int(os.environ.get('defaultCPUThreshold',    defaultCPUThreshold))
           defaultSSDThreshold    = int(os.environ.get('defaultSSDThreshold',    defaultSSDThreshold))

Monitoring/monitor-ontap-services/README.md

@@ -54,7 +54,7 @@ To install the program using the CloudFormation template, you will need to do th
 
 |Parameter Name | Notes|
 |---|---|
-|Stackname|The name you want to assign to the CloudFormation stack. Note that this name is used as a base name for the resources it creates, so please keep it under 25 characters.|
+|Stackname|The name you want to assign to the CloudFormation stack. Note that this name is used as a base name for the resources it creates, so please keep it **under 25 characters**. Also, since it is used as part of the s3 bucket name that it creates to keep event information in, it **must be in all lower case letters**.|
 |OntapAdminServer|The DNS name, or IP address, of the management endpoint of the FSxN file system you wish to monitor.|
 |SubnetIds|The subnet IDs that the Lambda function will be attached to. Must have connectivity to the FSxN file system you wish to monitor.|
 |SecurityGroupIds|The security group IDs that the Lambda function will be attached to. The security group most allow outbound traffic over port 443 to the SNS, Secrets Manager and S3 endpoints, as well as the FSxN file system you want to monitor.|