Fix logging values (#3732)

pull/3741/head
Josh Meranda 2024-04-03 21:47:56 -04:00 committed by GitHub
parent 45428b5021
commit cf22defe1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 29 deletions

View File

@ -65,7 +65,7 @@ rbac:
# specify service account manually # specify service account manually
# serviceAccountName: custom # serviceAccountName: custom
1: monitoring:
serviceMonitor: serviceMonitor:
# -- Create a Prometheus Operator ServiceMonitor object. # -- Create a Prometheus Operator ServiceMonitor object.
enabled: false enabled: false
@ -284,14 +284,6 @@ testReceiver:
# Labels to query http service # Labels to query http service
labels: {} labels: {}
monitoring:
# Create a Prometheus Operator ServiceMonitor object
serviceMonitor:
enabled: false
additionalLabels: {}
metricRelabelings: []
relabelings: []
# Logging CR specific serviceAccount annotations # Logging CR specific serviceAccount annotations
loggingServiceAccountAnnotations: {} loggingServiceAccountAnnotations: {}
## Syntax ## ## Syntax ##

View File

@ -13005,9 +13005,9 @@ entries:
catalog.cattle.io/upstream-version: 4.4.0 catalog.cattle.io/upstream-version: 4.4.0
apiVersion: v2 apiVersion: v2
appVersion: 4.4.0 appVersion: 4.4.0
created: "2024-03-21T11:11:30.575774598-04:00" created: "2024-04-03T15:30:02.728579052-04:00"
description: Logging operator for Kubernetes based on Fluentd and Fluentbit. description: Logging operator for Kubernetes based on Fluentd and Fluentbit.
digest: e80092fadf8751086dd1c518bb0be101077a89742d2e715a6f7ec190904c09e9 digest: 1b6cfada83d361c2596aa5047c39f8316e9e4280d081e14e43dd4bbc12a3fd91
home: https://kube-logging.github.io home: https://kube-logging.github.io
icon: file://assets/logos/rancher-logging.svg icon: file://assets/logos/rancher-logging.svg
keywords: keywords:

View File

@ -25,15 +25,6 @@
# -- PSP annotations # -- PSP annotations
annotations: annotations:
@@ -70,7 +65,7 @@
# specify service account manually
# serviceAccountName: custom
-monitoring:
+1:
serviceMonitor:
# -- Create a Prometheus Operator ServiceMonitor object.
enabled: false
@@ -115,10 +110,14 @@ @@ -115,10 +110,14 @@
# cpu: 100m # cpu: 100m
# memory: 128Mi # memory: 128Mi
@ -52,7 +43,7 @@
# -- Node Affinity # -- Node Affinity
affinity: {} affinity: {}
@@ -267,11 +266,181 @@ @@ -267,11 +266,173 @@
image: fluent/fluent-bit image: fluent/fluent-bit
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
port: 8080 port: 8080
@ -82,14 +73,6 @@
+ # Labels to query http service + # Labels to query http service
+ labels: {} + labels: {}
+ +
+monitoring:
+ # Create a Prometheus Operator ServiceMonitor object
+ serviceMonitor:
+ enabled: false
+ additionalLabels: {}
+ metricRelabelings: []
+ relabelings: []
+
+# Logging CR specific serviceAccount annotations +# Logging CR specific serviceAccount annotations
+loggingServiceAccountAnnotations: {} +loggingServiceAccountAnnotations: {}
+## Syntax ## +## Syntax ##