Skip to content

Commit

Permalink
Remove in_cluster from Kuberentes configuration examples (elastic#1…
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrsMark authored Sep 16, 2019
1 parent 71eee76 commit 19da163
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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*

Expand Down
1 change: 0 additions & 1 deletion deploy/kubernetes/filebeat-kubernetes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ data:
- /var/log/containers/*.log
processors:
- add_kubernetes_metadata:
in_cluster: true
host: ${NODE_NAME}
matchers:
- logs_path:
Expand Down
1 change: 0 additions & 1 deletion deploy/kubernetes/filebeat/filebeat-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ data:
- /var/log/containers/*.log
processors:
- add_kubernetes_metadata:
in_cluster: true
host: ${NODE_NAME}
matchers:
- logs_path:
Expand Down
1 change: 0 additions & 1 deletion metricbeat/module/kubernetes/state_cronjob/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions x-pack/filebeat/module/coredns/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions x-pack/filebeat/module/envoyproxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 19da163

Please sign in to comment.