Send logs to Cloudwatch in the same region, not always to Frankfurt (#25)
diff --git a/github-runner-ami/packer/files/install-files.sh b/github-runner-ami/packer/files/install-files.sh
index 9c726f6..bacde4e 100644
--- a/github-runner-ami/packer/files/install-files.sh
+++ b/github-runner-ami/packer/files/install-files.sh
@@ -18,7 +18,7 @@
set -eu -o pipefail
-mkdir /etc/iptables/ /etc/vector
+mkdir /etc/iptables/ /etc/vector /etc/systemd/system/vector.service.d
install --owner root --mode=0644 --target-directory "/etc/systemd/system/" "/tmp/etc-systemd-system/"*
install --owner root --mode=0755 --target-directory "/usr/local/sbin" "/tmp/usr-local-sbin/"*
@@ -27,3 +27,4 @@
install --owner root --mode=0644 --target-directory "/etc/cron.d" "/tmp/etc-cron.d/"*
install --owner root --mode=0644 --target-directory "/etc/sudoers.d" "/tmp/etc-sudoers.d/"*
install --owner root --mode=0644 --target-directory "/etc/vector/" "/tmp/etc-vector/"*
+install --owner root --mode=0644 --target-directory "/etc/systemd/system/vector.service.d/" "/tmp/etc-systemd-system-vector.service.d/"*
diff --git a/github-runner-ami/packer/files/vector.service.d.override.conf b/github-runner-ami/packer/files/vector.service.d.override.conf
new file mode 100644
index 0000000..899e86c
--- /dev/null
+++ b/github-runner-ami/packer/files/vector.service.d.override.conf
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+[Service]
+EnvironmentFile=/etc/environment
diff --git a/github-runner-ami/packer/files/vector.toml b/github-runner-ami/packer/files/vector.toml
index 05db414..07da3a0 100644
--- a/github-runner-ami/packer/files/vector.toml
+++ b/github-runner-ami/packer/files/vector.toml
@@ -95,4 +95,4 @@
create_missing_stream = true
group_name = "GitHubRunners"
stream_name = "{{ host }}"
-region = "eu-central-1"
+region = "${AWS_DEFAULT_REGION}"
diff --git a/github-runner-ami/packer/ubuntu2004.pkr.hcl b/github-runner-ami/packer/ubuntu2004.pkr.hcl
index f428705..cb688f8 100644
--- a/github-runner-ami/packer/ubuntu2004.pkr.hcl
+++ b/github-runner-ami/packer/ubuntu2004.pkr.hcl
@@ -89,7 +89,7 @@
# in to place with the approriate permissions via install-files.sh provisioner step
provisioner "shell" {
inline = [
- "mkdir -p /tmp/etc-systemd-system /tmp/usr-local-sbin /tmp/usr-local-bin /tmp/etc-sudoers.d /tmp/etc-iptables /tmp/etc-cron.d /tmp/etc-vector"
+ "mkdir -p /tmp/etc-systemd-system /tmp/usr-local-sbin /tmp/usr-local-bin /tmp/etc-sudoers.d /tmp/etc-iptables /tmp/etc-cron.d /tmp/etc-vector /tmp/etc-systemd-system-vector.service.d"
]
}
provisioner "file" {
@@ -136,6 +136,10 @@
destination = "/tmp/etc-vector/vector.toml"
source = "./files/vector.toml"
}
+ provisioner "file" {
+ destination = "/tmp/etc-systemd-system-vector.service.d/override.conf"
+ source = "./files/vector.service.d.override.conf"
+ }
provisioner "shell" {
scripts = [
"./files/install-files.sh",
