diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/Chart.yaml packages/rancher-logging/charts/Chart.yaml --- packages/rancher-logging/charts-original/Chart.yaml +++ packages/rancher-logging/charts/Chart.yaml @@ -1,5 +1,11 @@ apiVersion: v1 appVersion: 3.4.0 -description: A Helm chart to install Banzai Cloud logging-operator -name: logging-operator +description: A Helm chart to install Banzai Cloud logging-operator and a cluster logging pipeline. +name: rancher-logging version: 3.4.0 +icon: https://charts.rancher.io/assets/logos/logging.svg +annotations: + catalog.cattle.io/certified: rancher + catalog.cattle.io/namespace: cattle-logging-system + catalog.cattle.io/release-name: rancher-logging + catalog.cattle.io/ui-component: logging diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/templates/_helpers.tpl packages/rancher-logging/charts/templates/_helpers.tpl --- packages/rancher-logging/charts-original/templates/_helpers.tpl +++ packages/rancher-logging/charts/templates/_helpers.tpl @@ -56,3 +56,11 @@ {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end -}} + +{{- define "system_default_registry" -}} +{{- if .Values.global.systemDefaultRegistry -}} +{{- printf "%s/" .Values.global.systemDefaultRegistry -}} +{{- else -}} +{{- "" -}} +{{- end -}} +{{- end -}} diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values.yaml packages/rancher-logging/charts/values.yaml --- packages/rancher-logging/charts-original/values.yaml +++ packages/rancher-logging/charts/values.yaml @@ -18,7 +18,7 @@ ## Deploy CRDs used by Logging Operator. ## -createCustomResource: true +createCustomResource: false resources: {} # We usually recommend not to specify default resources and to leave this as a conscious @@ -76,4 +76,98 @@ monitoring: # Create a Prometheus Operator ServiceMonitor object serviceMonitor: - enabled: false \ No newline at end of file + enabled: true + +elasticsearch: + enabled: false + index_name: fluentd + scheme: http + user: "" + password: + secret_name: "" + key: "password" + ca_file: + secret_name: "" + key: "ca_file" + client_cert: + secret_name: "" + key: "client_cert" + client_key: + secret_name: "" + key: "client_key" + client_key_pass: + secret_name: "" + key: "client_key_pass" + + +kafka: + enabled: false + brokers: "" + default_topic: "fluentd" + sasl_over_ssl: false + scram_mechanism: "PLAIN" + username: + secret_name: "" + key: "username" + password: + secret_name: "" + key: "password" + ssl_ca_cert: + secret_name: "" + key: "ssl_ca_cert" + ssl_client_cert: + secret_name: "" + key: "ssl_client_cert" + ssl_client_cert_chain: + secret_name: "" + key: "ssl_client_cert_chain" + ssl_client_cert_key: + secret_name: "" + key: "ssl_client_cert_key" + +splunk: + enabled: false + host: "" + port: 8088 + protocol: http + index: rancher + token: + secret_name: "" + key: "token" + client_cert: "" + client_key: "" + insecure_ssl: false + +syslog: + enabled: false + address: "" + cluster: true + root_ca: "" + +disablePvc: true + +additionalLoggingSources: + rke1: + enabled: false + rke2: + enabled: false + k3s: + enabled: false + container_engine: "systemd" + +images: + config_reloader: + repository: rancher/jimmidyson-configmap-reload + tag: v0.2.2 + fluentbit: + repository: rancher/fluent-fluent-bit + tag: 1.5.0 + fluentd: + repository: rancher/banzaicloud-fluentd + tag: v1.10.4-alpine-2 + syslog_forwarder: + repository: rancher/fluent-bit-out-syslog + tag: 0.1.0 + +global: + systemDefaultRegistry: "" \ No newline at end of file