Skip to content

Commit eeee388

Browse files
committed
chore: update telegraf operator to v1.3.10
1 parent b9f8664 commit eeee388

File tree

7 files changed

+25
-23
lines changed

7 files changed

+25
-23
lines changed

bundle.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ spec:
503503
- name: RELATED_IMAGE_TAILING_SIDECAR
504504
value: registry.connect.redhat.com/sumologic/tailing-sidecar@sha256:34c7e3d6a15dcbb72ce498744baa5e6b4663af4838a6f6429458e2d73ecb4d09
505505
- name: RELATED_IMAGE_TELEGRAF_OPERATOR
506-
value: registry.connect.redhat.com/sumologic/telegraf-operator@sha256:e27d7a4d7c9947685641df6e238fbae5a48993530bd5c2c4bf6d7385c262715e
506+
value: registry.connect.redhat.com/sumologic/telegraf-operator@sha256:b21263cb36281d282246376e3dfd63e8ea5885a50047690f7fa3845917a7bbc6
507507
- name: RELATED_IMAGE_TELEGRAF
508508
value: registry.connect.redhat.com/sumologic/telegraf@sha256:ca396dad12a289aea9136da713020d31b179e9f49aae61c48332d61086d1d059
509509
- name: RELATED_IMAGE_KUBERNETES_FLUENTD

bundle/manifests/operator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ spec:
461461
- name: RELATED_IMAGE_TAILING_SIDECAR
462462
value: registry.connect.redhat.com/sumologic/tailing-sidecar@sha256:34c7e3d6a15dcbb72ce498744baa5e6b4663af4838a6f6429458e2d73ecb4d09
463463
- name: RELATED_IMAGE_TELEGRAF_OPERATOR
464-
value: registry.connect.redhat.com/sumologic/telegraf-operator@sha256:e27d7a4d7c9947685641df6e238fbae5a48993530bd5c2c4bf6d7385c262715e
464+
value: registry.connect.redhat.com/sumologic/telegraf-operator@sha256:b21263cb36281d282246376e3dfd63e8ea5885a50047690f7fa3845917a7bbc6
465465
- name: RELATED_IMAGE_TELEGRAF
466466
value: registry.connect.redhat.com/sumologic/telegraf@sha256:ca396dad12a289aea9136da713020d31b179e9f49aae61c48332d61086d1d059
467467
- name: RELATED_IMAGE_KUBERNETES_FLUENTD

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ spec:
6464
- name: RELATED_IMAGE_TAILING_SIDECAR
6565
value: registry.connect.redhat.com/sumologic/tailing-sidecar@sha256:34c7e3d6a15dcbb72ce498744baa5e6b4663af4838a6f6429458e2d73ecb4d09
6666
- name: RELATED_IMAGE_TELEGRAF_OPERATOR
67-
value: registry.connect.redhat.com/sumologic/telegraf-operator@sha256:e27d7a4d7c9947685641df6e238fbae5a48993530bd5c2c4bf6d7385c262715e
67+
value: registry.connect.redhat.com/sumologic/telegraf-operator@sha256:b21263cb36281d282246376e3dfd63e8ea5885a50047690f7fa3845917a7bbc6
6868
- name: RELATED_IMAGE_TELEGRAF
6969
value: registry.connect.redhat.com/sumologic/telegraf@sha256:ca396dad12a289aea9136da713020d31b179e9f49aae61c48332d61086d1d059
7070
- name: RELATED_IMAGE_KUBERNETES_FLUENTD

config/samples/full_config.yaml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
# accessKey: ""
3131

3232
## Sumo API endpoint; Leave blank for automatic endpoint discovery and redirection
33-
## ref: https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security
33+
## ref: https://help.sumologic.com/docs/api/getting-started#sumo-logic-endpoints-by-deployment-and-firewall-security
3434
endpoint: ""
3535

3636
## proxy urls
@@ -157,7 +157,7 @@ spec:
157157

158158
collector:
159159
## Configuration of additional collector fields
160-
## https://help.sumologic.com/Manage/Fields#http-source-fields
160+
## https://help.sumologic.com/docs/manage/fields/#http-source-fields
161161
fields: {}
162162

163163
## Configuration of http sources
@@ -280,11 +280,12 @@ spec:
280280
## This feature autodetects how much CPU is assigned to the nginx instance and sets
281281
## the right amount of workers based on that. Disable to use the default of 8 workers.
282282
workerCountAutotune: true
283+
## Nginx listen port
284+
port: 8080
283285
replicaCount: 3
284286
image:
285-
## TODO: Serve this image from the sumologic public ECR
286-
repository: public.ecr.aws/nginx/nginx
287-
tag: 1.21-alpine
287+
repository: public.ecr.aws/sumologic/nginx-unprivileged
288+
tag: 1.23.1-alpine
288289
pullPolicy: IfNotPresent
289290
resources:
290291
limits:
@@ -1029,7 +1030,7 @@ spec:
10291030
# - name: "image-pull-secret"
10301031
image:
10311032
repository: public.ecr.aws/sumologic/fluent-bit
1032-
tag: 1.6.10-sumo-2
1033+
tag: 1.6.10-sumo-3
10331034
pullPolicy: IfNotPresent
10341035

