testing changes

Author: laspsandoval

sds_data_manager/constructs/ialirt_rsync_alarm_construct.py

@@ -52,7 +52,7 @@ def __init__(
         self.create_event_rule(ialirt_bucket, ialirt_rsync_lambda)
         # Parameter store lookup.
         # Note: this must be run once for each account:
-        # aws ssm put-parameter --name /imap/ialirt/alarm_email
+        # aws ssm put-parameter --name /imap/ialirt/rsync_alarm_email
         # --value ialirt@example.com --type String --overwrite
         rsync_alarm_email = ssm.StringParameter.value_for_string_parameter(
             self, "/imap/ialirt/rsync_alarm_email"
@@ -76,6 +76,13 @@ def create_realtime_lambda(
             ],
         )
 
+        lambda_role.add_to_policy(
+            iam.PolicyStatement(
+                actions=["cloudwatch:PutMetricData"],
+                resources=["*"],
+            )
+        )
+
         s3_read_write_policy = iam.PolicyStatement(
             effect=iam.Effect.ALLOW,
             actions=["s3:ListBucket", "s3:GetObject"],

sds_data_manager/lambda_code/IAlirtCode/ialirt_rsync_alarm.py

@@ -2,21 +2,16 @@
 
 import json
 import logging
-from datetime import datetime, timezone
 
 import boto3
 import botocore
 from botocore.client import BaseClient
 
-from .ialirt_realtime import query_filenames
-
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 
 
-def check_for_rsync_failure(
-    s3_client: BaseClient, filenames: list, bucket: str
-) -> bool:
+def check_for_rsync_failure(s3_client: BaseClient, key: str, bucket: str) -> bool:
     """Scan recent log files in an S3 bucket for 'rsync' command failures.
 
     This function iterates through the specified log files stored in the given
@@ -28,8 +23,8 @@ def check_for_rsync_failure(
     ----------
     s3_client : BaseClient
         A boto3 S3 client used to retrieve log objects from the bucket.
-    filenames : list
-        List of S3 object keys (filenames) to scan for the failure message.
+    key : str
+        The S3 object key (filename) to scan for the failure message.
     bucket : str
         Name of the S3 bucket containing the log files.
 
@@ -39,13 +34,12 @@ def check_for_rsync_failure(
         True if any log file contains the string 'command failed: rsync';
         False otherwise.
     """
-    for key in filenames:
-        obj = s3_client.get_object(Bucket=bucket, Key=f"logs/{key}")
-        body = obj["Body"]
-        for line in body.iter_lines():
-            if b"command failed: rsync" in line:
-                logger.warning(f"Found rsync failure in {key}")
-                return True
+    obj = s3_client.get_object(Bucket=bucket, Key=key)
+    body = obj["Body"]
+    for line in body.iter_lines():
+        if b"command failed: rsync" in line:
+            logger.warning(f"Found rsync failure in {key}")
+            return True
     return False
 
 
@@ -69,7 +63,9 @@ def publish_failure_metric(found: bool):
             },
         ],
     )
-    logger.info(f"Published CloudWatch metric: IMAP/Ialirt::RsyncFailures = {value}")
+    logger.info(
+        f"Published CloudWatch metric: IMAP/Ialirt::IalirtRsyncFailures = {value}"
+    )
 
 
 def lambda_handler(event, context):
@@ -90,27 +86,15 @@ def lambda_handler(event, context):
 
     bucket = event["detail"]["bucket"]["name"]
     region = event["region"]
+    key = event["detail"]["object"]["key"]
 
     s3_client = boto3.client(
         "s3",
         region_name=region,
         config=botocore.client.Config(signature_version="s3v4"),
     )
 
-    if "now" in event:
-        now = datetime.fromisoformat(event["now"].replace("Z", "")).replace(
-            tzinfo=timezone.utc
-        )
-    else:
-        now = datetime.now(timezone.utc)
-
-    filenames = query_filenames(s3_client, bucket, now)
-    filenames = sorted(filenames)
-    if not filenames:
-        logger.info("No log files found in the last 48 hours.")
-        return {"statusCode": 204, "body": ""}
-
-    found = check_for_rsync_failure(s3_client, filenames, bucket)
+    found = check_for_rsync_failure(s3_client, key, bucket)
 
     publish_failure_metric(found)