Skip to content

Commit 2d41154

Browse files
committed
using Vector otlp sink
Signed-off-by: Vitalii Parfonov <[email protected]>
1 parent db93317 commit 2d41154

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export LOGGING_VERSION?=6.3
2525
export VERSION=$(LOGGING_VERSION).0
2626
export NAMESPACE?=openshift-logging
2727

28-
IMAGE_LOGGING_VECTOR?=qquay.io/vparfono/vector:v0.46.1-rh
28+
IMAGE_LOGGING_VECTOR?=quay.io/openshift-logging/vector:v0.46.1
2929
IMAGE_LOGFILEMETRICEXPORTER?=quay.io/openshift-logging/log-file-metric-exporter:6.1
3030
IMAGE_LOGGING_EVENTROUTER?=quay.io/openshift-logging/eventrouter:0.3
3131

@@ -217,7 +217,7 @@ test-env: ## Echo test environment, useful for running tests outside of the Make
217217

218218
.PHONY: test-functional
219219
test-functional: test-functional-benchmarker-vector
220-
RELATED_IMAGE_VECTOR=quay.io/vparfono/vector:v0.46.1-rh \
220+
RELATED_IMAGE_VECTOR=quay.io/openshift-logging/vector:v0.46.1 \
221221
RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \
222222
go test -race \
223223
./test/functional/... \

bundle/manifests/cluster-logging.clusterserviceversion.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2118,7 +2118,7 @@ spec:
21182118
- name: OPERATOR_NAME
21192119
value: cluster-logging-operator
21202120
- name: RELATED_IMAGE_VECTOR
2121-
value: quay.io/vparfono/vector:v0.46.1-rh
2121+
value: quay.io/openshift-logging/vector:v0.46.1
21222122
- name: RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER
21232123
value: quay.io/openshift-logging/log-file-metric-exporter:6.1
21242124
image: quay.io/openshift-logging/cluster-logging-operator:latest
@@ -2165,7 +2165,7 @@ spec:
21652165
provider:
21662166
name: Red Hat
21672167
relatedImages:
2168-
- image: quay.io/vparfono/vector:v0.46.1-rh
2168+
- image: quay.io/openshift-logging/vector:v0.46.1
21692169
name: vector
21702170
- image: quay.io/openshift-logging/log-file-metric-exporter:6.1
21712171
name: log-file-metric-exporter

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ spec:
4848
- name: OPERATOR_NAME
4949
value: "cluster-logging-operator"
5050
- name: RELATED_IMAGE_VECTOR
51-
value: quay.io/vparfono/vector:v0.46.1-rh
51+
value: quay.io/openshift-logging/vector:v0.46.1
5252
- name: RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER
5353
value: quay.io/openshift-logging/log-file-metric-exporter:6.1

internal/cmd/functional-benchmarker/config/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

1818
const (
1919
LogStressorImage = "quay.io/openshift-logging/cluster-logging-load-client:0.2"
20-
imageVector = "quay.io/vparfono/vector:v0.46.1-rh"
20+
imageVector = "quay.io/openshift-logging/vector:v0.46.1"
2121
)
2222

2323
type Options struct {

olm_deploy/scripts/env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ set -eou pipefail
33

44
LOGGING_VERSION=${LOGGING_VERSION:-6.1}
55

6-
LOGGING_VECTOR_VERSION=${LOGGING_VECTOR_VERSION:-v0.37.1}
6+
LOGGING_VECTOR_VERSION=${LOGGING_VECTOR_VERSION:-v0.46.1}
77
LOGGING_LOG_FILE_METRIC_EXPORTER_VERSION=${LOGGING_LOG_FILE_METRIC_EXPORTER_VERSION:-6.1}
88

99
LOGGING_IS=${LOGGING_IS:-openshift-logging}
1010
export IMAGE_CLUSTER_LOGGING_OPERATOR_REGISTRY=${IMAGE_CLUSTER_LOGGING_OPERATOR_REGISTRY:-quay.io/${LOGGING_IS}/cluster-logging-operator-registry:${LOGGING_VERSION}}
1111
export IMAGE_CLUSTER_LOGGING_OPERATOR=${IMAGE_CLUSTER_LOGGING_OPERATOR:-quay.io/${LOGGING_IS}/cluster-logging-operator:${LOGGING_VERSION}}
12-
export IMAGE_LOGGING_VECTOR=quay.io/vparfono/vector:v0.46.1-rh
12+
export IMAGE_LOGGING_VECTOR=${IMAGE_LOGGING_VECTOR:-quay.io/${LOGGING_IS}/vector:${LOGGING_VECTOR_VERSION}}
1313
export IMAGE_LOG_FILE_METRIC_EXPORTER=${IMAGE_LOG_FILE_METRIC_EXPORTER:-quay.io/${LOGGING_IS}/log-file-metric-exporter:${LOGGING_LOG_FILE_METRIC_EXPORTER_VERSION}}
1414

1515
export CLUSTER_LOGGING_OPERATOR_NAMESPACE=${CLUSTER_LOGGING_OPERATOR_NAMESPACE:-openshift-logging}

0 commit comments

Comments
 (0)