Skip to content

Commit

Permalink
Move Kubernetes events metricset to its own block in reference config (
Browse files Browse the repository at this point in the history
…#21407)

In the reference configuration the event metricset was in the block of
configurations for kube-state-metrics.

(cherry picked from commit cd28ee5)
  • Loading branch information
jsoriano committed Sep 30, 2020
1 parent 4822bb4 commit 992b2d6
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion deploy/kubernetes/auditbeat-kubernetes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: auditbeat
image: docker.elastic.co/beats/auditbeat:6.8.11
image: docker.elastic.co/beats/auditbeat:6.8.12
args: [
"-c", "/etc/auditbeat.yml"
]
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/filebeat-kubernetes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ spec:
terminationGracePeriodSeconds: 30
containers:
- name: filebeat
image: docker.elastic.co/beats/filebeat:6.8.11
image: docker.elastic.co/beats/filebeat:6.8.12
args: [
"-c", "/etc/filebeat.yml",
"-e",
Expand Down
10 changes: 6 additions & 4 deletions deploy/kubernetes/metricbeat-kubernetes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: metricbeat
image: docker.elastic.co/beats/metricbeat:6.8.11
image: docker.elastic.co/beats/metricbeat:6.8.12
args: [
"-c", "/etc/metricbeat.yml",
"-e",
Expand Down Expand Up @@ -217,11 +217,13 @@ data:
- state_replicaset
- state_pod
- state_container
# Uncomment this to get k8s events:
#- event
period: 10s
host: ${NODE_NAME}
hosts: ["kube-state-metrics:8080"]
# Uncomment this to get k8s events:
#- module: kubernetes
# metricsets:
# - event
---
# Deploy singleton instance in the whole cluster for some unique data sources, like kube-state-metrics
apiVersion: apps/v1beta1
Expand All @@ -242,7 +244,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: metricbeat
image: docker.elastic.co/beats/metricbeat:6.8.11
image: docker.elastic.co/beats/metricbeat:6.8.12
args: [
"-c", "/etc/metricbeat.yml",
"-e",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ data:
- state_replicaset
- state_pod
- state_container
# Uncomment this to get k8s events:
#- event
period: 10s
host: ${NODE_NAME}
hosts: ["kube-state-metrics:8080"]
# Uncomment this to get k8s events:
#- module: kubernetes
# metricsets:
# - event

0 comments on commit 992b2d6

Please sign in to comment.