From 1ea962e6d7764c674cf89f783ab5446239c29ad6 Mon Sep 17 00:00:00 2001
From: Brian Jackson <bjackson@fullvisibility.com>
Date: Mon, 24 Mar 2025 12:31:37 -0400
Subject: [PATCH 1/5] promtail deprecation warning
---
chart/templates/NOTES.txt | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt
index 0a5d431afd..5eedaa4734 100644
--- a/chart/templates/NOTES.txt
+++ b/chart/templates/NOTES.txt
@@ -414,3 +414,9 @@ PLATFORM ONE LOKI WARNING:
BigBang does not support the Loki Distributed deployment mode. For production deployments,
please set your strategy to "scalable" or "monolithic"
{{- end }}
+
+{{- if .Values.promtail.enabled }}
+DEPRECATION NOTICE:
+ Grafana Promtail has been deprecated and will be removed in a future Big Bang release.
+ Big Bang will be migrating to Grafana Alloy as the core log aggregator.
+{{- end }}
\ No newline at end of file
--
GitLab
From bb17d709318f215d26a15ec1a2ddbc6df3a6e346 Mon Sep 17 00:00:00 2001
From: Brian Jackson <bjackson@fullvisibility.com>
Date: Tue, 25 Mar 2025 10:23:03 -0400
Subject: [PATCH 2/5] Initially working as intended - still WIP
---
chart/templates/NOTES.txt | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt
index 5eedaa4734..0ab37049d4 100644
--- a/chart/templates/NOTES.txt
+++ b/chart/templates/NOTES.txt
@@ -126,9 +126,17 @@ PLATFORM ONE LOGGING WARNING:
{{- end }}
{{- end }}
-{{- if and .Values.promtail.enabled .Values.fluentbit.enabled }}
+
+{{- $fluentbitEnabled := .Values.fluentbit.enabled }}
+{{- $promtailEnabled := .Values.promtail.enabled }}
+{{- $alloyLogsEnabled := (index .Values.addons.alloy.values "k8s-monitoring" "alloy-logs" "enabled") }}
+{{- $loggerCount := add $fluentbitEnabled $promtailEnabled $alloyLogsEnabled }}
+{{- if ge $loggerCount 2 }}
PLATFORM ONE LOGGING WARNING:
- You have enabled both Promtail and Fluentbit (log forwarders). This is not a supported configuration and you may see conflicts as a result of both applications attempting to ship logs.
+ You have enabled multiple log collectors. This is not a supported configuration and you may see conflicts as a result of multiple applications attempting to ship logs.
+ - Fluentbit Enabled: {{ $fluentbitEnabled }}
+ - Promtail Enabled: {{ $promtailEnabled }}
+ - Alloy Enabled: {{ $alloyLogsEnabled }}
{{- end }}
{{- if and .Values.loki.enabled .Values.elasticsearchKibana.enabled }}
--
GitLab
From 501c69bdc875a600598291be15fd27a9317157ea Mon Sep 17 00:00:00 2001
From: Brian Jackson <bjackson@fullvisibility.com>
Date: Wed, 26 Mar 2025 12:33:06 -0400
Subject: [PATCH 3/5] Dig instead of index
---
chart/templates/NOTES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt
index 0ab37049d4..b5e1856c18 100644
--- a/chart/templates/NOTES.txt
+++ b/chart/templates/NOTES.txt
@@ -129,7 +129,7 @@ PLATFORM ONE LOGGING WARNING:
{{- $fluentbitEnabled := .Values.fluentbit.enabled }}
{{- $promtailEnabled := .Values.promtail.enabled }}
-{{- $alloyLogsEnabled := (index .Values.addons.alloy.values "k8s-monitoring" "alloy-logs" "enabled") }}
+{{- $alloyLogsEnabled := (dig "k8s-monitoring" "alloy-logs" "enabled" false .Values.addons.alloy.values) }}
{{- $loggerCount := add $fluentbitEnabled $promtailEnabled $alloyLogsEnabled }}
{{- if ge $loggerCount 2 }}
PLATFORM ONE LOGGING WARNING:
--
GitLab
From dfd9dbecf0d2af37fa65d65a093d1069730549b6 Mon Sep 17 00:00:00 2001
From: Brian Jackson <bjackson@fullvisibility.com>
Date: Mon, 31 Mar 2025 19:18:53 +0000
Subject: [PATCH 4/5] Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Peter Sigur <sigur_peter@bah.com>
---
chart/templates/NOTES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt
index b5e1856c18..4ff6271acc 100644
--- a/chart/templates/NOTES.txt
+++ b/chart/templates/NOTES.txt
@@ -426,5 +426,5 @@ PLATFORM ONE LOKI WARNING:
{{- if .Values.promtail.enabled }}
DEPRECATION NOTICE:
Grafana Promtail has been deprecated and will be removed in a future Big Bang release.
- Big Bang will be migrating to Grafana Alloy as the core log aggregator.
+ Big Bang will be migrating to Grafana Alloy (https://docs-bigbang.dso.mil/latest/packages/alloy/) as the core log aggregator.
{{- end }}
\ No newline at end of file
--
GitLab
From 5bc57de139c74157a27f9c0c83de3110f366365f Mon Sep 17 00:00:00 2001
From: Brian Jackson <bjackson@fullvisibility.com>
Date: Tue, 1 Apr 2025 12:56:05 -0400
Subject: [PATCH 5/5] Added compatibility with new alloyLogs value
---
chart/templates/NOTES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt
index 4ff6271acc..3e35a15d0f 100644
--- a/chart/templates/NOTES.txt
+++ b/chart/templates/NOTES.txt
@@ -129,7 +129,7 @@ PLATFORM ONE LOGGING WARNING:
{{- $fluentbitEnabled := .Values.fluentbit.enabled }}
{{- $promtailEnabled := .Values.promtail.enabled }}
-{{- $alloyLogsEnabled := (dig "k8s-monitoring" "alloy-logs" "enabled" false .Values.addons.alloy.values) }}
+{{- $alloyLogsEnabled := or (dig "k8s-monitoring" "alloy-logs" "enabled" false .Values.addons.alloy.values) (dig "alloyLogs" "enabled" false .Values.addons.alloy) }}
{{- $loggerCount := add $fluentbitEnabled $promtailEnabled $alloyLogsEnabled }}
{{- if ge $loggerCount 2 }}
PLATFORM ONE LOGGING WARNING:
--
GitLab