Skip to content
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

enable syslog collection for cosmic #1282

Merged
merged 7 commits into from
Jun 20, 2024
Merged

enable syslog collection for cosmic #1282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f475c5b
enable syslog collection for cosmic
Jun 19, 2024
099f9db
updatr trivyignore
Jun 19, 2024
b3dbba3
refactor component
Jun 19, 2024
35715a7
Merge branch 'ci_prod' into user/amagraw/enable-syslog-for-cosmic
Jun 20, 2024
ddf075c
add check for port
Jun 20, 2024
23e0025
add log statements
Jun 20, 2024
ba38e95
fix log
Jun 20, 2024
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
45 changes: 26 additions & 19 deletions build/linux/installer/scripts/livenessprobe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,33 @@
#!/bin/bash
source /opt/env_vars

if [[ "${CONTROLLER_TYPE}" == "DaemonSet" && "${CONTAINER_TYPE}" != "PrometheusSidecar" ]]; then
syslog_status=$(cat /var/opt/microsoft/docker-cimprov/state/syslog.status 2>/dev/null)
if grep -qr LINUX_SYSLOGS_BLOB /etc/mdsd.d/config-cache/configchunks > /dev/null 2>&1; then
if [[ "$syslog_status" == "disabled" ]]; then
echo "enabled" > /var/opt/microsoft/docker-cimprov/state/syslog.status
[ -d "/var/run/mdsd-ci" ] && cp /etc/opt/microsoft/docker-cimprov/70-rsyslog-forward-mdsd-ci.conf /var/run/mdsd-ci && echo "add" > /var/run/mdsd-ci/update.status
fi
else
if [[ "$syslog_status" == "enabled" ]]; then
echo "disabled" > /var/opt/microsoft/docker-cimprov/state/syslog.status
[ -f "/var/run/mdsd-ci/70-rsyslog-forward-mdsd-ci.conf" ] && rm /var/run/mdsd-ci/70-rsyslog-forward-mdsd-ci.conf && echo "remove" > /var/run/mdsd-ci/update.status
fi
fi
syslogSetup() {
syslog_status=$(cat /var/opt/microsoft/docker-cimprov/state/syslog.status 2>/dev/null)
if grep -qr LINUX_SYSLOGS_BLOB /etc/mdsd.d/config-cache/configchunks > /dev/null 2>&1; then
if [[ "$syslog_status" == "disabled" ]]; then
echo "enabled" > /var/opt/microsoft/docker-cimprov/state/syslog.status
[ -d "/var/run/mdsd-ci" ] && cp /etc/opt/microsoft/docker-cimprov/70-rsyslog-forward-mdsd-ci.conf /var/run/mdsd-ci && echo "add" > /var/run/mdsd-ci/update.status
fi
else
if [[ "$syslog_status" == "enabled" ]]; then
echo "disabled" > /var/opt/microsoft/docker-cimprov/state/syslog.status
[ -f "/var/run/mdsd-ci/70-rsyslog-forward-mdsd-ci.conf" ] && rm /var/run/mdsd-ci/70-rsyslog-forward-mdsd-ci.conf && echo "remove" > /var/run/mdsd-ci/update.status
fi
fi
}

CURRENT_LOGS_AND_EVENTS_ONLY=${LOGS_AND_EVENTS_ONLY}
ruby /opt/dcr-config-parser.rb > /dev/write-to-traces 2>&1
source /opt/dcr_env_var
if [ "${LOGS_AND_EVENTS_ONLY}" != "${CURRENT_LOGS_AND_EVENTS_ONLY}" ]; then
echo "dcr_env_var has been updated - dcr config changed" > /dev/termination-log
exit 1
if [[ "${CONTROLLER_TYPE}" == "DaemonSet" ]]; then
if [[ "${CONTAINER_TYPE}" == "PrometheusSidecar" && "${GENEVA_LOGS_INTEGRATION}" == "true" && -d "/var/run/mdsd-ci" ]]; then
syslogSetup
else
syslogSetup
CURRENT_LOGS_AND_EVENTS_ONLY=${LOGS_AND_EVENTS_ONLY}
ruby /opt/dcr-config-parser.rb > /dev/write-to-traces 2>&1
source /opt/dcr_env_var
if [ "${LOGS_AND_EVENTS_ONLY}" != "${CURRENT_LOGS_AND_EVENTS_ONLY}" ]; then
echo "dcr_env_var has been updated - dcr config changed" > /dev/termination-log
exit 1
fi
fi
fi

