Merge "Enable fluentd monitoring in single and multinode jobs"

This commit is contained in:
Zuul 2019-05-12 16:50:51 +00:00 committed by Gerrit Code Review
commit 096801c84f
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