Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chart,salt,build: Migrate to fluent-bit fluent chart #3709

Merged
merged 4 commits into from
Feb 22, 2022
Merged

chart,salt,build: Migrate to fluent-bit fluent chart #3709

merged 4 commits into from
Feb 22, 2022

Conversation

TeddyAndrieux
Copy link
Collaborator

Migrate from grafana fluent-bit deprecated helm chart to the fluent-bit
helm chart from fluent version 0.19.19

Move from fluent-bit-plugin-loki to fluent-bit version 1.8.12.

Rewrite fluent-bit output from config as it's not exactly the same
between grafana-loki and loki.

We also enable HTTP_Server back as it seems to work properly with this
version.

Fixes: #3435

@TeddyAndrieux TeddyAndrieux requested a review from a team as a code owner February 21, 2022 10:55
@bert-e
Copy link
Contributor

bert-e commented Feb 21, 2022

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Feb 21, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux TeddyAndrieux marked this pull request as draft February 21, 2022 16:58
@TeddyAndrieux TeddyAndrieux marked this pull request as ready for review February 22, 2022 08:11
@TeddyAndrieux
chart,salt,build: Migrate to fluent-bit fluent chart
f1c0ec0 
Migrate from grafana fluent-bit deprecated helm chart to the fluent-bit
helm chart from fluent:

```
rm -rf charts/fluent-bit
helm repo add fluent https://fluent.github.io/helm-charts
helm repo update
helm fetch -d charts --untar fluent/fluent-bit
```

Change image from `fluent-bit-loki-plugin` from grafana repository to
1.8.12 `fluent-bit` from fluent repository as Loki output plugin is
built-in.

Migrate fluent-bit option file to work with the new fluent-bit helm
template.

Rewrite fluent-bit output from config as it's not exactly the same
between `grafana-loki` and `loki`.

We also enable HTTP_Server back as it seems to work properly with this
version.

Render chart to salt state using:

```
./charts/render.py fluent-bit --namespace metalk8s-logging \
  charts/fluent-bit.yaml charts/fluent-bit/ \
  > salt/metalk8s/addons/logging/fluent-bit/deployed/chart.sls
```

Fixes: #3435
@TeddyAndrieux
salt: Increase fluent-bit buffer limit from 5MB to 50MB
d28779b 
Also bump Kubernetes ressources requests for memory

We also bump the number of workers used by fluent-bit.

Re-render using:
```
./charts/render.py fluent-bit --namespace metalk8s-logging \
  charts/fluent-bit.yaml charts/fluent-bit/ \
  > salt/metalk8s/addons/logging/fluent-bit/deployed/chart.sls
```
@TeddyAndrieux
salt: Delete the fluent-bit DaemonSet before upgrade and downgrade
f300235 
Since the label selector for the fluent-bit DaemonSet changed in the
version we embed compare to 2.11 we need to delete this DaemonSet before
upgrading or downgrading it

This commit should be reverted in `development/124.0`
@TeddyAndrieux
salt: Cleanup old fluent-bit objects after upgrade and downgrade
e265c8c 
Since the fluent-bit helm chart changed, we have some object that get
removed or renamed, so let's clean those right after upgrade and
downgrade

This commit should be reverted in `development/124.0`
@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Feb 22, 2022

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/123.0

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Feb 22, 2022

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/123.0

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit e265c8c into development/123.0 Feb 22, 2022
@bert-e bert-e deleted the improvement/bump-fluentbit-1812 branch February 22, 2022 16:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdemonet gdemonet gdemonet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Migrate from grafana fluent-bit-plugin-loki to official fluent-bit
3 participants
@TeddyAndrieux @bert-e @gdemonet