Expand Down
4 changes: 4 additions & 0 deletions kubernetes/ama-logs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,8 @@ spec:
value: "PrometheusSidecar"
- name: CONTROLLER_TYPE
value: "DaemonSet"
- name: SYSLOG_HOST_PORT
value: "28330"
- name: NODE_IP
valueFrom:
fieldRef:
Expand All @@ -567,6 +569,8 @@ spec:
- name: kube-api-access
mountPath: /var/run/secrets/kubernetes.io/serviceaccount
readOnly: true
- mountPath: /var/run/mdsd-ci
name: mdsd-sock
- mountPath: /var/run/mdsd-PrometheusSidecar
name: mdsd-prometheus-sock
- mountPath: /etc/kubernetes/host
Expand Down
45 changes: 30 additions & 15 deletions kubernetes/linux/main.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,8 @@ else
true > /etc/opt/microsoft/docker-cimprov/fluent-bit-internal-metrics.conf
fi

setGlobalEnvVar GENEVA_LOGS_INTEGRATION "${GENEVA_LOGS_INTEGRATION}"

if [ "${CONTAINER_TYPE}" != "PrometheusSidecar" ] && [ "${GENEVA_LOGS_INTEGRATION_SERVICE_MODE}" != "true" ]; then
#Parse the configmap to set the right environment variables.
ruby tomlparser.rb
Expand Down Expand Up @@ -998,6 +1000,18 @@ else
echo "MDSD backpressure threshold not set since tail_mem_buf_limit_megabytes is used in configmap. Use backpressure_memory_threshold_in_mb in configmap to set it."
fi

if [ -n "$SYSLOG_HOST_PORT" ] && [ "$SYSLOG_HOST_PORT" != "28330" ]; then
echo "Updating rsyslog config file with non default SYSLOG_HOST_PORT value ${SYSLOG_HOST_PORT}"
if sed -i "s/Port=\"[0-9]*\"/Port=\"$SYSLOG_HOST_PORT\"/g" /etc/opt/microsoft/docker-cimprov/70-rsyslog-forward-mdsd-ci.conf; then
echo "Successfully updated the rsylog config file."
else
echo "Failed to update the rsyslog config file."
fi
else
echo "SYSLOG_HOST_PORT is ${SYSLOG_HOST_PORT}. No changes made."
fi
SYSLOG_PORT_CONFIG="-y 0" # disables syslog listener for mdsd

