Merge branch 'main' into add_CF_template_to_mon_services

Author: kcantrel

.github/workflows/update-CloudformationTemplate.yml

@@ -0,0 +1,37 @@
+---
+# Copyright (c) NetApp, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+name: "Update Cloudformation Template"
+
+on:
+  pull_request:
+    paths:
+      - 'Monitoring/monitor-ontap-services/monitor_ontap_services.py'
+  push:
+    paths:
+      - 'Monitoring/monitor-ontap-services/monitor_ontap_services.py'
+    branches:
+      - main
+
+jobs:
+  update-Cloudformation-Template:
+    runs-on: ubuntu-latest
+    permissions:
+      # Give the default GITHUB_TOKEN write permission to commit and push the
+      # added or changed files to the repository.
+      contents: write
+
+    steps:
+      - name: Checkout pull request
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+
+      - name: Update the Cloudformation Template
+          shell: bash
+          working-directory: Monitoring/monitor-ontap-services
+          run:  ./updateMonOntapServiceCFTemplate
+
+      - name: Commit the changes
+        uses: stefanzweifel/git-auto-commit-action@v5

Management-Utilities/auto_set_fsxn_auto_grow/set_fsxn_volume_auto_grow.py

@@ -29,7 +29,7 @@
 #
 # Create a table of secret names and keys for the username and password for
 # each of the FSxIds. In the example below, it shows using the same
-# secret for four differnt FSxIds, but you can set it up to use
+# secret for four different FSxIds, but you can set it up to use
 # a different secret and/or keys for the username and password for each
 # of the FSxId.
 secretsTable = [
@@ -66,7 +66,7 @@
 # Set the minimum shirtk size for the volume in terms of the percentage of the provisioned size.
 minShrinkSizePercentage = 100
 #
-# Set the iime to wait for a volume to get created. This Lambda function will
+# Set the time to wait for a volume to get created. This Lambda function will
 # loop waiting for the volume to be created on the ONTAP side so it can set
 # the auto size parameters. It will wait up to the number of seconds specified
 # below before giving up. NOTE: You must set the timeout of this function
@@ -154,7 +154,9 @@ def lambda_handler(event, context):
 
     if 'secretsTable' not in globals():
         if 'dynamodbRegion' not in globals() or 'dynamodbSecretsTableName' not in globals():
-            raise Exception('Error, you must either define the secretsTable array at the top of this script, or define dynamodbRegion and dynamodbSecretsTableName.')
+            message = 'Error, you must either define the secretsTable array at the top of this script, or define dynamodbRegion and dynamodbSecretsTableName.'
+            logger.critcal(message)
+            raise Exception(message)
 
         table = dynamodbClient.Table(dynamodbSecretsTableName) # pylint: disable=E0602
 
@@ -170,7 +172,8 @@ def lambda_handler(event, context):
     if fsxId == "" or regionName == "" or volumeId == "" or volumeName == "" or volumeARN == "":
         message = "Couldn't obtain the fsxId, region, volume name, volume ID or volume ARN from the CloudWatch evevnt."
         logger.critcal(message)
-        raise Exception(message)
+#        raise Exception(message)
+        return
 
     logger.debug(f'Data from CloudWatch event: FSxID={fsxId}, Region={regionName}, VolumeName={volumeName}, volumeId={volumeId}.')
     #
@@ -179,7 +182,8 @@ def lambda_handler(event, context):
     if username == "" or password == "":
         message = f'No credentials for FSxN ID: {fsxId}.'
         logger.critical(message)
-        raise Exception(message)
+#        raise Exception(message)
+        return
     #
     # Build a header that is used for all the ONTAP API requests.
     auth = urllib3.make_headers(basic_auth=f'{username}:{password}')
@@ -192,14 +196,16 @@ def lambda_handler(event, context):
     if fsxnIp == "":
         message = f"Can't find management IP for FSxN file system with an ID of '{fsxId}'."
         logger.critical(message)
-        raise Exception(message)
+#        raise Exception(message)
+        return
     #
     # Get the volume UUID and volume size based on the volume ID.
     volumeData = getVolumeData(fsxClient, volumeId, volumeARN)
     if volumeData == None:
         message=f'Failed to get volume information for volumeID: {volumeId}.'
         logger.critical(message)
-        raise Exception(message)
+#        raise Exception(message)
+        return
     volumeUUID = volumeData["OntapConfiguration"]["UUID"]
     volumeSizeInMegabytes = volumeData["OntapConfiguration"]["SizeInMegabytes"]
     #

Monitoring/monitor-ontap-services/README.md

@@ -290,7 +290,7 @@ Each rule should be an object with one, or more, of the following keys:
         },
         {
           "name": "",
-          "severity": "notice|info|error|alert|emergency",
+          "severity": "alert|emergency",
           "message": ""
         }
       ]

README.md

@@ -8,7 +8,7 @@ built to maximize cost performance, resilience, and accessibility in business-cr
 This GitHub repository contains comprehensive code samples and automation scripts for FSx for Netapp ONTAP operations,
 promoting the use of Infrastructure as Code (IAC) tools and encouraging developers to extend the product's
 functionalities through code. The samples here go alongside the automation, management and monitoring that
-[BlueXP Workload Factory](https://www.netapp.com/bluexp/workload-factory/) provides.
+[BlueXP Workload Factory](https://console.workloads.netapp.com) provides.
 
 We welcome contributions from the community! Please read our [contribution guidelines](CONTRIBUTING.md) before getting started.