Enable fluentd monitoring in single and multinode jobs

This updates the scripts for deploying fluentd to include
overrides for enabling prometheus monitoring. Despite not
deploying prometheus in the osh-infra-logging job, we can still
leverage the post run job to gather metrics from the exporters
service. This gives us the means for verifying the functionality
of the exporter

Change-Id: Id98474de89d86419157635007e2f114f0947498e
This commit is contained in:
Steve Wilkerson 2019-05-06 14:22:29 -05:00 committed by Pete Birley
parent 96fcdf1c45
commit 7c093716ca
2 changed files with 8 additions and 1 deletions

View File

@ -21,6 +21,9 @@ make fluent-logging
if [ ! -d "/var/log/journal" ]; then if [ ! -d "/var/log/journal" ]; then
tee /tmp/fluent-logging.yaml << EOF tee /tmp/fluent-logging.yaml << EOF
monitoring:
prometheus:
enabled: true
pod: pod:
mounts: mounts:
fluentbit: fluentbit:

View File

@ -21,6 +21,9 @@ make fluent-logging
if [ ! -d "/var/log/journal" ]; then if [ ! -d "/var/log/journal" ]; then
tee /tmp/fluent-logging.yaml << EOF tee /tmp/fluent-logging.yaml << EOF
monitoring:
prometheus:
enabled: true
pod: pod:
replicas: replicas:
fluentd: 1 fluentd: 1
@ -41,7 +44,8 @@ helm upgrade --install fluent-logging ./fluent-logging \
else else
helm upgrade --install fluent-logging ./fluent-logging \ helm upgrade --install fluent-logging ./fluent-logging \
--namespace=osh-infra \ --namespace=osh-infra \
--set pod.replicas.fluentd=1 --set pod.replicas.fluentd=1 \
--set monitoring.prometheus.enabled=true
fi fi
#NOTE: Wait for deploy #NOTE: Wait for deploy