diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 1b4720359b9..ce2146cb173 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -16,6 +16,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Default of output.kafka.metadata.full is set to false by now. This reduced the amount of metadata to be queried from a kafka cluster. {pull}12738[12738] - Fixed a crash under Windows when fetching processes information. {pull}12833[12833] - Update to Golang 1.12.7. {pull}12931[12931] +- Remove `in_cluster` configuration parameter for Kuberentes, now in-cluster configuration is used only if no other kubeconfig is specified {pull}13051[13051] *Auditbeat* diff --git a/deploy/kubernetes/filebeat-kubernetes.yaml b/deploy/kubernetes/filebeat-kubernetes.yaml index a741cb64393..019d651655e 100644 --- a/deploy/kubernetes/filebeat-kubernetes.yaml +++ b/deploy/kubernetes/filebeat-kubernetes.yaml @@ -14,7 +14,6 @@ data: - /var/log/containers/*.log processors: - add_kubernetes_metadata: - in_cluster: true host: ${NODE_NAME} matchers: - logs_path: diff --git a/deploy/kubernetes/filebeat/filebeat-configmap.yaml b/deploy/kubernetes/filebeat/filebeat-configmap.yaml index 898c24d5a84..a7669672681 100644 --- a/deploy/kubernetes/filebeat/filebeat-configmap.yaml +++ b/deploy/kubernetes/filebeat/filebeat-configmap.yaml @@ -14,7 +14,6 @@ data: - /var/log/containers/*.log processors: - add_kubernetes_metadata: - in_cluster: true host: ${NODE_NAME} matchers: - logs_path: diff --git a/metricbeat/module/kubernetes/state_cronjob/README.md b/metricbeat/module/kubernetes/state_cronjob/README.md index a52f05cc7c5..535c3c36d60 100644 --- a/metricbeat/module/kubernetes/state_cronjob/README.md +++ b/metricbeat/module/kubernetes/state_cronjob/README.md @@ -61,7 +61,6 @@ Kubernetes YAML chunk should look like: - state_cronjob period: 10s hosts: ["kube-state-metrics:8080"] - in_cluster: true ``` Deploy kube-state-metrics. You can find the manifests [here](https://github.com/kubernetes/kube-state-metrics/tree/release-1.7/kubernetes) diff --git a/x-pack/filebeat/module/coredns/README.md b/x-pack/filebeat/module/coredns/README.md index f332195e72b..f30a4e21544 100644 --- a/x-pack/filebeat/module/coredns/README.md +++ b/x-pack/filebeat/module/coredns/README.md @@ -54,8 +54,7 @@ kubectl apply -f filebeat hints.default_config.enabled: false processors: - - add_kubernetes_metadata: - in_cluster: true + - add_kubernetes_metadata: ~ ``` This enables auto-discovery and hints for filebeat. When default.disable is set to true (default value is false), it will disable log harvesting for the pod/container, unless it has specific annotations enabled. This gives users more granular control on kubernetes log ingestion. The `add_kubernetes_metadata` processor will add enrichment data for Kubernetes to the ingest logs. diff --git a/x-pack/filebeat/module/envoyproxy/README.md b/x-pack/filebeat/module/envoyproxy/README.md index d2b62c8849d..5bcd179663c 100644 --- a/x-pack/filebeat/module/envoyproxy/README.md +++ b/x-pack/filebeat/module/envoyproxy/README.md @@ -49,8 +49,7 @@ kubectl apply -f filebeat hints.default_config.enabled: false processors: - - add_kubernetes_metadata: - in_cluster: true + - add_kubernetes_metadata: ~ ``` This enables auto-discovery and hints for filebeat. When default.disable is set to true (default value is false), it will disable log harvesting for the pod/container, unless it has specific annotations enabled. This gives users more granular control on kubernetes log ingestion. The `add_kubernetes_metadata` processor will add enrichment data for Kubernetes to the ingest logs.