Skip to content

fix: Changed fluentd config to prevent excess logging from the daemonset pods #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmonkman merged 2 commits into from
Feb 2, 2021
Merged

fix: Changed fluentd config to prevent excess logging from the daemonset pods #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4e050a
fix: Changed fluentd config to prevent excess logging from the daemon…
bmonkman Feb 2, 2021
4af5ebb
Fix formatting in systemd conf
bmonkman Feb 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/kubernetes/terraform/modules/kubernetes/logging/cloudwatch/files/host.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@
retry_forever true
</buffer>
</match>
</label>
</label>
38 changes: 25 additions & 13 deletions templates/kubernetes/terraform/modules/kubernetes/logging/cloudwatch/files/systemd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
@type systemd
@id in_systemd_kubelet
@label @systemd
filters [{ "_SYSTEMD_UNIT": "kubelet.service" }]
matches [{ "_SYSTEMD_UNIT": "kubelet.service" }]
<entry>
field_map {"MESSAGE": "message", "_HOSTNAME": "hostname", "_SYSTEMD_UNIT": "systemd_unit"}
field_map_strict true
field_map {"MESSAGE": "message", "_HOSTNAME": "hostname", "_SYSTEMD_UNIT": "systemd_unit"}
field_map_strict true
</entry>
<storage>
@type local
persistent true
path /var/log/fluentd-journald-kubelet.pos
</storage>
path /var/log/journal
pos_file /var/log/fluentd-journald-kubelet.pos
read_from_head true
tag kubelet.service
</source>
Expand All @@ -17,13 +21,17 @@
@type systemd
@id in_systemd_kubeproxy
@label @systemd
filters [{ "_SYSTEMD_UNIT": "kubeproxy.service" }]
matches [{ "_SYSTEMD_UNIT": "kubeproxy.service" }]
<entry>
field_map {"MESSAGE": "message", "_HOSTNAME": "hostname", "_SYSTEMD_UNIT": "systemd_unit"}
field_map_strict true
field_map {"MESSAGE": "message", "_HOSTNAME": "hostname", "_SYSTEMD_UNIT": "systemd_unit"}
field_map_strict true
</entry>
<storage>
@type local
persistent true
path /var/log/fluentd-journald-kubeproxy.pos
</storage>
path /var/log/journal
pos_file /var/log/fluentd-journald-kubeproxy.pos
read_from_head true
tag kubeproxy.service
</source>
Expand All @@ -32,13 +40,17 @@
@type systemd
@id in_systemd_docker
@label @systemd
filters [{ "_SYSTEMD_UNIT": "docker.service" }]
matches [{ "_SYSTEMD_UNIT": "docker.service" }]
<entry>
field_map {"MESSAGE": "message", "_HOSTNAME": "hostname", "_SYSTEMD_UNIT": "systemd_unit"}
field_map_strict true
field_map {"MESSAGE": "message", "_HOSTNAME": "hostname", "_SYSTEMD_UNIT": "systemd_unit"}
field_map_strict true
</entry>
<storage>
@type local
persistent true
path /var/log/fluentd-journald-docker.pos
</storage>
path /var/log/journal
pos_file /var/log/fluentd-journald-docker.pos
read_from_head true
tag docker.service
</source>
Expand Down Expand Up @@ -72,4 +84,4 @@
retry_forever true
</buffer>
</match>
</label>
</label>
10 changes: 7 additions & 3 deletions templates/kubernetes/terraform/modules/kubernetes/logging/cloudwatch/fluentd.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ resource "kubernetes_config_map" "cluster_info" {

resource "kubernetes_service_account" "fluentd" {
metadata {
name = "fluentd"
namespace = "amazon-cloudwatch"
name = "fluentd"
namespace = "amazon-cloudwatch"
annotations = {
"eks.amazonaws.com/role-arn" = module.iam_assumable_role_fluentd.this_iam_role_arn
}
Expand Down Expand Up @@ -178,6 +178,10 @@ resource "kubernetes_daemonset" "fluentd_cloudwatch" {
}
}
}
env {
name = "FLUENTD_OPT"
value = "-q"
}
resources {
limits {
memory = "200Mi"
Expand Down Expand Up @@ -217,7 +221,7 @@ resource "kubernetes_daemonset" "fluentd_cloudwatch" {
}

security_context {
fs_group = 65534
fs_group = 65534
}

termination_grace_period_seconds = 30
Expand Down