Skip to content

Commit 27e76c5

Browse files
michel-latermanmichel-laterman
authored
Remove Beats central management (#25696)
Remove the Kibana beats central management feature as it has been replaced by Fleet. Remove xpack command injection and replace with an includes mod. Restructure the xpack/libbeat/management module to include all fleet code in the directory (no api or fleet subdirs).
1 parent 4dc5285 commit 27e76c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+312
-4189
lines changed

‎CHANGELOG.next.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
3232
- Update to ECS 1.7.0. {pull}22571[22571]
3333
- Add support for SCRAM-SHA-512 and SCRAM-SHA-256 in Kafka output. {pull}12867[12867]
3434
- Remove id_field_data {pull}25239[25239]
35+
- Removed beats central management {pull}25696[25696], {issue}23908[23908]
3536
- MacOSX minimum supported version set to 10.14 {issue}24193{24193}
3637

3738
*Auditbeat*

‎filebeat/docs/howto/load-ingest-pipelines.asciidoc‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33

44
The ingest pipelines used to parse log lines are set up automatically the first
55
time you run {beatname_uc}, assuming the {es} output is enabled. If you're sending
6-
events to {ls}, or plan to use
7-
<<configuration-central-management,{beats} central management>>, you need to
8-
load the ingest pipelines manually. To do this, run the `setup` command with
9-
the `--pipelines` option specified. If you used the
6+
events to {ls} you need to load the ingest pipelines manually. To do this, run the
7+
`setup` command with the `--pipelines` option specified. If you used the
108
<<modules-command,`modules`>> command to enable modules in the `modules.d`
119
directory, also specify the `--modules` flag. For example, the following command
1210
loads the ingest pipelines used by all filesets enabled in the system, nginx,
@@ -44,4 +42,4 @@ PS > .{backslash}{beatname_lc}.exe setup --pipelines --modules system,nginx,mysq
4442

4543
TIP: If you're loading ingest pipelines manually because you want to send events
4644
to {ls}, also see
47-
{logstash-ref}/filebeat-modules.html[Working with {beatname_uc} modules].
45+
{logstash-ref}/filebeat-modules.html[Working with {beatname_uc} modules].

‎filebeat/docs/index.asciidoc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ include::./configuring-howto.asciidoc[]
4949

5050
include::{docdir}/howto/howto.asciidoc[]
5151

52-
include::{libbeat-dir}/shared-central-management.asciidoc[]
53-
5452
include::./modules.asciidoc[]
5553

5654
include::./fields.asciidoc[]

‎libbeat/docs/shared-central-management.asciidoc‎

Lines changed: 0 additions & 256 deletions
This file was deleted.

‎metricbeat/docs/index.asciidoc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ include::./configuring-howto.asciidoc[]
4949

5050
include::{docdir}/howto/howto.asciidoc[]
5151

52-
include::{libbeat-dir}/shared-central-management.asciidoc[]
53-
5452
include::./modules.asciidoc[]
5553

5654
include::./fields.asciidoc[]

‎x-pack/auditbeat/cmd/root.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ package cmd
77
import (
88
auditbeatcmd "github.com/elastic/beats/v7/auditbeat/cmd"
99
"github.com/elastic/beats/v7/libbeat/cmd"
10-
xpackcmd "github.com/elastic/beats/v7/x-pack/libbeat/cmd"
1110

1211
// Register Auditbeat x-pack modules.
1312
_ "github.com/elastic/beats/v7/x-pack/auditbeat/include"
13+
_ "github.com/elastic/beats/v7/x-pack/libbeat/include"
1414
)
1515

1616
// Name of the beat
@@ -23,5 +23,4 @@ func init() {
2323
settings := auditbeatcmd.AuditbeatSettings()
2424
settings.ElasticLicensed = true
2525
RootCmd = auditbeatcmd.Initialize(settings)
26-
xpackcmd.AddXPack(RootCmd, auditbeatcmd.Name)
2726
}

0 commit comments

Comments
 (0)