10351036
## Resource limits for fluent-bit
@@ -2567,7 +2568,7 @@ spec:
25672568

25682569
# Kafka Metrics
25692570
# List of Metrics are on following dochub page:
2570-
# https://help.sumologic.com/07Sumo-Logic-Apps/10Containers_and_Orchestration/Kafka/Kafka_Metrics
2571+
# https://help.sumologic.com/docs/integrations/containers-orchestration/kafka/#kafka-metrics
25712572
# Metrics follow following format:
25722573
# kafka_broker_*
25732574
# kafka_controller_*
@@ -2630,7 +2631,7 @@ spec:
26302631

26312632
## PostgreSQL Telegraf Metrics
26322633
## List of Metrics are on following dochub page:
2633-
## https://help.sumologic.com/07Sumo-Logic-Apps/12Databases/PostgreSQL/Metrics_for_the_Sumo_Logic_PostgreSQL_App
2634+
## https://help.sumologic.com/docs/integrations/databases/postgresql/#postgresql-metrics
26342635
## Metrics follow following format:
26352636
## postgresql_blks_hit
26362637
## postgresql_blks_read
@@ -5108,7 +5109,7 @@ spec:
51085109
scc:
51095110
create: false
51105111

5111-
## Configure OpenTelemetry Operator - Tracing
5112+
## Configure OpenTelemetry Operator - Instrumentation
51125113
## ref: https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-operator
51135114
opentelemetry-operator:
51145115
enabled: false

tests/compare_manifests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ sed -i.bak '/tag: v2.22.1/d' helm_operator_templates.yaml
2121
sed -i.bak 's#public.ecr.aws/sumologic/prometheus:v2.22.1#public.ecr.aws/sumologic/prometheus#g' helm_chart_templates.yaml
2222

2323
# Change image for telegraf operator to version with tag
24-
sed -i.bak 's#public.ecr.aws/sumologic/telegraf-operator-ubi@sha256:5ec540691a2db5032e117ff6f883ef75bfdd94b529d84fcb30f04acc5313724d#public.ecr.aws/sumologic/telegraf-operator-ubi:v1.3.10#g' helm_operator_templates.yaml
24+
sed -i.bak 's#public.ecr.aws/sumologic/telegraf-operator-ubi@sha256:0757c4b2bf9984eecb2d436b70b6613f4e5f7025b5f53af0382d0acf4c666449#public.ecr.aws/sumologic/telegraf-operator-ubi:v1.3.10#g' helm_operator_templates.yaml
2525

2626
# busybox image has not tag set in collection
2727
sed -i.bak 's/busybox:1.33.0/busybox/g' helm_operator_templates.yaml

tests/deploy_helm_operator.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ sed -i.bak "s#registry.connect.redhat.com/sumologic/kube-rbac-proxy@sha256:c1ea7
2525
sed -i.bak "s#registry.connect.redhat.com/sumologic/kube-rbac-proxy:v0.8.0-ubi#public.ecr.aws/sumologic/kube-rbac-proxy:v0.8.0-ubi#g" bundle.yaml
2626
sed -i.bak "s#registry.connect.redhat.com/sumologic/tailing-sidecar-operator@sha256:8b22b5035e7512fff17b05b37076f1bdbc3102cfbfc676e66ef7f3682dff5b98#ghcr.io/sumologic/tailing-sidecar-operator@sha256:e8b1d815666b69ab3047bc1d81afb51fb03caa99ca382c3f81949488072cd748#g" bundle.yaml
2727
sed -i.bak "s#registry.connect.redhat.com/sumologic/tailing-sidecar@sha256:34c7e3d6a15dcbb72ce498744baa5e6b4663af4838a6f6429458e2d73ecb4d09#ghcr.io/sumologic/tailing-sidecar@sha256:3a9a741cbc10298d9be5bd68367883de45ad887e63ce12fedaf4024da807b82f#g" bundle.yaml
28-
sed -i.bak "s#registry.connect.redhat.com/sumologic/telegraf-operator@sha256:e27d7a4d7c9947685641df6e238fbae5a48993530bd5c2c4bf6d7385c262715e#public.ecr.aws/sumologic/telegraf-operator-ubi@sha256:5ec540691a2db5032e117ff6f883ef75bfdd94b529d84fcb30f04acc5313724d#g" bundle.yaml
28+
sed -i.bak "s#registry.connect.redhat.com/sumologic/telegraf-operator@sha256:b21263cb36281d282246376e3dfd63e8ea5885a50047690f7fa3845917a7bbc6#public.ecr.aws/sumologic/telegraf-operator-ubi@sha256:0757c4b2bf9984eecb2d436b70b6613f4e5f7025b5f53af0382d0acf4c666449#g" bundle.yaml
2929
sed -i.bak "s#registry.connect.redhat.com/sumologic/telegraf@sha256:ca396dad12a289aea9136da713020d31b179e9f49aae61c48332d61086d1d059#public.ecr.aws/sumologic/telegraf@sha256:f9883d1e9e0baf0d326a7c2c5503e011b36bf0bff22d6470c2f6d2b39fdd11fb#g" bundle.yaml
3030
sed -i.bak "s#registry.connect.redhat.com/sumologic/kubernetes-fluentd@sha256:fdc41e366fa24046eb023ab76ca3bb571cdde5b35ea75ccdd9b9435091266562#public.ecr.aws/sumologic/kubernetes-fluentd@sha256:dca1e3854b2e7fd2540c53c8092e3105c6a4bdcce426035a2cd5fed28a8690bf#g" bundle.yaml
3131
sed -i.bak "s#registry.connect.redhat.com/sumologic/fluent-bit@sha256:18e188c2b72d4404cd14244776795244e49ff7f4bc743db97c5acec068fe5394#public.ecr.aws/sumologic/fluent-bit@sha256:a8ead538bbba26e83c9f70137ee9ae6dac922f7844ebd3273d57178b214790ab#g" bundle.yaml

