From f9d2e2829ff118e89e891c3fb3055f18dd743405 Mon Sep 17 00:00:00 2001 From: Alex K <8418476+fearful-symmetry@users.noreply.github.com> Date: Wed, 18 Nov 2020 10:28:31 -0800 Subject: [PATCH] add unit file states to system/service (#22557) (#22596) * add unit file states to system/service * add changelog (cherry picked from commit d52ef4723977e12df557ad8a4165c9a91fd5f744) --- CHANGELOG.next.asciidoc | 1 + metricbeat/docs/fields.asciidoc | 18 +++++++++++ metricbeat/module/system/fields.go | 2 +- .../module/system/service/_meta/data.json | 30 ++++++++----------- .../module/system/service/_meta/fields.yml | 6 ++++ metricbeat/module/system/service/data.go | 7 +++++ 6 files changed, 46 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 3e530a2a2f13..052ff303fc6c 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -590,6 +590,7 @@ same journal. {pull}18467[18467] - Expand unsupported option from namespace to metrics in the azure module. {pull}21486[21486] - Move s3_daily_storage and s3_request metricsets to use cloudwatch input. {pull}21703[21703] - Duplicate system.process.cmdline field with process.command_line ECS field name. {pull}22325[22325] +- Add unit file states to system/service {pull}22557[22557] *Packetbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index a8ae252fdb5c..156ddac80f35 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -42901,6 +42901,24 @@ type: keyword -- +*`system.service.unit_file.state`*:: ++ +-- +The state of the unit file + +type: keyword + +-- + +*`system.service.unit_file.vendor_preset`*:: ++ +-- +The default state of the unit file + +type: keyword + +-- + [float] === resources diff --git a/metricbeat/module/system/fields.go b/metricbeat/module/system/fields.go index 81f476c085fa..d494ea6311f6 100644 --- a/metricbeat/module/system/fields.go +++ b/metricbeat/module/system/fields.go @@ -32,5 +32,5 @@ func init() { // AssetSystem returns asset data. // This is the base64 encoded gzipped contents of module/system. func AssetSystem() string { - return "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" + return "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" } diff --git a/metricbeat/module/system/service/_meta/data.json b/metricbeat/module/system/service/_meta/data.json index 12f3fae8231b..dfca15efa6f2 100644 --- a/metricbeat/module/system/service/_meta/data.json +++ b/metricbeat/module/system/service/_meta/data.json @@ -10,32 +10,28 @@ "period": 10000 }, "process": { - "pid": 811 + "exit_code": 0, + "pid": 259 }, "service": { "type": "system" }, "system": { "service": { + "exec_code": "exited", "load_state": "loaded", - "name": "NetworkManager.service", - "resources": { - "memory": { - "usage": { - "bytes": 15646720 - } - }, - "tasks": { - "count": 4 - } - }, - "state": "active", - "state_since": "2019-10-18T21:24:57.581561-07:00", - "sub_state": "running" + "name": "dracut-pre-udev.service", + "state": "inactive", + "state_since": "2020-08-26T18:05:23.525244-07:00", + "sub_state": "dead", + "unit_file": { + "state": "static", + "vendor_preset": "disabled" + } } }, "systemd": { - "fragment_path": "/usr/lib/systemd/system/NetworkManager.service", - "unit": "NetworkManager.service" + "fragment_path": "/usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-udev.service", + "unit": "dracut-pre-udev.service" } } \ No newline at end of file diff --git a/metricbeat/module/system/service/_meta/fields.yml b/metricbeat/module/system/service/_meta/fields.yml index 529c4b01f97d..739dbcb074fa 100644 --- a/metricbeat/module/system/service/_meta/fields.yml +++ b/metricbeat/module/system/service/_meta/fields.yml @@ -22,6 +22,12 @@ - name: exec_code type: keyword description: The SIGCHLD code from the service's main process + - name: unit_file.state + type: keyword + description: The state of the unit file + - name: unit_file.vendor_preset + type: keyword + description: The default state of the unit file - name: resources type: group description: system metrics associated with the service diff --git a/metricbeat/module/system/service/data.go b/metricbeat/module/system/service/data.go index eda9eae0f6ab..077c3770f4e9 100644 --- a/metricbeat/module/system/service/data.go +++ b/metricbeat/module/system/service/data.go @@ -54,6 +54,9 @@ type Properties struct { ActiveExitTimestamp uint64 // Meta FragmentPath string + // UnitFileState + UnitFileState string + UnitFilePreset string } // formProperties gets properties for the systemd service and returns a MapStr with useful data @@ -71,6 +74,10 @@ func formProperties(unit dbus.UnitStatus, props Properties) (mb.Event, error) { "load_state": unit.LoadState, "state": unit.ActiveState, "sub_state": unit.SubState, + "unit_file": common.MapStr{ + "state": props.UnitFileState, + "vendor_preset": props.UnitFilePreset, + }, } //most of the properties values are context-dependent.