if [ "${CONTAINER_TYPE}" == "PrometheusSidecar" ]; then
if [ "${MUTE_PROM_SIDECAR}" != "true" ]; then
echo "starting mdsd with mdsd-port=26130, fluentport=26230 and influxport=26330 in sidecar container..."
Expand All @@ -1009,8 +1023,15 @@ if [ "${CONTAINER_TYPE}" == "PrometheusSidecar" ]; then
echo "export MDSD_ROLE_PREFIX=$MDSD_ROLE_PREFIX" >> ~/.bashrc
source ~/.bashrc
mkdir -p /var/run/mdsd-${CONTAINER_TYPE}
if [[ "${GENEVA_LOGS_INTEGRATION}" == "true" && -d "/var/run/mdsd-ci" && -n "${SYSLOG_HOST_PORT}" ]]; then
echo "enabling syslog listener for mdsd in prometheus sidecar container"
export MDSD_DEFAULT_TCP_SYSLOG_PORT=$SYSLOG_HOST_PORT
echo "export MDSD_DEFAULT_TCP_SYSLOG_PORT=$MDSD_DEFAULT_TCP_SYSLOG_PORT" >> ~/.bashrc
source ~/.bashrc
SYSLOG_PORT_CONFIG="" # enable syslog listener for mdsd for prometheus sidecar in geneva mode
fi
# add -T 0xFFFF for full traces
mdsd ${MDSD_AAD_MSI_AUTH_ARGS} -r ${MDSD_ROLE_PREFIX} -p 26130 -f 26230 -i 26330 -y 0 -e ${MDSD_LOG}/mdsd.err -w ${MDSD_LOG}/mdsd.warn -o ${MDSD_LOG}/mdsd.info -q ${MDSD_LOG}/mdsd.qos &
mdsd ${MDSD_AAD_MSI_AUTH_ARGS} -r ${MDSD_ROLE_PREFIX} -p 26130 -f 26230 -i 26330 "${SYSLOG_PORT_CONFIG}" -e ${MDSD_LOG}/mdsd.err -w ${MDSD_LOG}/mdsd.warn -o ${MDSD_LOG}/mdsd.info -q ${MDSD_LOG}/mdsd.qos &
else
echo "not starting mdsd (no metrics to scrape since MUTE_PROM_SIDECAR is true)"
fi
Expand All @@ -1019,24 +1040,18 @@ else
if isHighLogScaleMode; then
startAMACoreAgent
fi
# add -T 0xFFFF for full traces
export MDSD_ROLE_PREFIX=/var/run/mdsd-ci/default
echo "export MDSD_ROLE_PREFIX=$MDSD_ROLE_PREFIX" >> ~/.bashrc
if [ -n "$SYSLOG_HOST_PORT" ] && [ "$SYSLOG_HOST_PORT" != "28330" ]; then
echo "Updating rsyslog config file with non default SYSLOG_HOST_PORT value ${SYSLOG_HOST_PORT}"
if sed -i "s/Port=\"[0-9]*\"/Port=\"$SYSLOG_HOST_PORT\"/g" /etc/opt/microsoft/docker-cimprov/70-rsyslog-forward-mdsd-ci.conf; then
echo "Successfully updated the rsylog config file."
else
echo "Failed to update the rsyslog config file."
fi
else
echo "SYSLOG_HOST_PORT is ${SYSLOG_HOST_PORT}. No changes made."
if [[ "${GENEVA_LOGS_INTEGRATION}" != "true" ]]; then
echo "enabling syslog listener for mdsd in main container"
export MDSD_DEFAULT_TCP_SYSLOG_PORT=28330
pfrcks marked this conversation as resolved.
Show resolved Hide resolved
echo "export MDSD_DEFAULT_TCP_SYSLOG_PORT=$MDSD_DEFAULT_TCP_SYSLOG_PORT" >> ~/.bashrc
source ~/.bashrc
SYSLOG_PORT_CONFIG="" # enable syslog listener for mdsd for main container when not in geneva mode
fi
export MDSD_DEFAULT_TCP_SYSLOG_PORT=28330
echo "export MDSD_DEFAULT_TCP_SYSLOG_PORT=$MDSD_DEFAULT_TCP_SYSLOG_PORT" >> ~/.bashrc
source ~/.bashrc
mkdir -p /var/run/mdsd-ci
mdsd ${MDSD_AAD_MSI_AUTH_ARGS} -r ${MDSD_ROLE_PREFIX} -e ${MDSD_LOG}/mdsd.err -w ${MDSD_LOG}/mdsd.warn -o ${MDSD_LOG}/mdsd.info -q ${MDSD_LOG}/mdsd.qos 2>>/dev/null &
# add -T 0xFFFF for full traces
mdsd ${MDSD_AAD_MSI_AUTH_ARGS} -r ${MDSD_ROLE_PREFIX} "${SYSLOG_PORT_CONFIG}" -e ${MDSD_LOG}/mdsd.err -w ${MDSD_LOG}/mdsd.warn -o ${MDSD_LOG}/mdsd.info -q ${MDSD_LOG}/mdsd.qos 2>>/dev/null &
fi

# # Set up a cron job for logrotation
Expand Down
Loading