Revert useless metric keeping useful changes (#179)

* Revert "feat(fqdn): compute fqdn whenever possible (#172)"

This reverts commit 0690533.

* feat(revert): keep useful changes

Author: paologallinaharbur

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## v1.4.1 (2024-02-28)
+### Fixed
+ - Reverted a new metric that was reporting a FQDN different from the one reported by the infra-agent
+
 ## v1.3.0 (2023-10-10)
 ### Changed
  - Dependencies have been updated: testify, logrus, govmomi

go.mod

@@ -3,7 +3,7 @@ module github.com/newrelic/nri-vsphere
 go 1.19
 
 require (
-	github.com/newrelic/infra-integrations-sdk v3.8.0+incompatible
+	github.com/newrelic/infra-integrations-sdk v3.8.2+incompatible
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.8.4
 	github.com/vmware/govmomi v0.34.2
@@ -16,7 +16,7 @@ require (
 	github.com/google/uuid v1.4.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect

go.sum

@@ -6,14 +6,14 @@ github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/newrelic/infra-integrations-sdk v3.8.0+incompatible h1:QvwHLsgHyGw4ZULOSnnWQnVPE744K1eda+2XLp2eHtg=
-github.com/newrelic/infra-integrations-sdk v3.8.0+incompatible/go.mod h1:tMUHRMq6mJS0YyBnbWrTXAnREnQqC1AGO6Lu45u5xAM=
+github.com/newrelic/infra-integrations-sdk v3.8.2+incompatible h1:Ktcm1aPAl7CW3o+FXAIKJ+jygWVXDXaUIWFyf2CXQTk=
+github.com/newrelic/infra-integrations-sdk v3.8.2+incompatible/go.mod h1:tMUHRMq6mJS0YyBnbWrTXAnREnQqC1AGO6Lu45u5xAM=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
-github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
+github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
+github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

internal/collect/vms.go

@@ -18,7 +18,7 @@ func VirtualMachines(config *config.Config) {
 	m := config.ViewManager
 
 	// Reference: http://pubs.vmware.com/vsphere-60/topic/com.vmware.wssdk.apiref.doc/vim.VirtualMachine.html
-	propertiesToRetrieve := []string{"name", "summary", "network", "config", "guest", "guest.ipStack", "runtime", "resourcePool", "datastore", "overallStatus"}
+	propertiesToRetrieve := []string{"name", "summary", "network", "config", "guest", "runtime", "resourcePool", "datastore", "overallStatus"}
 	if config.Args.EnableVsphereSnapshots {
 		config.Logrus.Debug("collecting as well snapshot and layoutEx properties")
 		propertiesToRetrieve = append(propertiesToRetrieve, "snapshot", "layoutEx.file", "layoutEx.disk", "layoutEx.snapshot")

internal/process/vms.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/newrelic/infra-integrations-sdk/data/metric"
 	"github.com/newrelic/nri-vsphere/internal/config"
-	"github.com/vmware/govmomi/vim25/mo"
 )
 
 func createVirtualMachineSamples(config *config.Config) {
@@ -191,13 +190,8 @@ func createVirtualMachineSamples(config *config.Config) {
 						}
 					}
 				}
-
-				if fqdn := computeFullHostname(vm); fqdn != "" {
-					checkError(config.Logrus, ms.SetMetric("vmFullHostname", fqdn, metric.ATTRIBUTE))
-				}
-
 				ipAddressesTrimmed := strings.TrimSuffix(ipAddresses.String(), "|")
-				// it might be empty, but we still add the attribute for consistency
+				// it might be empty but we still add the attribute for consistency
 				checkError(config.Logrus, ms.SetMetric("ipAddresses", ipAddressesTrimmed, metric.ATTRIBUTE))
 			}
 
@@ -245,41 +239,3 @@ func createVirtualMachineSamples(config *config.Config) {
 		}
 	}
 }
