Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vcenterreceiver spike #30624

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 160 additions & 4 deletions receiver/vcenterreceiver/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,172 @@ import (
"context"
"fmt"
"net/url"
"time"

"github.com/ReneKroon/ttlcache/v2"
"github.com/vmware/govmomi"
"github.com/vmware/govmomi/find"
"github.com/vmware/govmomi/object"
"github.com/vmware/govmomi/performance"
"github.com/vmware/govmomi/property"
"github.com/vmware/govmomi/vim25"
vt "github.com/vmware/govmomi/vim25/types"
"go.uber.org/zap"
)

type client interface {
// EnsureConnection will establish a connection to the vSphere SDK if not already established
EnsureConnection(ctx context.Context, logger *zap.Logger) error
// Datacenters returns the datacenterComputeResources of the vSphere SDK
Datacenters(ctx context.Context) ([]*object.Datacenter, error)
// Clusters returns the clusterComputeResources of the vSphere SDK
Clusters(ctx context.Context, datacenter *object.Datacenter) ([]*object.ClusterComputeResource, error)
// ResourcePools returns the resourcePools in the vSphere SDK
ResourcePools(ctx context.Context) ([]*object.ResourcePool, error)
VMs(ctx context.Context) ([]*object.VirtualMachine, error)
Disconnect(ctx context.Context) error

PerformanceQuery(
ctx context.Context,
spec vt.PerfQuerySpec,
names []string,
objs []vt.ManagedObjectReference,
) (*perfSampleResult, error)
}

func newCachingClient(c *Config) client {
cache := ttlcache.NewCache()
_ = cache.SetTTL(c.CachingTTL)
cache.SkipTTLExtensionOnHit(true)
return &cachingClient{
delegate: defaultNewVcenterClient(c),
cache: cache,
refreshTTL: c.RefreshTTL,
}
}

type cachingClient struct {
delegate client
cache *ttlcache.Cache
refreshTTL time.Duration
refreshChan chan struct{}
}

func (c *cachingClient) PerformanceQuery(ctx context.Context, spec vt.PerfQuerySpec, names []string, objs []vt.ManagedObjectReference) (*perfSampleResult, error) {
return c.delegate.PerformanceQuery(ctx, spec, names, objs)
}

func (c *cachingClient) EnsureConnection(ctx context.Context, logger *zap.Logger) error {
if vc, ok := c.delegate.(*vcenterClient); ok {
if vc.moClient != nil {
if sessionActive, _ := vc.moClient.SessionManager.SessionIsActive(ctx); sessionActive {
return nil
}
}
}
if c.refreshChan != nil {
close(c.refreshChan)
}
c.refreshChan = make(chan struct{})
if err := c.delegate.EnsureConnection(ctx, logger); err != nil {
return err
}
if err := c.cache.Purge(); err != nil {
return err
}
if err := c.refresh(ctx); err != nil {
return err
}
go func() {
ticker := time.NewTicker(c.refreshTTL)
for {
select {
case <-c.refreshChan:
return
case <-ticker.C:
err := c.refresh(ctx)
if err != nil {
logger.Error("Error refreshing vCenter data: %v")
}
}
}
}()
return nil
}

func (c *cachingClient) refresh(ctx context.Context) error {
// cache data centers
dcs, err := c.delegate.Datacenters(ctx)
if err != nil {
return err
}
if err = c.cache.Set("dcs", dcs); err != nil {
return err
}
// cache resource pools
rps, err := c.delegate.ResourcePools(ctx)
if err != nil {
return err
}
if err = c.cache.Set("resourcepools", rps); err != nil {
return err
}
// cache VMs
vms, err := c.delegate.VMs(ctx)
if err != nil {
return err
}
if err = c.cache.Set("vms", vms); err != nil {
return err
}

// cache clusters under data centers
for _, datacenter := range dcs {
key := "datacenter" + datacenter.Reference().String()

clusters, err := c.delegate.Clusters(ctx, datacenter)
if err != nil {
return err
}
if err = c.cache.Set(key, clusters); err != nil {
return err
}
}

return nil
}

func (c *cachingClient) Datacenters(_ context.Context) ([]*object.Datacenter, error) {
dcs, _ := c.cache.Get("dcs")
return dcs.([]*object.Datacenter), nil
}

