diff --git a/aegea/base_config.yml b/aegea/base_config.yml index 3c93f96d..2c70fe27 100644 --- 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 index b8575368..ab109a17 100644 --- 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 deleted file mode 100644 index d9062070..00000000 --- a/aegea/rootfs.skel.build_ami/etc/awslogs.conf +++ /dev/null @@ -1,14 +0,0 @@ -[general] -# Path to the CloudWatch Logs agent's state file. The agent uses this file to maintain -# client side state across its executions. -state_file = /var/awslogs/state/agent-state -logging_config_file = /etc/awslogs.logging.conf - -[/var/log/syslog] -datetime_format = %b %d %H:%M:%S -file = /var/log/syslog -buffer_duration = 5000 -log_stream_name = {hostname} -#log_stream_name = {instance_id} -initial_position = start_of_file -log_group_name = syslog diff --git a/aegea/rootfs.skel.build_ami/etc/awslogs.logging.conf b/aegea/rootfs.skel.build_ami/etc/awslogs.logging.conf deleted file mode 100644 index 4045af29..00000000 --- a/aegea/rootfs.skel.build_ami/etc/awslogs.logging.conf +++ /dev/null @@ -1,39 +0,0 @@ -[loggers] -keys=root,cwlogs,reader,publisher - -[handlers] -keys=consoleHandler - -[formatters] -keys=simpleFormatter - -[logger_root] -level=INFO -handlers=consoleHandler - -[logger_cwlogs] -level=INFO -handlers=consoleHandler -qualname=cwlogs.push -propagate=0 - -[logger_reader] -level=WARNING -handlers=consoleHandler -qualname=cwlogs.push.reader -propagate=0 - -[logger_publisher] -level=WARNING -handlers=consoleHandler -qualname=cwlogs.push.publisher -propagate=0 - -[handler_consoleHandler] -class=logging.StreamHandler -level=INFO -formatter=simpleFormatter -args=(sys.stderr,) - -[formatter_simpleFormatter] -format=%(asctime)s - %(name)s - %(levelname)s - %(process)d - %(threadName)s - %(message)s diff --git a/aegea/rootfs.skel.build_ami/etc/logrotate.d/awslogs b/aegea/rootfs.skel.build_ami/etc/logrotate.d/awslogs deleted file mode 100644 index 7df22595..00000000 --- a/aegea/rootfs.skel.build_ami/etc/logrotate.d/awslogs +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/awslogs.log { - su root root - missingok - notifempty - size 100M - create 0600 root root - delaycompress - compress - rotate 4 - postrotate - service awslogs restart - endscript -} diff --git a/aegea/rootfs.skel.build_ami/root/.aws/config b/aegea/rootfs.skel.build_ami/root/.aws/config index b8575368..ab109a17 100644 --- 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 deleted file mode 100644 index e69de29b..00000000