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.

Sign up for GitHub

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

Jump to bottom

Implemented LUN to datasource translation #4934

Merged
merged 2 commits into from
Nov 2, 2018
Merged

Implemented LUN to datasource translation #4934

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41691f6
Implemented LUN to datasource translation
prydin Oct 15, 2018
5b4e56f
Cleaned up logging
prydin Oct 29, 2018
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
36 changes: 33 additions & 3 deletions plugins/inputs/vsphere/endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"log"
"net/url"
"regexp"
"strconv"
"strings"
"sync"
Expand All @@ -21,6 +22,8 @@ import (
"github.com/vmware/govmomi/vim25/types"
)

var isolateLUN = regexp.MustCompile(".*/([^/]+)/?$")

// Endpoint is a high-level representation of a connected vCenter endpoint. It is backed by the lower
// level Client type.
type Endpoint struct {
Expand All @@ -29,6 +32,7 @@ type Endpoint struct {
lastColls map[string]time.Time
instanceInfo map[string]resourceInfo
resourceKinds map[string]resourceKind
lun2ds map[string]string
discoveryTicker *time.Ticker
collectMux sync.RWMutex
initialized bool
Expand Down Expand Up @@ -93,6 +97,7 @@ func NewEndpoint(ctx context.Context, parent *VSphere, url *url.URL) (*Endpoint,
Parent: parent,
lastColls: make(map[string]time.Time),
instanceInfo: make(map[string]resourceInfo),
lun2ds: make(map[string]string),
initialized: false,
clientFactory: NewClientFactory(ctx, url, parent),
}
Expand Down Expand Up @@ -404,13 +409,25 @@ func (e *Endpoint) discover(ctx context.Context) error {
}
}

// Build lun2ds map
dss := resourceKinds["datastore"]
l2d := make(map[string]string)
for _, ds := range dss.objects {
url := ds.altID
m := isolateLUN.FindStringSubmatch(url)
if m != nil {
log.Printf("D! [input.vsphere]: LUN: %s", m[1])
l2d[m[1]] = ds.name
}
}

// Atomically swap maps
//
e.collectMux.Lock()
defer e.collectMux.Unlock()

e.instanceInfo = instInfo
e.resourceKinds = resourceKinds
e.lun2ds = l2d

sw.Stop()
SendInternalCounter("discovered_objects", e.URL.Host, int64(len(instInfo)))
Expand Down Expand Up @@ -509,14 +526,22 @@ func getDatastores(ctx context.Context, e *Endpoint, root *view.ContainerView) (
var resources []mo.Datastore
ctx1, cancel1 := context.WithTimeout(ctx, e.Parent.Timeout.Duration)
defer cancel1()
err := root.Retrieve(ctx1, []string{"Datastore"}, []string{"name", "parent"}, &resources)
err := root.Retrieve(ctx1, []string{"Datastore"}, []string{"name", "parent", "info"}, &resources)
if err != nil {
return nil, err
}
m := make(objectMap)
for _, r := range resources {
url := ""
if r.Info != nil {
info := r.Info.GetDatastoreInfo()
if info != nil {
url = info.Url
}
}
log.Printf("D! [input.vsphere]: DS URL: %s %s", url, r.Name)
m[r.ExtensibleManagedObject.Reference().Value] = objectRef{
name: r.Name, ref: r.ExtensibleManagedObject.Reference(), parentRef: r.Parent}
name: r.Name, ref: r.ExtensibleManagedObject.Reference(), parentRef: r.Parent, altID: url}
}
return m, nil
}
Expand Down Expand Up @@ -848,6 +873,11 @@ func (e *Endpoint) populateTags(objectRef *objectRef, resourceType string, resou
t["cpu"] = instance
} else if strings.HasPrefix(name, "datastore.") {
t["lun"] = instance
if ds, ok := e.lun2ds[instance]; ok {
t["dsname"] = ds
} else {
t["dsname"] = instance
}
} else if strings.HasPrefix(name, "disk.") {
t["disk"] = cleanDiskTag(instance)
} else if strings.HasPrefix(name, "net.") {
Expand Down