func (c *cachingClient) Clusters(_ context.Context, datacenter *object.Datacenter) ([]*object.ClusterComputeResource, error) {
key := "datacenter" + datacenter.Reference().String()
clusters, _ := c.cache.Get(key)
return clusters.([]*object.ClusterComputeResource), nil
}

func (c *cachingClient) ResourcePools(_ context.Context) ([]*object.ResourcePool, error) {
rps, _ := c.cache.Get("resourcepools")
return rps.([]*object.ResourcePool), nil
}

func (c *cachingClient) VMs(_ context.Context) ([]*object.VirtualMachine, error) {
vms, _ := c.cache.Get("vms")
return vms.([]*object.VirtualMachine), nil
}

func (c *cachingClient) Disconnect(ctx context.Context) error {
if c.refreshChan != nil {
close(c.refreshChan)
}
_ = c.cache.Close()
return c.delegate.Disconnect(ctx)
}

var _ client = &cachingClient{}

// vcenterClient is a client that collects data from a vCenter endpoint.
type vcenterClient struct {
moClient *govmomi.Client
Expand All @@ -27,16 +183,16 @@ type vcenterClient struct {
cfg *Config
}

var newVcenterClient = defaultNewVcenterClient
var newVcenterClient = newCachingClient

func defaultNewVcenterClient(c *Config) *vcenterClient {
func defaultNewVcenterClient(c *Config) client {
return &vcenterClient{
cfg: c,
}
}

// EnsureConnection will establish a connection to the vSphere SDK if not already established
func (vc *vcenterClient) EnsureConnection(ctx context.Context) error {
func (vc *vcenterClient) EnsureConnection(ctx context.Context, _ *zap.Logger) error {
if vc.moClient != nil {
sessionActive, _ := vc.moClient.SessionManager.SessionIsActive(ctx)
if sessionActive {
Expand Down Expand Up @@ -121,7 +277,7 @@ type perfSampleResult struct {
results []performance.EntityMetric
}

func (vc *vcenterClient) performanceQuery(
func (vc *vcenterClient) PerformanceQuery(
ctx context.Context,
spec vt.PerfQuerySpec,
names []string,
Expand Down
3 changes: 2 additions & 1 deletion receiver/vcenterreceiver/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/vmware/govmomi/vim25"
"go.opentelemetry.io/collector/config/configopaque"
"go.opentelemetry.io/collector/config/configtls"
"go.uber.org/zap"
)

func TestGetClusters(t *testing.T) {
Expand Down Expand Up @@ -86,7 +87,7 @@ func TestSessionReestablish(t *testing.T) {
require.NoError(t, err)
require.False(t, connected)

err = client.EnsureConnection(ctx)
err = client.EnsureConnection(ctx, zap.NewNop())
require.NoError(t, err)

connected, err = client.moClient.SessionManager.SessionIsActive(ctx)
Expand Down
3 changes: 3 additions & 0 deletions receiver/vcenterreceiver/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"errors"
"fmt"
"net/url"
"time"

"go.opentelemetry.io/collector/config/configopaque"
"go.opentelemetry.io/collector/config/configtls"
Expand All @@ -24,6 +25,8 @@ type Config struct {
Endpoint string `mapstructure:"endpoint"`
Username string `mapstructure:"username"`
Password configopaque.String `mapstructure:"password"`
RefreshTTL time.Duration `mapstructure:"refresh_ttl"`
CachingTTL time.Duration `mapstructure:"caching_ttl"`
}

// Validate checks to see if the supplied config will work for the receiver
Expand Down
2 changes: 2 additions & 0 deletions receiver/vcenterreceiver/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ func createDefaultConfig() component.Config {
ScraperControllerSettings: cfg,
TLSClientSetting: configtls.TLSClientSetting{},
MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(),
CachingTTL: 15 * time.Minute,
RefreshTTL: 5 * time.Minute,
}
}

Expand Down
2 changes: 2 additions & 0 deletions receiver/vcenterreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcente
go 1.20

require (
github.com/ReneKroon/ttlcache/v2 v2.11.0
github.com/basgys/goxml2json v1.1.0
github.com/google/go-cmp v0.6.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.92.0
Expand Down Expand Up @@ -99,6 +100,7 @@ require (
golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.15.0 // indirect
Expand Down
8 changes: 8 additions & 0 deletions receiver/vcenterreceiver/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading