From 1528502457f9ebdbbceed0c77a0f3c6c82221e35 Mon Sep 17 00:00:00 2001
From: "garcia.ryan" <garcia.ryan@solute.us>
Date: Thu, 8 Apr 2021 08:22:10 -0600
Subject: [PATCH] feat: Fluenbit and eck updates, increases log ingestion
reliability
---
chart/templates/clusterauditor/values.yaml | 3 +++
chart/templates/logging/fluentbit/values.yaml | 20 +++++++++++++++++++
chart/values.yaml | 4 ++--
3 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/chart/templates/clusterauditor/values.yaml b/chart/templates/clusterauditor/values.yaml
index 4cf19c98b4..5734079300 100644
--- a/chart/templates/clusterauditor/values.yaml
+++ b/chart/templates/clusterauditor/values.yaml
@@ -6,4 +6,7 @@
elasticsearch:
imagePullSecrets:
- name: private-registry
+
+istio:
+ enabled: {{ .Values.istio.enabled }}
{{- end -}}
diff --git a/chart/templates/logging/fluentbit/values.yaml b/chart/templates/logging/fluentbit/values.yaml
index 1d15344d5f..6988afc2e9 100644
--- a/chart/templates/logging/fluentbit/values.yaml
+++ b/chart/templates/logging/fluentbit/values.yaml
@@ -11,6 +11,26 @@ elasticsearch:
imagePullSecrets:
- name: private-registry
+{{- if .Values.monitoring.enabled }}
+serviceMonitor:
+ enabled: true
+ namespace: monitoring
+ interval: 10s
+ scrapeTimeout: 10s
+ selector:
+ prometheus: monitoring-monitoring-kube-prometheus
+
+dashboards:
+ enabled: true
+ labelKey: grafana_dashboard
+ namespace: monitoring
+{{- end }}
+
+{{- if .Values.istio.enabled }}
+podLabels:
+ traffic.sidecar.istio.io/excludeOutboundPorts: "443"
+{{- end }}
+
{{- if .Values.openshift }}
podSecurityContext:
seLinuxOptions:
diff --git a/chart/values.yaml b/chart/values.yaml
index 5bc604d0b8..6a94a04c18 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -172,7 +172,7 @@ logging:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/elasticsearch-kibana.git
path: "./chart"
- tag: "0.1.4-bb.4"
+ tag: "0.1.7-bb.0"
sso:
# -- Toggle OIDC SSO for Kibana/Elasticsearch on and off.
@@ -210,7 +210,7 @@ fluentbit:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/fluentbit.git
path: "./chart"
- tag: "0.7.10-bb.0"
+ tag: "0.15.3-bb.0"
values: {}
# ----------------------------------------------------------------------------------------------------------------------
--
GitLab