fix(sse/tracking): Use INFLUXDB_BUCKET for storing data (#3197)

Flagsmith · Dec 20, 2023 · fbd14fe · fbd14fe · vercel · Dec 20, 2023
1 parent 5ef3373
commit fbd14fe
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 13 deletions.
diff --git a/api/app/settings/common.py b/api/app/settings/common.py
@@ -914,7 +914,6 @@
 SSE_SERVER_BASE_URL = env.str("SSE_SERVER_BASE_URL", None)
 SSE_AUTHENTICATION_TOKEN = env.str("SSE_AUTHENTICATION_TOKEN", None)
 AWS_SSE_LOGS_BUCKET_NAME = env.str("AWS_SSE_LOGS_BUCKET_NAME", None)
-SSE_INFLUXDB_BUCKET = env.str("SSE_INFLUXDB_BUCKET", None)
 
 RAW_ANALYTICS_DATA_RETENTION_DAYS = env.int("RAW_ANALYTICS_DATA_RETENTION_DAYS", 30)
 BUCKETED_ANALYTICS_DATA_RETENTION_DAYS = env.int(

diff --git a/api/sse/tasks.py b/api/sse/tasks.py
@@ -67,7 +67,7 @@ def update_sse_usage():
                     agg_request_count[environment["api_key"]],
                     agg_last_event_generated_at[environment["api_key"]],
                 )
-                write_api.write(bucket=settings.SSE_INFLUXDB_BUCKET, record=record)
+                write_api.write(bucket=settings.INFLUXDB_BUCKET, record=record)
 
 
 def _get_influx_point(

diff --git a/api/tests/unit/sse/test_tasks.py b/api/tests/unit/sse/test_tasks.py
@@ -106,7 +106,7 @@ def test_track_sse_usage(
         return_value=[first_access_log, second_access_log, third_access_log],
     )
     influxdb_bucket = "test_bucket"
-    settings.SSE_INFLUXDB_BUCKET = influxdb_bucket
+    settings.INFLUXDB_BUCKET = influxdb_bucket
 
     mocked_influx_db_client = mocker.patch("sse.tasks.influxdb_client")
     mocked_influx_point = mocker.patch("sse.tasks.Point")

diff --git a/infrastructure/aws/production/ecs-task-definition-task-processor.json b/infrastructure/aws/production/ecs-task-definition-task-processor.json
@@ -79,10 +79,6 @@
                     "name": "INFLUXDB_URL",
                     "value": "https://eu-central-1-1.aws.cloud2.influxdata.com"
                 },
-                {
-                    "name": "SSE_INFLUXDB_BUCKET",
-                    "value": "sse_prod"
-                },
                 {
                     "name": "AWS_SSE_LOGS_BUCKET_NAME",
                     "value": "flagsmith-fastly-logs-production"
@@ -217,4 +213,4 @@
     ],
     "cpu": "1024",
     "memory": "2048"
-}
+}
diff --git a/infrastructure/aws/staging/ecs-task-definition-task-processor.json b/infrastructure/aws/staging/ecs-task-definition-task-processor.json
@@ -131,10 +131,6 @@
                     "name": "INFLUXDB_URL",
                     "value": "https://eu-central-1-1.aws.cloud2.influxdata.com"
                 },
-                {
-                    "name": "SSE_INFLUXDB_BUCKET",
-                    "value": "sse_staging"
-                },
                 {
                     "name": "AWS_SSE_LOGS_BUCKET_NAME",
                     "value": "flagsmith-fastly-logs-staging"
@@ -205,4 +201,4 @@
     ],
     "cpu": "1024",
     "memory": "2048"
-}
+}