Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions kubernetes/linux/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1214,7 +1214,7 @@ else
if [ "${CONTAINER_TYPE}" == "PrometheusSidecar" ] && [ -e "/opt/telegraf-test-prom-side-car.conf" ]; then
if [ "${MUTE_PROM_SIDECAR}" != "true" ]; then
echo "****************Start Telegraf in Test Mode**************************"
/opt/telegraf --config /opt/telegraf-test-prom-side-car.conf --input-filter file -test
/opt/telegraf --non-strict-env-handling --config /opt/telegraf-test-prom-side-car.conf --input-filter file -test
if [ $? -eq 0 ]; then
mv "/opt/telegraf-test-prom-side-car.conf" "/etc/opt/microsoft/docker-cimprov/telegraf-prom-side-car.conf"
echo "Moving test conf file to telegraf side-car conf since test run succeeded"
Expand All @@ -1226,7 +1226,7 @@ else
else
if [ -e "/opt/telegraf-test.conf" ]; then
echo "****************Start Telegraf in Test Mode**************************"
/opt/telegraf --config /opt/telegraf-test.conf --input-filter file -test
/opt/telegraf --non-strict-env-handling --config /opt/telegraf-test.conf --input-filter file -test
if [ $? -eq 0 ]; then
mv "/opt/telegraf-test.conf" "/etc/opt/microsoft/docker-cimprov/telegraf.conf"
echo "Moving test conf file to telegraf daemonset conf since test run succeeded"
Expand All @@ -1237,7 +1237,7 @@ else
else
if [ -e "/opt/telegraf-test-rs.conf" ]; then
echo "****************Start Telegraf in Test Mode**************************"
/opt/telegraf --config /opt/telegraf-test-rs.conf --input-filter file -test
/opt/telegraf --non-strict-env-handling --config /opt/telegraf-test-rs.conf --input-filter file -test
if [ $? -eq 0 ]; then
mv "/opt/telegraf-test-rs.conf" "/etc/opt/microsoft/docker-cimprov/telegraf-rs.conf"
echo "Moving test conf file to telegraf replicaset conf since test run succeeded"
Expand Down Expand Up @@ -1389,7 +1389,7 @@ elif [ "${MUTE_PROM_SIDECAR}" != "true" ]; then
elif [ "${CONTROLLER_TYPE}" != "ReplicaSet" ] && [ "${CONTAINER_TYPE}" != "PrometheusSidecar" ] && [ "${LOGS_AND_EVENTS_ONLY}" == "true" ]; then
echo "not starting telegraf for LOGS_AND_EVENTS_ONLY daemonset"
else
/opt/telegraf --config $telegrafConfFile &
/opt/telegraf --non-strict-env-handling --config $telegrafConfFile &
fi
else
echo "not starting telegraf (no metrics to scrape since MUTE_PROM_SIDECAR is true)"
Expand All @@ -1413,7 +1413,7 @@ if [ "${AZMON_COLLECT_AMA_LOGS_PROCESS_METRICS}" == "true" ]; then
appinsightsKey=$(echo "$APPLICATIONINSIGHTS_AUTH" | base64 -d | tr -d '\n')
sed -i -e "s/placeholder_appinsights_key/$appinsightsKey/g" $amaLogsProcessMetricsConfFile
# Use /proc so telegraf only collect process metrics inside ama-logs containers.
HOST_PROC=/proc /opt/telegraf --config $amaLogsProcessMetricsConfFile &
HOST_PROC=/proc /opt/telegraf --non-strict-env-handling --config $amaLogsProcessMetricsConfFile &
else
echo "APPLICATIONINSIGHTS_AUTH or AKS_RESOURCE_ID not set, skipping ama-logs process metrics monitoring"
fi
Expand Down
1 change: 1 addition & 0 deletions kubernetes/linux/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ sudo update-ca-trust
# the mariner package version is behind the global packages so we are using different versions for arm64 and x86_64
if [ "$ARCH" == "arm64" ]; then
sudo tdnf install ruby-3.3.5-7.azl3.aarch64 -y
sudo tdnf install zlib-devel -y
else
tdnf install -y gcc patch bzip2 openssl-devel libyaml-devel libffi-devel readline-devel zlib-devel gdbm-devel ncurses-devel
wget https://github.com/rbenv/ruby-build/archive/refs/tags/v20251023.tar.gz -O ruby-build.tar.gz
Expand Down
Loading