fix dependencies and naming after repo location change (#19)

Author: paologallinaharbur

Makefile

@@ -10,7 +10,7 @@ GOLINTER      = golangci-lint
 BIN_DIR    = $(WORKDIR)/bin
 TARGET = target
 TARGET_DIR       = $(WORKDIR)/$(TARGET)
-INTEGRATION  := vmware-vsphere
+INTEGRATION  := vsphere
 SHORT_INTEGRATION  := vsphere
 BINARY_NAME   = nri-$(INTEGRATION)
 

README.md

@@ -22,22 +22,22 @@ If you have the source code and Go toolchain installed, you can build and run th
 $ make test
 $ make compile-all
 ```
-The command above executes the tests for the vSphere integration and builds an executable file named `nri-vmware-vsphere` under `bin/{architecture}`. 
+The command above executes the tests for the vSphere integration and builds an executable file named `nri-vsphere` under `bin/{architecture}`. 
 
 2. Run the executable with the following arguments:
 ```bash
-$ ./bin/darwin/nri-vmware-vsphere --url 127.0.0.1:8989/sdk --user user --pass pass --validate_ssl false
+$ ./bin/darwin/nri-vsphere --url 127.0.0.1:8989/sdk --user user --pass pass --validate_ssl false
 ```
-To learn more about the usage of `./bin/darwin/nri-vmware-vsphere`, pass the `-help` argument.
+To learn more about the usage of `./bin/darwin/nri-vsphere`, pass the `-help` argument.
 ```bash
-$ ./bin/darwin/nri-vmware-vsphere -help
+$ ./bin/darwin/nri-vsphere -help
 ```
 
 External dependencies are managed via govendor.
 
 ## Contributing code
 
-We welcome code contributions (in the form of pull requests) from our user community. Before submitting a pull request, please review [these guidelines](https://github.com/newrelic/nri-vmware-vsphere/blob/master/CONTRIBUTING.md).
+We welcome code contributions (in the form of pull requests) from our user community. Before submitting a pull request, please review [these guidelines](https://github.com/newrelic/nri-vsphere/blob/master/CONTRIBUTING.md).
 
 Following these helps us efficiently review and incorporate your contribution and avoid breaking your code with future changes to the agent.
 

THIRD_PARTY_NOTICES.md

@@ -8,7 +8,7 @@ In the event that a required notice is missing or incorrect, please notify us
 by e-mailing [[email protected]](mailto:[email protected]).
 
 For any licenses that require the disclosure of source code, the source code
-can be found at https://github.com/newrelic/nri-vmware-vsphere.
+can be found at https://github.com/newrelic/nri-vsphere.
 
 ## Contents
 

cmd/nri-vmware-vsphere/nri-vmware-vsphere.go cmd/nri-vsphere/nri-vsphere.go

@@ -7,12 +7,12 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/newrelic/nri-vmware-vsphere/internal/client"
-	"github.com/newrelic/nri-vmware-vsphere/internal/collect"
-	"github.com/newrelic/nri-vmware-vsphere/internal/integration"
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
-	"github.com/newrelic/nri-vmware-vsphere/internal/outputs"
-	"github.com/newrelic/nri-vmware-vsphere/internal/process"
+	"github.com/newrelic/nri-vsphere/internal/client"
+	"github.com/newrelic/nri-vsphere/internal/collect"
+	"github.com/newrelic/nri-vsphere/internal/integration"
+	"github.com/newrelic/nri-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/outputs"
+	"github.com/newrelic/nri-vsphere/internal/process"
 	"github.com/vmware/govmomi/view"
 )
 

config/vsphere-config-win.yml.sample

@@ -1,7 +1,7 @@
 integrations:
-  - name: com.newrelic.vmware-vsphere
+  - name: com.newrelic.vsphere
     exec:
-      - C:\Program Files\New Relic\newrelic-infra\newrelic-integrations\bin\nri-vmware-vsphere.exe
+      - C:\Program Files\New Relic\newrelic-infra\newrelic-integrations\bin\nri-vsphere.exe
       # vSphere API connection data (Vcenter or ESXi servers)
       - --url
       - https://192.168.0.210/sdk

config/vsphere-config.yml.sample

@@ -1,7 +1,7 @@
 integrations:
-  - name: com.newrelic.vmware-vsphere
+  - name: com.newrelic.vsphere
     exec:
-      - /var/db/newrelic-infra/newrelic-integrations/bin/nri-vmware-vsphere
+      - /var/db/newrelic-infra/newrelic-integrations/bin/nri-vsphere
       # vSphere API connection data (Vcenter or ESXi servers)
       - --url
       - https://192.168.0.210/sdk

integration-test/Dockerfile

@@ -7,9 +7,9 @@ RUN git clone https://github.com/vmware/govmomi.git
 WORKDIR /go/src/github.com/vmware/govmomi/vcsim
 RUN make all
 
-WORKDIR /go/src/github.com/newrelic/nri-vmware-vsphere/
+WORKDIR /go/src/github.com/newrelic/nri-vsphere/
 COPY . .
 
-#Compiling nri-vmware-vsphere, it will avaible at /go/src/github.com/newrelic/nri-vmware-vsphere/bin/linux/nri-vmware-vsphere
+#Compiling nri-vsphere, it will avaible at /go/src/github.com/newrelic/nri-vsphere/bin/linux/nri-vsphere
 RUN make compile-linux
 

integration-test/docker-compose.yml

@@ -8,5 +8,5 @@ services:
       dockerfile: ./integration-test/Dockerfile
     ports:
        - "8989:8989"
-    entrypoint: "/go/src/github.com/vmware/govmomi/vcsim/vcsim -l :8989 -load /go/src/github.com/newrelic/nri-vmware-vsphere/integration-test/my-vcenter"
+    entrypoint: "/go/src/github.com/vmware/govmomi/vcsim/vcsim -l :8989 -load /go/src/github.com/newrelic/nri-vsphere/integration-test/my-vcenter"
 

integration-test/expectedOutput/default

@@ -52,7 +52,7 @@ func exectuteIntegration() ([]byte, []byte) {
 	var cmdLine []string
 	cmdLine = append(cmdLine, "exec", "-i")
 	cmdLine = append(cmdLine, "vmware-integration-with-mock")
-	cmdLine = append(cmdLine, "/go/src/github.com/newrelic/nri-vmware-vsphere/bin/nri-vmware-vsphere",
+	cmdLine = append(cmdLine, "/go/src/github.com/newrelic/nri-vsphere/bin/nri-vsphere",
 		"-user", "user",
 		"-pass", "pass",
 		"-url", "127.0.0.1:8989/sdk",

integration-test/nri-vmware-vspere_test.go

@@ -5,7 +5,7 @@ package collect
 
 import (
 	"context"
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 	"github.com/vmware/govmomi/vim25/mo"
 )
 

internal/collect/clusters.go

@@ -6,7 +6,7 @@ package collect
 import (
 	"context"
 
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 	"github.com/vmware/govmomi/vim25/mo"
 )
 

internal/collect/datacenters.go

@@ -6,7 +6,7 @@ package collect
 import (
 	"context"
 
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 	"github.com/vmware/govmomi/vim25/mo"
 )
 

internal/collect/datastores.go

@@ -6,7 +6,7 @@ package collect
 import (
 	"context"
 
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 	"github.com/vmware/govmomi/vim25/mo"
 )
 

internal/collect/hosts.go

@@ -6,7 +6,7 @@ package collect
 import (
 	"context"
 
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 	"github.com/vmware/govmomi/vim25/mo"
 )
 

internal/collect/networks.go

@@ -6,7 +6,7 @@ package collect
 import (
 	"context"
 
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 	"github.com/vmware/govmomi/vim25/mo"
 )
 

internal/collect/resourcepools.go

@@ -6,7 +6,7 @@ package collect
 import (
 	"context"
 
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 	"github.com/vmware/govmomi/vim25/mo"
 )
 

internal/collect/vms.go

@@ -6,7 +6,7 @@ package integration
 import (
 	"os"
 
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 	"github.com/sirupsen/Logrus"
 )
 

internal/integration/integration.go

@@ -44,8 +44,8 @@ type Config struct {
 func NewConfig() *Config {
 	return &Config{
 		Logrus:               logrus.New(),
-		IntegrationName:      "com.newrelic.vmware-vsphere",
-		IntegrationNameShort: "vmware-vsphere",
+		IntegrationName:      "com.newrelic.vsphere",
+		IntegrationNameShort: "vsphere",
 		IntegrationVersion:   "Unknown-SNAPSHOT",
 		StartTime:            time.Now().UnixNano() / int64(time.Millisecond),
 		IsVcenterAPIType:     false,

internal/load/load.go

@@ -8,7 +8,7 @@ import (
 	"os"
 
 	Integration "github.com/newrelic/infra-integrations-sdk/integration"
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 )
 
 // InfraIntegration Creates Infrastructure SDK Integration

internal/outputs/infra.go

@@ -5,7 +5,7 @@ package process
 
 import (
 	"github.com/newrelic/infra-integrations-sdk/data/metric"
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 )
 
 func createClusterSamples(config *load.Config, timestamp int64) {

internal/process/cluster.go

@@ -5,7 +5,7 @@ package process
 
 import (
 	"github.com/newrelic/infra-integrations-sdk/data/metric"
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 )
 
 func createDatacenterSamples(config *load.Config, timestamp int64) {

internal/process/datacenter.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/newrelic/infra-integrations-sdk/data/metric"
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 	"github.com/vmware/govmomi/vim25/types"
 )
 

internal/process/datastores.go

@@ -5,7 +5,7 @@ package process
 
 import (
 	"github.com/newrelic/infra-integrations-sdk/data/metric"
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 	"strconv"
 )
 

internal/process/hosts.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/newrelic/infra-integrations-sdk/data/metric"
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 )
 
 const (

internal/process/process.go

@@ -5,7 +5,7 @@ package process
 
 import (
 	"github.com/newrelic/infra-integrations-sdk/data/metric"
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 )
 
 func createResourcePoolSamples(config *load.Config, timestamp int64) {

internal/process/resourcepool.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/newrelic/infra-integrations-sdk/data/metric"
-	"github.com/newrelic/nri-vmware-vsphere/internal/load"
+	"github.com/newrelic/nri-vsphere/internal/load"
 )
 
 func createVirtualMachineSamples(config *load.Config, timestamp int64) {