Bug 258506 - sysutils/beats7: Install system.yml.sample configuration
Summary: sysutils/beats7: Install system.yml.sample configuration
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Many People
Assignee: Juraj Lutter
URL:
Keywords: easy, needs-patch
Depends on:
Blocks:
 
Reported: 2021-09-14 20:59 UTC by Dan Langille
Modified: 2022-05-07 13:32 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (elastic)
koobs: merge-quarterly?


Attachments
install filebeat & metricbeat system.yml as .sample (1.84 KB, patch)
2021-09-21 20:51 UTC, Dan Langille
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Dan Langille freebsd_committer freebsd_triage 2021-09-14 20:59:24 UTC
Hello,

etc/beats/metricbeat.modules.d/system.yml seems like a great candidate for a .sample file

It would avoid this situation:

$ sudo pkg check -s
Password:
Checking all packages:   1%
beats7-7.10.1: checksum mismatch for /usr/local/etc/beats/metricbeat.modules.d/system.yml
Checking all packages: 100%

I imagine that local changes to that file are common. Upgrades shouldn't overwrite them.

I don't know about the other 572 .yml files in pkg-plist though...
Comment 1 Juraj Lutter freebsd_committer freebsd_triage 2021-09-14 21:01:31 UTC
Thanks for the feedback, this will be included in next update.
Comment 2 Dan Langille freebsd_committer freebsd_triage 2021-09-21 20:51:19 UTC
Created attachment 228106 [details]
install filebeat & metricbeat system.yml as .sample

I am not familiar with the port. I am not confident this patch is correct.

A testport showed:

root@130R-dvl:~ # pkg which /usr/local/etc/beats/filebeat.modules.d/system.yml*
/usr/local/etc/beats/filebeat.modules.d/system.yml was not found in the database
/usr/local/etc/beats/filebeat.modules.d/system.yml.sample was installed by package beats7-7.14.0

root@130R-dvl:~ # pkg which /usr/local/etc/beats/metricbeat.modules.d/system.yml*
/usr/local/etc/beats/metricbeat.modules.d/system.yml was not found in the database
/usr/local/etc/beats/metricbeat.modules.d/system.yml.sample was installed by package beats7-7.14.0
root@130R-dvl:~ #
Comment 3 Juraj Lutter freebsd_committer freebsd_triage 2021-09-21 20:53:29 UTC
I already have upcoming update to latest 7.14.2 in my build queue. Now that we have node14 updated to proper version, even www/kibana7 will start correctly.

I will review what needs to be done with these files to be installed properly.
Comment 4 commit-hook freebsd_committer freebsd_triage 2021-10-24 22:39:47 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3c5941307404109bdfc8130de42d85a557180ecf

commit 3c5941307404109bdfc8130de42d85a557180ecf
Author:     Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2021-10-24 21:36:34 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2021-10-24 22:37:44 +0000

    sysutils/beats7: Update to 7.15.1

    - Update to 7.15.1
    - For breaking changes for 7.15.x see UPDATING
    - Install kibana dashboard files from binary package (PR 247776)
    - Install .yml config files into examples directory (PR 258506)
    - Release notes:
    https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-7.15.1.html

    PR:             247776, 258506

 UPDATING                                           |   30 +
 sysutils/beats7/Makefile                           |  159 ++-
 sysutils/beats7/distinfo                           |   92 +-
 .../files/patch-auditbeat_auditbeat.reference.yml  |   11 +-
 .../files/patch-auditbeat_auditbeat.yml (new)      |   13 +
 .../files/patch-filebeat_filebeat.reference.yml    |   13 +-
 sysutils/beats7/files/patch-filebeat_filebeat.yml  |   15 +-
 .../patch-metricbeat_metricbeat.reference.yml      |   11 +-
 .../beats7/files/patch-metricbeat_metricbeat.yml   |   15 +-
 ...patch-packetbeat_packetbeat.reference.yml (new) |   11 +
 .../beats7/files/patch-packetbeat_packetbeat.yml   |   13 +-
 sysutils/beats7/files/pkg-message.in (new)         |   12 +
 sysutils/beats7/pkg-plist                          | 1298 +-------------------
 13 files changed, 298 insertions(+), 1395 deletions(-)
Comment 5 Juraj Lutter freebsd_committer freebsd_triage 2022-05-07 13:32:40 UTC
Fixed in commit 3c5941307404109bdfc8130de42d85a557180ecf