From 9c50316e1ffc2b0bdb50baa867530d9157d0e8c0 Mon Sep 17 00:00:00 2001 From: Alexandre Allard Date: Fri, 7 May 2021 11:40:37 +0200 Subject: [PATCH 1/5] charts: Bump fluent-bit to 2.2.0 Previous helm chart repository https://grafana.github.io/loki/charts is now deprecated, so we move to the new one. Update fluent-bit chart using: ``` rm -rf charts/fluent-bit helm repo add grafana https://grafana.github.io/helm-charts helm repo update helm fetch -d charts --untar grafana/fluent-bit ``` Refs: #3279 --- charts/fluent-bit/Chart.yaml | 7 +++---- charts/fluent-bit/README.md | 19 ++++++++++++++----- charts/fluent-bit/templates/configmap.yaml | 2 +- charts/fluent-bit/values.yaml | 2 +- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml index 16054392db..ca27d85969 100644 --- a/charts/fluent-bit/Chart.yaml +++ b/charts/fluent-bit/Chart.yaml @@ -1,7 +1,6 @@ apiVersion: v1 -appVersion: v2.0.0 -description: Uses fluent-bit Loki go plugin for gathering logs and sending them to - Loki +appVersion: v2.1.0 +description: Uses fluent-bit Loki go plugin for gathering logs and sending them to Loki home: https://grafana.com/loki icon: https://raw.githubusercontent.com/grafana/loki/master/docs/sources/logo.png kubeVersion: ^1.10.0-0 @@ -11,4 +10,4 @@ maintainers: name: fluent-bit sources: - https://github.com/grafana/loki -version: 2.0.1 +version: 2.2.0 diff --git a/charts/fluent-bit/README.md b/charts/fluent-bit/README.md index 8af1a8fe2f..4b221f4200 100644 --- a/charts/fluent-bit/README.md +++ b/charts/fluent-bit/README.md @@ -2,14 +2,23 @@ This chart install the Fluent Bit application to ship logs to Loki. It defines daemonset on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +## Get Repo Info + +```console +helm repo add grafana https://grafana.github.io/helm-charts +helm repo update +``` + +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ + ## Installing the Chart > If you don't have `Helm` installed locally, or `Tiller` installed in your Kubernetes cluster, read the [Using Helm](https://docs.helm.sh/using_helm/) documentation to get started. To install the chart with the release name `my-release` using our helm repository: ```bash -helm repo add loki https://grafana.github.io/loki/charts -helm upgrade --install my-release loki/fluent-bit \ +helm repo add grafana https://grafana.github.io/helm-charts +helm upgrade --install my-release grafana/fluent-bit \ --set loki.serviceName=loki.default.svc.cluster.local ``` @@ -20,7 +29,7 @@ The command deploys Fluent Bit on the Kubernetes cluster with the default config To configure the chart to send to [Grafana Cloud](https://grafana.com/products/cloud) use: ```bash -helm upgrade --install my-release loki/fluent-bit \ +helm upgrade --install my-release grafana/fluent-bit \ --set loki.serviceName=logs-us-west1.grafana.net,loki.servicePort=80,loki.serviceScheme=https \ --set loki.user=2830,loki.password=1234 ``` @@ -30,7 +39,7 @@ helm upgrade --install my-release loki/fluent-bit \ To install a custom tag use the following command: ```bash -helm upgrade --install my-release loki/fluent-bit \ +helm upgrade --install my-release grafana/fluent-bit \ --set image.tag= ``` @@ -39,7 +48,7 @@ The full list of available tags on [docker hub](https://cloud.docker.com/u/grafa Alternatively you can install the full [Loki stack](../loki-stack) (Loki + Fluent Bit) using: ```bash -helm upgrade --install my-release loki/loki-stack \ +helm upgrade --install my-release grafana/loki-stack \ --set fluent-bit.enabled=true,promtail.enabled=false ``` diff --git a/charts/fluent-bit/templates/configmap.yaml b/charts/fluent-bit/templates/configmap.yaml index 23fdba80e6..bb09b2458e 100644 --- a/charts/fluent-bit/templates/configmap.yaml +++ b/charts/fluent-bit/templates/configmap.yaml @@ -33,7 +33,7 @@ data: K8S-Logging.Exclude {{ .Values.config.k8sLoggingExclude }} K8S-Logging.Parser {{ .Values.config.k8sLoggingParser }} [Output] - Name loki + Name grafana-loki Match * {{- if and .Values.loki.user .Values.loki.password }} Url {{ .Values.loki.serviceScheme }}://{{ .Values.loki.user }}:{{ .Values.loki.password }}@{{ include "loki.serviceName" . }}:{{ .Values.loki.servicePort }}{{ .Values.loki.servicePath }} diff --git a/charts/fluent-bit/values.yaml b/charts/fluent-bit/values.yaml index 4c7e8bc9fb..ab267555bd 100644 --- a/charts/fluent-bit/values.yaml +++ b/charts/fluent-bit/values.yaml @@ -50,7 +50,7 @@ deploymentStrategy: RollingUpdate image: repository: grafana/fluent-bit-plugin-loki - tag: 1.6.0-amd64 + tag: 2.1.0-amd64 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be present in the namespace. From 3ec8f54e2607c72244916515777198ddfb3364b4 Mon Sep 17 00:00:00 2001 From: Alexandre Allard Date: Fri, 7 May 2021 11:44:52 +0200 Subject: [PATCH 2/5] build: Bump fluent-bit image verson to 2.1.0-amd64 Refs: #3279 --- buildchain/buildchain/versions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py index 36fc9867bc..7e2f0345d6 100644 --- a/buildchain/buildchain/versions.py +++ b/buildchain/buildchain/versions.py @@ -244,8 +244,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str: ), Image( name="fluent-bit-plugin-loki", - version="1.6.0-amd64", - digest="sha256:cb1cd95d0fcf76b626623684f0c8b204a9f773443650c7b3d243b96c29ff7020", + version="2.1.0-amd64", + digest="sha256:bedd17176ced6106404606d31f6d6bfa56b10d769074c0b624fb0bc470b081c2", ), ) From e9f03b0cc1c62bbe3f005dcefd3ff8321fc46eeb Mon Sep 17 00:00:00 2001 From: Alexandre Allard Date: Fri, 7 May 2021 11:46:02 +0200 Subject: [PATCH 3/5] salt: Re-render fluent-bit Salt formula We have bump fluent-bit chart, so we need to re-render this formula as follows: ``` ./charts/render.py fluent-bit --namespace metalk8s-logging \ --remove-manifest ConfigMap fluent-bit \ charts/fluent-bit.yaml charts/fluent-bit/ \ > salt/metalk8s/addons/logging/fluent-bit/deployed/chart.sls ``` Refs: #3279 --- .../logging/fluent-bit/deployed/chart.sls | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/salt/metalk8s/addons/logging/fluent-bit/deployed/chart.sls b/salt/metalk8s/addons/logging/fluent-bit/deployed/chart.sls index 9cae4dfc9b..17f4d8923d 100644 --- a/salt/metalk8s/addons/logging/fluent-bit/deployed/chart.sls +++ b/salt/metalk8s/addons/logging/fluent-bit/deployed/chart.sls @@ -14,7 +14,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: fluent-bit app.kubernetes.io/part-of: metalk8s - chart: fluent-bit-2.0.1 + chart: fluent-bit-2.2.0 heritage: metalk8s release: fluent-bit name: fluent-bit @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: fluent-bit app.kubernetes.io/part-of: metalk8s - chart: fluent-bit-2.0.1 + chart: fluent-bit-2.2.0 heritage: metalk8s release: fluent-bit name: fluent-bit @@ -65,7 +65,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: fluent-bit app.kubernetes.io/part-of: metalk8s - chart: fluent-bit-2.0.1 + chart: fluent-bit-2.2.0 heritage: metalk8s release: fluent-bit name: fluent-bit-clusterrole @@ -89,7 +89,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: fluent-bit app.kubernetes.io/part-of: metalk8s - chart: fluent-bit-2.0.1 + chart: fluent-bit-2.2.0 heritage: metalk8s release: fluent-bit name: fluent-bit-clusterrolebinding @@ -111,7 +111,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: fluent-bit app.kubernetes.io/part-of: metalk8s - chart: fluent-bit-2.0.1 + chart: fluent-bit-2.2.0 heritage: metalk8s release: fluent-bit name: fluent-bit @@ -134,7 +134,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: fluent-bit app.kubernetes.io/part-of: metalk8s - chart: fluent-bit-2.0.1 + chart: fluent-bit-2.2.0 heritage: metalk8s release: fluent-bit name: fluent-bit @@ -155,7 +155,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: fluent-bit app.kubernetes.io/part-of: metalk8s - chart: fluent-bit-2.0.1 + chart: fluent-bit-2.2.0 heritage: metalk8s release: fluent-bit name: fluent-bit-headless @@ -180,7 +180,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: fluent-bit app.kubernetes.io/part-of: metalk8s - chart: fluent-bit-2.0.1 + chart: fluent-bit-2.2.0 heritage: metalk8s release: fluent-bit name: fluent-bit @@ -193,7 +193,7 @@ spec: template: metadata: annotations: - checksum/config: 3bed338de62965258211f9a86544e9b6437e23d31787a38f9051656e4a6e68c9 + checksum/config: 7f6f78193f3a6250a31fdc23769553e5afb6a6831286b03f617c2853a535ff75 prometheus.io/path: /api/v1/metrics/prometheus prometheus.io/port: '2020' prometheus.io/scrape: 'true' @@ -203,7 +203,7 @@ spec: spec: affinity: {} containers: - - image: {% endraw -%}{{ build_image_name("fluent-bit-plugin-loki", False) }}{%- raw %}:1.6.0-amd64 + - image: {% endraw -%}{{ build_image_name("fluent-bit-plugin-loki", False) }}{%- raw %}:2.1.0-amd64 imagePullPolicy: IfNotPresent name: fluent-bit-loki ports: @@ -266,7 +266,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: fluent-bit app.kubernetes.io/part-of: metalk8s - chart: fluent-bit-2.0.1 + chart: fluent-bit-2.2.0 heritage: metalk8s metalk8s.scality.com/monitor: '' name: fluent-bit From be07fd3b91cb07b6dfb3bae0717f0c8acc801269 Mon Sep 17 00:00:00 2001 From: Alexandre Allard Date: Mon, 10 May 2021 11:20:40 +0200 Subject: [PATCH 4/5] salt: Update fluent-bit Loki Output The name has changed from loki to grafana-loki. Refs: #3279 --- salt/metalk8s/addons/logging/fluent-bit/deployed/configmap.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/metalk8s/addons/logging/fluent-bit/deployed/configmap.sls b/salt/metalk8s/addons/logging/fluent-bit/deployed/configmap.sls index ec3ba907d7..c9bc0f35c2 100644 --- a/salt/metalk8s/addons/logging/fluent-bit/deployed/configmap.sls +++ b/salt/metalk8s/addons/logging/fluent-bit/deployed/configmap.sls @@ -82,7 +82,7 @@ Create fluent-bit ConfigMap: Remove logtag {%- for index in range(loki.spec.deployment.replicas) %} [Output] - Name loki + Name grafana-loki Match * Url http://loki-{{ index }}:3100/loki/api/v1/push TenantID "" From 52f327a891234a17c9899f20b6424bfe51259a78 Mon Sep 17 00:00:00 2001 From: Alexandre Allard Date: Mon, 10 May 2021 14:36:04 +0200 Subject: [PATCH 5/5] Add CHANGELOG entry for fluent-bit version bump Refs: #3279 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70b2c9a33a..a2d854451e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ - Bump CoreDNS version to 1.8.0 (PR[#3354](https://github.com/scality/metalk8s/pull/3354)) +- [#3279](https://github.com/scality/metalk8s/issues/3279) - Bump + fluent-bit chart version from 2.0.1 to 2.2.0 + fluent-bit-plugin-loki image has been bump accordingly from v1.6.0-amd64 + to v2.1.0-amd64 (PR[#3364](https://github.com/scality/metalk8s/pull/3364)) + - [#3279](https://github.com/scality/metalk8s/issues/3279) - Bump loki chart version from 2.1.0 to 2.5.0. loki image has been bump accordingly from 2.0.0 to 2.2.0