From 131a875aec23c98afef8fc67080bcbf0f5141924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= Date: Tue, 22 Dec 2020 13:00:44 +0100 Subject: [PATCH] Remove fluent-bit rawConfig mentions after upgrading to new fluent-bit chart --- deploy/docs/Best_Practices.md | 21 ++++++++++++++------- deploy/helm/sumologic/README.md | 5 ++++- deploy/helm/sumologic/values.yaml | 1 + 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/deploy/docs/Best_Practices.md b/deploy/docs/Best_Practices.md index c70da5e0a6..f48c82c915 100644 --- a/deploy/docs/Best_Practices.md +++ b/deploy/docs/Best_Practices.md @@ -246,16 +246,23 @@ you will need to ensure the logs get mounted to the host so fluent-bit can be configured to capture from the host. Example: -In `values.yaml` in the `fluent-bit.rawConfig` section, you have to add -a new input specifying the file path, eg. +In `values.yaml` in the `fluent-bit.config.input` section, you have to add +a new `INPUT` specifying the file path (retaining the remaining part of `input` +config), e.g.: -```bash -[INPUT] - Name tail - Path /var/log/syslog +```yaml +fluent-bit: + config: + # ... + inputs: |- + # Copy original fluent-bit.config.inputs here + # ... + [INPUT] + Name tail + Path /var/log/syslog ``` -Reference: https://fluentbit.io/documentation/0.12/input/tail.html +Reference: https://docs.fluentbit.io/manual/pipeline/inputs/tail#configuration-file ## Filtering Prometheus Metrics by Namespace diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index c7fe63cdaa..d946768628 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -164,6 +164,10 @@ Parameter | Description | Default `metrics-server.args` | Arguments for metric server. | `["--kubelet-insecure-tls","--kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname"]` `fluent-bit.resources` | Resources for Fluent-bit daemonsets. | `{}` `fluent-bit.enabled` | Flag to control deploying Fluent-bit Helm sub-chart. | `true` +`fluent-bit.config.service` | Configure Fluent-bit Helm sub-chart service. | [fluent-bit.config.service in values.yaml](https://github.com/SumoLogic/sumologic-kubernetes-collection/blob/v2.0.0-beta.0/deploy/helm/sumologic/values.yaml#L816-L824) +`fluent-bit.config.inputs` | Configure Fluent-bit Helm sub-chart inputs. | [fluent-bit.config.inputs in values.yaml](https://github.com/SumoLogic/sumologic-kubernetes-collection/blob/v2.0.0-beta.0/deploy/helm/sumologic/values.yaml#L826-L891) +`fluent-bit.config.outputs` | Configure Fluent-bit Helm sub-chart outputs. | [fluent-bit.config.outputs in values.yaml](https://github.com/SumoLogic/sumologic-kubernetes-collection/blob/v2.0.0-beta.0/deploy/helm/sumologic/values.yaml#L894-L902) +`fluent-bit.config.customParsers` | Configure Fluent-bit Helm sub-chart customParsers. | [fluent-bit.config.customParsers in values.yaml](https://github.com/SumoLogic/sumologic-kubernetes-collection/blob/v2.0.0-beta.0/deploy/helm/sumologic/values.yaml#L904-L913) `fluent-bit.service.labels` | Labels for fluent-bit service. | `{sumologic.com/scrape: "true"}` `fluent-bit.podLabels` | Additional labels for fluent-bit pods. | `{}` `fluent-bit.podAnnotations` | Additional annotations for fluent-bit pods. | `{}` @@ -182,7 +186,6 @@ Parameter | Description | Default `fluent-bit.input.systemd.enabled` | Enable systemd input. | `true` `fluent-bit.parsers.enabled` | Enable custom parsers. | `true` `fluent-bit.parsers.regex` | List of regex parsers. | `[{"name":"multi_line","regex":"(?\u003clog\u003e^{\"log\":\"\\d{4}-\\d{1,2}-\\d{1,2}.\\d{2}:\\d{2}:\\d{2}.*)"}]` -`fluent-bit.rawConfig` | DESCRIPTION | `@INCLUDE fluent-bit-service.conf [INPUT] Name tail Path /var/log/containers/*.log Multiline On Parser_Firstline multi_line Tag containers.* Refresh_Interval 1 Rotate_Wait 60 Mem_Buf_Limit 5MB Skip_Long_Lines On DB /tail-db/tail-containers-state-sumo.db DB.Sync Normal [INPUT] Name systemd Tag host.* Systemd_Filter _SYSTEMD_UNIT=addon-config.service Systemd_Filter _SYSTEMD_UNIT=addon-run.service Systemd_Filter _SYSTEMD_UNIT=cfn-etcd-environment.service Systemd_Filter _SYSTEMD_UNIT=cfn-signal.service Systemd_Filter _SYSTEMD_UNIT=clean-ca-certificates.service Systemd_Filter _SYSTEMD_UNIT=containerd.service Systemd_Filter _SYSTEMD_UNIT=coreos-metadata.service Systemd_Filter _SYSTEMD_UNIT=coreos-setup-environment.service Systemd_Filter _SYSTEMD_UNIT=coreos-tmpfiles.service Systemd_Filter _SYSTEMD_UNIT=dbus.service Systemd_Filter _SYSTEMD_UNIT=docker.service Systemd_Filter _SYSTEMD_UNIT=efs.service Systemd_Filter _SYSTEMD_UNIT=etcd-member.service Systemd_Filter _SYSTEMD_UNIT=etcd.service Systemd_Filter _SYSTEMD_UNIT=etcd2.service Systemd_Filter _SYSTEMD_UNIT=etcd3.service Systemd_Filter _SYSTEMD_UNIT=etcdadm-check.service Systemd_Filter _SYSTEMD_UNIT=etcdadm-reconfigure.service Systemd_Filter _SYSTEMD_UNIT=etcdadm-save.service Systemd_Filter _SYSTEMD_UNIT=etcdadm-update-status.service Systemd_Filter _SYSTEMD_UNIT=flanneld.service Systemd_Filter _SYSTEMD_UNIT=format-etcd2-volume.service Systemd_Filter _SYSTEMD_UNIT=kube-node-taint-and-uncordon.service Systemd_Filter _SYSTEMD_UNIT=kubelet.service Systemd_Filter _SYSTEMD_UNIT=ldconfig.service Systemd_Filter _SYSTEMD_UNIT=locksmithd.service Systemd_Filter _SYSTEMD_UNIT=logrotate.service Systemd_Filter _SYSTEMD_UNIT=lvm2-monitor.service Systemd_Filter _SYSTEMD_UNIT=mdmon.service Systemd_Filter _SYSTEMD_UNIT=nfs-idmapd.service Systemd_Filter _SYSTEMD_UNIT=nfs-mountd.service Systemd_Filter _SYSTEMD_UNIT=nfs-server.service Systemd_Filter _SYSTEMD_UNIT=nfs-utils.service Systemd_Filter _SYSTEMD_UNIT=node-problem-detector.service Systemd_Filter _SYSTEMD_UNIT=ntp.service Systemd_Filter _SYSTEMD_UNIT=oem-cloudinit.service Systemd_Filter _SYSTEMD_UNIT=rkt-gc.service Systemd_Filter _SYSTEMD_UNIT=rkt-metadata.service Systemd_Filter _SYSTEMD_UNIT=rpc-idmapd.service Systemd_Filter _SYSTEMD_UNIT=rpc-mountd.service Systemd_Filter _SYSTEMD_UNIT=rpc-statd.service Systemd_Filter _SYSTEMD_UNIT=rpcbind.service Systemd_Filter _SYSTEMD_UNIT=set-aws-environment.service Systemd_Filter _SYSTEMD_UNIT=system-cloudinit.service Systemd_Filter _SYSTEMD_UNIT=systemd-timesyncd.service Systemd_Filter _SYSTEMD_UNIT=update-ca-certificates.service Systemd_Filter _SYSTEMD_UNIT=user-cloudinit.service Systemd_Filter _SYSTEMD_UNIT=var-lib-etcd2.service Max_Entries 1000 Read_From_Tail true @INCLUDE fluent-bit-output.conf` `kube-prometheus-stack.kubeTargetVersionOverride` | Provide a target gitVersion of K8S, in case .Capabilites.KubeVersion is not available (e.g. helm template). Changing this may break Sumo Logic apps. | `1.13.0-0` `kube-prometheus-stack.enabled` | Flag to control deploying Prometheus Operator Helm sub-chart. | `true` `kube-prometheus-stack.alertmanager.enabled` | Deploy alertmanager. | `false` diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 4e08e50321..491367d3e8 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -824,6 +824,7 @@ fluent-bit: HTTP_Server On HTTP_Listen 0.0.0.0 HTTP_Port 2020 + ## https://docs.fluentbit.io/manual/pipeline/inputs inputs: | [INPUT] Name tail