From 3102d52cce4c9a1504a3bde60a5e01b5948ef9b3 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 5 Aug 2021 13:52:22 +0200 Subject: [PATCH 1/6] feat: update kuberzero-redis incl. cleanup for clusters etc. --- charts/kubezero-aws-ebs-csi-driver/Chart.yaml | 2 +- charts/kubezero-aws-ebs-csi-driver/README.md | 7 ++- charts/kubezero-lib/Chart.yaml | 2 +- charts/kubezero-lib/templates/_helpers.tpl | 30 +++++---- charts/kubezero-metrics/Chart.yaml | 2 +- charts/kubezero-metrics/README.md.gotmpl | 2 + .../templates/dashboard-gunzip-cm.yaml | 4 +- charts/kubezero-metrics/values.yaml | 61 +++++++++++++++++++ charts/kubezero-redis/Chart.yaml | 4 +- .../envoyfilter-custom-redis-cluster.yaml | 2 +- .../templates/envoyfilter-redis-proxy.yaml | 2 +- .../templates/istio-authorization-policy.yaml | 2 +- .../templates/istio-service.yaml | 6 +- charts/kubezero-redis/values.yaml | 12 ++-- 14 files changed, 105 insertions(+), 33 deletions(-) diff --git a/charts/kubezero-aws-ebs-csi-driver/Chart.yaml b/charts/kubezero-aws-ebs-csi-driver/Chart.yaml index c9737eb..aebc463 100644 --- a/charts/kubezero-aws-ebs-csi-driver/Chart.yaml +++ b/charts/kubezero-aws-ebs-csi-driver/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-aws-ebs-csi-driver description: KubeZero Umbrella Chart for aws-ebs-csi-driver type: application -version: 0.6.3 +version: 0.6.4 appVersion: 1.2.4 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png diff --git a/charts/kubezero-aws-ebs-csi-driver/README.md b/charts/kubezero-aws-ebs-csi-driver/README.md index 5c389a2..b0c70fa 100644 --- a/charts/kubezero-aws-ebs-csi-driver/README.md +++ b/charts/kubezero-aws-ebs-csi-driver/README.md @@ -1,6 +1,6 @@ # kubezero-aws-ebs-csi-driver -![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.3](https://img.shields.io/badge/AppVersion-1.2.3-informational?style=flat-square) +![Version: 0.6.4](https://img.shields.io/badge/Version-0.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.4](https://img.shields.io/badge/AppVersion-1.2.4-informational?style=flat-square) KubeZero Umbrella Chart for aws-ebs-csi-driver @@ -23,7 +23,7 @@ Kubernetes: `>= 1.18.0` | Repository | Name | Version | |------------|------|---------| -| | aws-ebs-csi-driver | 1.2.3 | +| | aws-ebs-csi-driver | 1.2.4 | | https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 | ## IAM Role @@ -50,6 +50,9 @@ This class is by default also set as default storage class. | aws-ebs-csi-driver.controller.tolerations[0].effect | string | `"NoSchedule"` | | | aws-ebs-csi-driver.controller.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | | | aws-ebs-csi-driver.enableVolumeSnapshot | bool | `true` | | +| aws-ebs-csi-driver.node.tolerations[0].effect | string | `"NoSchedule"` | | +| aws-ebs-csi-driver.node.tolerations[0].key | string | `"kubezero-workergroup"` | | +| aws-ebs-csi-driver.node.tolerations[0].operator | string | `"Exists"` | | | aws-ebs-csi-driver.nodeSelector."node-role.kubernetes.io/master" | string | `""` | | | aws-ebs-csi-driver.storageClasses[0].allowVolumeExpansion | bool | `true` | | | aws-ebs-csi-driver.storageClasses[0].name | string | `"ebs-sc-gp2-xfs"` | | diff --git a/charts/kubezero-lib/Chart.yaml b/charts/kubezero-lib/Chart.yaml index 68ed401..82569d7 100644 --- a/charts/kubezero-lib/Chart.yaml +++ b/charts/kubezero-lib/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-lib description: KubeZero helm library - common helm functions and blocks type: library -version: 0.1.3 +version: 0.1.4 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: diff --git a/charts/kubezero-lib/templates/_helpers.tpl b/charts/kubezero-lib/templates/_helpers.tpl index a0b2c7e..76c3dbe 100644 --- a/charts/kubezero-lib/templates/_helpers.tpl +++ b/charts/kubezero-lib/templates/_helpers.tpl @@ -1,14 +1,3 @@ -{{- /* -Common set of labels -*/ -}} -{{- define "kubezero-lib.labels" -}} -helm.sh/chart: {{ include "kubezero-lib.chart" . }} -app.kubernetes.io/name: {{ include "kubezero-lib.name" . }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/part-of: kubezero -{{- end -}} - {{- /* Common naming functions */ -}} @@ -32,3 +21,22 @@ Common naming functions {{- define "kubezero-lib.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} + +{{/* +Selector labels +*/}} +{{- define "kubezero-lib.selectorLabels" -}} +app.kubernetes.io/name: {{ include "kubezero-lib.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end -}} + +{{- /* +Common set of labels +*/ -}} +{{- define "kubezero-lib.labels" -}} +helm.sh/chart: {{ include "kubezero-lib.chart" . }} +{{ include "kubezero-lib.selectorLabels" . }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +app.kubernetes.io/part-of: kubezero +{{- end -}} + diff --git a/charts/kubezero-metrics/Chart.yaml b/charts/kubezero-metrics/Chart.yaml index 52908c0..b0fe43f 100644 --- a/charts/kubezero-metrics/Chart.yaml +++ b/charts/kubezero-metrics/Chart.yaml @@ -14,7 +14,7 @@ maintainers: - name: Quarky9 dependencies: - name: kubezero-lib - version: ">= 0.1.3" + version: ">= 0.1.4" repository: https://zero-down-time.github.io/kubezero/ - name: kube-prometheus-stack version: 17.0.3 diff --git a/charts/kubezero-metrics/README.md.gotmpl b/charts/kubezero-metrics/README.md.gotmpl index ce00b33..5f9b964 100644 --- a/charts/kubezero-metrics/README.md.gotmpl +++ b/charts/kubezero-metrics/README.md.gotmpl @@ -21,3 +21,5 @@ - https://grafana.com/api/dashboards/9578/revisions/4/download ## Prometheus - https://grafana.com/api/dashboards/3662/revisions/2/download +## AlertManager SNS Forwarder +- https://github.com/DataReply/alertmanager-sns-forwarder diff --git a/charts/kubezero-metrics/templates/dashboard-gunzip-cm.yaml b/charts/kubezero-metrics/templates/dashboard-gunzip-cm.yaml index 446b39d..7689484 100644 --- a/charts/kubezero-metrics/templates/dashboard-gunzip-cm.yaml +++ b/charts/kubezero-metrics/templates/dashboard-gunzip-cm.yaml @@ -7,5 +7,5 @@ metadata: {{ include "kubezero-lib.labels" $ | indent 4 }} data: script.sh: |- - #!/bin/sh - find /tmp/dashboards -name "*.gz" -exec gunzip -f -k {} \; + #!/bin/sh + find /tmp/dashboards -name "*.gz" -exec gunzip -f -k {} \; diff --git a/charts/kubezero-metrics/values.yaml b/charts/kubezero-metrics/values.yaml index d6693ac..b57b7b0 100644 --- a/charts/kubezero-metrics/values.yaml +++ b/charts/kubezero-metrics/values.yaml @@ -5,6 +5,9 @@ kube-prometheus-stack: defaultRules: create: true + #additionalRuleLabels: + # clusterName: myTestCluster + # awsRegion: eu-central-1 coreDns: enabled: true @@ -199,6 +202,64 @@ kube-prometheus-stack: # externalUrl: logFormat: json + # for none AWS cluster or if SNS AlertHub should NOT be used, remove sns-forwarder by overwriting containers eg.: + # containers: [] + + # Add sns-forwarder to AlertManager pod, see: https://github.com/DataReply/alertmanager-sns-forwarder + # uses the alertmanager serviceaccount to assume IAM role, requires annotation: kubezero.com/sns_forwarder_arn_prefix to point to SNSAlertHub + # eg: "arn:aws:sns:eu-central-1:123456789012:" + containers: + - name: alertmanager-sns-forwarder + image: datareply/alertmanager-sns-forwarder:latest + imagePullPolicy: Always + env: + - name: SNS_FORWARDER_ARN_PREFIX + valueFrom: + fieldRef: + fieldPath: metadata.annotations['kubezero.com/sns_forwarder_ARN_PREFIX'] + - name: AWS_ROLE_ARN + valueFrom: + fieldRef: + fieldPath: metadata.annotations['kubezero.com/sns_forwarder_AWS_ROLE_ARN'] + - name: AWS_WEB_IDENTITY_TOKEN_FILE + value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" + - name: AWS_STS_REGIONAL_ENDPOINTS + value: regional + volumeMounts: + - name: aws-token + mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" + readOnly: true + resources: + limits: + memory: 64Mi + cpu: 100m + requests: + cpu: 25m + memory: 32Mi + ports: + - containerPort: 9087 + name: webhook-port + livenessProbe: + httpGet: + path: /health + port: webhook-port + initialDelaySeconds: 30 + timeoutSeconds: 10 + readinessProbe: + httpGet: + path: /health + port: webhook-port + initialDelaySeconds: 10 + timeoutSeconds: 10 + volumes: + - name: aws-token + projected: + sources: + - serviceAccountToken: + path: token + expirationSeconds: 86400 + audience: "sts.amazonaws.com" + # Metrics adapter prometheus-adapter: enabled: true diff --git a/charts/kubezero-redis/Chart.yaml b/charts/kubezero-redis/Chart.yaml index 117f517..15776dd 100644 --- a/charts/kubezero-redis/Chart.yaml +++ b/charts/kubezero-redis/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-redis description: KubeZero Umbrella Chart for Redis HA type: application -version: 0.3.0 +version: 0.3.1 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -15,7 +15,7 @@ dependencies: version: ">= 0.1.3" repository: https://zero-down-time.github.io/kubezero/ - name: redis - version: 12.1.1 + version: 14.8.8 repository: https://charts.bitnami.com/bitnami condition: redis.enabled - name: redis-cluster diff --git a/charts/kubezero-redis/templates/envoyfilter-custom-redis-cluster.yaml b/charts/kubezero-redis/templates/envoyfilter-custom-redis-cluster.yaml index e044802..316b157 100644 --- a/charts/kubezero-redis/templates/envoyfilter-custom-redis-cluster.yaml +++ b/charts/kubezero-redis/templates/envoyfilter-custom-redis-cluster.yaml @@ -22,7 +22,7 @@ spec: address: socket_address: address: {{ $.Release.Name }}-{{ $i }}.{{ $.Release.Name }}-headless.{{ $.Release.Namespace }}.svc.cluster.local - port_value: {{ index $.Values "redis-cluster" "redisPort" }} + port_value: 6379 {{- end }} cluster_type: name: envoy.clusters.redis diff --git a/charts/kubezero-redis/templates/envoyfilter-redis-proxy.yaml b/charts/kubezero-redis/templates/envoyfilter-redis-proxy.yaml index f8f4705..8685330 100644 --- a/charts/kubezero-redis/templates/envoyfilter-redis-proxy.yaml +++ b/charts/kubezero-redis/templates/envoyfilter-redis-proxy.yaml @@ -13,7 +13,7 @@ spec: match: context: GATEWAY listener: - name: 0.0.0.0_{{ index .Values "redis-cluster" "redisPort" }} + name: 0.0.0.0_{{ default 6379 .Values.istio.port }} filterChain: filter: name: "envoy.filters.network.tcp_proxy" diff --git a/charts/kubezero-redis/templates/istio-authorization-policy.yaml b/charts/kubezero-redis/templates/istio-authorization-policy.yaml index c3666de..866ae27 100644 --- a/charts/kubezero-redis/templates/istio-authorization-policy.yaml +++ b/charts/kubezero-redis/templates/istio-authorization-policy.yaml @@ -21,6 +21,6 @@ spec: {{- end }} to: - operation: - ports: ["{{ default 6379 .Values.redis.redisPort }}"] + ports: ["{{ default 6379 .Values.istio.port }}"] {{- end }} {{- end }} diff --git a/charts/kubezero-redis/templates/istio-service.yaml b/charts/kubezero-redis/templates/istio-service.yaml index edb8823..12c0e45 100644 --- a/charts/kubezero-redis/templates/istio-service.yaml +++ b/charts/kubezero-redis/templates/istio-service.yaml @@ -13,10 +13,10 @@ spec: - {{ .Values.istio.gateway }} tcp: - match: - - port: {{ default 6379 .Values.redis.redisPort }} + - port: {{ default 6379 .Values.istio.port }} route: - destination: - host: redis-headless + host: redis-cluster-headless port: - number: {{ default 6379 .Values.redis.redisPort }} + number: 6379 {{- end }} diff --git a/charts/kubezero-redis/values.yaml b/charts/kubezero-redis/values.yaml index 6d67c07..b83f909 100644 --- a/charts/kubezero-redis/values.yaml +++ b/charts/kubezero-redis/values.yaml @@ -1,12 +1,13 @@ redis: enabled: false - redisPort: 6379 + architecture: standalone - cluster: - slaveCount: 0 + replica: + replicaCount: 0 - usePassword: false + auth: + enabled: false master: persistence: @@ -20,14 +21,11 @@ redis: enabled: false serviceMonitor: enabled: false -# extraArgs: -# redis.addr: "redis://localhost:6379" redis-cluster: enabled: false - redisPort: 6379 usePassword: false cluster: -- 2.40.1 From 73cc497bff362819d71971a7ea34545fe96070d2 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 5 Aug 2021 14:01:25 +0200 Subject: [PATCH 2/6] chore: disable sns-forwarder again for now --- charts/kubezero-metrics/values.yaml | 102 ++++++++++++++-------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/charts/kubezero-metrics/values.yaml b/charts/kubezero-metrics/values.yaml index b57b7b0..f553225 100644 --- a/charts/kubezero-metrics/values.yaml +++ b/charts/kubezero-metrics/values.yaml @@ -208,57 +208,57 @@ kube-prometheus-stack: # Add sns-forwarder to AlertManager pod, see: https://github.com/DataReply/alertmanager-sns-forwarder # uses the alertmanager serviceaccount to assume IAM role, requires annotation: kubezero.com/sns_forwarder_arn_prefix to point to SNSAlertHub # eg: "arn:aws:sns:eu-central-1:123456789012:" - containers: - - name: alertmanager-sns-forwarder - image: datareply/alertmanager-sns-forwarder:latest - imagePullPolicy: Always - env: - - name: SNS_FORWARDER_ARN_PREFIX - valueFrom: - fieldRef: - fieldPath: metadata.annotations['kubezero.com/sns_forwarder_ARN_PREFIX'] - - name: AWS_ROLE_ARN - valueFrom: - fieldRef: - fieldPath: metadata.annotations['kubezero.com/sns_forwarder_AWS_ROLE_ARN'] - - name: AWS_WEB_IDENTITY_TOKEN_FILE - value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" - - name: AWS_STS_REGIONAL_ENDPOINTS - value: regional - volumeMounts: - - name: aws-token - mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" - readOnly: true - resources: - limits: - memory: 64Mi - cpu: 100m - requests: - cpu: 25m - memory: 32Mi - ports: - - containerPort: 9087 - name: webhook-port - livenessProbe: - httpGet: - path: /health - port: webhook-port - initialDelaySeconds: 30 - timeoutSeconds: 10 - readinessProbe: - httpGet: - path: /health - port: webhook-port - initialDelaySeconds: 10 - timeoutSeconds: 10 - volumes: - - name: aws-token - projected: - sources: - - serviceAccountToken: - path: token - expirationSeconds: 86400 - audience: "sts.amazonaws.com" + #containers: + #- name: alertmanager-sns-forwarder + # image: datareply/alertmanager-sns-forwarder:latest + # imagePullPolicy: Always + # env: + # - name: SNS_FORWARDER_ARN_PREFIX + # valueFrom: + # fieldRef: + # fieldPath: metadata.annotations['kubezero.com/sns_forwarder_ARN_PREFIX'] + # - name: AWS_ROLE_ARN + # valueFrom: + # fieldRef: + # fieldPath: metadata.annotations['kubezero.com/sns_forwarder_AWS_ROLE_ARN'] + # - name: AWS_WEB_IDENTITY_TOKEN_FILE + # value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" + # - name: AWS_STS_REGIONAL_ENDPOINTS + # value: regional + # volumeMounts: + # - name: aws-token + # mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" + # readOnly: true + # resources: + # limits: + # memory: 64Mi + # cpu: 100m + # requests: + # cpu: 25m + # memory: 32Mi + # ports: + # - containerPort: 9087 + # name: webhook-port + # livenessProbe: + # httpGet: + # path: /health + # port: webhook-port + # initialDelaySeconds: 30 + # timeoutSeconds: 10 + # readinessProbe: + # httpGet: + # path: /health + # port: webhook-port + # initialDelaySeconds: 10 + # timeoutSeconds: 10 + #volumes: + #- name: aws-token + # projected: + # sources: + # - serviceAccountToken: + # path: token + # expirationSeconds: 86400 + # audience: "sts.amazonaws.com" # Metrics adapter prometheus-adapter: -- 2.40.1 From c00158c40e0ca9716da0601771564dda52c94ed5 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Sun, 8 Aug 2021 00:48:35 +0200 Subject: [PATCH 3/6] fix: multi-cert fix for istio-ingress --- charts/kubezero/templates/istio-ingress.yaml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/charts/kubezero/templates/istio-ingress.yaml b/charts/kubezero/templates/istio-ingress.yaml index ccf1621..a7d1b22 100644 --- a/charts/kubezero/templates/istio-ingress.yaml +++ b/charts/kubezero/templates/istio-ingress.yaml @@ -15,17 +15,12 @@ istio-ingress: istio-ingressgateway: {{- toYaml . | nindent 6 }} {{- end }} - {{- with index .Values "istio-ingress" "public" "dnsNames" }} - # Legacy - dnsNames: - {{- toYaml . | nindent 2 }} - certificates: + {{- with index .Values "istio-ingress" "public" "dnsNames" }} - name: ingress-cert dnsNames: {{- toYaml . | nindent 4 }} {{- end }} - # New multi cert gateway {{- range $cert := (index .Values "istio-ingress" "public" "certificates") }} - name: {{ $cert.name }} dnsNames: @@ -44,17 +39,12 @@ istio-private-ingress: istio-ingressgateway: {{- toYaml . | nindent 6 }} {{- end }} - {{- with index .Values "istio-ingress" "private" "dnsNames" }} - # Legacy - dnsNames: - {{- toYaml . | nindent 2 }} - certificates: + {{- with index .Values "istio-ingress" "private" "dnsNames" }} - name: private-ingress-cert dnsNames: {{- toYaml . | nindent 4 }} {{- end }} - # New multi cert gateway {{- range $cert := (index .Values "istio-ingress" "private" "certificates") }} - name: {{ $cert.name }} dnsNames: -- 2.40.1 From 563045cd84abb94ec155581d2b010bc6914a3eb0 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 11 Aug 2021 14:59:44 +0200 Subject: [PATCH 4/6] feat: add Istio support for NATS mqtt --- charts/kubezero-mq/Chart.yaml | 2 +- .../templates/nats/istio-service.yaml | 22 +++++++++++++++++++ charts/kubezero-mq/values.yaml | 5 +++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 charts/kubezero-mq/templates/nats/istio-service.yaml diff --git a/charts/kubezero-mq/Chart.yaml b/charts/kubezero-mq/Chart.yaml index 0f65f56..c7caea3 100644 --- a/charts/kubezero-mq/Chart.yaml +++ b/charts/kubezero-mq/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-mq description: KubeZero umbrella chart for MQ systems like NATS, RabbitMQ type: application -version: 0.2.1 +version: 0.2.2 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: diff --git a/charts/kubezero-mq/templates/nats/istio-service.yaml b/charts/kubezero-mq/templates/nats/istio-service.yaml new file mode 100644 index 0000000..1d867ee --- /dev/null +++ b/charts/kubezero-mq/templates/nats/istio-service.yaml @@ -0,0 +1,22 @@ +{{- if .Values.nats.istio.enabled }} +apiVersion: networking.istio.io/v1beta1 +kind: VirtualService +metadata: + name: {{ .Release.Name }}-nats + namespace: {{ .Release.Namespace }} + labels: +{{ include "kubezero-lib.labels" . | indent 4 }} +spec: + hosts: + - {{ .Values.nats.istio.url }} + gateways: + - {{ .Values.nats.istio.gateway }} + tcp: + - match: + - port: 1883 + route: + - destination: + host: {{ .Release.Name }}-nats + port: + number: 1883 +{{- end }} diff --git a/charts/kubezero-mq/values.yaml b/charts/kubezero-mq/values.yaml index ae0b0fb..0133425 100644 --- a/charts/kubezero-mq/values.yaml +++ b/charts/kubezero-mq/values.yaml @@ -18,6 +18,11 @@ nats: mqtt: enabled: false + istio: + enabled: false + # url: "mq.example.com" + gateway: istio-ingress/private-ingressgateway + # rabbitmq rabbitmq: enabled: false -- 2.40.1 From e3b1ba26b4ec5dfeb2e9355d55da4e81a73e7549 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 11 Aug 2021 15:11:02 +0200 Subject: [PATCH 5/6] fix: fix service name target for NATS istio support --- charts/kubezero-mq/templates/nats/istio-service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/kubezero-mq/templates/nats/istio-service.yaml b/charts/kubezero-mq/templates/nats/istio-service.yaml index 1d867ee..a70096e 100644 --- a/charts/kubezero-mq/templates/nats/istio-service.yaml +++ b/charts/kubezero-mq/templates/nats/istio-service.yaml @@ -16,7 +16,7 @@ spec: - port: 1883 route: - destination: - host: {{ .Release.Name }}-nats + host: nats port: number: 1883 {{- end }} -- 2.40.1 From 5e7d0d8d2cbc0e743fb0c3c58271e467b7abfab3 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 12 Aug 2021 21:47:26 +0200 Subject: [PATCH 6/6] feat: add temp filter for fluent-bit multiline noise to fluentd --- charts/kubezero-logging/Chart.yaml | 2 +- charts/kubezero-logging/README.md | 4 ++-- charts/kubezero-logging/values.yaml | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/charts/kubezero-logging/Chart.yaml b/charts/kubezero-logging/Chart.yaml index ba7d9d4..b1a54fc 100644 --- a/charts/kubezero-logging/Chart.yaml +++ b/charts/kubezero-logging/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-logging description: KubeZero Umbrella Chart for complete EFK stack type: application -version: 0.7.5 +version: 0.7.6 appVersion: 1.6.0 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png diff --git a/charts/kubezero-logging/README.md b/charts/kubezero-logging/README.md index 5dfa5b5..6b6fdbb 100644 --- a/charts/kubezero-logging/README.md +++ b/charts/kubezero-logging/README.md @@ -1,6 +1,6 @@ # kubezero-logging -![Version: 0.7.5](https://img.shields.io/badge/Version-0.7.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square) +![Version: 0.7.6](https://img.shields.io/badge/Version-0.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square) KubeZero Umbrella Chart for complete EFK stack @@ -111,7 +111,7 @@ Kubernetes: `>= 1.18.0` | fluentd.env[1].valueFrom.secretKeyRef.name | string | `"logging-es-elastic-user"` | | | fluentd.fileConfigs."00_system.conf" | string | `"\n root_dir /var/log/fluentd\n log_level info\n ignore_repeated_log_interval 60s\n ignore_same_log_interval 60s\n workers 2\n"` | | | fluentd.fileConfigs."01_sources.conf" | string | `"\n @type http\n @label @KUBERNETES\n port 9880\n bind 0.0.0.0\n keepalive_timeout 30\n\n\n\n @type forward\n @label @KUBERNETES\n port 24224\n bind 0.0.0.0\n # skip_invalid_event true\n send_keepalive_packet true\n \n self_hostname \"#{ENV['HOSTNAME']}\"\n shared_key {{ .Values.shared_key }}\n \n"` | | -| fluentd.fileConfigs."02_filters.conf" | string | `""` | | +| fluentd.fileConfigs."02_filters.conf" | string | `""` | | | fluentd.fileConfigs."04_outputs.conf" | string | `""` | | | fluentd.image.repository | string | `"fluent/fluentd-kubernetes-daemonset"` | | | fluentd.image.tag | string | `"v1-debian-elasticsearch"` | | diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml index 20c8b19..7f600a0 100644 --- a/charts/kubezero-logging/values.yaml +++ b/charts/kubezero-logging/values.yaml @@ -156,6 +156,15 @@ fluentd: @label @FLUENT_LOG + # Exclude current fluent-bit multiline noise + + @type grep + + key log + pattern /could not append content to multiline context/ + + + @type relabel @label @DISPATCH -- 2.40.1