fixup! [u] Send GitLab host logs to CloudWatch (#3894)

DataBiosphere · May 24, 2023 · 051811d · 051811d
1 parent eb41499
commit 051811d
Showing 1 changed file with 16 additions and 19 deletions.
diff --git a/terraform/gitlab/gitlab.tf.json.template.py b/terraform/gitlab/gitlab.tf.json.template.py
@@ -1559,15 +1559,24 @@ def qq(*words):
                                             'collect_list': [
                                                 {
                                                     'file_path': path,
-                                                    'log_group_name': '/aws/cwagent/azul-gitlab',
-                                                    'log_stream_name':
-                                                        path
-                                                        if not path.endswith('*.log')
-                                                        else
-                                                        path.replace('*', 'reconfigure')
+                                                    'log_group_name': '${aws_cloudwatch_log_group.gitlab_cwagent.name}',
+                                                    'log_stream_name': path.replace('*', '?')
                                                 }
                                                 for path in
                                                 [
+                                                    f'/var/log/{file}'
+                                                    for file in
+                                                    [
+                                                        'amazon/ssm/amazon-ssm-agent.log',
+                                                        'audit/audit.log',
+                                                        'cloud-init.log',
+                                                        'cron',
+                                                        'maillog',
+                                                        'messages',
+                                                        'secure'
+                                                    ]
+
+                                                ] + [
                                                     f'/mnt/gitlab/logs/{file}.log'
                                                     for file in
                                                     [
@@ -1582,7 +1591,7 @@ def qq(*words):
                                                         # reconfigure logs (name based on UNIX timestamp of when
                                                         # reconfigure initiated). Only the most recent file, by
                                                         # modification time, matching the wildcard is collected.
-                                                        'reconfigure/*.log'
+                                                        'reconfigure/*'
                                                     ]
                                                 ] + [
                                                     f'/mnt/gitlab/logs/gitlab-rails/{file}.log'
@@ -1601,18 +1610,6 @@ def qq(*words):
                                                         'production',
                                                         'sidekiq_client'
                                                     ]
-                                                ] + [
-                                                    f'/var/log/{file}'
-                                                    for file in
-                                                    [
-                                                        'amazon/ssm/amazon-ssm-agent.log',
-                                                        'audit/audit.log',
-                                                        'cloud-init.log',
-                                                        'cron',
-                                                        'maillog',
-                                                        'messages',
-                                                        'secure'
-                                                    ]
                                                 ]
                                             ]
                                         }