From 1ab8eeb8d34cf3a12b3bbeb68de6286fbf69bdb1 Mon Sep 17 00:00:00 2001 From: Marian Craciunescu Date: Wed, 30 May 2018 18:58:34 +0300 Subject: [PATCH 1/9] added hostname fields --- metricbeat/module/vsphere/virtualmachine/_meta/data.json | 3 ++- metricbeat/module/vsphere/virtualmachine/_meta/fields.yml | 6 +++++- .../module/vsphere/virtualmachine/virtualmachine_test.go | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/metricbeat/module/vsphere/virtualmachine/_meta/data.json b/metricbeat/module/vsphere/virtualmachine/_meta/data.json index bf542bfbf66..6f17cea85f1 100644 --- a/metricbeat/module/vsphere/virtualmachine/_meta/data.json +++ b/metricbeat/module/vsphere/virtualmachine/_meta/data.json @@ -18,6 +18,7 @@ } }, "host": "ha-host", + "hostname": "localhost.localdomain", "memory": { "free": { "guest": { @@ -41,4 +42,4 @@ "name": "ha-host_VM1" } } -} \ No newline at end of file +} diff --git a/metricbeat/module/vsphere/virtualmachine/_meta/fields.yml b/metricbeat/module/vsphere/virtualmachine/_meta/fields.yml index bc58b7dd58e..d62bdad1e30 100644 --- a/metricbeat/module/vsphere/virtualmachine/_meta/fields.yml +++ b/metricbeat/module/vsphere/virtualmachine/_meta/fields.yml @@ -7,7 +7,11 @@ - name: host type: keyword description: > - Host name + unique Host name id + - name: hostname + type: keyword + description: > + Host name of the host - name: name type: keyword description: > diff --git a/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go b/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go index 8b850f3450e..da8a5a3d7f0 100644 --- a/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go +++ b/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go @@ -49,6 +49,7 @@ func TestFetchEventContents(t *testing.T) { t.Logf("%s/%s event: %+v", f.Module().Name(), f.Name(), event.StringToPrint()) assert.EqualValues(t, "ha-host", event["host"]) + assert.EqualValues(t, "localhost.localdomain", event["hostname"]) assert.True(t, strings.Contains(event["name"].(string), "ha-host_VM")) cpu := event["cpu"].(common.MapStr) From cad5e3c9b4691ead71bef970466abade02da4b60 Mon Sep 17 00:00:00 2001 From: Marian Craciunescu Date: Tue, 22 Oct 2019 15:12:44 +0300 Subject: [PATCH 2/9] rebase and added metricbeat --- .../vsphere/virtualmachine/_meta/fields.yml | 6 ++--- .../vsphere/virtualmachine/virtualmachine.go | 23 ++++++++++++++++--- .../virtualmachine/virtualmachine_test.go | 4 ++-- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/metricbeat/module/vsphere/virtualmachine/_meta/fields.yml b/metricbeat/module/vsphere/virtualmachine/_meta/fields.yml index d62bdad1e30..f7bc14d856f 100644 --- a/metricbeat/module/vsphere/virtualmachine/_meta/fields.yml +++ b/metricbeat/module/vsphere/virtualmachine/_meta/fields.yml @@ -4,11 +4,11 @@ virtualmachine release: beta fields: - - name: host + - name: host.id type: keyword description: > - unique Host name id - - name: hostname + Host id + - name: host.hostname type: keyword description: > Host name of the host diff --git a/metricbeat/module/vsphere/virtualmachine/virtualmachine.go b/metricbeat/module/vsphere/virtualmachine/virtualmachine.go index 1d211711d9d..fae77b32fe8 100644 --- a/metricbeat/module/vsphere/virtualmachine/virtualmachine.go +++ b/metricbeat/module/vsphere/virtualmachine/virtualmachine.go @@ -151,12 +151,12 @@ func (m *MetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) error { "bytes": (int64(vm.Summary.QuickStats.GuestMemoryUsage) * 1024 * 1024), }, "host": common.MapStr{ - "bytes": (int64(vm.Summary.QuickStats.HostMemoryUsage) * 1024 * 1024), + "bytes": int64(vm.Summary.QuickStats.HostMemoryUsage) * 1024 * 1024, }, }, "total": common.MapStr{ "guest": common.MapStr{ - "bytes": (int64(vm.Summary.Config.MemorySizeMB) * 1024 * 1024), + "bytes": int64(vm.Summary.Config.MemorySizeMB) * 1024 * 1024, }, }, "free": common.MapStr{ @@ -168,13 +168,19 @@ func (m *MetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) error { } if vm.Summary.Runtime.Host != nil { - event["host"] = vm.Summary.Runtime.Host.Value + event["host.id"] = vm.Summary.Runtime.Host.Value } else { m.Logger().Debug("'Host', 'Runtime' or 'Summary' data not found. This is either a parsing error " + "from vsphere library, an error trying to reach host/guest or incomplete information returned " + "from host/guest") } + hostSystem, err := getHostSystem(ctx, c, vm.Summary.Runtime.Host.Reference()) + if err != nil { + m.Logger().Debug(err.Error()) + } else { + event["host.hostname"] = hostSystem.Summary.Config.Name + } // Get custom fields (attributes) values if get_custom_fields is true. if m.GetCustomFields && vm.Summary.CustomValue != nil { customFields := getCustomFields(vm.Summary.CustomValue, customFieldsMap) @@ -285,3 +291,14 @@ func setCustomFieldsMap(ctx context.Context, client *vim25.Client) (map[int32]st return customFieldsMap, nil } + +func getHostSystem(ctx context.Context, c *vim25.Client, ref types.ManagedObjectReference) (*mo.HostSystem, error) { + pc := property.DefaultCollector(c) + + var hs mo.HostSystem + err := pc.RetrieveOne(ctx, ref, []string{"summary"}, &hs) + if err != nil { + return nil, fmt.Errorf("error retrieving host information: %v", err) + } + return &hs, nil +} diff --git a/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go b/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go index da8a5a3d7f0..fb640c48fdc 100644 --- a/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go +++ b/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go @@ -48,8 +48,8 @@ func TestFetchEventContents(t *testing.T) { t.Logf("%s/%s event: %+v", f.Module().Name(), f.Name(), event.StringToPrint()) - assert.EqualValues(t, "ha-host", event["host"]) - assert.EqualValues(t, "localhost.localdomain", event["hostname"]) + assert.EqualValues(t, "ha-host", event["host.id"]) + assert.EqualValues(t, "localhost.localdomain", event["host.hostname"]) assert.True(t, strings.Contains(event["name"].(string), "ha-host_VM")) cpu := event["cpu"].(common.MapStr) From 5783ed4a3610705fe5e825d39b8c30ee7778998d Mon Sep 17 00:00:00 2001 From: Marian Craciunescu Date: Thu, 24 Oct 2019 12:22:55 +0300 Subject: [PATCH 3/9] make update working --- metricbeat/docs/fields.asciidoc | 14 ++++++++++++-- metricbeat/docs/modules/aws/ebs.asciidoc | 1 - metricbeat/docs/modules/aws/elb.asciidoc | 1 - .../docs/modules/cockroachdb/status.asciidoc | 1 - metricbeat/docs/modules/tomcat/cache.asciidoc | 1 - metricbeat/docs/modules/tomcat/memory.asciidoc | 1 - metricbeat/docs/modules/tomcat/requests.asciidoc | 1 - metricbeat/docs/modules/tomcat/threading.asciidoc | 1 - metricbeat/module/vsphere/fields.go | 2 +- 9 files changed, 13 insertions(+), 10 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index ba3bc732339..c556c73c4e5 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -32047,10 +32047,20 @@ virtualmachine -*`vsphere.virtualmachine.host`*:: +*`vsphere.virtualmachine.host.id`*:: + -- -Host name +Host id + + +type: keyword + +-- + +*`vsphere.virtualmachine.host.hostname`*:: ++ +-- +Host name of the host type: keyword diff --git a/metricbeat/docs/modules/aws/ebs.asciidoc b/metricbeat/docs/modules/aws/ebs.asciidoc index 98da239353a..34b20f457ef 100644 --- a/metricbeat/docs/modules/aws/ebs.asciidoc +++ b/metricbeat/docs/modules/aws/ebs.asciidoc @@ -9,7 +9,6 @@ beta[] include::../../../../x-pack/metricbeat/module/aws/ebs/_meta/docs.asciidoc[] -This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields diff --git a/metricbeat/docs/modules/aws/elb.asciidoc b/metricbeat/docs/modules/aws/elb.asciidoc index dda9ad02e8e..ab3d0f9d269 100644 --- a/metricbeat/docs/modules/aws/elb.asciidoc +++ b/metricbeat/docs/modules/aws/elb.asciidoc @@ -9,7 +9,6 @@ beta[] include::../../../../x-pack/metricbeat/module/aws/elb/_meta/docs.asciidoc[] -This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields diff --git a/metricbeat/docs/modules/cockroachdb/status.asciidoc b/metricbeat/docs/modules/cockroachdb/status.asciidoc index d15dd6fc0b8..3bd0aef9687 100644 --- a/metricbeat/docs/modules/cockroachdb/status.asciidoc +++ b/metricbeat/docs/modules/cockroachdb/status.asciidoc @@ -9,7 +9,6 @@ beta[] include::../../../../x-pack/metricbeat/module/cockroachdb/status/_meta/docs.asciidoc[] -This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields diff --git a/metricbeat/docs/modules/tomcat/cache.asciidoc b/metricbeat/docs/modules/tomcat/cache.asciidoc index ddddaae045e..bb5705d2287 100644 --- a/metricbeat/docs/modules/tomcat/cache.asciidoc +++ b/metricbeat/docs/modules/tomcat/cache.asciidoc @@ -9,7 +9,6 @@ beta[] include::../../../../x-pack/metricbeat/module/tomcat/cache/_meta/docs.asciidoc[] -This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields diff --git a/metricbeat/docs/modules/tomcat/memory.asciidoc b/metricbeat/docs/modules/tomcat/memory.asciidoc index 1d850e840cd..8d52481022d 100644 --- a/metricbeat/docs/modules/tomcat/memory.asciidoc +++ b/metricbeat/docs/modules/tomcat/memory.asciidoc @@ -9,7 +9,6 @@ beta[] include::../../../../x-pack/metricbeat/module/tomcat/memory/_meta/docs.asciidoc[] -This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields diff --git a/metricbeat/docs/modules/tomcat/requests.asciidoc b/metricbeat/docs/modules/tomcat/requests.asciidoc index 8f2db18d4d4..4d83b3568bf 100644 --- a/metricbeat/docs/modules/tomcat/requests.asciidoc +++ b/metricbeat/docs/modules/tomcat/requests.asciidoc @@ -9,7 +9,6 @@ beta[] include::../../../../x-pack/metricbeat/module/tomcat/requests/_meta/docs.asciidoc[] -This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields diff --git a/metricbeat/docs/modules/tomcat/threading.asciidoc b/metricbeat/docs/modules/tomcat/threading.asciidoc index 4d356cb2a9a..4b16486c429 100644 --- a/metricbeat/docs/modules/tomcat/threading.asciidoc +++ b/metricbeat/docs/modules/tomcat/threading.asciidoc @@ -9,7 +9,6 @@ beta[] include::../../../../x-pack/metricbeat/module/tomcat/threading/_meta/docs.asciidoc[] -This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields diff --git a/metricbeat/module/vsphere/fields.go b/metricbeat/module/vsphere/fields.go index d199abd80d0..22e671f12f5 100644 --- a/metricbeat/module/vsphere/fields.go +++ b/metricbeat/module/vsphere/fields.go @@ -32,5 +32,5 @@ func init() { // AssetVsphere returns asset data. // This is the base64 encoded gzipped contents of ../metricbeat/module/vsphere. func AssetVsphere() string { - return "eJzMlsFymzAQhu9+ip3ckwfg0Es6aS9uO5OmV48Mi1GNWI20JEOfviMJPBjkJDWirQ6eMQv//3nF/tYtHLHL4NnqCg1uAFhyjRncPD/6KzcbgAJtbqRmSU0GHzYAAH0VFBVt7R4zWKOwmMEeWWwASol1YTN/8y00QuHYxC3uNGZwMNTq/krE51xoLFYIFpbpJBeXvCjblyIi018yrCnIGMZ9nhUGliN2L2SKSe0VIrc+DlRz3cGwtE4/neWDrNF2llHBTHjwzIUWueTujolFfbfvGG2UoKbm8Gf2350ieEWgErjC6Na4VZJRgjOY2884S4OYFPPBICanbC0WSSmfLBbrUOqcUzJqNDk2/F7K/vZTdRYJFVlekgaT5/99EHwmy5czINdt2BZV/Uq5LfffnkA2sJ2ojm1DAqTzDfP/DmM/0ul8/UC/YatQkVlrTLde3NnHpN+ezx5urUROhLdOEC+Fa5BfyBx37lsc7Kqh/RJk4Vz2dAaShltRK5FXsll0drmodE1uTaJvYQtez620GfkjtAG2oQ+XbSnhHk9Nv2o0gmVzgMdwiPrfQnscYocWLa8WZVTCJ2ewODQ8q3sv10T1b2qa9E3f1rMMTtZXH8bpYceRvJw1by2T2oXIihLS/ifOjqPh4m7BZN97Y4gY/9W/jd8BAAD//8WY8bw=" + return "eJzMlsFunDAQhu/7FKPcsw/AoZdUaS/bVkrT68oLw+IuxpY9JKJPX9mGFRjTpMG08WGlteH/PzDzj2/hgl0GT0ZVqHEHQJxqzODm6cHN3OwACjS55oq4bDL4sAMA6FdByKKt7W0aa2QGMzghsR1AybEuTOYuvoWGCRyb2EGdwgzOWraqn4n4TIXGYgUjZkhe5eKSi7L9UkQkfJJhhCBjGPs7WRhYLtg9S10Ea38gsuPjQDXXHQxLY/XTWd7zGk1nCAXMhAfPnCmWc+r2JInV+1NHaKIEtWzOf2f/3SqCUwRZAlUY3Ro7SqkFowzm9jPOUiMmxbzXiMkpW4NFUspHg8U2lCqnlIwKdY4NvZayv/y6OouEShpakwbB/f8/CD5LQ8sZkKvWb4uofqXclrtvj8AbOASqY1ufAOl8ff2/wtiVdDpfV9Av2AoUUm9Vpgcnbu1j0i/XZw+3VSInwtsmiNfCNUjPUl+O9l8c7E1F+8XLwlT2egbimlpWC5ZXvFl1dllUektu2ejb8/BJ10ZXIDgxsz8bpeXQUII83yqlf/iNgIPfieXAlgm/stD0q0LNiDdnePDHuPfWNsYxem7R0GZhKkv4ZA1Wx5ZjdR/rhqi+UJLkf/rXOukCyd6rawfpYcdNYT1r3hqS4uhDM0ooTz9xdiD2k8cVlX3njCFi/E8b1+8AAAD//7eBEp0=" } From e05dfa49eede6aefa3c73a53cdeca305c55f6e1b Mon Sep 17 00:00:00 2001 From: Marian Craciunescu Date: Fri, 25 Oct 2019 11:40:17 +0300 Subject: [PATCH 4/9] Revert "make update working" This reverts commit 5783ed4a --- metricbeat/docs/fields.asciidoc | 14 ++------------ metricbeat/module/vsphere/fields.go | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index c556c73c4e5..ba3bc732339 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -32047,20 +32047,10 @@ virtualmachine -*`vsphere.virtualmachine.host.id`*:: +*`vsphere.virtualmachine.host`*:: + -- -Host id - - -type: keyword - --- - -*`vsphere.virtualmachine.host.hostname`*:: -+ --- -Host name of the host +Host name type: keyword diff --git a/metricbeat/module/vsphere/fields.go b/metricbeat/module/vsphere/fields.go index 22e671f12f5..d199abd80d0 100644 --- a/metricbeat/module/vsphere/fields.go +++ b/metricbeat/module/vsphere/fields.go @@ -32,5 +32,5 @@ func init() { // AssetVsphere returns asset data. // This is the base64 encoded gzipped contents of ../metricbeat/module/vsphere. func AssetVsphere() string { - return "eJzMlsFunDAQhu/7FKPcsw/AoZdUaS/bVkrT68oLw+IuxpY9JKJPX9mGFRjTpMG08WGlteH/PzDzj2/hgl0GT0ZVqHEHQJxqzODm6cHN3OwACjS55oq4bDL4sAMA6FdByKKt7W0aa2QGMzghsR1AybEuTOYuvoWGCRyb2EGdwgzOWraqn4n4TIXGYgUjZkhe5eKSi7L9UkQkfJJhhCBjGPs7WRhYLtg9S10Ea38gsuPjQDXXHQxLY/XTWd7zGk1nCAXMhAfPnCmWc+r2JInV+1NHaKIEtWzOf2f/3SqCUwRZAlUY3Ro7SqkFowzm9jPOUiMmxbzXiMkpW4NFUspHg8U2lCqnlIwKdY4NvZayv/y6OouEShpakwbB/f8/CD5LQ8sZkKvWb4uofqXclrtvj8AbOASqY1ufAOl8ff2/wtiVdDpfV9Av2AoUUm9Vpgcnbu1j0i/XZw+3VSInwtsmiNfCNUjPUl+O9l8c7E1F+8XLwlT2egbimlpWC5ZXvFl1dllUektu2ejb8/BJ10ZXIDgxsz8bpeXQUII83yqlf/iNgIPfieXAlgm/stD0q0LNiDdnePDHuPfWNsYxem7R0GZhKkv4ZA1Wx5ZjdR/rhqi+UJLkf/rXOukCyd6rawfpYcdNYT1r3hqS4uhDM0ooTz9xdiD2k8cVlX3njCFi/E8b1+8AAAD//7eBEp0=" + return "eJzMlsFymzAQhu9+ip3ckwfg0Es6aS9uO5OmV48Mi1GNWI20JEOfviMJPBjkJDWirQ6eMQv//3nF/tYtHLHL4NnqCg1uAFhyjRncPD/6KzcbgAJtbqRmSU0GHzYAAH0VFBVt7R4zWKOwmMEeWWwASol1YTN/8y00QuHYxC3uNGZwMNTq/krE51xoLFYIFpbpJBeXvCjblyIi018yrCnIGMZ9nhUGliN2L2SKSe0VIrc+DlRz3cGwtE4/neWDrNF2llHBTHjwzIUWueTujolFfbfvGG2UoKbm8Gf2350ieEWgErjC6Na4VZJRgjOY2884S4OYFPPBICanbC0WSSmfLBbrUOqcUzJqNDk2/F7K/vZTdRYJFVlekgaT5/99EHwmy5czINdt2BZV/Uq5LfffnkA2sJ2ojm1DAqTzDfP/DmM/0ul8/UC/YatQkVlrTLde3NnHpN+ezx5urUROhLdOEC+Fa5BfyBx37lsc7Kqh/RJk4Vz2dAaShltRK5FXsll0drmodE1uTaJvYQtez620GfkjtAG2oQ+XbSnhHk9Nv2o0gmVzgMdwiPrfQnscYocWLa8WZVTCJ2ewODQ8q3sv10T1b2qa9E3f1rMMTtZXH8bpYceRvJw1by2T2oXIihLS/ifOjqPh4m7BZN97Y4gY/9W/jd8BAAD//8WY8bw=" } From 35cbf78a816880ac21f287d1d2b78bc2efadd8e7 Mon Sep 17 00:00:00 2001 From: Marian Craciunescu Date: Fri, 25 Oct 2019 18:36:21 +0300 Subject: [PATCH 5/9] BEAT_STRICT_PERMS=false make fmt update --- metricbeat/docs/fields.asciidoc | 14 ++++++++++++-- metricbeat/module/vsphere/fields.go | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index ba3bc732339..c556c73c4e5 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -32047,10 +32047,20 @@ virtualmachine -*`vsphere.virtualmachine.host`*:: +*`vsphere.virtualmachine.host.id`*:: + -- -Host name +Host id + + +type: keyword + +-- + +*`vsphere.virtualmachine.host.hostname`*:: ++ +-- +Host name of the host type: keyword diff --git a/metricbeat/module/vsphere/fields.go b/metricbeat/module/vsphere/fields.go index d199abd80d0..22e671f12f5 100644 --- a/metricbeat/module/vsphere/fields.go +++ b/metricbeat/module/vsphere/fields.go @@ -32,5 +32,5 @@ func init() { // AssetVsphere returns asset data. // This is the base64 encoded gzipped contents of ../metricbeat/module/vsphere. func AssetVsphere() string { - return "eJzMlsFymzAQhu9+ip3ckwfg0Es6aS9uO5OmV48Mi1GNWI20JEOfviMJPBjkJDWirQ6eMQv//3nF/tYtHLHL4NnqCg1uAFhyjRncPD/6KzcbgAJtbqRmSU0GHzYAAH0VFBVt7R4zWKOwmMEeWWwASol1YTN/8y00QuHYxC3uNGZwMNTq/krE51xoLFYIFpbpJBeXvCjblyIi018yrCnIGMZ9nhUGliN2L2SKSe0VIrc+DlRz3cGwtE4/neWDrNF2llHBTHjwzIUWueTujolFfbfvGG2UoKbm8Gf2350ieEWgErjC6Na4VZJRgjOY2884S4OYFPPBICanbC0WSSmfLBbrUOqcUzJqNDk2/F7K/vZTdRYJFVlekgaT5/99EHwmy5czINdt2BZV/Uq5LfffnkA2sJ2ojm1DAqTzDfP/DmM/0ul8/UC/YatQkVlrTLde3NnHpN+ezx5urUROhLdOEC+Fa5BfyBx37lsc7Kqh/RJk4Vz2dAaShltRK5FXsll0drmodE1uTaJvYQtez620GfkjtAG2oQ+XbSnhHk9Nv2o0gmVzgMdwiPrfQnscYocWLa8WZVTCJ2ewODQ8q3sv10T1b2qa9E3f1rMMTtZXH8bpYceRvJw1by2T2oXIihLS/ifOjqPh4m7BZN97Y4gY/9W/jd8BAAD//8WY8bw=" + return "eJzMlsFunDAQhu/7FKPcsw/AoZdUaS/bVkrT68oLw+IuxpY9JKJPX9mGFRjTpMG08WGlteH/PzDzj2/hgl0GT0ZVqHEHQJxqzODm6cHN3OwACjS55oq4bDL4sAMA6FdByKKt7W0aa2QGMzghsR1AybEuTOYuvoWGCRyb2EGdwgzOWraqn4n4TIXGYgUjZkhe5eKSi7L9UkQkfJJhhCBjGPs7WRhYLtg9S10Ea38gsuPjQDXXHQxLY/XTWd7zGk1nCAXMhAfPnCmWc+r2JInV+1NHaKIEtWzOf2f/3SqCUwRZAlUY3Ro7SqkFowzm9jPOUiMmxbzXiMkpW4NFUspHg8U2lCqnlIwKdY4NvZayv/y6OouEShpakwbB/f8/CD5LQ8sZkKvWb4uofqXclrtvj8AbOASqY1ufAOl8ff2/wtiVdDpfV9Av2AoUUm9Vpgcnbu1j0i/XZw+3VSInwtsmiNfCNUjPUl+O9l8c7E1F+8XLwlT2egbimlpWC5ZXvFl1dllUektu2ejb8/BJ10ZXIDgxsz8bpeXQUII83yqlf/iNgIPfieXAlgm/stD0q0LNiDdnePDHuPfWNsYxem7R0GZhKkv4ZA1Wx5ZjdR/rhqi+UJLkf/rXOukCyd6rawfpYcdNYT1r3hqS4uhDM0ooTz9xdiD2k8cVlX3njCFi/E8b1+8AAAD//7eBEp0=" } From aaa427ab9b15f2accf0401dd0b6e9d712c442447 Mon Sep 17 00:00:00 2001 From: Marian Craciunescu Date: Sat, 26 Oct 2019 11:58:23 +0300 Subject: [PATCH 6/9] fix data.json --- metricbeat/module/vsphere/virtualmachine/_meta/data.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metricbeat/module/vsphere/virtualmachine/_meta/data.json b/metricbeat/module/vsphere/virtualmachine/_meta/data.json index 6f17cea85f1..cae229ceaeb 100644 --- a/metricbeat/module/vsphere/virtualmachine/_meta/data.json +++ b/metricbeat/module/vsphere/virtualmachine/_meta/data.json @@ -17,8 +17,8 @@ "mhz": 0 } }, - "host": "ha-host", - "hostname": "localhost.localdomain", + "host.id": "ha-host", + "host.hostname": "localhost.localdomain", "memory": { "free": { "guest": { From 5656b8cc628b78768225876871f76e969cca43af Mon Sep 17 00:00:00 2001 From: Marian Craciunescu Date: Sat, 26 Oct 2019 12:03:41 +0300 Subject: [PATCH 7/9] rebase with master --- metricbeat/docs/modules/aws/ebs.asciidoc | 1 + metricbeat/docs/modules/aws/elb.asciidoc | 1 + metricbeat/docs/modules/cockroachdb/status.asciidoc | 1 + metricbeat/docs/modules/tomcat/cache.asciidoc | 1 + metricbeat/docs/modules/tomcat/memory.asciidoc | 1 + metricbeat/docs/modules/tomcat/requests.asciidoc | 1 + metricbeat/docs/modules/tomcat/threading.asciidoc | 1 + 7 files changed, 7 insertions(+) diff --git a/metricbeat/docs/modules/aws/ebs.asciidoc b/metricbeat/docs/modules/aws/ebs.asciidoc index 34b20f457ef..98da239353a 100644 --- a/metricbeat/docs/modules/aws/ebs.asciidoc +++ b/metricbeat/docs/modules/aws/ebs.asciidoc @@ -9,6 +9,7 @@ beta[] include::../../../../x-pack/metricbeat/module/aws/ebs/_meta/docs.asciidoc[] +This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields diff --git a/metricbeat/docs/modules/aws/elb.asciidoc b/metricbeat/docs/modules/aws/elb.asciidoc index ab3d0f9d269..dda9ad02e8e 100644 --- a/metricbeat/docs/modules/aws/elb.asciidoc +++ b/metricbeat/docs/modules/aws/elb.asciidoc @@ -9,6 +9,7 @@ beta[] include::../../../../x-pack/metricbeat/module/aws/elb/_meta/docs.asciidoc[] +This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields diff --git a/metricbeat/docs/modules/cockroachdb/status.asciidoc b/metricbeat/docs/modules/cockroachdb/status.asciidoc index 3bd0aef9687..d15dd6fc0b8 100644 --- a/metricbeat/docs/modules/cockroachdb/status.asciidoc +++ b/metricbeat/docs/modules/cockroachdb/status.asciidoc @@ -9,6 +9,7 @@ beta[] include::../../../../x-pack/metricbeat/module/cockroachdb/status/_meta/docs.asciidoc[] +This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields diff --git a/metricbeat/docs/modules/tomcat/cache.asciidoc b/metricbeat/docs/modules/tomcat/cache.asciidoc index bb5705d2287..ddddaae045e 100644 --- a/metricbeat/docs/modules/tomcat/cache.asciidoc +++ b/metricbeat/docs/modules/tomcat/cache.asciidoc @@ -9,6 +9,7 @@ beta[] include::../../../../x-pack/metricbeat/module/tomcat/cache/_meta/docs.asciidoc[] +This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields diff --git a/metricbeat/docs/modules/tomcat/memory.asciidoc b/metricbeat/docs/modules/tomcat/memory.asciidoc index 8d52481022d..1d850e840cd 100644 --- a/metricbeat/docs/modules/tomcat/memory.asciidoc +++ b/metricbeat/docs/modules/tomcat/memory.asciidoc @@ -9,6 +9,7 @@ beta[] include::../../../../x-pack/metricbeat/module/tomcat/memory/_meta/docs.asciidoc[] +This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields diff --git a/metricbeat/docs/modules/tomcat/requests.asciidoc b/metricbeat/docs/modules/tomcat/requests.asciidoc index 4d83b3568bf..8f2db18d4d4 100644 --- a/metricbeat/docs/modules/tomcat/requests.asciidoc +++ b/metricbeat/docs/modules/tomcat/requests.asciidoc @@ -9,6 +9,7 @@ beta[] include::../../../../x-pack/metricbeat/module/tomcat/requests/_meta/docs.asciidoc[] +This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields diff --git a/metricbeat/docs/modules/tomcat/threading.asciidoc b/metricbeat/docs/modules/tomcat/threading.asciidoc index 4b16486c429..4d356cb2a9a 100644 --- a/metricbeat/docs/modules/tomcat/threading.asciidoc +++ b/metricbeat/docs/modules/tomcat/threading.asciidoc @@ -9,6 +9,7 @@ beta[] include::../../../../x-pack/metricbeat/module/tomcat/threading/_meta/docs.asciidoc[] +This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields From 4d1d9a21595c13d31831311dfb347649379b5a49 Mon Sep 17 00:00:00 2001 From: Marian Craciunescu Date: Mon, 18 Nov 2019 19:51:31 +0200 Subject: [PATCH 8/9] Add changelog mod --- CHANGELOG.next.asciidoc | 2 +- metricbeat/magefile.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 5b8350bcd6e..1c0da08fd15 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -233,7 +233,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Change kubernetes.event.message to text. {pull}13964[13964] - Fix performance counter values for windows/perfmon metricset. {issue}14036[14036] {pull}14039[14039] - Add FailOnRequired when applying schema and fix metric names in mongodb metrics metricset. {pull}14143[14143] - +- Vshpere module splits `virtualmachine.host` into `virtualmachine.host.id` and `virtualmachine.host.hostname`. {issue}7187[7187] {pull}7213[7213] *Packetbeat* - Prevent duplicate packet loss error messages in HTTP events. {pull}10709[10709] diff --git a/metricbeat/magefile.go b/metricbeat/magefile.go index 2464e0a6a6a..97905e65429 100644 --- a/metricbeat/magefile.go +++ b/metricbeat/magefile.go @@ -51,7 +51,7 @@ import ( func init() { common.RegisterCheckDeps(update.Update) - + devtools.SetBuildVariableSources(devtools.DefaultBeatBuildVariableSources) devtools.BeatDescription = "Metricbeat is a lightweight shipper for metrics." } From f0277ab2f79843ddfa23a35073e0f20e6a05d079 Mon Sep 17 00:00:00 2001 From: Marian Craciunescu Date: Mon, 18 Nov 2019 21:53:26 +0200 Subject: [PATCH 9/9] rebase with master --- CHANGELOG.next.asciidoc | 3 +-- metricbeat/magefile.go | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 6890eeecfce..11c64a6b0d8 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -246,7 +246,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Change kubernetes.event.message to text. {pull}13964[13964] - Fix performance counter values for windows/perfmon metricset. {issue}14036[14036] {pull}14039[14039] - Add FailOnRequired when applying schema and fix metric names in mongodb metrics metricset. {pull}14143[14143] -- Vshpere module splits `virtualmachine.host` into `virtualmachine.host.id` and `virtualmachine.host.hostname`. {issue}7187[7187] {pull}7213[7213] - Convert increments of 100 nanoseconds/ticks to milliseconds for WriteTime and ReadTime in diskio metricset (Windows) for consistency. {issue}14233[14233] - Limit some of the error messages to the logs only {issue}14317[14317] {pull}14327[14327] - Convert indexed ms-since-epoch timestamp fields in `elasticsearch/ml_job` metricset to ints from float64s. {issue}14220[14220] {pull}14222[14222] @@ -256,8 +255,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix marshaling of ms-since-epoch values in `elasticsearch/cluster_stats` metricset. {pull}14378[14378] - Fix checking tagsFilter using length in cloudwatch metricset. {pull}14525[14525] - Log bulk failures from bulk API requests to monitoring cluster. {issue}14303[14303] {pull}14356[14356] - - Vshpere module splits `virtualmachine.host` into `virtualmachine.host.id` and `virtualmachine.host.hostname`. {issue}7187[7187] {pull}7213[7213] + *Packetbeat* - Prevent duplicate packet loss error messages in HTTP events. {pull}10709[10709] diff --git a/metricbeat/magefile.go b/metricbeat/magefile.go index 9da71dd6179..d061ae500ce 100644 --- a/metricbeat/magefile.go +++ b/metricbeat/magefile.go @@ -51,7 +51,6 @@ import ( func init() { common.RegisterCheckDeps(update.Update) - devtools.SetBuildVariableSources(devtools.DefaultBeatBuildVariableSources) devtools.BeatDescription = "Metricbeat is a lightweight shipper for metrics." }