Skip to content

Commit 591e771

Browse files
mpfz0rMarius Sturm
authored and
Marius Sturm
committed
Remove filebeat from linux packages (#326)
* Remove filebeat from linux packages Linux users should install their collectors from elastic * Also remove filebeat path from built-in default * Don't create spooldir for nxlog * Extend whitelist to include beats binarys The wrapper scripts have hardcoded paths, that we cannot overwrite with the configuration.
1 parent 8ce86bd commit 591e771

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

cfgfile/schema.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,18 @@ log_rotate_max_file_size: "10MiB"
4848
log_rotate_keep_files: 10
4949
collector_configuration_directory: "/var/lib/graylog-sidecar/generated"
5050
collector_binaries_whitelist:
51-
- "/usr/lib/graylog-sidecar/filebeat"
5251
- "/usr/bin/filebeat"
5352
- "/usr/bin/packetbeat"
5453
- "/usr/bin/metricbeat"
5554
- "/usr/bin/heartbeat"
5655
- "/usr/bin/auditbeat"
56+
- "/usr/bin/journalbeat"
57+
- "/usr/share/filebeat/bin/filebeat"
58+
- "/usr/share/packetbeat/bin/packetbeat"
59+
- "/usr/share/metricbeat/bin/metricbeat"
60+
- "/usr/share/heartbeat/bin/heartbeat"
61+
- "/usr/share/auditbeat/bin/auditbeat"
62+
- "/usr/share/journalbeat/bin/journalbeat"
5763
- "/opt/nxlog/bin/nxlog"
5864
`
5965

dist/fetch_collectors.sh

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ download_beat()
4040

4141
for ARCH in "${ARCHS[@]}"
4242
do
43-
download_beat "filebeat" "linux" ${FILEBEAT_VERSION} ${ARCH}
4443
download_beat "filebeat" "windows" ${FILEBEAT_VERSION} ${ARCH}
4544
download_beat "winlogbeat" "windows" ${WINLOGBEAT_VERSION} ${ARCH}
4645
done

dist/recipe.rb

-2
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ def build
2424

2525
def install
2626
bin.install 'graylog-sidecar'
27-
lib('graylog-sidecar').install '../../collectors/filebeat/linux/x86_64/filebeat'
2827
etc('graylog/sidecar').install '../../../sidecar-example.yml', 'sidecar.yml'
2928
var('lib/graylog-sidecar/generated').mkdir
3029
var('log/graylog-sidecar').mkdir
3130
var('run/graylog-sidecar').mkdir
32-
var('spool/graylog-sidecar/nxlog').mkdir
3331
end
3432
end

dist/recipe32.rb

-2
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ def build
2424

2525
def install
2626
bin.install 'graylog-sidecar'
27-
lib('graylog-sidecar').install '../../collectors/filebeat/linux/x86/filebeat'
2827
etc('graylog/sidecar').install '../../../sidecar-example.yml', 'sidecar.yml'
2928
var('lib/graylog-sidecar/generated').mkdir
3029
var('log/graylog-sidecar').mkdir
3130
var('run/graylog-sidecar').mkdir
32-
var('spool/graylog-sidecar/nxlog').mkdir
3331
end
3432
end

sidecar-example.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,16 @@ server_api_token: ""
7171
#
7272
# Default:
7373
# collector_binaries_whitelist:
74-
# - "/usr/lib/graylog-sidecar/filebeat"
7574
# - "/usr/bin/filebeat"
7675
# - "/usr/bin/packetbeat"
7776
# - "/usr/bin/metricbeat"
7877
# - "/usr/bin/heartbeat"
7978
# - "/usr/bin/auditbeat"
79+
# - "/usr/bin/journalbeat"
80+
# - "/usr/share/filebeat/bin/filebeat"
81+
# - "/usr/share/packetbeat/bin/packetbeat"
82+
# - "/usr/share/metricbeat/bin/metricbeat"
83+
# - "/usr/share/heartbeat/bin/heartbeat"
84+
# - "/usr/share/auditbeat/bin/auditbeat"
85+
# - "/usr/share/journalbeat/bin/journalbeat"
8086
# - "/opt/nxlog/bin/nxlog"

0 commit comments

Comments
 (0)