Merge remote-tracking branch 'origin/master' into feature/logzio-moni…

…toring-multi-env-tests

charts/fluentbit/Chart.yaml

@@ -6,8 +6,8 @@ keywords:
   - fluent-bit
   - fluentd
 type: application
-version: 0.0.5
-appVersion: 0.4.1
+version: 0.0.6
+appVersion: 0.6.0
 sources:
   - https://github.com/logzio/logzio-helm
   - https://github.com/fluent/fluent-bit/

charts/fluentbit/README.md

@@ -90,6 +90,8 @@ kubectl get nodes -o json | jq ".items[]|{name:.metadata.name, taints:.spec.tain
 
 
 ## Change log
+* 0.0.6 - Upgrade 'fluent-bit-output' image to 0.6.0
+  - Upgrade fluent-bit to v3.0.4.
 * 0.0.5 - Upgrade docker image to 0.4.1
   * Trim the compiler build path from stack traces.
   * Add timestamp decode support for new fluentbit versions.

charts/fluentbit/values.yaml

@@ -12,7 +12,7 @@ replicaCount: 1
 image:
   repository: logzio/fluent-bit-output
   # Overrides the image tag whose default is {{ .Chart.AppVersion }}
-  tag: "0.4.1"
+  tag: "0.6.0"
   pullPolicy: Always
 
 testFramework:

charts/logzio-monitoring/Chart.yaml

@@ -2,7 +2,8 @@ apiVersion: v2
 name: logzio-monitoring
 description: logzio-monitoring allows you to ship logs, metrics, traces and security reports from your Kubernetes cluster using the OpenTelemetry collector for metrics and traces, Fluentd for logs, and Trivy for security reports.
 type: application
-version: 5.3.6
+version: 6.0.0
+
 
 
 sources:

charts/logzio-monitoring/README.md

@@ -48,9 +48,9 @@ Use the following command, and replace the placeholders with your parameters:
 ```shell
 helm install -n monitoring \
 --set logs.enabled=true \
---set logzio-fluentd.secrets.logzioShippingToken="<<LOG-SHIPPING-TOKEN>>" \
---set logzio-fluentd.secrets.logzioListener="<<LISTENER-HOST>>" \
---set logzio-fluentd.env_id="<<ENV-ID>>" \
+--set logzio-logs-collector.secrets.logzioLogsToken="<<LOG-SHIPPING-TOKEN>>" \
+--set logzio-logs-collector.secrets.logzioRegion="<<LOGZIO-REGION>>" \
+--set logzio-logs-collector.secrets.env_id="<<ENV-ID>>" \
 --set metricsOrTraces.enabled=true \
 --set logzio-k8s-telemetry.metrics.enabled=true \
 --set logzio-k8s-telemetry.secrets.MetricsToken="<<PROMETHEUS-METRICS-SHIPPING-TOKEN>>" \
@@ -128,19 +128,18 @@ For example, to change a value named `someField` in `logzio-telemetry`'s `values
 --set logzio-k8s-telemetry.someField="my new value"
 ```
 
-### Migrate to OpenTelemetry for log collection
+### Migrate to OpenTelemetry for log collection (Migrating to logzio-monitoring 6.0.0)
 
-The `logzio-fluentd` chart will be disabled by default in favor of the `logzio-logs-collector` for log collection in upcoming releases. To migrate to `logzio-logs-collector`, add the following `--set` flags:
+The `logzio-fluentd` chart is disabled by default in favor of the `logzio-logs-collector` for log collection. To use `logzio-fluentd`, add the following `--set` flags:
 
 ```sh
 helm install -n monitoring \
 --set logs.enabled=true \  
---set logzio-fluentd.enabled=false \  
---set logzio-logs-collector.enabled=true \  
---set logzio-logs-collector.secrets.logzioLogsToken=<<token>> \  
---set logzio-logs-collector.secrets.logzioRegion=<<region>> \  
---set logzio-logs-collector.secrets.env_id=<<env_id>> \  
---set logzio-logs-collector.secrets.logType=<<log_type>> \
+--set logzio-fluentd.enabled=true \  
+--set logzio-logs-collector.enabled=false \  
+--set logzio-fluentd.secrets.logzioShippingToken="<<LOG-SHIPPING-TOKEN>>" \
+--set logzio-fluentd.secrets.logzioListener="<<LISTENER-HOST>>" \
+--set logzio-fluentd.env_id="<<ENV-ID>>" \
 logzio-monitoring logzio-helm/logzio-monitoring
 ```
 
@@ -151,9 +150,9 @@ To ship logs from pods running on Fargate, set the `fargateLogRouter.enabled` va
 ```shell
 helm install -n monitoring \
 --set logs.enabled=true \
---set logzio-fluentd.fargateLogRouter.enabled=true \
---set logzio-fluentd.secrets.logzioShippingToken="<<LOG-SHIPPING-TOKEN>>" \
---set logzio-fluentd.secrets.logzioListener="<<LISTENER-HOST>>" \
+--set logzio-logs-collector.fargateLogRouter.enabled=true \
+--set logzio-logs-collector.secrets.logzioLogsToken="<<LOG-SHIPPING-TOKEN>>" \
+--set logzio-logs-collector.secrets.logzioRegion="<<LOGZIO-REGION>>" \
 --set metricsOrTraces.enabled=true \
 --set logzio-k8s-telemetry.metrics.enabled=true \
 --set logzio-k8s-telemetry.secrets.MetricsToken="<<PROMETHEUS-METRICS-SHIPPING-TOKEN>>" \
@@ -225,6 +224,9 @@ There are two possible approaches to the upgrade you can choose from:
 
 
 ## Changelog
+- **6.0.0**:
+  - **Breaking changes**:
+  	- Make `logzio-logs-collector` default subchart for logging instead of `logzio-fluentd`
 - **5.3.6**:
   - Upgrade `logzio-k8s-telemetry` version to `4.2.3`:
 	- Disable Kubernetes objects receiver by default.

charts/logzio-monitoring/templates/NOTES.txt

@@ -1,6 +1,6 @@
 
 {{- if and (.Values.logs.enabled) (not (index .Values "logzio-logs-collector" "enabled")) (index .Values "logzio-fluentd" "enabled") }}
-[ DEPRICATION ] You are using fluetnd agent for log collection, this option will be disabled by default in upcoming releases.
+[ DEPRICATION ] You are using fluetnd agent for log collection.
 You can change to opentelemetry logzio-logs-collector by setting the following values:
 
   --set logs.enabled=true \
@@ -28,10 +28,4 @@ You can change to opentelemetry logzio-logs-collector by setting the following v
 {{ end }}
 
 
-{{- if and (.Values.logs.enabled) (index .Values "logzio-logs-collector" "enabled")}}
-[ INFO ] You enabled opentelemetry logzio-logs-collector for log collection.
-
-{{ end }}
-
-
 

charts/logzio-monitoring/values.yaml

@@ -20,12 +20,12 @@ deployEvents:
 
 # Override values for the Fluentd sub-chart
 logzio-fluentd:
-  enabled: true
+  enabled: false
   daemonset:
     logType: "agent-k8s"
 
 logzio-logs-collector:
-  enabled: false
+  enabled: true
 
 # Override values for the opencost sub-chart
 opencost: