Skip to content

Jan agent tasks #698

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
gracewehner merged 8 commits into from
Jan 28, 2022
Merged

Jan agent tasks #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d00d5c3
scan with latest telegraf
gracewehner Jan 13, 2022
6c0d576
try 1.20.3
gracewehner Jan 20, 2022
1f6a5da
upgrade windows
gracewehner Jan 20, 2022
f849c7a
exclude containerd disk path
gracewehner Jan 20, 2022
ac83db9
add in skip for mdsd telegraf
gracewehner Jan 20, 2022
16e7601
increase windows cpu request/limit
gracewehner Jan 20, 2022
07d1e47
add wildcard
gracewehner Jan 21, 2022
21faafe
feedback fixes
gracewehner Jan 22, 2022
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 .github/workflows/pr-checker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
format: 'table'
severity: 'CRITICAL,HIGH'
vuln-type: 'os,library'
skip-dirs: '/opt,/usr/sbin'
skip-dirs: '/usr/sbin'
exit-code: '1'
timeout: '5m0s'
WINDOWS-build:
Expand Down
2 changes: 1 addition & 1 deletion build/linux/installer/conf/telegraf.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
# Below due to Bug - https://github.com/influxdata/telegraf/issues/5615
# ORDER matters here!! - i.e the below should be the LAST modifier
[inputs.disk.tagdrop]
path = ["/var/lib/kubelet*", "/dev/termination-log", "/var/log", "/etc/hosts", "/etc/resolv.conf", "/etc/hostname", "/etc/kubernetes/host", "/var/lib/docker/containers", "/etc/config/settings"]
path = ["/var/lib/kubelet*", "/dev/termination-log", "/var/log", "/etc/hosts", "/etc/resolv.conf", "/etc/hostname", "/etc/kubernetes/host", "/var/lib/docker/containers", "/etc/config/settings", "/run/host/containerd/io.containerd.runtime.v2.task/k8s.io/*"]


# Read metrics about memory usage
Expand Down
2 changes: 1 addition & 1 deletion charts/azuremonitor-containers/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ omsagent:
memory: 750Mi
daemonsetwindows:
limits:
cpu: 200m
cpu: 500m
memory: 600Mi
deployment:
requests:
Expand Down
7 changes: 4 additions & 3 deletions kubernetes/linux/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ sudo apt-get install jq=1.5+dfsg-2 -y
#used to setcaps for ruby process to read /proc/env
sudo apt-get install libcap2-bin -y

wget https://dl.influxdata.com/telegraf/releases/telegraf-1.18.0_linux_amd64.tar.gz
tar -zxvf telegraf-1.18.0_linux_amd64.tar.gz
wget https://dl.influxdata.com/telegraf/releases/telegraf-1.20.3_linux_amd64.tar.gz
tar -zxvf telegraf-1.20.3_linux_amd64.tar.gz

mv /opt/telegraf-1.18.0/usr/bin/telegraf /opt/telegraf
mv /opt/telegraf-1.20.3/usr/bin/telegraf /opt/telegraf

chmod 777 /opt/telegraf

Expand Down Expand Up @@ -61,6 +61,7 @@ rm -f $TMPDIR/docker-cimprov*.sh
rm -f $TMPDIR/azure-mdsd*.deb
rm -f $TMPDIR/mdsd.xml
rm -f $TMPDIR/envmdsd
rm -f $TMPDIR/telegraf-*.tar.gz

# remove build dependencies
sudo apt-get remove ruby2.6-dev gcc make -y
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/omsagent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ spec:
imagePullPolicy: IfNotPresent
resources:
limits:
cpu: 200m
cpu: 500m
memory: 600Mi
env:
- name: FBIT_SERVICE_FLUSH_INTERVAL
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/windows/setup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Write-Host ('Finished Installing Fluentbit')

Write-Host ('Installing Telegraf');
try {
$telegrafUri='https://dl.influxdata.com/telegraf/releases/telegraf-1.18.0_windows_amd64.zip'
$telegrafUri='https://dl.influxdata.com/telegraf/releases/telegraf-1.20.3_windows_amd64.zip'
Invoke-WebRequest -Uri $telegrafUri -OutFile /installation/telegraf.zip
Expand-Archive -Path /installation/telegraf.zip -Destination /installation/telegraf
Move-Item -Path /installation/telegraf/*/* -Destination /opt/telegraf/ -ErrorAction SilentlyContinue
Expand Down