Skip to content

Commit

Permalink
Update kubernetes examples configuration to use inputs (#7080) (#7095)
Browse files Browse the repository at this point in the history
When we made the rename of the prospectors to input we overlooked the update of
the kubernetes examples files and readme.

Ref #6642

(cherry picked from commit cbc3f0e)
  • Loading branch information
ph authored and exekias committed May 15, 2018
1 parent 489ad50 commit 3412504
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
18 changes: 9 additions & 9 deletions deploy/kubernetes/filebeat-kubernetes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ metadata:
data:
filebeat.yml: |-
filebeat.config:
prospectors:
# Mounted `filebeat-prospectors` configmap:
path: ${path.config}/prospectors.d/*.yml
# Reload prospectors configs as they change:
inputs:
# Mounted `filebeat-inputs` configmap:
path: ${path.config}/inputs.d/*.yml
# Reload inputs configs as they change:
reload.enabled: false
modules:
path: ${path.config}/modules.d/*.yml
Expand All @@ -34,7 +34,7 @@ data:
apiVersion: v1
kind: ConfigMap
metadata:
name: filebeat-prospectors
name: filebeat-inputs
namespace: kube-system
labels:
k8s-app: filebeat
Expand Down Expand Up @@ -98,8 +98,8 @@ spec:
mountPath: /etc/filebeat.yml
readOnly: true
subPath: filebeat.yml
- name: prospectors
mountPath: /usr/share/filebeat/prospectors.d
- name: inputs
mountPath: /usr/share/filebeat/inputs.d
readOnly: true
- name: data
mountPath: /usr/share/filebeat/data
Expand All @@ -114,10 +114,10 @@ spec:
- name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
- name: prospectors
- name: inputs
configMap:
defaultMode: 0600
name: filebeat-prospectors
name: filebeat-inputs
# We set an `emptyDir` here to ensure the manifest will deploy correctly.
# It's recommended to change this to a `hostPath` folder, to ensure internal data
# files survive pod changes (ie: version upgrade)
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/filebeat/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ By deploying filebeat as a [DaemonSet](https://kubernetes.io/docs/concepts/workl
we ensure we get a running filebeat daemon on each node of the cluster.

Docker logs host folder (`/var/lib/docker/containers`) is mounted on the
filebeat container. Filebeat will start a prospector for these files and start
filebeat container. Filebeat will start an input for these files and start
harvesting them as they appear.

Everything is deployed under `kube-system` namespace, you can change that by
Expand Down
10 changes: 5 additions & 5 deletions deploy/kubernetes/filebeat/filebeat-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ metadata:
data:
filebeat.yml: |-
filebeat.config:
prospectors:
# Mounted `filebeat-prospectors` configmap:
path: ${path.config}/prospectors.d/*.yml
# Reload prospectors configs as they change:
inputs:
# Mounted `filebeat-inputs` configmap:
path: ${path.config}/inputs.d/*.yml
# Reload inputs configs as they change:
reload.enabled: false
modules:
path: ${path.config}/modules.d/*.yml
Expand All @@ -34,7 +34,7 @@ data:
apiVersion: v1
kind: ConfigMap
metadata:
name: filebeat-prospectors
name: filebeat-inputs
namespace: kube-system
labels:
k8s-app: filebeat
Expand Down
8 changes: 4 additions & 4 deletions deploy/kubernetes/filebeat/filebeat-daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ spec:
mountPath: /etc/filebeat.yml
readOnly: true
subPath: filebeat.yml
- name: prospectors
mountPath: /usr/share/filebeat/prospectors.d
- name: inputs
mountPath: /usr/share/filebeat/inputs.d
readOnly: true
- name: data
mountPath: /usr/share/filebeat/data
Expand All @@ -64,10 +64,10 @@ spec:
- name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
- name: prospectors
- name: inputs
configMap:
defaultMode: 0600
name: filebeat-prospectors
name: filebeat-inputs
# We set an `emptyDir` here to ensure the manifest will deploy correctly.
# It's recommended to change this to a `hostPath` folder, to ensure internal data
# files survive pod changes (ie: version upgrade)
Expand Down

0 comments on commit 3412504

Please sign in to comment.