From 7c093716ca638938e290a4b62168cd8f23e1ec18 Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Mon, 6 May 2019 14:22:29 -0500 Subject: [PATCH] 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 --- tools/deployment/multinode/130-fluent-logging.sh | 3 +++ tools/deployment/osh-infra-logging/060-fluent-logging.sh | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/deployment/multinode/130-fluent-logging.sh b/tools/deployment/multinode/130-fluent-logging.sh index 9d9c98390..50bfe63e8 100755 --- a/tools/deployment/multinode/130-fluent-logging.sh +++ b/tools/deployment/multinode/130-fluent-logging.sh @@ -21,6 +21,9 @@ make fluent-logging if [ ! -d "/var/log/journal" ]; then tee /tmp/fluent-logging.yaml << EOF +monitoring: + prometheus: + enabled: true pod: mounts: fluentbit: diff --git a/tools/deployment/osh-infra-logging/060-fluent-logging.sh b/tools/deployment/osh-infra-logging/060-fluent-logging.sh index a02c750ab..ea95267df 100755 --- a/tools/deployment/osh-infra-logging/060-fluent-logging.sh +++ b/tools/deployment/osh-infra-logging/060-fluent-logging.sh @@ -21,6 +21,9 @@ make fluent-logging if [ ! -d "/var/log/journal" ]; then tee /tmp/fluent-logging.yaml << EOF +monitoring: + prometheus: + enabled: true pod: replicas: fluentd: 1 @@ -41,7 +44,8 @@ helm upgrade --install fluent-logging ./fluent-logging \ else helm upgrade --install fluent-logging ./fluent-logging \ --namespace=osh-infra \ - --set pod.replicas.fluentd=1 + --set pod.replicas.fluentd=1 \ + --set monitoring.prometheus.enabled=true fi #NOTE: Wait for deploy