Create release-8.x branch for Elastic 8.x series

This commit is contained in:
Antoine Cotten
2025-04-05 19:15:51 +02:00
parent c97a67ee12
commit b2035ebbb8
24 changed files with 62 additions and 306 deletions

View File

@@ -1,14 +0,0 @@
# Dependabot configuration
#
# For more information, please refer to:
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates
version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: github-actions
directory: /
schedule:
interval: weekly

View File

@@ -2,9 +2,9 @@ name: CI
on:
push:
branches: [ main ]
branches: [ release-8.x ]
pull_request:
branches: [ main ]
branches: [ release-8.x ]
jobs:
@@ -72,7 +72,7 @@ jobs:
#############################
# Elasticsearch's high disk watermark gets regularly exceeded on GitHub Actions runners.
# https://www.elastic.co/guide/en/elasticsearch/reference/current/fix-watermark-errors.html
# https://www.elastic.co/guide/en/elasticsearch/reference/8.18/fix-watermark-errors.html
- name: Disable Elasticsearch disk allocation decider
run: .github/workflows/scripts/disable-disk-alloc-decider.sh

View File

@@ -1,12 +1,10 @@
name: Documentation
on:
schedule:
- cron: '0 0 * * 0' # At 00:00 every Sunday
push:
branches: [ main ]
branches: [ release-8.x ]
pull_request:
branches: [ main ]
branches: [ release-8.x ]
jobs:

View File

@@ -1,57 +0,0 @@
name: Close issues without context
permissions:
issues: write
on:
issues:
types: [ labeled ]
jobs:
close-lock:
name: Close and lock issues
if: contains(github.event.issue.labels.*.name, 'bot:close') && github.event.issue.state == 'open'
runs-on: ubuntu-latest
steps:
- name: Close
id: close
uses: actions/stale@v9.1.0
with:
days-before-issue-stale: -1
days-before-issue-close: 0
stale-issue-label: bot:close
close-issue-label: insufficient information
close-issue-message: >-
This description omits all, or critical parts of the information requested by maintainers to be able to
reproduce the issue:
- the **complete** log history of your Elastic components, including `setup`.
- any change(s) performed to the docker-elk configuration.
- details about the runtime environment, for both Docker and Compose.
Therefore, this issue will now be **closed**. Please open a new issue and fill in the template. It saves
everyone's efforts, and allows maintainers to provide you with a solution in as few round trips as possible.
Thank you for your understanding. :pray:
# Due to eventual consistency, listing closed issues immediately after a
# close does not always yield the expected results. A sleep is a simple
# enough remediation to this issue.
- name: Pause
if: fromJson(steps.close.outputs.closed-issues-prs)[0]
run: sleep 5
- name: Lock
uses: dessant/lock-threads@v5
if: fromJson(steps.close.outputs.closed-issues-prs)[0]
with:
process-only: issues
issue-inactive-days: 0
include-any-issue-labels: bot:close
remove-issue-labels: bot:close
issue-lock-reason: spam
log-output: true

View File

@@ -1,43 +0,0 @@
name: Merge Elastic updates
on:
workflow_run:
workflows: [ CI ]
types:
- completed
branches:
- update/main
- update/tls
- update/release-7.x
- update/release-9.x
jobs:
merge:
name: Merge pull request
if: github.event.workflow_run.conclusion == 'success'
runs-on: ubuntu-latest
steps:
- name: Impersonate update bot
uses: actions/create-github-app-token@v2
id: generate-token
with:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Approve and merge
uses: ridedott/merge-me-action@v2
with:
GITHUB_LOGIN: docker-elk-updater
GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
- name: Delete branch
uses: actions/github-script@v7
with:
script: |
await github.request('DELETE /repos/{owner}/{repo}/git/refs/{ref}', {
owner: '${{ github.event.workflow_run.repository.owner.login }}',
repo: '${{ github.event.workflow_run.repository.name }}',
ref: 'heads/${{ github.event.workflow_run.head_branch }}'
})

View File

