Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

disable fluentd persistence by default #858

Merged
merged 2 commits into from
Aug 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/helm/sumologic/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ fluentd:
## Persist data to a persistent volume; When enabled, fluentd uses the file buffer instead of memory buffer.
persistence:
## After setting the value to true, run the helm upgrade command with the --force flag.
enabled: true
enabled: false

## If defined, storageClassName: <storageClass>
## If set to "-", storageClassName: "", which disables dynamic provisioning
Expand Down
75 changes: 14 additions & 61 deletions deploy/kubernetes/fluentd-sumologic.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@ data:
@log_level error
@include logs.output.conf
<buffer>
@type file
path /fluentd/buffer/logs.containers
@type memory
@include buffer.output.conf
</buffer>
</store>
Expand All @@ -185,8 +184,7 @@ data:
sumo_client "k8s_1.2.0-beta.2"
@include logs.output.conf
<buffer>
@type file
path /fluentd/buffer/logs.default
@type memory
@include buffer.output.conf
</buffer>
</store>
Expand Down Expand Up @@ -218,8 +216,7 @@ data:
sumo_client "k8s_1.2.0-beta.2"
@include logs.output.conf
<buffer>
@type file
path /fluentd/buffer/logs.kubelet
@type memory
@include buffer.output.conf
</buffer>
</store>
Expand Down Expand Up @@ -256,8 +253,7 @@ data:
sumo_client "k8s_1.2.0-beta.2"
@include logs.output.conf
<buffer>
@type file
path /fluentd/buffer/logs.systemd
@type memory
@include buffer.output.conf
</buffer>
</store>
Expand Down Expand Up @@ -312,8 +308,7 @@ data:
verify_ssl "true"
proxy_uri ""
<buffer>
@type file
path /fluentd/buffer/events
@type memory
@include buffer.output.conf
</buffer>
</store>
Expand Down Expand Up @@ -431,8 +426,7 @@ data:
endpoint "#{ENV['SUMO_ENDPOINT_APISERVER_METRICS_SOURCE']}"
@include metrics.output.conf
<buffer>
@type file
path /fluentd/buffer/metrics.apiserver
@type memory
@include buffer.output.conf
</buffer>
</store>
Expand All @@ -447,8 +441,7 @@ data:
endpoint "#{ENV['SUMO_ENDPOINT_KUBELET_METRICS_SOURCE']}"
@include metrics.output.conf
<buffer>
@type file
path /fluentd/buffer/metrics.container
@type memory
@include buffer.output.conf
</buffer>
</store>
Expand All @@ -463,8 +456,7 @@ data:
endpoint "#{ENV['SUMO_ENDPOINT_CONTROL_PLANE_METRICS_SOURCE']}"
@include metrics.output.conf
<buffer>
@type file
path /fluentd/buffer/metrics.control_plane
@type memory
@include buffer.output.conf
</buffer>
</store>
Expand All @@ -479,8 +471,7 @@ data:
endpoint "#{ENV['SUMO_ENDPOINT_CONTROLLER_METRICS_SOURCE']}"
@include metrics.output.conf
<buffer>
@type file
path /fluentd/buffer/metrics.controller
@type memory
@include buffer.output.conf
</buffer>
</store>
Expand All @@ -495,8 +486,7 @@ data:
endpoint "#{ENV['SUMO_ENDPOINT_KUBELET_METRICS_SOURCE']}"
@include metrics.output.conf
<buffer>
@type file
path /fluentd/buffer/metrics.kubelet
@type memory
@include buffer.output.conf
</buffer>
</store>
Expand All @@ -511,8 +501,7 @@ data:
endpoint "#{ENV['SUMO_ENDPOINT_NODE_METRICS_SOURCE']}"
@include metrics.output.conf
<buffer>
@type file
path /fluentd/buffer/metrics.node
@type memory
@include buffer.output.conf
</buffer>
</store>
Expand All @@ -527,8 +516,7 @@ data:
endpoint "#{ENV['SUMO_ENDPOINT_SCHEDULER_METRICS_SOURCE']}"
@include metrics.output.conf
<buffer>
@type file
path /fluentd/buffer/metrics.scheduler
@type memory
@include buffer.output.conf
</buffer>
</store>
Expand All @@ -543,8 +531,7 @@ data:
endpoint "#{ENV['SUMO_ENDPOINT_STATE_METRICS_SOURCE']}"
@include metrics.output.conf
<buffer>
@type file
path /fluentd/buffer/metrics.state
@type memory
@include buffer.output.conf
</buffer>
</store>
Expand All @@ -559,8 +546,7 @@ data:
endpoint "#{ENV['SUMO_ENDPOINT_DEFAULT_METRICS_SOURCE']}"
@include metrics.output.conf
<buffer>
@type file
path /fluentd/buffer/metrics.default
@type memory
@include buffer.output.conf
</buffer>
</store>
Expand Down Expand Up @@ -821,8 +807,6 @@ spec:
mountPath: /fluentd/etc/
- name: pos-files
mountPath: /mnt/pos/
- name: buffer
mountPath: "/fluentd/buffer"
livenessProbe:
httpGet:
path: /fluentd.pod.healthcheck?json=%7B%22log%22%3A+%22health+check%22%7D
Expand All @@ -842,15 +826,6 @@ spec:
secretKeyRef:
name: sumologic
key: endpoint-events
volumeClaimTemplates:
- metadata:
name: buffer
spec:
accessModes: [ReadWriteOnce]
storageClassName:
resources:
requests:
storage: 10Gi
---
# Source: sumologic/templates/metrics-statefulset.yaml

Expand Down Expand Up @@ -937,8 +912,6 @@ spec:
mountPath: /fluentd/etc/
- name: pos-files
mountPath: /mnt/pos/
- name: buffer
mountPath: "/fluentd/buffer"
env:
- name: SUMO_ENDPOINT_APISERVER_METRICS_SOURCE
valueFrom:
Expand Down Expand Up @@ -982,15 +955,6 @@ spec:
key: endpoint-metrics-kube-state
- name: ADDITIONAL_PLUGINS
value: ""
volumeClaimTemplates:
- metadata:
name: buffer
spec:
accessModes: [ReadWriteOnce]
storageClassName:
resources:
requests:
storage: 10Gi

---
# Source: sumologic/templates/statefulset.yaml
Expand Down Expand Up @@ -1078,8 +1042,6 @@ spec:
mountPath: /fluentd/etc/
- name: pos-files
mountPath: /mnt/pos/
- name: buffer
mountPath: "/fluentd/buffer"
env:
- name: SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE
valueFrom:
Expand All @@ -1088,15 +1050,6 @@ spec:
key: endpoint-logs
- name: ADDITIONAL_PLUGINS
value: ""
volumeClaimTemplates:
- metadata:
name: buffer
spec:
accessModes: [ReadWriteOnce]
storageClassName:
resources:
requests:
storage: 10Gi

---
# Source: sumologic/templates/hpa.yaml
Expand Down