Merge pull request #5 from dlcs/feature/metrics_update

Updates to raised CW metrics
dlcs · Oct 17, 2023 · 4cbf48a · 4cbf48a
2 parents 2129855 + 301e377
commit 4cbf48a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/.env-dist b/.env-dist
@@ -3,10 +3,8 @@ CONNECTION_TIMEOUT=
 AWS_PROFILE=
 DRY_RUN=
 ENABLE_CLOUDWATCH_INTEGRATION=
-CLOUDWATCH_CUSTOMER_DIFFERENCE_METRIC_NAME=
 CLOUDWATCH_SPACE_DIFFERENCE_METRIC_NAME=
 CLOUDWATCH_SPACE_DELETE_METRIC_NAME=
-CLOUDWATCH_CUSTOMER_DELETE_METRIC_NAME=
 CLOUDWATCH_SPACE_IMAGE_SIZE_DIFFERENCE_METRIC_NAME=
 CLOUDWATCH_SPACE_IMAGE_NUMBER_DIFFERENCE_METRIC_NAME=
 CLOUDWATCH_SPACE_THUMBNAIL_SIZE_DIFFERENCE_METRIC_NAME=
diff --git a/src/customer_storage_recalculator.py b/src/customer_storage_recalculator.py
@@ -35,7 +35,7 @@ def begin_cleanup():
 def set_cloudwatch_metrics(records, cloudwatch, connection_info):
     metric_data = []
     dimensions = [{
-                    'Name': "TABLE_NAME",
+                    'Name': "DATABASE_NAME",
                     'Value': connection_info["database"]
                 },
                 {
@@ -61,27 +61,27 @@ def set_cloudwatch_metrics(records, cloudwatch, connection_info):
         {
             'MetricName': CLOUDWATCH_SPACE_IMAGE_SIZE_DIFFERENCE_METRIC_NAME,
             'Dimensions': dimensions,
-            'Unit': 'None',
+            'Unit': 'Bytes',
             'Value': space_total_image_size_delta
         },
         {
             'MetricName': CLOUDWATCH_SPACE_IMAGE_NUMBER_DIFFERENCE_METRIC_NAME,
             'Dimensions': dimensions,
-            'Unit': 'None',
+            'Unit': 'Count',
             'Value': space_total_image_number_delta
         },
         {
             'MetricName': CLOUDWATCH_SPACE_THUMBNAIL_SIZE_DIFFERENCE_METRIC_NAME,
             'Dimensions': dimensions,
-            'Unit': 'None',
+            'Unit': 'Bytes',
             'Value': space_total_thumbnail_size_delta
         }
     ])
 
     try:
         logger.debug(f"updating cloudwatch metrics - {metric_data}")
         cloudwatch.put_metric_data(MetricData=metric_data,
-                                   Namespace='Entity Counter Recalculator')
+                                   Namespace='Protagonist Recalculator')
         return metric_data
     except Exception as e:
         logger.error(f"Error posting to cloudwatch: {e}")

diff --git a/src/entity_counter_recalculator.py b/src/entity_counter_recalculator.py
@@ -35,7 +35,7 @@ def begin_cleanup():
 def set_cloudwatch_metrics(records, cloudwatch, connection_info):
     metric_data = []
     dimensions = [{
-                    'Name': "TABLE_NAME",
+                    'Name': "DATABASE_NAME",
                     'Value': connection_info["database"]
                 },
                 {
@@ -61,21 +61,21 @@ def set_cloudwatch_metrics(records, cloudwatch, connection_info):
         {
             'MetricName': CLOUDWATCH_SPACE_DIFFERENCE_METRIC_NAME,
             'Dimensions': dimensions,
-            'Unit': 'None',
+            'Unit': 'Count',
             'Value': space_delta
         },
         {
             'MetricName': CLOUDWATCH_SPACE_DELETE_METRIC_NAME,
             'Dimensions': dimensions,
-            'Unit': 'None',
+            'Unit': 'Count',
             'Value': space_deletes_needed
         }
     ])
 
     try:
         logger.debug(f"updating cloudwatch metrics - {metric_data}")
         cloudwatch.put_metric_data(MetricData=metric_data,
-                                   Namespace='Entity Counter Recalculator')
+                                   Namespace='Protagonist Recalculator')
         return metric_data
     except Exception as e:
         logger.error(f"Error posting to cloudwatch: {e}")