@@ -1,119 +0,0 @@
name: Update Elastic release
on:
schedule:
- cron: '0 0 * * 0' # At 00:00 every Sunday
jobs:
check-and-update:
name: Check and update Elastic release
runs-on: ubuntu-latest
strategy:
matrix:
branch:
- main
- tls
- release-7.x
- release-9.x
steps:
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branch }}
sparse-checkout-cone-mode: false
sparse-checkout: /.env
- name: Read current stack version
id: current-release
run: |
source .env
: ${ELASTIC_VERSION:?unset}
echo "version=${ELASTIC_VERSION}" >>"$GITHUB_OUTPUT"
- uses: actions/setup-node@v4
- run: npm install semver
- name: Get latest release version
uses: actions/github-script@v7
id: get-latest-release
with:
script: |
const semver = require('semver')
const latestVersion = await github.
paginate(github.rest.repos.listReleases, {
owner: 'elastic',
repo: 'elasticsearch'
})
.then(releases => {
for (const release of releases) {
// Results are returned sorted by created_at, so it is safe to assume
// that the first encountered match is also the series' latest release.
const version=semver.clean(release.tag_name)
if (semver.satisfies(version, '^${{ steps.current-release.outputs.version }}')) {
return version
}
}
});
if (latestVersion) {
// Return an object so that the result can be handled as structured data
// instead of a quoted string in subsequent steps.
return { version: latestVersion }
}
# Subsequent executions of actions/checkout omit to revert this setting to 'false',
# even if sparse-checkout is later disabled (see actions/checkout#2034).
- name: Disable sparse checkout
run: git config core.sparseCheckout false
# Removes untracked files created by npm (node_modules/, package.json, ...).
# Disables previous sparse checkout.
- name: Clean checkout
uses: actions/checkout@v4
if: steps.get-latest-release.outputs.result && fromJson(steps.get-latest-release.outputs.result).version != steps.current-release.outputs.version
with:
ref: ${{ matrix.branch }}
- name: Update stack version
id: update-files
if: steps.get-latest-release.outputs.result && fromJson(steps.get-latest-release.outputs.result).version != steps.current-release.outputs.version
run: |
cur_ver=${{ steps.current-release.outputs.version }}
new_ver=${{ fromJson(steps.get-latest-release.outputs.result).version }}
# Escape period characters so sed interprets them literally
cur_ver="${cur_ver//./\\.}"
declare -a upd_files=( .env README.md */Dockerfile extensions/*/Dockerfile )
if [ -f tls/README.md ]; then
upd_files+=( tls/README.md )
fi
sed -i "s/${cur_ver}/${new_ver}/g" "${upd_files[@]}"
git_status="$(git status --porcelain)"
if [[ ${git_status} ]]; then
echo -e 'Changes to be committed:\n'
echo "${git_status}"
echo 'has-changes=true' >>"$GITHUB_OUTPUT"
fi
- name: Impersonate update bot
uses: actions/create-github-app-token@v2
id: generate-token
if: steps.update-files.outputs.has-changes
with:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Send pull request to update to new version
if: steps.update-files.outputs.has-changes
uses: peter-evans/create-pull-request@v7
with:
token: ${{ steps.generate-token.outputs.token }}
branch: update/${{ matrix.branch }}
commit-message: Update to v${{ fromJson(steps.get-latest-release.outputs.result).version }}
title: Update to v${{ fromJson(steps.get-latest-release.outputs.result).version }}
delete-branch: true

View File

@@ -1,19 +1,19 @@
# Elastic stack (ELK) on Docker
[![Elastic Stack version](https://img.shields.io/badge/Elastic%20Stack-8.17.4-00bfb3?style=flat&logo=elastic-stack)](https://www.elastic.co/blog/category/releases)
[![Build Status](https://github.com/deviantony/docker-elk/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/deviantony/docker-elk/actions/workflows/ci.yml?query=branch%3Amain)
[![Build Status](https://github.com/deviantony/docker-elk/actions/workflows/ci.yml/badge.svg?branch=release-8.x)](https://github.com/deviantony/docker-elk/actions/workflows/ci.yml?query=branch%3Arelease-8.x)
[![Join the chat](https://badges.gitter.im/Join%20Chat.svg)](https://app.gitter.im/#/room/#deviantony_docker-elk:gitter.im)
Run the latest version of the [Elastic stack][elk-stack] with Docker and Docker Compose.
Run the version 8.x of the [Elastic stack][elk-stack] with Docker and Docker Compose.
It gives you the ability to analyze any data set by using the searching/aggregation capabilities of Elasticsearch and
the visualization power of Kibana.
Based on the [official Docker images][elastic-docker] from Elastic:
* [Elasticsearch](https://github.com/elastic/elasticsearch/tree/main/distribution/docker)
* [Logstash](https://github.com/elastic/logstash/tree/main/docker)
* [Kibana](https://github.com/elastic/kibana/tree/main/src/dev/build/tasks/os_packages/docker_generator)
* [Elasticsearch](https://github.com/elastic/elasticsearch/tree/8.18/distribution/docker)
* [Logstash](https://github.com/elastic/logstash/tree/8.18/docker)
* [Kibana](https://github.com/elastic/kibana/tree/8.18/src/dev/build/tasks/os_packages/docker_generator)
Other available stack variants:
@@ -138,7 +138,7 @@ instructions from the [documentation][mac-filesharing] to add more locations.
Clone this repository onto the Docker host that will run the stack with the command below:
```sh
git clone https://github.com/deviantony/docker-elk.git
git clone --branch release-8.x https://github.com/deviantony/docker-elk.git
```
Then, initialize the Elasticsearch users and groups required by docker-elk by executing the command:
@@ -267,9 +267,6 @@ docker compose down -v
### Version selection
This repository stays aligned with the latest version of the Elastic stack. The `main` branch tracks the current major
version (8.x).
To use a different version of the core Elastic components, simply change the version number inside the [`.env`](.env)
file. If you are upgrading an existing stack, remember to rebuild all container images using the `docker compose build`
command.
@@ -278,12 +275,6 @@ command.
> Always pay attention to the [official upgrade instructions][upgrade] for each individual component before performing a
> stack upgrade.
Older major versions are also supported on separate branches:
* [`release-7.x`](https://github.com/deviantony/docker-elk/tree/release-7.x): 7.x series
* [`release-6.x`](https://github.com/deviantony/docker-elk/tree/release-6.x): 6.x series (End-of-life)
* [`release-5.x`](https://github.com/deviantony/docker-elk/tree/release-5.x): 5.x series (End-of-life)
## Configuration
> [!IMPORTANT]
@@ -464,10 +455,10 @@ See the following Wiki pages:
[elk-stack]: https://www.elastic.co/what-is/elk-stack
[elastic-docker]: https://www.docker.elastic.co/
[subscriptions]: https://www.elastic.co/subscriptions
[es-security]: https://www.elastic.co/guide/en/elasticsearch/reference/current/security-settings.html
[license-settings]: https://www.elastic.co/guide/en/elasticsearch/reference/current/license-settings.html
[license-mngmt]: https://www.elastic.co/guide/en/kibana/current/managing-licenses.html
[license-apis]: https://www.elastic.co/guide/en/elasticsearch/reference/current/licensing-apis.html
[es-security]: https://www.elastic.co/guide/en/elasticsearch/reference/8.18/security-settings.html
[license-settings]: https://www.elastic.co/guide/en/elasticsearch/reference/8.18/license-settings.html
[license-mngmt]: https://www.elastic.co/guide/en/kibana/8.18/managing-licenses.html
[license-apis]: https://www.elastic.co/guide/en/elasticsearch/reference/8.18/licensing-apis.html
[elastdocker]: https://github.com/sherifabdlnaby/elastdocker
@@ -475,29 +466,29 @@ See the following Wiki pages:
[compose-install]: https://docs.docker.com/compose/install/
[linux-postinstall]: https://docs.docker.com/engine/install/linux-postinstall/
[bootstrap-checks]: https://www.elastic.co/guide/en/elasticsearch/reference/current/bootstrap-checks.html
[es-sys-config]: https://www.elastic.co/guide/en/elasticsearch/reference/current/system-config.html
[es-heap]: https://www.elastic.co/guide/en/elasticsearch/reference/current/important-settings.html#heap-size-settings
[bootstrap-checks]: https://www.elastic.co/guide/en/elasticsearch/reference/8.18/bootstrap-checks.html
[es-sys-config]: https://www.elastic.co/guide/en/elasticsearch/reference/8.18/system-config.html
[es-heap]: https://www.elastic.co/guide/en/elasticsearch/reference/8.18/important-settings.html#heap-size-settings
[win-filesharing]: https://docs.docker.com/desktop/settings/windows/#file-sharing
[mac-filesharing]: https://docs.docker.com/desktop/settings/mac/#file-sharing
[builtin-users]: https://www.elastic.co/guide/en/elasticsearch/reference/current/built-in-users.html
[ls-monitoring]: https://www.elastic.co/guide/en/logstash/current/monitoring-with-metricbeat.html
[sec-cluster]: https://www.elastic.co/guide/en/elasticsearch/reference/current/secure-cluster.html
[builtin-users]: https://www.elastic.co/guide/en/elasticsearch/reference/8.18/built-in-users.html
[ls-monitoring]: https://www.elastic.co/guide/en/logstash/8.18/monitoring-with-metricbeat.html
[sec-cluster]: https://www.elastic.co/guide/en/elasticsearch/reference/8.18/secure-cluster.html
[connect-kibana]: https://www.elastic.co/guide/en/kibana/current/connect-to-elasticsearch.html
[index-pattern]: https://www.elastic.co/guide/en/kibana/current/index-patterns.html
[connect-kibana]: https://www.elastic.co/guide/en/kibana/8.18/connect-to-elasticsearch.html
[index-pattern]: https://www.elastic.co/guide/en/kibana/8.18/index-patterns.html
[config-es]: ./elasticsearch/config/elasticsearch.yml
[config-kbn]: ./kibana/config/kibana.yml
[config-ls]: ./logstash/config/logstash.yml
[es-docker]: https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html
[kbn-docker]: https://www.elastic.co/guide/en/kibana/current/docker.html
[ls-docker]: https://www.elastic.co/guide/en/logstash/current/docker-config.html
[es-docker]: https://www.elastic.co/guide/en/elasticsearch/reference/8.18/docker.html
[kbn-docker]: https://www.elastic.co/guide/en/kibana/8.18/docker.html
[ls-docker]: https://www.elastic.co/guide/en/logstash/8.18/docker-config.html
[upgrade]: https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-upgrade.html
[upgrade]: https://www.elastic.co/guide/en/elasticsearch/reference/8.18/setup-upgrade.html
<!-- markdownlint-configure-file
{

View File

@@ -59,7 +59,7 @@ services:
# Elasticsearch. Ignored on subsequent runs.
ELASTIC_PASSWORD: ${ELASTIC_PASSWORD:-}
# Use single node discovery in order to disable production mode and avoid bootstrap checks.
# see: https://www.elastic.co/guide/en/elasticsearch/reference/current/bootstrap-checks.html
# see: https://www.elastic.co/guide/en/elasticsearch/reference/8.18/bootstrap-checks.html
discovery.type: single-node
networks:
- elk

View File

@@ -6,7 +6,7 @@ cluster.name: docker-cluster
network.host: 0.0.0.0
## X-Pack settings
## see https://www.elastic.co/guide/en/elasticsearch/reference/current/security-settings.html
## see https://www.elastic.co/guide/en/elasticsearch/reference/8.18/security-settings.html
#
xpack.license.self_generated.type: trial
xpack.security.enabled: true

View File

@@ -17,4 +17,4 @@ All configuration files are available in the `config/` directory.
## Documentation
[Curator Reference](https://www.elastic.co/guide/en/elasticsearch/client/curator/current/index.html)
[Curator Reference](https://www.elastic.co/guide/en/elasticsearch/client/curator/8.0/index.html)

View File

@@ -1,5 +1,5 @@
# Curator configuration
# https://www.elastic.co/guide/en/elasticsearch/client/curator/current/configfile.html
# https://www.elastic.co/guide/en/elasticsearch/client/curator/8.0/configfile.html
elasticsearch:
client:

View File

@@ -132,13 +132,13 @@ Docker container: [Running Enterprise Search Using Docker][enterprisesearch-dock
[config-enterprisesearch]: ./config/enterprise-search.yml
[enterprisesearch-encryption]: https://www.elastic.co/guide/en/enterprise-search/current/encryption-keys.html
[enterprisesearch-security]: https://www.elastic.co/guide/en/workplace-search/current/workplace-search-security.html
[enterprisesearch-config]: https://www.elastic.co/guide/en/enterprise-search/current/configuration.html
[enterprisesearch-docker]: https://www.elastic.co/guide/en/enterprise-search/current/docker.html
[enterprisesearch-docs]: https://www.elastic.co/guide/en/enterprise-search/current/index.html
[enterprisesearch-kb]: https://www.elastic.co/guide/en/kibana/current/enterprise-search-settings-kb.html
[enterprisesearch-encryption]: https://www.elastic.co/guide/en/enterprise-search/8.18/encryption-keys.html
[enterprisesearch-security]: https://www.elastic.co/guide/en/workplace-search/8.18/workplace-search-security.html
[enterprisesearch-config]: https://www.elastic.co/guide/en/enterprise-search/8.18/configuration.html
[enterprisesearch-docker]: https://www.elastic.co/guide/en/enterprise-search/8.18/docker.html
[enterprisesearch-docs]: https://www.elastic.co/guide/en/enterprise-search/8.18/index.html
[enterprisesearch-kb]: https://www.elastic.co/guide/en/kibana/8.18/enterprise-search-settings-kb.html
[es-security]: https://www.elastic.co/guide/en/elasticsearch/reference/current/security-settings.html#api-key-service-settings
[es-security]: https://www.elastic.co/guide/en/elasticsearch/reference/8.18/security-settings.html#api-key-service-settings
[config-es]: ../../elasticsearch/config/elasticsearch.yml
[config-kbn]: ../../kibana/config/kibana.yml

View File

@@ -1,6 +1,6 @@
---
## Enterprise Search core configuration
## https://www.elastic.co/guide/en/enterprise-search/current/configuration.html
## https://www.elastic.co/guide/en/enterprise-search/8.18/configuration.html
#
## --------------------- REQUIRED ---------------------

View File

@@ -35,8 +35,8 @@ container: [Run Filebeat on Docker][filebeat-docker].
[Filebeat documentation][filebeat-doc]
[filebeat-config]: https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-reference-yml.html
[filebeat-docker]: https://www.elastic.co/guide/en/beats/filebeat/current/running-on-docker.html
[filebeat-doc]: https://www.elastic.co/guide/en/beats/filebeat/current/index.html
[filebeat-config]: https://www.elastic.co/guide/en/beats/filebeat/8.18/filebeat-reference-yml.html
[filebeat-docker]: https://www.elastic.co/guide/en/beats/filebeat/8.18/running-on-docker.html
[filebeat-doc]: https://www.elastic.co/guide/en/beats/filebeat/8.18/index.html
[setup]: ../../README.md#how-to-re-execute-the-setup

View File

@@ -46,7 +46,7 @@ output.elasticsearch:
password: ${FILEBEAT_INTERNAL_PASSWORD}
## HTTP endpoint for health checking
## https://www.elastic.co/guide/en/beats/filebeat/current/http-endpoint.html
## https://www.elastic.co/guide/en/beats/filebeat/8.18/http-endpoint.html
#
http:

View File

@@ -12,7 +12,7 @@ services:
- -e
# Disable config file permissions checks. Allows mounting
# 'config/filebeat.yml' even if it's not owned by root.
# see: https://www.elastic.co/guide/en/beats/libbeat/current/config-file-permissions.html
# see: https://www.elastic.co/guide/en/beats/libbeat/8.18/config-file-permissions.html
- --strict.perms=false
volumes:
- ./extensions/filebeat/config/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro,Z

View File

@@ -53,10 +53,10 @@ management UI: [Fleet UI Settings][fleet-cfg].
![elastic-agent-dashboard](https://user-images.githubusercontent.com/3299086/202701404-958f8d80-a7a0-4044-bbf9-bf73f3bdd17a.png
"Elastic Agent Dashboard")
[fleet-doc]: https://www.elastic.co/guide/en/fleet/current/fleet-overview.html
[fleet-pol]: https://www.elastic.co/guide/en/fleet/current/agent-policy.html
[fleet-cfg]: https://www.elastic.co/guide/en/fleet/current/fleet-settings.html
[fleet-doc]: https://www.elastic.co/guide/en/fleet/8.18/fleet-overview.html
[fleet-pol]: https://www.elastic.co/guide/en/fleet/8.18/agent-policy.html
[fleet-cfg]: https://www.elastic.co/guide/en/fleet/8.18/fleet-settings.html
[config-kbn]: ../../kibana/config/kibana.yml
[es-svc-token]: https://www.elastic.co/guide/en/elasticsearch/reference/current/service-tokens-command.html
[es-svc-token]: https://www.elastic.co/guide/en/elasticsearch/reference/8.18/service-tokens-command.html

View File

@@ -34,8 +34,8 @@ Docker container: [Run Heartbeat on Docker][heartbeat-docker].
[Heartbeat documentation][heartbeat-doc]
[heartbeat-config]: https://www.elastic.co/guide/en/beats/heartbeat/current/heartbeat-reference-yml.html
[heartbeat-docker]: https://www.elastic.co/guide/en/beats/heartbeat/current/running-on-docker.html
[heartbeat-doc]: https://www.elastic.co/guide/en/beats/heartbeat/current/index.html
[heartbeat-config]: https://www.elastic.co/guide/en/beats/heartbeat/8.18/heartbeat-reference-yml.html
[heartbeat-docker]: https://www.elastic.co/guide/en/beats/heartbeat/8.18/running-on-docker.html
[heartbeat-doc]: https://www.elastic.co/guide/en/beats/heartbeat/8.18/index.html
[setup]: ../../README.md#how-to-re-execute-the-setup

View File

@@ -32,7 +32,7 @@ output.elasticsearch:
password: ${HEARTBEAT_INTERNAL_PASSWORD}
## HTTP endpoint for health checking
## https://www.elastic.co/guide/en/beats/heartbeat/current/http-endpoint.html
## https://www.elastic.co/guide/en/beats/heartbeat/8.18/http-endpoint.html
#
http:

View File

@@ -9,7 +9,7 @@ services:
- -e
# Disable config file permissions checks. Allows mounting
# 'config/heartbeat.yml' even if it's not owned by root.
# see: https://www.elastic.co/guide/en/beats/libbeat/current/config-file-permissions.html
# see: https://www.elastic.co/guide/en/beats/libbeat/8.18/config-file-permissions.html
- --strict.perms=false
volumes:
- ./extensions/heartbeat/config/heartbeat.yml:/usr/share/heartbeat/heartbeat.yml:ro,Z

View File

@@ -42,8 +42,8 @@ Docker container: [Run Metricbeat on Docker][metricbeat-docker].
![host-dashboard](https://user-images.githubusercontent.com/3299086/202710594-0deccf40-3a9a-4e63-8411-2e0d9cc6ad3a.png
"Host Overview Dashboard")
[metricbeat-config]: https://www.elastic.co/guide/en/beats/metricbeat/current/metricbeat-reference-yml.html
[metricbeat-docker]: https://www.elastic.co/guide/en/beats/metricbeat/current/running-on-docker.html
[metricbeat-doc]: https://www.elastic.co/guide/en/beats/metricbeat/current/index.html
[metricbeat-config]: https://www.elastic.co/guide/en/beats/metricbeat/8.18/metricbeat-reference-yml.html
[metricbeat-docker]: https://www.elastic.co/guide/en/beats/metricbeat/8.18/running-on-docker.html
[metricbeat-doc]: https://www.elastic.co/guide/en/beats/metricbeat/8.18/index.html
[setup]: ../../README.md#how-to-re-execute-the-setup

View File

@@ -64,7 +64,7 @@ output.elasticsearch:
password: ${METRICBEAT_INTERNAL_PASSWORD}
## HTTP endpoint for health checking
## https://www.elastic.co/guide/en/beats/metricbeat/current/http-endpoint.html
## https://www.elastic.co/guide/en/beats/metricbeat/8.18/http-endpoint.html
#
http:

View File

@@ -12,7 +12,7 @@ services:
- -e
# Disable config file permissions checks. Allows mounting
# 'config/metricbeat.yml' even if it's not owned by root.
# see: https://www.elastic.co/guide/en/beats/libbeat/current/config-file-permissions.html
# see: https://www.elastic.co/guide/en/beats/libbeat/8.18/config-file-permissions.html
- --strict.perms=false
# Mount point of the hosts filesystem. Required to monitor the host
# from within a container.

View File

@@ -17,18 +17,18 @@ elasticsearch.password: ${KIBANA_SYSTEM_PASSWORD}
## Encryption keys (optional but highly recommended)
##
## Generate with either
## $ docker container run --rm docker.elastic.co/kibana/kibana:8.6.2 bin/kibana-encryption-keys generate
## $ docker container run --rm docker.elastic.co/kibana/kibana:8.18.0 bin/kibana-encryption-keys generate
## $ openssl rand -hex 32
##
## https://www.elastic.co/guide/en/kibana/current/using-kibana-with-security.html
## https://www.elastic.co/guide/en/kibana/current/kibana-encryption-keys.html
## https://www.elastic.co/guide/en/kibana/8.18/using-kibana-with-security.html
## https://www.elastic.co/guide/en/kibana/8.18/kibana-encryption-keys.html
#
#xpack.security.encryptionKey:
#xpack.encryptedSavedObjects.encryptionKey:
#xpack.reporting.encryptionKey:
## Fleet
## https://www.elastic.co/guide/en/kibana/current/fleet-settings-kb.html
## https://www.elastic.co/guide/en/kibana/8.18/fleet-settings-kb.html
#
xpack.fleet.agents.fleet_server.hosts: [ http://fleet-server:8220 ]