From 1ee50f24292cdf37423cf52994e774064beb0694 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 30 Sep 2024 15:57:18 -0400 Subject: [PATCH] chore: Moved config scripts to config repo Moved to https://github.com/korrel8r/config/tree/main --- hack/openshift/Makefile | 58 ----------- hack/openshift/README.adoc | 64 ------------ hack/openshift/README.md | 3 + .../config/operators/distributed-tracing.yaml | 31 ------ .../config/operators/kustomization.yaml | 7 -- hack/openshift/config/operators/logging.yaml | 27 ----- .../openshift/config/operators/lokistack.yaml | 27 ----- .../openshift/config/operators/netobserv.yaml | 28 ------ .../config/operators/opentelemetry.yaml | 31 ------ .../config/operators/tempostack.yaml | 31 ------ hack/openshift/config/resources/.gitignore | 1 - hack/openshift/config/resources/chat.yaml | 29 ------ .../config/resources/kustomization.yaml | 26 ----- .../logging/clusterlogforwarder.yaml | 9 -- .../resources/logging/clusterlogging.yaml | 15 --- .../resources/logging/kustomization.yaml | 5 - .../config/resources/logging/lokistack.yaml | 27 ----- hack/openshift/config/resources/minio.yaml | 88 ----------------- .../resources/netobserv/0namespace.yaml | 7 -- .../resources/netobserv/flow_collector.yaml | 98 ------------------- .../resources/netobserv/kustomization.yaml | 9 -- .../config/resources/netobserv/lokistack.yaml | 27 ----- .../config/resources/netobserv/namespace.yaml | 4 - .../resources/tempostack/kustomization.yaml | 4 - .../resources/tempostack/tempostack.yaml | 38 ------- hack/openshift/config/tools/traceql.yaml | 21 ---- .../openshift/config/uiplugins/uiplugins.yaml | 33 ------- 27 files changed, 3 insertions(+), 745 deletions(-) delete mode 100644 hack/openshift/Makefile delete mode 100644 hack/openshift/README.adoc create mode 100644 hack/openshift/README.md delete mode 100644 hack/openshift/config/operators/distributed-tracing.yaml delete mode 100644 hack/openshift/config/operators/kustomization.yaml delete mode 100644 hack/openshift/config/operators/logging.yaml delete mode 100644 hack/openshift/config/operators/lokistack.yaml delete mode 100644 hack/openshift/config/operators/netobserv.yaml delete mode 100644 hack/openshift/config/operators/opentelemetry.yaml delete mode 100644 hack/openshift/config/operators/tempostack.yaml delete mode 100644 hack/openshift/config/resources/.gitignore delete mode 100644 hack/openshift/config/resources/chat.yaml delete mode 100644 hack/openshift/config/resources/kustomization.yaml delete mode 100644 hack/openshift/config/resources/logging/clusterlogforwarder.yaml delete mode 100644 hack/openshift/config/resources/logging/clusterlogging.yaml delete mode 100644 hack/openshift/config/resources/logging/kustomization.yaml delete mode 100644 hack/openshift/config/resources/logging/lokistack.yaml delete mode 100644 hack/openshift/config/resources/minio.yaml delete mode 100644 hack/openshift/config/resources/netobserv/0namespace.yaml delete mode 100644 hack/openshift/config/resources/netobserv/flow_collector.yaml delete mode 100644 hack/openshift/config/resources/netobserv/kustomization.yaml delete mode 100644 hack/openshift/config/resources/netobserv/lokistack.yaml delete mode 100644 hack/openshift/config/resources/netobserv/namespace.yaml delete mode 100644 hack/openshift/config/resources/tempostack/kustomization.yaml delete mode 100644 hack/openshift/config/resources/tempostack/tempostack.yaml delete mode 100644 hack/openshift/config/tools/traceql.yaml delete mode 100644 hack/openshift/config/uiplugins/uiplugins.yaml diff --git a/hack/openshift/Makefile b/hack/openshift/Makefile deleted file mode 100644 index 563e2e6f..00000000 --- a/hack/openshift/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# Deploy operators and resources for observability components. - -all: operators resources uiplugins - -operators: - kubectl apply -k config/operators - ../wait.sh subscription openshift-logging cluster-logging - ../wait.sh subscription openshift-operators-redhat loki-operator - ../wait.sh subscription openshift-netobserv-operator netobserv-operator - kubectl patch consoles.operator.openshift.io/cluster --type=merge --patch '{ "spec": { "plugins": ["monitoring-plugin", "logging-view-plugin", "netobserv-plugin"]}}' - -# Find default storage class. -DEFAULT_SC=$(shell kubectl get storageclass -o=jsonpath='{.items[?(@.metadata.annotations.storageclass\.kubernetes\.io/is-default-class=="true")].metadata.name}') -STORAGE_CLASS?=$(or $(strip $(DEFAULT_SC)),$(error Cannot determine storage class, must set STORAGE_CLASS.)) -STORAGE_ENV=config/resources/storage.env - -ifneq ($(STORAGE_CLASS),$(file < $(STORAGE_ENV))) -.PHONY: $(STORAGE_ENV) -endif -$(STORAGE_ENV): - echo "STORAGE_CLASS=$(STORAGE_CLASS)" > $@ - -MINIO_ROLLOUT=../wait.sh rollout minio deployment/minio - -LOGGING_ROLLOUT=../wait.sh rollout openshift-logging \ -deployment.apps/cluster-logging-operator \ -deployment.apps/logging-loki-distributor \ -deployment.apps/logging-loki-gateway \ -deployment.apps/logging-loki-querier \ -deployment.apps/logging-loki-query-frontend \ -deployment.apps/logging-view-plugin - - -NETOBSERV_ROLLOUT=../wait.sh rollout netobserv \ -deployment.apps/loki-distributor \ -deployment.apps/loki-gateway \ -deployment.apps/loki-querier \ -deployment.apps/loki-query-frontend \ -deployment.apps/netobserv-plugin - -resources: $(STORAGE_ENV) - kubectl apply -k config/resources - $(MINIO_ROLLOUT) - $(LOGGING_ROLLOUT) - $(NETOBSERV_ROLLOUT) - -uiplugins: - kubectl apply -f config/uiplugins - -clean-operators: - kubectl delete --ignore-not-found -k config/operators - kubectl patch consoles.operator.openshift.io/cluster --type=merge --patch '{ "spec": { "plugins": [] }}' - -clean-resources: - test -f $(STORAGE_ENV) || echo STORAGE_CLASS=dummy > $(STORAGE_ENV) # Kustomize needs this file. - trap "rm $(STORAGE_ENV)" EXIT; kubectl delete --ignore-not-found -k config/resources - -clean-all: clean-resources clean-operators diff --git a/hack/openshift/README.adoc b/hack/openshift/README.adoc deleted file mode 100644 index 83c45461..00000000 --- a/hack/openshift/README.adoc +++ /dev/null @@ -1,64 +0,0 @@ -= Set up OpenShift for testing -:toc: left - -These instructions will help you set up a small cluster with observable -signals for test or demonstration purposes. This is not intended for -production clusters. - -== Log-in to a cluster - -Log into an existing OpenShift cluster as `kubeadmin` or other user with the `cluster-admin` role. - -To create a test cluster on your own machine install -https://developers.redhat.com/products/openshift-local/overview[OpenShift Local] - -== Installing Operators - -To install operators from the command line: - -[source,bash] ----- -make operators ----- - -Deploys the following: - -- Loki Operator in namespace `openshift-operators-redhat` -- Red Hat OpenShift Logging Operator in namespace `openshift-logging` -- Network Observability Operator in namespace `openshift-netobserv-operator` - -[NOTE] -==== -Alternatively you can install the operators in the Openshift console from _Operators > OperatorHub_. -Use the "Provided by Red Hat" version of each operator. -==== - -== Creating resources - -Create an instance of the required resources for each operator, from the CLI: - -[source,bash] ----- -make resources ----- - -Deploys into the following namespaces: - -- `minio`: deploys minio to provide local S3 storage. -- `openshift-logging`: `cluserlogging` and `clusterlogforwarder` with `lokistack` for log storage. -- `netobserv`: `flowcollector` with `lokistack` for flow event storage. - -== Viewing in the Console - -From the OpenShift console: - -- _Observe > Logs_ -- _Observe > Network Traffic_ - -== Uninstalling - -[source,bash] ----- -make clean-resources -make clean-operators ----- diff --git a/hack/openshift/README.md b/hack/openshift/README.md new file mode 100644 index 00000000..b8ae4f24 --- /dev/null +++ b/hack/openshift/README.md @@ -0,0 +1,3 @@ +# Configuration scripts and resources for openshift + +Contents have moved to https://github.com/korrel8r/config/blob/main diff --git a/hack/openshift/config/operators/distributed-tracing.yaml b/hack/openshift/config/operators/distributed-tracing.yaml deleted file mode 100644 index 927663b4..00000000 --- a/hack/openshift/config/operators/distributed-tracing.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - labels: - openshift.io/cluster-monitoring: "true" - name: openshift-distributed-tracing ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - annotations: - olm.providedAPIs: Jaeger.v1.jaegertracing.io - name: openshift-distributed-tracing-hack - namespace: openshift-distributed-tracing -spec: - upgradeStrategy: Default ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - labels: - operators.coreos.com/jaeger-product.openshift-distributed-tracing: "" - name: jaeger-product - namespace: openshift-distributed-tracing -spec: - channel: stable - installPlanApproval: Automatic - name: jaeger-product - source: redhat-operators - sourceNamespace: openshift-marketplace ---- diff --git a/hack/openshift/config/operators/kustomization.yaml b/hack/openshift/config/operators/kustomization.yaml deleted file mode 100644 index ec37877c..00000000 --- a/hack/openshift/config/operators/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: Kustomization -apiVersion: kustomize.config.k8s.io/v1beta1 - -resources: - - lokistack.yaml - - logging.yaml - - netobserv.yaml diff --git a/hack/openshift/config/operators/logging.yaml b/hack/openshift/config/operators/logging.yaml deleted file mode 100644 index 649e9cde..00000000 --- a/hack/openshift/config/operators/logging.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - labels: - openshift.io/cluster-monitoring: "true" - name: openshift-logging ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - annotations: - olm.providedAPIs: ClusterLogForwarder.v1.logging.openshift.io,ClusterLogging.v1.logging.openshift.io,LogFileMetricExporter.v1alpha1.logging.openshift.i - name: openshift-logging-hack - namespace: openshift-logging -spec: - upgradeStrategy: Default ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: cluster-logging - namespace: openshift-logging -spec: - channel: "stable" - name: cluster-logging - source: redhat-operators - sourceNamespace: openshift-marketplace diff --git a/hack/openshift/config/operators/lokistack.yaml b/hack/openshift/config/operators/lokistack.yaml deleted file mode 100644 index 0dde14f6..00000000 --- a/hack/openshift/config/operators/lokistack.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - labels: - openshift.io/cluster-monitoring: "true" - name: openshift-operators-redhat ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - annotations: - olm.providedAPIs: AlertingRule.v1.loki.grafana.com,LokiStack.v1.loki.grafana.com,RecordingRule.v1.loki.grafana.com,RulerConfig.v1.loki.grafana.com - name: openshift-operators-redhat-hack - namespace: openshift-operators-redhat -spec: - upgradeStrategy: Default ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: loki-operator - namespace: openshift-operators-redhat -spec: - channel: stable - name: loki-operator - source: redhat-operators - sourceNamespace: openshift-marketplace diff --git a/hack/openshift/config/operators/netobserv.yaml b/hack/openshift/config/operators/netobserv.yaml deleted file mode 100644 index f8adbd05..00000000 --- a/hack/openshift/config/operators/netobserv.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - labels: - openshift.io/cluster-monitoring: "true" - name: openshift-netobserv-operator ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - annotations: - olm.providedAPIs: "FlowCollector.v1alpha1.flows.netobserv.io,FlowCollector.v1beta1.flows.netobserv.io,FlowCollector.v1beta2.flows.netobserv.io,FlowMetric.v1alpha1.flows.netobserv.io" - name: openshift-netobserv-operator-hack - namespace: openshift-netobserv-operator -spec: - upgradeStrategy: Default ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: netobserv-operator - namespace: openshift-netobserv-operator -spec: - channel: stable - installPlanApproval: Automatic - name: netobserv-operator - source: redhat-operators - sourceNamespace: openshift-marketplace diff --git a/hack/openshift/config/operators/opentelemetry.yaml b/hack/openshift/config/operators/opentelemetry.yaml deleted file mode 100644 index 43cefa23..00000000 --- a/hack/openshift/config/operators/opentelemetry.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - labels: - openshift.io/cluster-monitoring: "true" - name: openshift-opentelemetry-operator ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - annotations: - olm.providedAPIs: Instrumentation.v1alpha1.opentelemetry.io,OpAMPBridge.v1alpha1.opentelemetry.io,OpenTelemetryCollector.v1alpha1.opentelemetry.io,OpenTelemetryCollector.v1beta1.opentelemetry.io - name: openshift-opentelemetry-operator-hack - namespace: openshift-opentelemetry-operator -spec: - upgradeStrategy: Default ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - labels: - operators.coreos.com/opentelemetry-product.openshift-opentelemetry-operator: "" - name: opentelemetry-product - namespace: openshift-opentelemetry-operator -spec: - channel: stable - installPlanApproval: Automatic - name: opentelemetry-product - source: redhat-operators - sourceNamespace: openshift-marketplace ---- diff --git a/hack/openshift/config/operators/tempostack.yaml b/hack/openshift/config/operators/tempostack.yaml deleted file mode 100644 index 84053367..00000000 --- a/hack/openshift/config/operators/tempostack.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - labels: - openshift.io/cluster-monitoring: "true" - name: openshift-tempo-operator ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - annotations: - olm.providedAPIs: TempoMonolithic.v1alpha1.tempo.grafana.com,TempoStack.v1alpha1.tempo.grafana.com - name: openshift-tempo-operator-hack - namespace: openshift-tempo-operator -spec: - upgradeStrategy: Default ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - labels: - operators.coreos.com/tempo-product.openshift-tempo-operator: "" - name: tempo-product - namespace: openshift-tempo-operator -spec: - channel: stable - installPlanApproval: Automatic - name: tempo-product - source: redhat-operators - sourceNamespace: openshift-marketplace ---- diff --git a/hack/openshift/config/resources/.gitignore b/hack/openshift/config/resources/.gitignore deleted file mode 100644 index b34d0b81..00000000 --- a/hack/openshift/config/resources/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/storage.env diff --git a/hack/openshift/config/resources/chat.yaml b/hack/openshift/config/resources/chat.yaml deleted file mode 100644 index b824e6e9..00000000 --- a/hack/openshift/config/resources/chat.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# Generate application log messages. -apiVersion: v1 -kind: Namespace -metadata: - name: chat ---- -apiVersion: v1 -kind: Pod -metadata: - labels: - app: chat - test: "true" - name: chat-x - namespace: chat -spec: - containers: - - name: chat - image: quay.io/libpod/alpine - command: - - sh - - "-c" - - 'i=1; while true; do echo "$(date) chat says hello - $i"; i=$((i + 1)); sleep 1; done' - securityContext: - allowPrivilegeEscalation: false - runAsNonRoot: true - seccompProfile: - type: "RuntimeDefault" - capabilities: - drop: [ALL] diff --git a/hack/openshift/config/resources/kustomization.yaml b/hack/openshift/config/resources/kustomization.yaml deleted file mode 100644 index 2aef2a86..00000000 --- a/hack/openshift/config/resources/kustomization.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - minio.yaml - - chat.yaml - - logging - - netobserv - - tempostack - -configMapGenerator: - - name: storage-env - envs: - - storage.env - -replacements: - - source: - kind: ConfigMap - name: storage-env - fieldPath: data.STORAGE_CLASS - targets: - - select: - kind: LokiStack - fieldPaths: - - spec.storageClassName - diff --git a/hack/openshift/config/resources/logging/clusterlogforwarder.yaml b/hack/openshift/config/resources/logging/clusterlogforwarder.yaml deleted file mode 100644 index ab3fdb8e..00000000 --- a/hack/openshift/config/resources/logging/clusterlogforwarder.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: logging.openshift.io/v1 -kind: ClusterLogForwarder -metadata: - name: instance - namespace: openshift-logging -spec: - pipelines: - - inputRefs: [application, infrastructure, audit] - outputRefs: [default] diff --git a/hack/openshift/config/resources/logging/clusterlogging.yaml b/hack/openshift/config/resources/logging/clusterlogging.yaml deleted file mode 100644 index 509e0112..00000000 --- a/hack/openshift/config/resources/logging/clusterlogging.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: logging.openshift.io/v1 -kind: ClusterLogging -metadata: - annotations: - logging.openshift.io/preview-korrel8r-console: enabled # Enables korrel8r preview in openshift console - name: instance - namespace: openshift-logging -spec: - managementState: Managed - collection: - type: vector - logStore: - type: lokistack - lokistack: - name: logging-loki diff --git a/hack/openshift/config/resources/logging/kustomization.yaml b/hack/openshift/config/resources/logging/kustomization.yaml deleted file mode 100644 index b7e895f2..00000000 --- a/hack/openshift/config/resources/logging/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -namespace: openshift-logging -resources: - - lokistack.yaml - - clusterlogging.yaml - - clusterlogforwarder.yaml diff --git a/hack/openshift/config/resources/logging/lokistack.yaml b/hack/openshift/config/resources/logging/lokistack.yaml deleted file mode 100644 index b2ce4db1..00000000 --- a/hack/openshift/config/resources/logging/lokistack.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: minio -stringData: - access_key_id: minio - access_key_secret: minio123 - bucketnames: loki - endpoint: http://minio.minio.svc:9000 -type: Opaque ---- -apiVersion: loki.grafana.com/v1 -kind: LokiStack -metadata: - name: logging-loki -spec: - size: 1x.demo - storage: - schemas: - - version: v12 - effectiveDate: '2022-06-01' - secret: - name: minio - type: s3 - storageClassName: REPLACE - tenants: - mode: openshift-logging diff --git a/hack/openshift/config/resources/minio.yaml b/hack/openshift/config/resources/minio.yaml deleted file mode 100644 index c7028ce4..00000000 --- a/hack/openshift/config/resources/minio.yaml +++ /dev/null @@ -1,88 +0,0 @@ -# Deploy minio, does not require an operator. -apiVersion: v1 -kind: Namespace -metadata: - name: minio ---- -# Example secret, copy to client namespace. -apiVersion: v1 -kind: Secret -metadata: - name: minio - namespace: minio -stringData: - access_key_id: minio - access_key_secret: minio123 - bucketnames: loki - endpoint: http://minio.minio.svc:9000 -type: Opaque ---- -apiVersion: v1 -kind: Service -metadata: - name: minio - namespace: minio -spec: - ports: - - port: 9000 - protocol: TCP - targetPort: 9000 - selector: - app.kubernetes.io/name: minio - type: ClusterIP ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app.kubernetes.io/name: minio - name: minio - namespace: minio -spec: - selector: - matchLabels: - app.kubernetes.io/name: minio - strategy: - type: Recreate - template: - metadata: - labels: - app.kubernetes.io/name: minio - spec: - containers: - - command: - - /bin/sh - - -c - - | - mkdir -p /storage/loki && \ - minio server /storage - env: - - name: MINIO_ACCESS_KEY - value: minio - - name: MINIO_SECRET_KEY - value: minio123 - image: quay.io/minio/minio - name: minio - ports: - - containerPort: 9000 - volumeMounts: - - mountPath: /storage - name: storage - volumes: - - name: storage - persistentVolumeClaim: - claimName: minio ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - labels: - app.kubernetes.io/name: minio - name: minio - namespace: minio -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi diff --git a/hack/openshift/config/resources/netobserv/0namespace.yaml b/hack/openshift/config/resources/netobserv/0namespace.yaml deleted file mode 100644 index eb49cca2..00000000 --- a/hack/openshift/config/resources/netobserv/0namespace.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - labels: - openshift.io/cluster-monitoring: "true" - name: netobserv diff --git a/hack/openshift/config/resources/netobserv/flow_collector.yaml b/hack/openshift/config/resources/netobserv/flow_collector.yaml deleted file mode 100644 index 7714a47b..00000000 --- a/hack/openshift/config/resources/netobserv/flow_collector.yaml +++ /dev/null @@ -1,98 +0,0 @@ -apiVersion: flows.netobserv.io/v1beta2 -kind: FlowCollector -metadata: - annotations: - flows.netobserv.io/flowcollectorlegacy-namespace: netobserv - flows.netobserv.io/flpparent-namespace: netobserv - name: cluster -spec: - kafka: - sasl: - type: Disabled - agent: - ebpf: - cacheActiveTimeout: 5s - cacheMaxFlows: 100000 - excludeInterfaces: - - lo - kafkaBatchSize: 1048576 - logLevel: info - sampling: 50 - ipfix: - cacheActiveTimeout: 20s - cacheMaxFlows: 400 - clusterNetworkOperator: - namespace: openshift-network-operator - ovnKubernetes: - containerName: ovnkube-node - daemonSetName: ovnkube-node - namespace: ovn-kubernetes - sampling: 400 - type: eBPF - consolePlugin: - autoscaler: - maxReplicas: 3 - status: Disabled - enable: true - imagePullPolicy: IfNotPresent - logLevel: info - portNaming: - enable: true - quickFilters: - - default: true - filter: - flow_layer: app - name: Applications - - filter: - flow_layer: infra - name: Infrastructure - - default: true - filter: - dst_kind: Pod - src_kind: Pod - name: Pods network - - filter: - dst_kind: Service - name: Services network - replicas: 1 - deploymentModel: Direct - loki: - enable: true - lokiStack: - name: loki - manual: - authToken: Disabled - ingesterUrl: http://loki:3100/ - querierUrl: http://loki:3100/ - statusTls: - caCert: {} - userCert: {} - tenantID: netobserv - microservices: - ingesterUrl: http://loki-distributor:3100/ - querierUrl: http://loki-query-frontend:3100/ - tenantID: netobserv - mode: LokiStack - monolithic: - tenantID: netobserv - url: http://loki:3100/ - readTimeout: 30s - writeBatchSize: 102400 - writeBatchWait: 1s - writeTimeout: 10s - namespace: netobserv - processor: - imagePullPolicy: IfNotPresent - kafkaConsumerAutoscaler: - maxReplicas: 3 - status: Disabled - kafkaConsumerBatchSize: 10485760 - kafkaConsumerQueueCapacity: 1000 - kafkaConsumerReplicas: 3 - logLevel: info - logTypes: Flows - metrics: - server: - port: 9102 - tls: - type: Disabled diff --git a/hack/openshift/config/resources/netobserv/kustomization.yaml b/hack/openshift/config/resources/netobserv/kustomization.yaml deleted file mode 100644 index 2017228f..00000000 --- a/hack/openshift/config/resources/netobserv/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: netobserv - -resources: - - namespace.yaml - - lokistack.yaml - - flow_collector.yaml diff --git a/hack/openshift/config/resources/netobserv/lokistack.yaml b/hack/openshift/config/resources/netobserv/lokistack.yaml deleted file mode 100644 index 9af88fda..00000000 --- a/hack/openshift/config/resources/netobserv/lokistack.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: minio -stringData: - access_key_id: minio - access_key_secret: minio123 - bucketnames: loki - endpoint: http://minio.minio.svc:9000 -type: Opaque ---- -apiVersion: loki.grafana.com/v1 -kind: LokiStack -metadata: - name: loki -spec: - size: 1x.demo - storage: - schemas: - - version: v12 - effectiveDate: '2022-06-01' - secret: - name: minio - type: s3 - storageClassName: REPLACE - tenants: - mode: openshift-network diff --git a/hack/openshift/config/resources/netobserv/namespace.yaml b/hack/openshift/config/resources/netobserv/namespace.yaml deleted file mode 100644 index b3d5d38e..00000000 --- a/hack/openshift/config/resources/netobserv/namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: netobserv diff --git a/hack/openshift/config/resources/tempostack/kustomization.yaml b/hack/openshift/config/resources/tempostack/kustomization.yaml deleted file mode 100644 index d29944d6..00000000 --- a/hack/openshift/config/resources/tempostack/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - tempostack.yaml diff --git a/hack/openshift/config/resources/tempostack/tempostack.yaml b/hack/openshift/config/resources/tempostack/tempostack.yaml deleted file mode 100644 index 0d5d9115..00000000 --- a/hack/openshift/config/resources/tempostack/tempostack.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: minio - namespace: openshift-tempo-operator -stringData: - access_key_id: minio - access_key_secret: minio123 - bucket: tempo - endpoint: http://minio.minio.svc:9000 -type: Opaque ---- -apiVersion: tempo.grafana.com/v1alpha1 -kind: TempoStack -metadata: - name: tempo-stack - namespace: openshift-tempo-operator -spec: - storageSize: 1Gi - storage: - secret: - name: minio - type: s3 - resources: - total: - limits: - memory: 2Gi - cpu: 2000m - template: - queryFrontend: - jaegerQuery: - enabled: true - ingress: - route: - termination: edge - type: route ---- diff --git a/hack/openshift/config/tools/traceql.yaml b/hack/openshift/config/tools/traceql.yaml deleted file mode 100644 index 49135f40..00000000 --- a/hack/openshift/config/tools/traceql.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: traceql-search -spec: - containers: - - name: traceql-search - image: ghcr.io/grafana/tempo-operator/test-utils:main - command: - - /bin/bash - - -eux - - -c - args: - - | - curl -G \ - --header "Authorization: Bearer $(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" \ - --cacert /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt \ - --data-urlencode 'q={ resource.service.name="article-service" }' \ - https://tempo-platform-gateway.openshift-tracing.svc.cluster.local:8080/api/traces/v1/platform/tempo/api/search | jq - restartPolicy: Never - diff --git a/hack/openshift/config/uiplugins/uiplugins.yaml b/hack/openshift/config/uiplugins/uiplugins.yaml deleted file mode 100644 index 85b447cb..00000000 --- a/hack/openshift/config/uiplugins/uiplugins.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -apiVersion: observability.openshift.io/v1alpha1 -kind: UIPlugin -metadata: - name: dashboards -spec: - type: Dashboards ---- -apiVersion: observability.openshift.io/v1alpha1 -kind: UIPlugin -metadata: - name: troubleshooting-panel -spec: - type: TroubleshootingPanel ---- -apiVersion: observability.openshift.io/v1alpha1 -kind: UIPlugin -metadata: - name: distributed-tracing -spec: - type: DistributedTracing ---- -apiVersion: observability.openshift.io/v1alpha1 -kind: UIPlugin -metadata: - name: logging -spec: - type: Logging - logging: - lokiStack: - name: logging-loki - logsLimit: 50 - timeout: 30s