diff --git a/components/monitoring/logging/production/base/configure-logging/configure-log-collectors.yaml b/components/monitoring/logging/production/base/configure-logging/configure-log-collectors.yaml deleted file mode 100644 index c31058d759d..00000000000 --- a/components/monitoring/logging/production/base/configure-logging/configure-log-collectors.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: "logging.openshift.io/v1" -kind: "ClusterLogging" -metadata: - name: "instance" - annotations: - logging.openshift.io/preview-vector-collector: enabled - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - argocd.argoproj.io/sync-wave: "2" -spec: - collection: - type: vector diff --git a/components/monitoring/logging/production/base/configure-logging/configure-logforwarder.yaml b/components/monitoring/logging/production/base/configure-logging/configure-logforwarder.yaml deleted file mode 100644 index 9e41cb7ded9..00000000000 --- a/components/monitoring/logging/production/base/configure-logging/configure-logforwarder.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -apiVersion: logging.openshift.io/v1 -kind: ClusterLogForwarder -metadata: - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - argocd.argoproj.io/sync-wave: "1" - name: instance -spec: - outputs: - - name: splunk-receiver-application - secret: - name: log-forwarder-splunk-rhtap-application-secret - type: splunk - url: https://http-inputs-rhcorporate.splunkcloud.com - - name: splunk-receiver-audit - secret: - name: log-forwarder-splunk-rhtap-audit-secret - type: splunk - url: https://http-inputs-rhcorporate.splunkcloud.com - pipelines: - - name: fluentd-forward-logs-to-splunk-rhtap-app-index - inputRefs: - - application - outputRefs: - - splunk-receiver-application - parse: json - - name: fluentd-forward-logs-to-splunk-rhtap-audit-index - inputRefs: - - infrastructure - - audit - outputRefs: - - splunk-receiver-audit - parse: json diff --git a/components/monitoring/logging/production/base/configure-logging/kustomization.yaml b/components/monitoring/logging/production/base/configure-logging/kustomization.yaml deleted file mode 100644 index d74dddb16c3..00000000000 --- a/components/monitoring/logging/production/base/configure-logging/kustomization.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- configure-log-collectors.yaml -- configure-logforwarder.yaml - -namespace: "openshift-logging" - -generatorOptions: - disableNameSuffixHash: true \ No newline at end of file diff --git a/components/monitoring/logging/production/base/external-secrets/kustomization.yaml b/components/monitoring/logging/production/base/external-secrets/kustomization.yaml deleted file mode 100644 index 5b894fefde7..00000000000 --- a/components/monitoring/logging/production/base/external-secrets/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- splunk-log-forwarder-external-secrets.yaml -namespace: openshift-logging diff --git a/components/monitoring/logging/production/base/external-secrets/splunk-log-forwarder-external-secrets.yaml b/components/monitoring/logging/production/base/external-secrets/splunk-log-forwarder-external-secrets.yaml deleted file mode 100644 index b241727c6cf..00000000000 --- a/components/monitoring/logging/production/base/external-secrets/splunk-log-forwarder-external-secrets.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: log-forwarder-splunk-rhtap-application-external-secret - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - argocd.argoproj.io/sync-wave: "-1" -spec: - dataFrom: - - extract: - key: "" # will be added by the overlays - refreshInterval: 1h - secretStoreRef: - name: appsre-stonesoup-vault - kind: ClusterSecretStore - target: - name: log-forwarder-splunk-rhtap-application-secret - deletionPolicy: Delete ---- -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: log-forwarder-splunk-rhtap-audit-external-secret - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - argocd.argoproj.io/sync-wave: "-1" -spec: - dataFrom: - - extract: - key: "" # will be added by the overlays - refreshInterval: 1h - secretStoreRef: - name: appsre-stonesoup-vault - kind: ClusterSecretStore - target: - name: log-forwarder-splunk-rhtap-audit-secret - deletionPolicy: Delete diff --git a/components/monitoring/logging/production/base/install-logging-operator.yaml b/components/monitoring/logging/production/base/install-logging-operator.yaml deleted file mode 100644 index b87aa4841c1..00000000000 --- a/components/monitoring/logging/production/base/install-logging-operator.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# On managed clusters, there is no need to create the openshift-logging -# namespace because it's created automatically by hive. ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: cluster-logging - namespace: openshift-logging - annotations: - argocd.argoproj.io/sync-wave: "0" -spec: - channel: "stable" - name: cluster-logging - source: redhat-operators - sourceNamespace: openshift-marketplace diff --git a/components/monitoring/logging/production/base/kustomization.yaml b/components/monitoring/logging/production/base/kustomization.yaml index be01268cb2a..6c00ae34ebd 100644 --- a/components/monitoring/logging/production/base/kustomization.yaml +++ b/components/monitoring/logging/production/base/kustomization.yaml @@ -1,14 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- install-logging-operator.yaml -- ./configure-logging/ -- ./rbac/ -- ./external-secrets/ - -generatorOptions: - disableNameSuffixHash: true - +- ../../base +- ../../base/external-secrets patches: - target: group: external-secrets.io @@ -27,4 +21,10 @@ patches: patch: | - op: replace path: /spec/dataFrom/0/extract/key - value: production/monitoring/logging/fluentd/splunk-forwarder-rhtap-production-audit \ No newline at end of file + value: production/monitoring/logging/fluentd/splunk-forwarder-rhtap-production-audit + - path: ../base/patches/configure-logforwarder-compression-patch.yaml + target: + group: observability.openshift.io + version: v1 + kind: ClusterLogForwarder + name: instance diff --git a/components/monitoring/logging/production/base/logging-operator-prerequisite/kustomization.yaml b/components/monitoring/logging/production/base/logging-operator-prerequisite/kustomization.yaml deleted file mode 100644 index 81ebb3d1864..00000000000 --- a/components/monitoring/logging/production/base/logging-operator-prerequisite/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- operatorgroup.yaml diff --git a/components/monitoring/logging/production/base/logging-operator-prerequisite/operatorgroup.yaml b/components/monitoring/logging/production/base/logging-operator-prerequisite/operatorgroup.yaml deleted file mode 100644 index 4541359e7c4..00000000000 --- a/components/monitoring/logging/production/base/logging-operator-prerequisite/operatorgroup.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: cluster-logging - namespace: openshift-logging - annotations: - argocd.argoproj.io/sync-wave: "0" -spec: - targetNamespaces: - - openshift-logging diff --git a/components/monitoring/logging/production/base/patches/configure-logforwarder-compression-patch.yaml b/components/monitoring/logging/production/base/patches/configure-logforwarder-compression-patch.yaml new file mode 100644 index 00000000000..3ccf5b5dcd7 --- /dev/null +++ b/components/monitoring/logging/production/base/patches/configure-logforwarder-compression-patch.yaml @@ -0,0 +1,9 @@ +--- +- op: add + path: /spec/outputs/0/splunk/tuning + value: + compression: gzip +- op: add + path: /spec/outputs/1/splunk/tuning + value: + compression: gzip