Skip to content

Commit d46e657

Browse files
boonwareboonware
authored
[minor] cluster logging operator (#246)
1 parent 5fa0fdd commit d46e657

File tree

11 files changed

+318
-50
lines changed

11 files changed

+318
-50
lines changed

‎cluster-applications/054-cluster-logging-operator/Chart.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
apiVersion: v2
2+
name: cluster-logging-operator
3+
description: Cluster Logging Operator
4+
type: application
5+
version: 1.0.0
6+
7+
dependencies:
8+
- name: junitreporter
9+
version: 1.0.0
10+
repository: "file://../../sub-charts/junitreporter/"
11+
condition: junitreporter.devops_mongo_uri != ""

‎cluster-applications/054-cluster-logging-operator/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Cluster Logging Operator
2+
===============================================================================
3+
Installs the Cluster Logging Operator. For further info see https://docs.openshift.com/container-platform/4.12/observability/logging/cluster-logging.html (replace version in URL with OpenShift version)

‎cluster-applications/054-cluster-logging-operator/templates/01-OperatorGroup.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
apiVersion: operators.coreos.com/v1
3+
kind: OperatorGroup
4+
metadata:
5+
name: cluster-logging-operator
6+
namespace: openshift-logging
7+
annotations:
8+
argocd.argoproj.io/sync-wave: "054"
9+
{{- if .Values.custom_labels }}
10+
labels:
11+
{{ .Values.custom_labels | toYaml | indent 4 }}
12+
{{- end }}
13+
spec:
14+
targetNamespaces:
15+
- openshift-logging

‎cluster-applications/054-cluster-logging-operator/templates/02-Subcription.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
apiVersion: operators.coreos.com/v1alpha1
3+
kind: Subscription
4+
metadata:
5+
name: cluster-logging-operator
6+
namespace: openshift-logging
7+
annotations:
8+
argocd.argoproj.io/sync-wave: "054"
9+
{{- if .Values.custom_labels }}
10+
labels:
11+
{{ .Values.custom_labels | toYaml | indent 4 }}
12+
{{- end }}
13+
spec:
14+
channel: "{{ .Values.cluster_logging_operator_channel }}"
15+
installPlanApproval: {{ .Values.cluster_logging_operator_install_plan | default "Automatic" | quote }}
16+
name: cluster-logging
17+
source: redhat-operators
18+
sourceNamespace: openshift-marketplace

‎cluster-applications/054-cluster-logging-operator/templates/03-Secret.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
kind: Secret
3+
apiVersion: v1
4+
metadata:
5+
name: cloudwatch
6+
namespace: openshift-logging
7+
annotations:
8+
argocd.argoproj.io/sync-wave: "054"
9+
{{- if .Values.custom_labels }}
10+
labels:
11+
{{ .Values.custom_labels | toYaml | indent 4 }}
12+
{{- end }}
13+
type: Opaque
14+
data:
15+
aws_access_key_id: {{ .Values.cluster_logging_operator_aws_access_key_id | b64enc }}
16+
aws_secret_access_key: {{ .Values.cluster_logging_operator_aws_secret_access_key | b64enc }}

‎cluster-applications/054-cluster-logging-operator/templates/04-ClusterLogging.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
apiVersion: logging.openshift.io/v1
3+
kind: ClusterLogging
4+
metadata:
5+
name: instance
6+
namespace: openshift-logging
7+
annotations:
8+
argocd.argoproj.io/sync-wave: "055"
9+
argocd.argoproj.io/sync-options: "SkipDryRunOnMissingResource=true,Validate=false"
10+
{{- if .Values.custom_labels }}
11+
labels:
12+
{{ .Values.custom_labels | toYaml | indent 4 }}
13+
{{- end }}
14+
spec:
15+
collection:
16+
type: vector
17+
resources:
18+
limits:
19+
memory: 8Gi
20+
requests:
21+
cpu: 100m
22+
memory: 256Mi

‎cluster-applications/054-cluster-logging-operator/templates/05-ClusterLogForwarder.yaml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
---
2+
apiVersion: logging.openshift.io/v1
3+
kind: ClusterLogForwarder
4+
metadata:
5+
name: instance
6+
namespace: openshift-logging
7+
annotations:
8+
argocd.argoproj.io/sync-wave: "055"
9+
argocd.argoproj.io/sync-options: "SkipDryRunOnMissingResource=true,Validate=false"
10+
{{- if .Values.custom_labels }}
11+
labels:
12+
{{ .Values.custom_labels | toYaml | indent 4 }}
13+
{{- end }}
14+
spec:
15+
filters:
16+
- drop:
17+
- test:
18+
- field: .level
19+
matches: info|Info|INFO|DEBUG|Debug|debug
20+
name: noise
21+
type: drop
22+
- kubeAPIAudit:
23+
omitStages: []
24+
rules:
25+
- level: Metadata
26+
name: sos-policy
27+
type: kubeAPIAudit
28+
outputs:
29+
- name: cloudwatch-1
30+
type: cloudwatch
31+
secret:
32+
name: cloudwatch
33+
tuning:
34+
compression: zstd
35+
cloudwatch:
36+
groupBy: logType
37+
groupPrefix: '{{ .Values.cluster_id }}'
38+
region: '{{ .Values.region_id }}'
39+
{{- if eq .Values.cluster_logging_operator_use_syslog_forwarder "true" }}
40+
- name: rsyslog-local
41+
type: syslog
42+
url: 'tcp://syslog-forwarder:9200'
43+
syslog:
44+
appName: myapp
45+
facility: user
46+
msgID: mymsg
47+
procID: myproc
48+
rfc: RFC5424
49+
severity: informational
50+
{{- end }}
51+
pipelines:
52+
- name: app-logs
53+
detectMultilineErrors: true
54+
filterRefs:
55+
- noise
56+
inputRefs:
57+
- application
58+
outputRefs:
59+
- cloudwatch-1
60+
- name: infra-logs
61+
detectMultilineErrors: true
62+
inputRefs:
63+
- infrastructure
64+
outputRefs:
65+
- cloudwatch-1
66+
- name: audit-logs
67+
filterRefs:
68+
- sos-policy
69+
inputRefs:
70+
- audit
71+
outputRefs:
72+
- cloudwatch-1
73+
{{- if eq .Values.cluster_logging_operator_use_syslog_forwarder "true" }}
74+
- rsyslog-local
75+
{{- end }}

‎cluster-applications/054-cluster-logging-operator/values.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
cluster_id: xxx
3+
region_id: xxx
4+
cluster_logging_operator_aws_access_key_id: xxx
5+
cluster_logging_operator_aws_secret_access_key: xxx
6+
cluster_logging_operator_channel: "stable-5.9"
7+
cluster_logging_operator_use_syslog_forwarder: "true"

0 commit comments

Comments
 (0)