-
-// computeFullHostname joins hostname and domain for each VM
-// These data depends on the vmwareTools, therefore they need to be installed,
-// and we depend on how such tool is collecting the value.
-// Moreover, notice that we are returning the first domain contained in IpStack array.
-func computeFullHostname(vm *mo.VirtualMachine) string {
-	if vm.Guest == nil {
-		return ""
-	}
-	if vm.Summary.Guest == nil {
-		return ""
-	}
-
-	for _, is := range vm.Guest.IpStack {
-		if is.DnsConfig == nil {
-			continue
-		}
-
-		var domain = is.DnsConfig.DomainName
-		var hostname = is.DnsConfig.HostName
-		if domain == "" || hostname == "" {
-			continue
-		}
-		if hostname != vm.Summary.Guest.HostName {
-			continue
-		}
-
-		// we noticed that the hostname is sometimes the short one and sometimes the fqdn
-		hostname = strings.TrimSuffix(hostname, domain)
-		hostname = strings.TrimSuffix(hostname, ".")
-
-		var fullHostname = hostname + "." + domain
-		fullHostname = strings.TrimSuffix(fullHostname, ".")
-
-		return fullHostname
-	}
-	return ""
-}

internal/process/vms_test.go

@@ -7,14 +7,12 @@ import (
 	"github.com/newrelic/nri-vsphere/internal/collect"
 	"github.com/newrelic/nri-vsphere/internal/config"
 	"github.com/newrelic/nri-vsphere/internal/model"
-	"github.com/newrelic/nri-vsphere/internal/process/testdata"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/vmware/govmomi/simulator"
 	"github.com/vmware/govmomi/view"
 	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
 	"testing"
 )
 
@@ -56,65 +54,3 @@ func getDatacenter(ctx context.Context, vm *view.Manager) *model.Datacenter {
 	_ = cv.Retrieve(ctx, []string{"Datacenter"}, []string{"name"}, &datacenters)
 	return model.NewDatacenter(&datacenters[0])
 }
-
-const hostname = "test"
-const fullHostname = "test.this.com"
-const domain = "this.com"
-
-func TestComputeFullHostname(t *testing.T) {
-	var vm = &mo.VirtualMachine{}
-	assert.Equal(t, "", computeFullHostname(vm))
-
-	vm = &mo.VirtualMachine{
-		Guest: &types.GuestInfo{
-			IpStack: []types.GuestStackInfo{
-				{
-					DnsConfig: &types.NetDnsConfigInfo{
-						HostName:   hostname + "different",
-						DomainName: domain,
-					},
-				},
-				{
-					DnsConfig: &types.NetDnsConfigInfo{
-						HostName: hostname,
-					},
-				},
-				{
-					DnsConfig: &types.NetDnsConfigInfo{
-						DomainName: domain,
-					},
-				},
-				{ // This is the only entry that the implementation should consider
-					DnsConfig: &types.NetDnsConfigInfo{
-						HostName:   hostname,
-						DomainName: domain,
-					},
-				},
-			},
-		},
-		Summary: types.VirtualMachineSummary{
-			Guest: &types.VirtualMachineGuestSummary{
-				HostName: hostname,
-			},
-		},
-	}
-	assert.Equal(t, fullHostname, computeFullHostname(vm))
-
-	// No matter if in hostname there is the fqdn, we do not place the suffix twice
-	vm.Guest.IpStack[3].DnsConfig.HostName = fullHostname
-	vm.Summary.Guest.HostName = fullHostname
-	assert.Equal(t, fullHostname, computeFullHostname(vm))
-
-	// No matter if in hostname there is the fqdn, we do not place the suffix twice
-	vm.Guest.IpStack[3].DnsConfig.HostName = hostname + "."
-	vm.Summary.Guest.HostName = hostname + "."
-	assert.Equal(t, fullHostname, computeFullHostname(vm))
-
-	// if the hostname is different in the summary we avoid computing the fqdn
-	vm.Guest.IpStack[3].DnsConfig.HostName = hostname + "different"
-	assert.Equal(t, "", computeFullHostname(vm))
-
-	// Testing it with mock from real data
-	realVM := testdata.GetVMFromStaticData(t)
-	assert.Equal(t, "vm-3.test.com", computeFullHostname(&realVM))
-}