Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

[meta] NIT Update backport config and small doc fixes #1017

Merged
merged 3 commits into from
Jan 14, 2021
Merged

[meta] NIT Update backport config and small doc fixes #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f79aff9
update backport config for 7.11 branch
jmlrt Jan 14, 2021
233f24d
fix config headline and toc
jmlrt Jan 14, 2021
8a964e0
update support matrix
jmlrt Jan 14, 2021
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 .backportrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"upstream": "elastic/helm-charts",
"targetBranchChoices": ["6.8", "7.10", "7.x"],
"targetBranchChoices": ["6.8", "7.10", "7.11", "7.x"],
"all": true,
"prFilter": "label:need-backport",
"targetPRLabels": ["backport"],
Expand Down
31 changes: 16 additions & 15 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ The `master` version of these charts are intended to support the latest pre-rele
versions of our products, and therefore may or may not work with current released
versions.

| Chart | Docker documentation | Latest 7 Version | Latest 6 Version |
|--------------------------------------------|---------------------------------------------------------------------------------|----------------------------|-----------------------------|
| Chart | Docker documentation | Latest 7 Version | Latest 6 Version |
|--------------------------------------------|---------------------------------------------------------------------------------|-----------------------------|-----------------------------|
| [APM-Server](./apm-server/README.md) | https://www.elastic.co/guide/en/apm/server/current/running-on-docker.html | [`7.10.1`][apm-7] | [`6.8.13`][apm-6] |
| [Elasticsearch](./elasticsearch/README.md) | https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html | [`7.10.1`][elasticsearch-7] | [`6.8.13`][elasticsearch-6] |
| [Filebeat](./filebeat/README.md) | https://www.elastic.co/guide/en/beats/filebeat/current/running-on-docker.html | [`7.10.1`][filebeat-7] | [`6.8.13`][filebeat-6] |
Expand All @@ -53,19 +53,20 @@ Note that only the released charts coming from [Elastic Helm repo][] or

### Support Matrix

| | Elasticsearch | Kibana | Logstash | Filebeat | Metricbeat | APM Server |
|-----|---------------|--------|----------|----------|------------|------------|
| 6.8 | Beta | Beta | Beta | Beta | Beta | Alpha |
| 7.0 | Alpha | Alpha | / | / | / | / |
| 7.1 | Beta | Beta | / | Beta | / | / |
| 7.2 | Beta | Beta | / | Beta | Beta | / |
| 7.3 | Beta | Beta | / | Beta | Beta | / |
| 7.4 | Beta | Beta | / | Beta | Beta | / |
| 7.5 | Beta | Beta | Beta | Beta | Beta | Alpha |
| 7.6 | Beta | Beta | Beta | Beta | Beta | Alpha |
| 7.7 | GA | GA | Beta | GA | GA | Beta |
| 7.8 | GA | GA | Beta | GA | GA | Beta |
| 7.9 | GA | GA | Beta | GA | GA | Beta |
| | Elasticsearch | Kibana | Logstash | Filebeat | Metricbeat | APM Server |
|------|---------------|--------|----------|----------|------------|------------|
| 6.8 | Beta | Beta | Beta | Beta | Beta | Alpha |
| 7.0 | Alpha | Alpha | / | / | / | / |
| 7.1 | Beta | Beta | / | Beta | / | / |
| 7.2 | Beta | Beta | / | Beta | Beta | / |
| 7.3 | Beta | Beta | / | Beta | Beta | / |
| 7.4 | Beta | Beta | / | Beta | Beta | / |
| 7.5 | Beta | Beta | Beta | Beta | Beta | Alpha |
| 7.6 | Beta | Beta | Beta | Beta | Beta | Alpha |
| 7.7 | GA | GA | Beta | GA | GA | Beta |
| 7.8 | GA | GA | Beta | GA | GA | Beta |
| 7.9 | GA | GA | Beta | GA | GA | Beta |
| 7.10 | GA | GA | Beta | GA | GA | Beta |

### Kubernetes Versions

Expand Down
9 changes: 6 additions & 3 deletions filebeat/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ This Helm chart is a lightweight way to configure and run our official
- [How to use Filebeat with Elasticsearch with security (authentication and TLS) enabled?](#how-to-use-filebeat-with-elasticsearch-with-security-authentication-and-tls-enabled)
- [How to install OSS version of Filebeat?](#how-to-install-oss-version-of-filebeat)
- [Why is Filebeat host.name field set to Kubernetes pod name?](#why-is-filebeat-hostname-field-set-to-kubernetes-pod-name)
- [How do I get multiple beats agents working with hostNetworking enabled?](#how-do-i-get-multiple-beats-agents-working-with-hostnetworking-enabled)
- [How to change readinessProbe for outputs which don't support testing](#how-to-change-readinessprobe-for-outputs-which-dont-support-testing)
- [Contributing](#contributing)

Expand Down Expand Up @@ -87,6 +88,8 @@ activate it by setting `hostNetworking: true` in [values.yaml][].
as a reference. They are also used in the automated testing of this chart.


## Configuration

| Parameter | Description | Default |
|--------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------|
| `clusterRoleRules` | Configurable [cluster role rules][] that Filebeat uses to access Kubernetes resources | see [values.yaml][] |
Expand Down Expand Up @@ -192,9 +195,9 @@ same node.

### How do I get multiple beats agents working with hostNetworking enabled?

The default http port for multiple beats agents may be on the same port, for
example, Filebeats and Metricbeats both default to 5066. When `hostNetworking`
is enabled this will cause collisions when standing up the http server. The work
The default http port for multiple beats agents may be on the same port, for
example, Filebeats and Metricbeats both default to 5066. When `hostNetworking`
is enabled this will cause collisions when standing up the http server. The work
around for this is to set `http.port` in the config file for one of the beats agent
to use a different port.

Expand Down