tests/test_openshift.yaml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
accessKey: "dummy"
3131

3232
## Sumo API endpoint; Leave blank for automatic endpoint discovery and redirection
33-
## ref: https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security
33+
## ref: https://help.sumologic.com/docs/api/getting-started#sumo-logic-endpoints-by-deployment-and-firewall-security
3434
endpoint: "http://receiver-mock.receiver-mock:3000/terraform/api/"
3535

3636
## proxy urls
@@ -157,7 +157,7 @@ spec:
157157

158158
collector:
159159
## Configuration of additional collector fields
160-
## https://help.sumologic.com/Manage/Fields#http-source-fields
160+
## https://help.sumologic.com/docs/manage/fields/#http-source-fields
161161
fields: {}
162162

163163
## Configuration of http sources
@@ -280,11 +280,12 @@ spec:
280280
## This feature autodetects how much CPU is assigned to the nginx instance and sets
281281
## the right amount of workers based on that. Disable to use the default of 8 workers.
282282
workerCountAutotune: true
283+
## Nginx listen port
284+
port: 8080
283285
replicaCount: 3
284286
image:
285-
## TODO: Serve this image from the sumologic public ECR
286-
repository: public.ecr.aws/nginx/nginx
287-
tag: 1.21-alpine
287+
repository: public.ecr.aws/sumologic/nginx-unprivileged
288+
tag: 1.23.1-alpine
288289
pullPolicy: IfNotPresent
289290
resources:
290291
limits:
@@ -1031,7 +1032,7 @@ spec:
10311032
# - name: "image-pull-secret"
10321033
image:
10331034
repository: public.ecr.aws/sumologic/fluent-bit
1034-
tag: 1.6.10-sumo-2
1035+
tag: 1.6.10-sumo-3
10351036
pullPolicy: IfNotPresent
10361037

10371038
## Resource limits for fluent-bit
@@ -2609,7 +2610,7 @@ spec:
26092610

26102611
# Kafka Metrics
26112612
# List of Metrics are on following dochub page:
2612-
# https://help.sumologic.com/07Sumo-Logic-Apps/10Containers_and_Orchestration/Kafka/Kafka_Metrics
2613+
# https://help.sumologic.com/docs/integrations/containers-orchestration/kafka/#kafka-metrics
26132614
# Metrics follow following format:
26142615
# kafka_broker_*
26152616
# kafka_controller_*
@@ -2672,7 +2673,7 @@ spec:
26722673

26732674
## PostgreSQL Telegraf Metrics
26742675
## List of Metrics are on following dochub page:
2675-
## https://help.sumologic.com/07Sumo-Logic-Apps/12Databases/PostgreSQL/Metrics_for_the_Sumo_Logic_PostgreSQL_App
2676+
## https://help.sumologic.com/docs/integrations/databases/postgresql/#postgresql-metrics
26762677
## Metrics follow following format:
26772678
## postgresql_blks_hit
26782679
## postgresql_blks_read
@@ -5150,7 +5151,7 @@ spec:
51505151
scc:
51515152
create: false
51525153

5153-
## Configure OpenTelemetry Operator - Tracing
5154+
## Configure OpenTelemetry Operator - Instrumentation
51545155
## ref: https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-operator
51555156
opentelemetry-operator:
51565157
enabled: true

0 commit comments

Comments
 (0)