resolve conflict

README.md

@@ -1,6 +1,8 @@
 [![Build Status](https://travis-ci.org/cha87de/kvmtop.svg?branch=profiler)](https://travis-ci.org/cha87de/kvmtop)
 [![GitHub release](https://img.shields.io/github/release/cha87de/kvmtop.svg)](https://github.com/cha87de/kvmtop/releases)
 [![GitHub stars](https://img.shields.io/github/stars/cha87de/kvmtop.svg?style=social&label=Stars)](https://github.com/cha87de/kvmtop)
+[![Go Report Card](https://goreportcard.com/badge/github.com/cha87de/kvmtop)](https://goreportcard.com/report/github.com/cha87de/kvmtop)
+[![GoDoc](https://godoc.org/github.com/cha87de/kvmtop?status.svg)](https://godoc.org/github.com/cha87de/kvmtop)
 [![Docker Pulls](https://img.shields.io/docker/pulls/cha87de/kvmtop.svg)](https://hub.docker.com/r/cha87de/kvmtop/)
 
 ## What kvmtop does
@@ -119,8 +121,6 @@ A more detailed list, including all metrics is available here at [./docs/README.
 ## kvmtop with InfluxDB
 
 kvmtop can be used as a monitoring agent to send data to an InfluxDB instance: kvmtop transmits JSON data via TCP to logstash, while logstash writes to InfluxDB. More detailes are available at [https://github.com/cha87de/kvmtop-datasink/](https://github.com/cha87de/kvmtop-datasink/).
-<<<<<<< HEAD
-=======
 
 ```    
                                       kvmtop-datasink
@@ -134,4 +134,17 @@ kvmtop can be used as a monitoring agent to send data to an InfluxDB instance: k
                   |                                                     |
                   +-----------------------------------------------------+
 ```
->>>>>>> master
+
+# Development Guide
+
+Install the golang binary. Create a new folder as your kvmtop workspace, e.g. /opt/kvmtop.  Then follow these steps:
+
+```
+cd /opt/kvmtop
+export GOPATH=$(pwd) # take workspace as GOPATH
+go get -d github.com/cha87de/kvmtop/...   # download all source files, including depencencies
+go install github.com/cha87de/kvmtop/...  # compile kvmtop binaries
+```
+The resulting binaries are then located in `/opt/kvmtop/bin`.
+
+Further reading: https://golang.org/doc/code.html

collectors/cpucollector/collector.go

@@ -33,6 +33,9 @@ func (collector *Collector) Collect() {
 		cpuCollect(&domain)
 		return true
 	})
+
+	// collect host measurements
+	cpuCollectHost(models.Collection.Host)
 }
 
 // Print returns the collectors measurements in a Printable struct

collectors/cpucollector/host.go

@@ -33,6 +33,10 @@ func cpuLookupHost(host *models.Host) {
 	host.AddMetricMeasurement("cpu_cores", models.CreateMeasurement(uint64(cores)))
 }
 
+func cpuCollectHost(host *models.Host) {
+	// TODO lookup cpu host utilisation, cf. #23
+}
+
 func cpuPrintHost(host *models.Host) []string {
 	cpuMinfreq := collectors.GetMetricFloat64(host.Measurable, "cpu_minfreq", 0)
 	cpuMaxfreq := collectors.GetMetricFloat64(host.Measurable, "cpu_maxfreq", 0)

collectors/hostcollector/collector.go

@@ -1,8 +1,7 @@
 package hostcollector
 
 import (
-	"os"
-
+	"github.com/cha87de/kvmtop/config"
 	"github.com/cha87de/kvmtop/models"
 )
 
@@ -17,9 +16,10 @@ func (collector *Collector) Lookup() {
 		uuid := key.(string)
 		domain := value.(models.Domain)
 		libvirtDomain, _ := models.Collection.LibvirtDomains.Load(uuid)
-		hostLookup(&domain, libvirtDomain)
+		domainLookup(&domain, libvirtDomain)
 		return true
 	})
+	hostLookup(models.Collection.Host)
 }
 
 // Collect host collector data
@@ -28,35 +28,43 @@ func (collector *Collector) Collect() {
 	models.Collection.Domains.Map.Range(func(key, value interface{}) bool {
 		// uuid := key.(string)
 		domain := value.(models.Domain)
-		hostCollect(&domain)
+		domainCollect(&domain)
 		return true
 	})
+	hostCollect(models.Collection.Host)
 }
 
 // Print returns the collectors measurements in a Printable struct
 func (collector *Collector) Print() models.Printable {
+	hostFields := []string{
+		"host_name",
+	}
+	domainFields := []string{
+		"host_name",
+	}
+
+	if config.Options.Verbose {
+		hostFields = append(hostFields,
+			"host_uuid",
+		)
+	}
+
 	printable := models.Printable{
-		HostFields: []string{
-			"host_name",
-		},
-		DomainFields: []string{
-			"host_name",
-		},
+		HostFields:   hostFields,
+		DomainFields: domainFields,
 	}
 
 	// lookup for each domain
 	printable.DomainValues = make(map[string][]string)
 	models.Collection.Domains.Map.Range(func(key, value interface{}) bool {
 		uuid := key.(string)
 		domain := value.(models.Domain)
-		printable.DomainValues[uuid] = hostPrint(&domain)
+		printable.DomainValues[uuid] = domainPrint(&domain)
 		return true
 	})
 
 	// lookup for host
-	// printable.HostValues = cpuPrintHost(host)
-	hostname, _ := os.Hostname()
-	printable.HostValues = append(printable.HostValues, hostname)
+	printable.HostValues = hostPrint(models.Collection.Host)
 
 	return printable
 }

collectors/hostcollector/domainCollect.go

@@ -0,0 +1,7 @@
+package hostcollector
+
+import "github.com/cha87de/kvmtop/models"
+
+func domainCollect(domain *models.Domain) {
+	// nothing to do at present
+}

collectors/hostcollector/domainLookup.go

@@ -0,0 +1,16 @@
+package hostcollector
+
+import (
+	"os"
+
+	"github.com/cha87de/kvmtop/models"
+	libvirt "github.com/libvirt/libvirt-go"
+)
+
+func domainLookup(domain *models.Domain, libvirtDomain libvirt.Domain) {
+	name, err := os.Hostname()
+	if err != nil {
+		panic(err)
+	}
+	domain.AddMetricMeasurement("host_name", models.CreateMeasurement(name))
+}

collectors/hostcollector/domainPrint.go

@@ -0,0 +1,12 @@
+package hostcollector
+
+import (
+	"github.com/cha87de/kvmtop/collectors"
+	"github.com/cha87de/kvmtop/models"
+)
+
+func domainPrint(domain *models.Domain) []string {
+	host := collectors.GetMetricString(domain.Measurable, "host_name", 0)
+	result := append([]string{host})
+	return result
+}

collectors/hostcollector/hostCollect.go

@@ -0,0 +1,7 @@
+package hostcollector
+
+import "github.com/cha87de/kvmtop/models"
+
+func hostCollect(host *models.Host) {
+	// nothing to do
+}

collectors/hostcollector/hostLookup.go

@@ -0,0 +1,22 @@
+package hostcollector
+
+import (
+	"os"
+
+	"github.com/cha87de/kvmtop/config"
+	"github.com/cha87de/kvmtop/models"
+	"github.com/cha87de/kvmtop/util"
+)
+
+func hostLookup(host *models.Host) {
+	name, err := os.Hostname()
+	if err != nil {
+		panic(err)
+	}
+	host.AddMetricMeasurement("host_name", models.CreateMeasurement(name))
+
+	if config.Options.Verbose {
+		uuid := util.GetSysDmiUUID()
+		host.AddMetricMeasurement("host_uuid", models.CreateMeasurement(uuid.Value))
+	}
+}

collectors/hostcollector/hostPrint.go

@@ -0,0 +1,18 @@
+package hostcollector
+
+import (
+	"github.com/cha87de/kvmtop/collectors"
+	"github.com/cha87de/kvmtop/config"
+	"github.com/cha87de/kvmtop/models"
+)
+
+func hostPrint(host *models.Host) []string {
+	hostname := collectors.GetMetricString(host.Measurable, "host_name", 0)
+	result := []string{hostname}
+
+	if config.Options.Verbose {
+		hostUUID := collectors.GetMetricString(host.Measurable, "host_uuid", 0)
+		result = append(result, hostUUID)
+	}
+	return result
+}

util/sys-dmi-uuid.go

@@ -0,0 +1,25 @@
+package util
+
+import (
+	"bytes"
+	"fmt"
+	"io/ioutil"
+)
+
+// SysDmiUUID reflects the systems UUID from /sys/devices/virtual/dmi/id/product_uuid
+type SysDmiUUID struct {
+	Value string
+}
+
+// GetSysDmiUUID reads the hosts DMI UUID from /sys/devices/virtual/dmi/id/product_uuid
+// Please Note: root privileges are required to read the file
+func GetSysDmiUUID() SysDmiUUID {
+	stat := SysDmiUUID{}
+	filepath := fmt.Sprint("/sys/devices/virtual/dmi/id/product_uuid")
+	filecontent, _ := ioutil.ReadFile(filepath)
+	fmt.Fscan(
+		bytes.NewBuffer(filecontent),
+		&stat.Value,
+	)
+	return stat
+}