From b70e5b6b7859d87147115d4a7c5b47cf2f716821 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Thu, 15 Aug 2024 19:00:42 +1000 Subject: [PATCH 1/5] build: update logging-operator from 4.6.1 to 4.9.0 --- charts/lagoon-logging/Chart.lock | 6 +++--- charts/lagoon-logging/Chart.yaml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/lagoon-logging/Chart.lock b/charts/lagoon-logging/Chart.lock index 5cb42cde..e51d15ff 100644 --- a/charts/lagoon-logging/Chart.lock +++ b/charts/lagoon-logging/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: logging-operator repository: oci://ghcr.io/kube-logging/helm-charts - version: 4.6.1 -digest: sha256:e746740d59c5de0162b79dbffbe5696f1e5204e122abad3ac76bc6a22bd3fb7b -generated: "2024-05-28T15:19:59.540195358+10:00" + version: 4.9.0 +digest: sha256:6c06a155e62a3716a1d549187a29e4fa8cdf59ddcf3bddec58e2abcb07ffa27d +generated: "2024-08-15T16:08:40.297734358+10:00" diff --git a/charts/lagoon-logging/Chart.yaml b/charts/lagoon-logging/Chart.yaml index 927957f2..1b83bb7a 100644 --- a/charts/lagoon-logging/Chart.yaml +++ b/charts/lagoon-logging/Chart.yaml @@ -19,16 +19,16 @@ type: application # time you make changes to the chart and its templates, including the app # version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.83.0 +version: 0.84.0 # AppVersion is set here the same as the logging-operator chart version to # autopopulate the post-install CRD message. -appVersion: 4.6.1 +appVersion: 4.9.0 dependencies: - name: logging-operator repository: oci://ghcr.io/kube-logging/helm-charts - version: 4.6.1 + version: 4.9.0 condition: logging-operator.enabled # This section is used to collect a changelog for artifacthub.io @@ -38,4 +38,4 @@ annotations: artifacthub.io/containsSecurityUpdates: "true" artifacthub.io/changes: | - kind: changed - description: update logging-operator from 4.2.3 to 4.6.1 and use oci registry + description: update logging-operator from 4.6.1 to 4.9.0 From 7ee8e04605ef77401431ea2b5d5c74b617412b94 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Thu, 15 Aug 2024 19:00:59 +1000 Subject: [PATCH 2/5] build: update uselagoon/logs-concentrator from v3.4.0 to v3.5.0 --- charts/lagoon-logs-concentrator/Chart.yaml | 6 ++---- charts/lagoon-logs-concentrator/values.yaml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/charts/lagoon-logs-concentrator/Chart.yaml b/charts/lagoon-logs-concentrator/Chart.yaml index 42e57fbe..69639974 100644 --- a/charts/lagoon-logs-concentrator/Chart.yaml +++ b/charts/lagoon-logs-concentrator/Chart.yaml @@ -19,7 +19,7 @@ type: application # time you make changes to the chart and its templates, including the app # version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.49.0 +version: 0.50.0 # This section is used to collect a changelog for artifacthub.io # It should be started afresh for each release @@ -27,6 +27,4 @@ version: 0.49.0 annotations: artifacthub.io/changes: | - kind: changed - description: update uselagoon/logs-concentrator from v3.2.0 to v3.4.0 - - kind: changed - description: increase resource requests for logs-concentrator statefulset + description: update uselagoon/logs-concentrator from v3.4.0 to v3.5.0 diff --git a/charts/lagoon-logs-concentrator/values.yaml b/charts/lagoon-logs-concentrator/values.yaml index df7424bd..a1e960f2 100644 --- a/charts/lagoon-logs-concentrator/values.yaml +++ b/charts/lagoon-logs-concentrator/values.yaml @@ -12,7 +12,7 @@ image: repository: uselagoon/logs-concentrator pullPolicy: IfNotPresent # Overrides the image tag whose default is "latest". - tag: "v3.4.0" + tag: "v3.5.0" imagePullSecrets: [] nameOverride: "" From a99feebacdad0a7d8c8874dbd7b5c7ea1745a77a Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Thu, 15 Aug 2024 19:01:17 +1000 Subject: [PATCH 3/5] build: update uselagoon/logs-dispatcher from v3.6.0 to v3.7.0 --- charts/lagoon-logging/Chart.yaml | 2 ++ charts/lagoon-logging/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/lagoon-logging/Chart.yaml b/charts/lagoon-logging/Chart.yaml index 1b83bb7a..b6fff45d 100644 --- a/charts/lagoon-logging/Chart.yaml +++ b/charts/lagoon-logging/Chart.yaml @@ -39,3 +39,5 @@ annotations: artifacthub.io/changes: | - kind: changed description: update logging-operator from 4.6.1 to 4.9.0 + - kind: changed + description: update uselagoon/logs-dispatcher from v3.6.0 to v3.7.0 diff --git a/charts/lagoon-logging/values.yaml b/charts/lagoon-logging/values.yaml index 7ea91ae5..e16c0201 100644 --- a/charts/lagoon-logging/values.yaml +++ b/charts/lagoon-logging/values.yaml @@ -19,7 +19,7 @@ logsDispatcher: repository: uselagoon/logs-dispatcher pullPolicy: IfNotPresent # Overrides the image tag whose default is "latest". - tag: "v3.6.0" + tag: "v3.7.0" serviceAccount: # Specifies whether a service account should be created @@ -121,7 +121,7 @@ cdnLogsCollector: repository: uselagoon/logs-dispatcher pullPolicy: IfNotPresent # Overrides the image tag whose default is "latest". - tag: "v3.6.0" + tag: "v3.7.0" podAnnotations: {} From 8bfff3a2198cfdbb37f3468ba34e117f00dae6ac Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 2 Sep 2024 11:32:19 +1000 Subject: [PATCH 4/5] update logging-operator from 4.9.0 to 4.9.1 --- charts/lagoon-logging/Chart.lock | 6 +++--- charts/lagoon-logging/Chart.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/lagoon-logging/Chart.lock b/charts/lagoon-logging/Chart.lock index e51d15ff..18691940 100644 --- a/charts/lagoon-logging/Chart.lock +++ b/charts/lagoon-logging/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: logging-operator repository: oci://ghcr.io/kube-logging/helm-charts - version: 4.9.0 -digest: sha256:6c06a155e62a3716a1d549187a29e4fa8cdf59ddcf3bddec58e2abcb07ffa27d -generated: "2024-08-15T16:08:40.297734358+10:00" + version: 4.9.1 +digest: sha256:26b05aafbf9e1d92adfd10664ac225d8f07adc00e497369d563c4b12d445c108 +generated: "2024-09-02T11:31:43.731650736+10:00" diff --git a/charts/lagoon-logging/Chart.yaml b/charts/lagoon-logging/Chart.yaml index b6fff45d..712da2c9 100644 --- a/charts/lagoon-logging/Chart.yaml +++ b/charts/lagoon-logging/Chart.yaml @@ -23,12 +23,12 @@ version: 0.84.0 # AppVersion is set here the same as the logging-operator chart version to # autopopulate the post-install CRD message. -appVersion: 4.9.0 +appVersion: 4.9.1 dependencies: - name: logging-operator repository: oci://ghcr.io/kube-logging/helm-charts - version: 4.9.0 + version: 4.9.1 condition: logging-operator.enabled # This section is used to collect a changelog for artifacthub.io @@ -38,6 +38,6 @@ annotations: artifacthub.io/containsSecurityUpdates: "true" artifacthub.io/changes: | - kind: changed - description: update logging-operator from 4.6.1 to 4.9.0 + description: update logging-operator from 4.6.1 to 4.9.1 - kind: changed description: update uselagoon/logs-dispatcher from v3.6.0 to v3.7.0 From f62e565e3f9eea437179edb20b20a085b4fb87aa Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 2 Sep 2024 18:47:03 +1000 Subject: [PATCH 5/5] chore: add crd settings for fluentbitNamespaceLabels --- charts/lagoon-logging/templates/logging.yaml | 2 ++ charts/lagoon-logging/values.yaml | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/charts/lagoon-logging/templates/logging.yaml b/charts/lagoon-logging/templates/logging.yaml index b5625d75..a7bbeb8c 100644 --- a/charts/lagoon-logging/templates/logging.yaml +++ b/charts/lagoon-logging/templates/logging.yaml @@ -30,6 +30,8 @@ spec: # At the time of writing this just hits the metrics endpoint. # https://github.com/banzaicloud/logging-operator/blob/master/pkg/sdk/logging/api/v1beta1/logging_types.go#L452-L467 livenessDefaultCheck: true + filterKubernetes: + namespace_labels: {{ default "Off" .Values.fluentbitNamespaceLabels | quote }} {{- if .Values.fluentbitPrivileged }} security: securityContext: diff --git a/charts/lagoon-logging/values.yaml b/charts/lagoon-logging/values.yaml index e16c0201..602b2e24 100644 --- a/charts/lagoon-logging/values.yaml +++ b/charts/lagoon-logging/values.yaml @@ -250,6 +250,10 @@ consolidateServiceIndices: false # sent to a third-party service and not to a central elasticsearch. enableDefaultForwarding: true +# Set this to "On" for the default behavior including kubernetes_namespace_name +# labels. In router-logs this could be confusing, but may be useful for debug. +fluentbitNamespaceLabels: "Off" + # Set how many Fluentd log forwarder pods should be running fluentdReplicaCount: 3