Merge commit 'fe564d72279f4ab061b961dd528623f0ed272667' as 'cluster-config'

cluster-config/components/loki/instance/base/clusterlogforwarder.yaml

@@ -0,0 +1,39 @@
+apiVersion: logging.openshift.io/v1
+kind: ClusterLogForwarder
+metadata:
+  name: instance
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+spec:
+  outputs:
+    - name: loki-app
+      type: loki
+      url: http://lokistack-gateway-http.openshift-logging.svc:8080/api/logs/v1/application
+      secret:
+        name: lokistack-gateway-bearer-token
+    - name: loki-infra
+      type: loki
+      url: http://lokistack-gateway-http.openshift-logging.svc:8080/api/logs/v1/infrastructure
+      secret:
+        name: lokistack-gateway-bearer-token
+    - name: loki-audit
+      type: loki
+      url: http://lokistack-gateway-http.openshift-logging.svc:8080/api/logs/v1/audit
+      secret:
+        name: lokistack-gateway-bearer-token
+  pipelines:
+    - name: send-app-logs
+      inputRefs:
+        - application
+      outputRefs:
+        - loki-app
+    - name: send-infra-logs
+      inputRefs:
+        - infrastructure
+      outputRefs:
+        - loki-infra
+    - name: send-audit-logs
+      inputRefs:
+        - audit
+      outputRefs:
+        - loki-audit

cluster-config/components/loki/instance/base/clusterlogging.yaml

@@ -0,0 +1,14 @@
+apiVersion: logging.openshift.io/v1
+kind: ClusterLogging
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+  name: instance
+spec:
+  managementState: Managed
+  logStore:
+    type: lokistack
+    lokistack:
+      name: logging-loki
+  collection:
+    type: vector

cluster-config/components/loki/instance/base/kustomization.yaml

@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: openshift-logging
+
+resources:
+- lokigateway-secret.yaml
+# - role.yaml
+- lokistack.yaml
+# - clusterlogforwarder.yaml
+- clusterlogging.yaml

cluster-config/components/loki/instance/base/lokigateway-secret.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+data:
+  token: L3Zhci9ydW4vc2VjcmV0cy9rdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3Rva2Vu
+kind: Secret
+metadata:
+  name: lokistack-gateway-bearer-token
+type: Opaque

cluster-config/components/loki/instance/base/lokistack.yaml

@@ -0,0 +1,18 @@
+apiVersion: loki.grafana.com/v1
+kind: LokiStack
+metadata:
+  name: logging-loki
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+spec:
+  size: 1x.extra-small
+  storage:
+    schemas:
+      - effectiveDate: '2022-06-01'
+        version: v12
+    secret:
+      name: loki-storage
+      type: s3
+  storageClassName: lvms-vg1
+  tenants:
+    mode: openshift-logging

cluster-config/components/loki/instance/base/role.yaml

@@ -0,0 +1,29 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: lokistack-tenant-logs
+rules:
+- apiGroups:
+  - 'loki.grafana.com'
+  resources:
+  - application
+  - infrastructure
+  - audit
+  resourceNames:
+  - logs
+  verbs:
+  - 'create'
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: lokistack-tenant-logs
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: lokistack-tenant-logs
+subjects:
+- kind: ServiceAccount
+  name: logcollector
+  namespace: openshift-logging

cluster-config/components/loki/instance/overlays/sno/ingestion-rate-patch.yaml

@@ -0,0 +1,11 @@
+apiVersion: loki.grafana.com/v1beta1
+kind: LokiStack
+metadata:
+  name: lokistack
+spec:
+  limits:
+    global:
+      ingestion:
+        ingestionRate: 12
+        ingestionBurstSize: 15
+  size: 1x.extra-small

cluster-config/components/loki/instance/overlays/sno/kustomization.yaml

@@ -0,0 +1,20 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: openshift-logging
+
+resources:
+- ../../base
+
+patches:
+- patch: |-
+    - op: replace
+      path: /spec/size
+      value: 1x.extra-small
+  target:
+    kind: LokiStack
+    name: logging-loki
+- path: ingestion-rate-patch.yaml
+  target:
+    kind: LokiStack
+    name: logging-loki