Skip to content

fix telegraf telemetry and improve fluentd liveness #611

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
ganga1980 merged 4 commits into from
Jul 23, 2021
Merged

fix telegraf telemetry and improve fluentd liveness #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55a5d07
fix telegraf telemetry and improve fluentd liveness
ganga1980 Jul 21, 2021
3df15dd
address identified vuln with libsystemd0
ganga1980 Jul 21, 2021
bd7ffe4
resolve merge conflicts
ganga1980 Jul 23, 2021
341e3b5
fix exported image file extension
ganga1980 Jul 23, 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 .pipelines/pipeline.user.windows.official.all_tag.all_phase.all_config.ci_prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ package:
repository_name: 'cdpxwin1809' # only supported ones are cdpx acr repos
tag: 'win-ciprod' # OPTIONAL: Defaults to latest. The tag for the built image. Final tag will be 1.0.0alpha, 1.0.0-timestamp-commitID.
latest: false # OPTIONAL: Defaults to false. If tag is not set to latest and this flag is set, then tag as latest as well and push latest as well.
export_to_artifact_path: 'agentimage.tar.gz' # path for exported image and use this instead of fixed tag
export_to_artifact_path: 'agentimage.tar.zip' # path for exported image and use this instead of fixed tag
2 changes: 1 addition & 1 deletion .pipelines/pipeline.user.windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ package:
repository_name: 'cdpxwin1809' # only supported ones are cdpx acr repos
tag: 'win-cidev' # OPTIONAL: Defaults to latest. The tag for the built image. Final tag will be 1.0.0alpha, 1.0.0-timestamp-commitID.
latest: false # OPTIONAL: Defaults to false. If tag is not set to latest and this flag is set, then tag as latest as well and push latest as well.
export_to_artifact_path: 'agentimage.tar.gz' # path for exported image and use this instead of fixed tag
export_to_artifact_path: 'agentimage.tar.zip' # path for exported image and use this instead of fixed tag
18 changes: 17 additions & 1 deletion build/linux/installer/scripts/livenessprobe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,29 @@ fi

#optionally test to exit non zero value if fluentd is not running
#fluentd not used in sidecar container
if [ "${CONTAINER_TYPE}" != "PrometheusSidecar" ]; then
if [ "${CONTAINER_TYPE}" != "PrometheusSidecar" ]; then
(ps -ef | grep "fluentd" | grep -v "grep")
if [ $? -ne 0 ]
then
echo "fluentd is not running" > /dev/termination-log
exit 1
fi
# fluentd launches by default supervisor and worker process
# so adding the liveness checks individually to handle scenario if any of the process dies
# supervisor process
(ps -ef | grep "fluentd" | grep "supervisor" | grep -v "grep")
if [ $? -ne 0 ]
then
echo "fluentd supervisor is not running" > /dev/termination-log
exit 1
fi
# worker process
(ps -ef | grep "fluentd" | grep -v "supervisor" | grep -v "grep" )
if [ $? -ne 0 ]
then
echo "fluentd worker is not running" > /dev/termination-log
exit 1
fi
fi

#test to exit non zero value if fluentbit is not running
Expand Down
2 changes: 2 additions & 0 deletions source/plugins/go/src/oms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,6 +959,7 @@ func PostTelegrafMetricsToLA(telegrafRecords []map[interface{}]interface{}) int

if er != nil {
Log("Error::mdsd::Failed to write to mdsd %d records after %s. Will retry ... error : %s", len(msgPackEntries), elapsed, er.Error())
UpdateNumTelegrafMetricsSentTelemetry(0, 1, 0)
if MdsdInsightsMetricsMsgpUnixSocketClient != nil {
MdsdInsightsMetricsMsgpUnixSocketClient.Close()
MdsdInsightsMetricsMsgpUnixSocketClient = nil
Expand All @@ -970,6 +971,7 @@ func PostTelegrafMetricsToLA(telegrafRecords []map[interface{}]interface{}) int
return output.FLB_RETRY
} else {
numTelegrafMetricsRecords := len(msgPackEntries)
UpdateNumTelegrafMetricsSentTelemetry(numTelegrafMetricsRecords, 0, 0)
Log("Success::mdsd::Successfully flushed %d telegraf metrics records that was %d bytes to mdsd in %s ", numTelegrafMetricsRecords, bts, elapsed)
}
}
Expand Down