Replace awscli-cwlogs with fluent-bit

kislyuk · Sep 8, 2024 · 7f53f63 · 7f53f63
1 parent aab2e39
commit 7f53f63
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 82 deletions.
diff --git a/aegea/base_config.yml b/aegea/base_config.yml
@@ -10,7 +10,7 @@ build_image:
   commands:
     - "rm -f /usr/lib/python*/EXTERNALLY-MANAGED"
     - "update-locale LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8"
-    - "pip3 install awscli-cwlogs==1.4.6 boto3==1.34.145 awscli==1.33.27 miniwdl==1.12.1"
+    - "pip3 install boto3==1.35.14 awscli==1.34.14 miniwdl==1.12.1"
   packages:
     - language-pack-en
     - iptables-persistent
@@ -69,6 +69,7 @@ build_image:
     - apt-transport-https
     - software-properties-common
     - bat
+    - fluent-bit
 
 build_docker_image:
   base_image: ubuntu:24.04
@@ -112,7 +113,7 @@ build_ami:
     - "update-grub"
     - "grub-install /dev/xvda"
     - "rm -f /usr/lib/python*/EXTERNALLY-MANAGED"
-    - "pip3 install awscli-cwlogs==1.4.6 boto3==1.34.145 awscli==1.33.27 miniwdl==1.12.1"
+    - "pip3 install boto3==1.35.14 awscli==1.34.14 miniwdl==1.12.1"
     - "activate-global-python-argcomplete"
     - "dpkg-reconfigure debconf -f noninteractive -p critical"
     - "systemctl mask apport.service apt-daily.service apt-daily-upgrade.service"
@@ -121,11 +122,16 @@ build_ami:
     - "apt-get autoremove --yes"
     - "apt-get clean --yes"
     - "find /etc/cron.* -type f -not -name .placeholder -and -not -name logrotate -and -not -name fstrim -delete"
+    - "truncate -s 0 /var/log/syslog"
   cloud_config_data:
-    apt_sources:
-      - source: "deb https://cloud.r-project.org/bin/linux/ubuntu focal-cran40/"
-        filename: rstudio.list
-        keyid: E298A3A825C0D65DFD57CBB651716619E084DAB9
+    apt:
+      sources:
+        rstudio:
+          source: "deb https://cloud.r-project.org/bin/linux/ubuntu $RELEASE-cran40"
+          keyid: E298A3A825C0D65DFD57CBB651716619E084DAB9
+        fluentbit:
+          source: "deb https://packages.fluentbit.io/ubuntu/$RELEASE $RELEASE main"
+          keyid: C3C0A28534B9293EAF51FABD9F9DDC083888C1CD
   cloud_init_timeout_seconds: 900
   cloud_init_poll_interval_seconds: 8
 

diff --git a/aegea/rootfs.skel.build_ami/etc/aws.conf b/aegea/rootfs.skel.build_ami/etc/aws.conf
@@ -1,6 +1 @@
-[plugins]
-cwlogs = cwlogs
-[preview]
-efs=true
-cloudfront=true
 [default]
diff --git a/aegea/rootfs.skel.build_ami/etc/awslogs.conf b/aegea/rootfs.skel.build_ami/etc/awslogs.conf
diff --git a/aegea/rootfs.skel.build_ami/etc/awslogs.logging.conf b/aegea/rootfs.skel.build_ami/etc/awslogs.logging.conf
diff --git a/aegea/rootfs.skel.build_ami/etc/logrotate.d/awslogs b/aegea/rootfs.skel.build_ami/etc/logrotate.d/awslogs
diff --git a/aegea/rootfs.skel.build_ami/root/.aws/config b/aegea/rootfs.skel.build_ami/root/.aws/config
@@ -1,6 +1 @@
-[plugins]
-cwlogs = cwlogs
-[preview]
-efs=true
-cloudfront=true
 [default]
diff --git a/aegea/rootfs.skel.build_ami/var/awslogs/state/.keep b/aegea/rootfs.skel.build_ami/var/awslogs/state/.keep