change format of log file s3 key

neuro-inc · Oct 18, 2023 · aaaaa8e · aaaaa8e
1 parent b2bfc5e
commit aaaaa8e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/charts/platform-monitoring/files/fluent-bit/fluent-bit.conf b/charts/platform-monitoring/files/fluent-bit/fluent-bit.conf
@@ -71,7 +71,7 @@
     total_file_size  1M
     upload_timeout   1m
     use_put_object   On
-    s3_key_format    /$TAG/%Y%m%d%H%M_$INDEX.gz
+    s3_key_format    /$TAG/%Y%m%d%H%M__$INDEX.gz
     static_file_path On
     json_date_key    time
 {{- end }}
diff --git a/charts/platform-monitoring/values.yaml b/charts/platform-monitoring/values.yaml
@@ -73,7 +73,7 @@ fluentbit:
       operator: Exists
   podAnnotations: {}
   taildb:
-    directory: /var/lib/platform-monitoring/fluent-bit
+    directory: /var/lib/platform-monitoring-fluent-bit
   logLevel: info
 
 minioGateway:

diff --git a/platform_monitoring/logs.py b/platform_monitoring/logs.py
@@ -326,7 +326,7 @@ async def _load_log_keys(self, since: Optional[datetime]) -> list[str]:
                 # get time slice from s3 key
                 time_slice_str = basename(s3_key).split(".")[0].split("_")
                 start_time_str = time_slice_str[0]
-                index = int(time_slice_str[1])
+                index = int(time_slice_str[-1])
                 if start_time_str >= since_time_str:
                     keys.append((start_time_str, index, s3_key))
         keys.sort()  # order keys by time slice

diff --git a/tests/k8s/logging.yml b/tests/k8s/logging.yml
@@ -161,7 +161,7 @@ data:
         total_file_size  1M
         upload_timeout   1s
         use_put_object   On
-        s3_key_format    /$TAG/%Y%m%d%H%M_$INDEX.gz
+        s3_key_format    /$TAG/%Y%m%d%H%M__$INDEX.gz
         static_file_path On
         json_date_key    time
 ---