kazu634
/
itamae
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix-for-nf-conntrack' of kazu634/itamae into master

This commit is contained in:
Kazuhiro MUSASHI 2020-09-26 16:59:59 +09:00 committed by Gitea
parent b3cdf96640 f1c09b8ae9
commit 81cfec10d9
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cookbooks/base/files/etc/sysctl.d/90-conntrack-tcp-timeout-time-wait.conf Normal file
View File

@ -0,0 +1 @@
net.netfilter.nf_conntrack_tcp_timeout_time_wait=60

3
cookbooks/base/kernel.rb
View File

@ -2,7 +2,8 @@ STORAGE = '/etc/sysctl.d'
[ [
"#{STORAGE}/90-vm-swappiness.conf", "#{STORAGE}/90-vm-swappiness.conf",
"#{STORAGE}/90-vfs-cache-pressure.conf" "#{STORAGE}/90-vfs-cache-pressure.conf",
"#{STORAGE}/90-conntrack-tcp-timeout-time-wait.conf"
].each do |conf| ].each do |conf|
remote_file conf do remote_file conf do
owner 'root' owner 'root'

12
cookbooks/promtail/templates/etc/promtail/base.yaml
View File

@ -282,11 +282,21 @@ scrape_configs:
pipeline_stages: pipeline_stages:
- match: - match:
selector: '{job="systemd"} !~ "temperature"' selector: '{job="systemd"} !~ "(temperature|nf_conntrack)"'
stages: stages:
- drop: - drop:
expression: (CMD|UFW|session|TTY) expression: (CMD|UFW|session|TTY)
- match:
selector: '{job="systemd"} |~ "nf_conntrack"'
stages:
- template:
source: level
template: 'error'
- labels:
level:
- match: - match:
selector: '{job="systemd"} |~ "temperature"' selector: '{job="systemd"} |~ "temperature"'