Skip to content

Commit

Permalink
[collector] Enable retry_on_failure for filelog receiver created by…
Browse files Browse the repository at this point in the history 
… logsCollection preset (open-telemetry#999)

* enable filelog with retry_on_failure as default config

Signed-off-by: Husni Alhamdani <[email protected]>

* enable filelog with retry_on_failure as default config

Signed-off-by: Husni Alhamdani <[email protected]>

---------

Signed-off-by: Husni Alhamdani <[email protected]>
Co-authored-by: Tyler Helmuth <[email protected]>
  • Loading branch information
@husnialhamdani @TylerHelmuth @12ushan
2 people authored and 12ushan committed Jul 22, 2024
1 parent 4f8e73b commit 7a1c489
Show file tree
Hide file tree
Showing 45 changed files with 59 additions and 55 deletions.
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-collector
version: 0.78.0
version: 0.78.1
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
2 changes: 1 addition & 1 deletion ...s/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 9b00ec05592ba2a79813b4330e8b9806670841414f4d8857dc276f3059d59a84
checksum/config: a48779289a36cd261e898a6fc6e3e1f67372f85a473e6f2857142be0d57eb6d5

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: b5f97b431f02e63569d8e97ebd3b3b5ec42334272394adfe7da1f380aa391c80
checksum/config: aee6e0960716856224ed13b82c28428449c96d20590129ac0133b4e72eba55fb

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
2 changes: 1 addition & 1 deletion ...ts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
4 changes: 3 additions & 1 deletion ...s/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down Expand Up @@ -102,6 +102,8 @@ data:
- from: attributes.log
to: body
type: move
retry_on_failure:
enabled: true
start_at: end
jaeger:
protocols:
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 6f280dabe9aa8a9e0a08e73250811afcd12dcf181bdc64d8b22d14507a7a15bb
checksum/config: 6f0dbd9cfb5b1aeb04853795f83d7694ad404180725225d9338032178c14eddc

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion ...ts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 639fddacad9c74162e66ebe85027c2cb61f50fb2b9ba989697fe5dd657fc353c
checksum/config: 53e440171d3fd866dad4a2f5d9188b4809fa0554040cd34b30302db93cdc8c75

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
2 changes: 1 addition & 1 deletion .../opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: d2fcac462ad3a18f97c11feebfba347ec528d7add3adb1c32dcab805631c6220
checksum/config: 34da9e095b1e8977cd1e79e36c5876a6e42c2bd44a4fead400c1b0e9c612f048

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion ...s/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: d2fcac462ad3a18f97c11feebfba347ec528d7add3adb1c32dcab805631c6220
checksum/config: 34da9e095b1e8977cd1e79e36c5876a6e42c2bd44a4fead400c1b0e9c612f048

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: b5f97b431f02e63569d8e97ebd3b3b5ec42334272394adfe7da1f380aa391c80
checksum/config: aee6e0960716856224ed13b82c28428449c96d20590129ac0133b4e72eba55fb

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: baaf65522449735520b8d23ae7ead5528fdf063bf13ebf9d421145db4c37080e
checksum/config: f0f80be7747d705faf3d878cce3bbe6cde6aa53bc7a4f593ff584a061b2223b2

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
2 changes: 1 addition & 1 deletion ...entelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
2 changes: 1 addition & 1 deletion .../opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
2 changes: 1 addition & 1 deletion ...lemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
2 changes: 1 addition & 1 deletion ...ts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRoleBinding
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.78.0
helm.sh/chart: opentelemetry-collector-0.78.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 26f3f3405f7b3630723af8743ebe4c98590bf75b2f1c00ded4da1da8dddf3905
checksum/config: 0d4e1815db5463e371abe2e7aad59c35778f6fcca2e30e6444632ae46e78f634

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Loading

0 comments on commit 7a1c489

Please sign in to comment.