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.

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

feat: updated the logging-operator version #2818

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions licenses.d2iq.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -322,18 +322,18 @@ resources:
- license_path: LICENSE
ref: ${image_tag}
url: https://github.com/helm/chartmuseum
- container_image: ghcr.io/kube-logging/config-reloader:v0.0.5
- container_image: ghcr.io/kube-logging/config-reloader:v0.0.6
sources:
- license_path: LICENSE.txt
ref: ${image_tag}
url: https://github.com/kube-logging/config-reloader
- container_image: ghcr.io/kube-logging/logging-operator:4.2.2
- container_image: ghcr.io/kube-logging/logging-operator:4.10.1
sources:
- license_path: LICENSE
notice_path: NOTICE
ref: ${image_tag}
url: https://github.com/kube-logging/logging-operator
- container_image: ghcr.io/kube-logging/node-exporter:v0.6.1
- container_image: ghcr.io/kube-logging/node-exporter:v0.8.0
sources:
- license_path: LICENSE
ref: ${image_tag}
Expand Down Expand Up @@ -484,10 +484,10 @@ resources:
- license_path: LICENSE
ref: v${image_tag%-d2iq.0}
url: https://github.com/weaviate/weaviate
- container_image: ghcr.io/kube-logging/fluentd:v1.16-full-build.122
- container_image: ghcr.io/kube-logging/fluentd:v1.16-4.10-filters-build.156
sources:
- url: https://github.com/fluent/fluentd
ref: ${image_tag%-full-build.122}
ref: ${image_tag%-4.10-filters-build.156}
license_path: LICENSE
- container_image: nvcr.io/nvidia/cloud-native/dcgm:3.3.8-1-ubuntu22.04
sources:
Expand Down
164 changes: 164 additions & 0 deletions services/logging-operator/4.10.1/defaults/cm.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: logging-operator-4.10.1-d2iq-defaults
namespace: ${releaseNamespace}
data:
values.yaml: |-
---
rbac:
psp:
enabled: false
priorityClassName: "dkp-critical-priority"
resources:
limits:
cpu: 1000m
memory: 512Mi
requests:
cpu: 100m
memory: 128Mi
http:
service:
labels:
servicemonitor.kommander.mesosphere.io/path: "metrics"
# For Helm v3, avoids creating CRDs from templates.
createCustomResource: false
logging:
enabled: true
clusterFlows:
- name: cluster-containers
spec:
globalOutputRefs:
- loki
clusterOutputs:
- name: loki
spec:
loki:
url: http://grafana-loki-loki-distributed-gateway.${releaseNamespace}.svc.cluster.local:80
extract_kubernetes_labels: true
configure_kubernetes_labels: true
buffer:
# Limit retries to prevent getting stuck on delivering logs out-of-order to Loki.
# See https://github.com/banzaicloud/logging-operator/issues/674 and
# https://github.com/fluent/fluent-bit/issues/2748.
# fluentd uses exponential backoff when retrying logs. The retry limit should balance tolerance for
# temporary loki unavailability with dropping out-of-order logs that can't be delivered.
retry_forever: false
retry_max_times: 5
flush_mode: interval
flush_interval: 10s
flush_thread_count: 8
extra_labels:
log_source: kubernetes_container
tls:
enabled: true
fluentd:
podPriorityClassName: "dkp-critical-priority"
image:
# The image should be updated when logging-operator is upgraded.
repository: ghcr.io/kube-logging/fluentd
tag: v1.16-4.10-filters-build.156
resources:
limits:
memory: 400Mi
cpu: 1000m
requests:
memory: 100Mi
cpu: 500m
scaling:
replicas: 1
port: 24240
readinessProbe:
failureThreshold: 3
initialDelaySeconds: 5
periodSeconds: 5
successThreshold: 1
tcpSocket:
port: 24240
timeoutSeconds: 3
logLevel: warn
fluentLogDestination: stdout
bufferStorageVolume:
pvc:
source:
claimName: fluentd-buffer
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 10Gi
volumeMode: Filesystem
metrics:
port: 24231
path: /metrics
prometheusAnnotations: true
bufferVolumeMetrics:
port: 9200
path: /metrics
prometheusAnnotations: true
statefulsetAnnotations:
secret.reloader.stakater.com/reload: logging-operator-logging-fluentd-tls
fluentbit:
podPriorityClassName: "dkp-critical-priority"
image:
# Explicitly specify the version here. This should be updated when logging-operator is upgraded.
# Also, update the image in fluent-bit configuration if the image is upgraded here.
repository: ghcr.io/mesosphere/dkp-container-images/cr.fluentbit.io/fluent/fluent-bit
tag: 2.2.3-d2iq.1
resources:
limits:
memory: 750Mi
requests:
cpu: 350m
memory: 350Mi
tolerations:
- operator: Exists
effect: NoSchedule
- operator: Exists
effect: NoExecute
- operator: Exists
key: CriticalAddonsOnly
flush: 1
grace: 5
logLevel: warn
coroStackSize: 24576
inputTail:
Path: /var/log/containers/*.log
Tag: kubernetes.*
Parser: cri
DB: /tail-db/kubernetes.db
Skip_Long_Lines: "On"
Refresh_Interval: "5"
Rotate_Wait: "5"
Mem_Buf_Limit: 5MB
filterKubernetes:
Match: kubernetes.*
Kube_Tag_Prefix: kubernetes.var.log.containers
Merge_Log: "On"
Labels: "On"
Annotations: "On"
Buffer_Size: "0"
Kube_URL: https://kubernetes.default.svc:443
Kube_CA_File: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
Kube_Token_File: /var/run/secrets/kubernetes.io/serviceaccount/token
tls.verify: "On"
K8S-Logging.Parser: "Off"
K8S-Logging.Exclude: "Off"
forwardOptions:
# Limit retries to prevent getting stuck on delivering logs out-of-order to Loki.
# See https://github.com/banzaicloud/logging-operator/issues/674 and
# https://github.com/fluent/fluent-bit/issues/2748.
# fluent-bit uses exponential backoff when retrying logs. The retry limit should balance tolerance for
# temporary fluentd unavailability with dropping out-of-order logs that can't be delivered.
Retry_Limit: "5"
positiondb:
hostPath:
path: /var/log/tail-db
type: DirectoryOrCreate
metrics:
port: 2020
path: /api/v1/metrics/prometheus
prometheusAnnotations: true
daemonsetAnnotations:
secret.reloader.stakater.com/reload: logging-operator-logging-fluentbit-tls
4 changes: 4 additions & 0 deletions services/logging-operator/4.10.1/extra-images.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{{ .Values.logging.fluentbit.image.repository }}:{{ .Values.logging.fluentbit.image.tag }}
{{ .Values.logging.fluentd.image.repository }}:{{ .Values.logging.fluentd.image.tag }}
ghcr.io/kube-logging/config-reloader:v0.0.6
ghcr.io/kube-logging/node-exporter:v0.8.0
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ kind: Kustomization
resources:
- grafana-dashboards
- logging-operator.yaml
- logging-operator-logging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ spec:
chart: logging-operator
sourceRef:
kind: HelmRepository
name: kube-logging.github.io-charts
name: mesosphere.github.io-charts-stable
namespace: kommander-flux
# When upgrading, make sure to update the fluent-bit and fluentd images in logging-operator-logging.yaml.
version: 4.2.3
version: 4.10.1
interval: 15s
install:
crds: CreateReplace
Expand All @@ -25,4 +25,4 @@ spec:
releaseName: logging-operator
valuesFrom:
- kind: ConfigMap
name: logging-operator-4.2.5-d2iq-defaults
name: logging-operator-4.10.1-d2iq-defaults
Loading
Loading