Skip to content

Commit b38a78f

Browse files
tomdohertyjsoriano
authored andcommitted
Add domain state metricset to kvm module (#17673)
This allows tracking KVM transitions of state and consolidate resource usage with machine state. Signed-off-by: Tom Doherty <tom@singlesecond.com> (cherry picked from commit ed7fa2a)
1 parent 24e11ea commit b38a78f

17 files changed

Lines changed: 365 additions & 6 deletions

CHANGELOG.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ https://github.com/elastic/beats/compare/v7.5.0...v7.5.1[View commits]
3030
- Fix docker network stats when multiple interfaces are configured. {issue}14586[14586] {pull}14825[14825]
3131
- Fix ListMetrics pagination in aws module. {issue}14926[14926] {pull}14942[14942]
3232
- Fix CPU count in docker/cpu in cases where no `online_cpus` are reported {pull}15070[15070]
33+
- Add domain state to kvm module {pull}17673[17673]
3334

3435
[[release-notes-7.5.0]]
3536
=== Beats version 7.5.0

metricbeat/docs/fields.asciidoc

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25865,6 +25865,50 @@ type: long
2586525865
Domain name
2586625866
2586725867
25868+
type: keyword
25869+
25870+
--
25871+
25872+
[float]
25873+
=== status
25874+
25875+
status
25876+
25877+
25878+
25879+
[float]
25880+
=== stat
25881+
25882+
Memory stat
25883+
25884+
25885+
25886+
*`kvm.status.stat.state`*::
25887+
+
25888+
--
25889+
domain state
25890+
25891+
25892+
type: keyword
25893+
25894+
--
25895+
25896+
*`kvm.status.id`*::
25897+
+
25898+
--
25899+
Domain id
25900+
25901+
25902+
type: long
25903+
25904+
--
25905+
25906+
*`kvm.status.name`*::
25907+
+
25908+
--
25909+
Domain name
25910+
25911+
2586825912
type: keyword
2586925913
2587025914
--

metricbeat/docs/modules/kvm.asciidoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ in <<configuration-metricbeat>>. Here is an example configuration:
2020
----
2121
metricbeat.modules:
2222
- module: kvm
23-
metricsets: ["dommemstat"]
23+
metricsets: ["dommemstat", "status"]
2424
enabled: true
2525
period: 10s
2626
hosts: ["unix:///var/run/libvirt/libvirt-sock"]
@@ -39,5 +39,9 @@ The following metricsets are available:
3939

4040
* <<metricbeat-metricset-kvm-dommemstat,dommemstat>>
4141

42+
* <<metricbeat-metricset-kvm-status,status>>
43+
4244
include::kvm/dommemstat.asciidoc[]
4345

46+
include::kvm/status.asciidoc[]
47+
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
////
2+
This file is generated! See scripts/mage/docs_collector.go
3+
////
4+
5+
[[metricbeat-metricset-kvm-status]]
6+
=== kvm status metricset
7+
8+
beta[]
9+
10+
include::../../../module/kvm/status/_meta/docs.asciidoc[]
11+
12+
This is a default metricset. If the host module is unconfigured, this metricset is enabled by default.
13+
14+
==== Fields
15+
16+
For a description of each field in the metricset, see the
17+
<<exported-fields-kvm,exported fields>> section.
18+
19+
Here is an example document generated by this metricset:
20+
21+
[source,json]
22+
----
23+
include::../../../module/kvm/status/_meta/data.json[]
24+
----

metricbeat/docs/modules_list.asciidoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ This file is generated! See scripts/mage/docs_collector.go
168168
|<<metricbeat-metricset-kubernetes-system,system>>
169169
|<<metricbeat-metricset-kubernetes-volume,volume>>
170170
|<<metricbeat-module-kvm,kvm>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
171-
.1+| .1+| |<<metricbeat-metricset-kvm-dommemstat,dommemstat>> beta[]
171+
.2+| .2+| |<<metricbeat-metricset-kvm-dommemstat,dommemstat>> beta[]
172+
|<<metricbeat-metricset-kvm-status,status>> beta[]
172173
|<<metricbeat-module-logstash,Logstash>> |image:./images/icon-no.png[No prebuilt dashboards] |
173174
.2+| .2+| |<<metricbeat-metricset-logstash-node,node>>
174175
|<<metricbeat-metricset-logstash-node_stats,node_stats>>

metricbeat/include/list_common.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

metricbeat/metricbeat.reference.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ metricbeat.modules:
556556

557557
#--------------------------------- Kvm Module ---------------------------------
558558
- module: kvm
559-
metricsets: ["dommemstat"]
559+
metricsets: ["dommemstat", "status"]
560560
enabled: true
561561
period: 10s
562562
hosts: ["unix:///var/run/libvirt/libvirt-sock"]

metricbeat/module/kvm/_meta/config.reference.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- module: kvm
2-
metricsets: ["dommemstat"]
2+
metricsets: ["dommemstat", "status"]
33
enabled: true
44
period: 10s
55
hosts: ["unix:///var/run/libvirt/libvirt-sock"]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
- module: kvm
22
#metricsets:
33
# - dommemstat
4+
# - status
45
period: 10s
56
hosts: ["unix:///var/run/libvirt/libvirt-sock"]

metricbeat/module/kvm/fields.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)