renamed of windows metric name.

command/command_windows.go

@@ -27,7 +27,7 @@ func metricsGenerators(conf *config.Config) []metrics.Generator {
 	var err error
 
 	generators := []metrics.Generator{}
-	if g, err = metricsWindows.NewLoadavg5Generator(); err == nil {
+	if g, err = metricsWindows.NewProcessorQueueLengthGenerator(); err == nil {
 		generators = append(generators, g)
 	}
 	if g, err = metricsWindows.NewCPUUsageGenerator(); err == nil {

metrics/windows/memory.go

@@ -36,8 +36,8 @@ func (g *MemoryGenerator) Generate() (metrics.Values, error) {
 	ret["memory.free"] = free
 	ret["memory.total"] = total
 	ret["memory.used"] = total - free
-	ret["memory.swap_total"] = float64(memoryStatusEx.TotalVirtual) / 1024
-	ret["memory.swap_free"] = float64(memoryStatusEx.AvailVirtual) / 1024
+	ret["memory.pagefile_total"] = float64(memoryStatusEx.TotalVirtual) / 1024
+	ret["memory.pagefile_free"] = float64(memoryStatusEx.AvailVirtual) / 1024
 
 	memoryLogger.Debugf("memory : %s", ret)
 	return metrics.Values(ret), nil

metrics/windows/memory_test.go

@@ -16,8 +16,8 @@ func TestMemoryGenerator(t *testing.T) {
 	for _, name := range []string{
 		"total",
 		"free",
-		"swap_total",
-		"swap_free",
+		"pagefile_total",
+		"pagefile_free",
 		"used",
 	} {
 		if _, ok := values["memory."+name]; !ok {

metrics/windows/loadavg5.go → metrics/windows/processor_queue_length.go

@@ -11,41 +11,41 @@ import (
 	"github.com/mackerelio/mackerel-agent/util/windows"
 )
 
-// Loadavg5Generator XXX
-type Loadavg5Generator struct {
+// ProcessorQueueLengthGenerator is struct of windows api
+type ProcessorQueueLengthGenerator struct {
 	query    syscall.Handle
 	counters []*windows.CounterInfo
 }
 
-var loadavg5Logger = logging.GetLogger("metrics.loadavg5")
+var processorQueueLengthLogger = logging.GetLogger("metrics.processor_queue_length")
 
-// NewLoadavg5Generator XXX
-func NewLoadavg5Generator() (*Loadavg5Generator, error) {
-	g := &Loadavg5Generator{0, nil}
+// NewProcessorQueueLengthGenerator is set up windows api
+func NewProcessorQueueLengthGenerator() (*ProcessorQueueLengthGenerator, error) {
+	g := &ProcessorQueueLengthGenerator{0, nil}
 
 	var err error
 	g.query, err = windows.CreateQuery()
 	if err != nil {
-		loadavg5Logger.Criticalf(err.Error())
+		processorQueueLengthLogger.Criticalf(err.Error())
 		return nil, err
 	}
 
-	counter, err := windows.CreateCounter(g.query, "loadavg5", `\System\Processor Queue Length`)
+	counter, err := windows.CreateCounter(g.query, "processor_queue_length", `\System\Processor Queue Length`)
 	if err != nil {
-		loadavg5Logger.Criticalf(err.Error())
+		processorQueueLengthLogger.Criticalf(err.Error())
 		return nil, err
 	}
 	g.counters = append(g.counters, counter)
 	return g, nil
 }
 
 // Generate XXX
-func (g *Loadavg5Generator) Generate() (metrics.Values, error) {
+func (g *ProcessorQueueLengthGenerator) Generate() (metrics.Values, error) {
 
 	r, _, err := windows.PdhCollectQueryData.Call(uintptr(g.query))
 	if r != 0 && err != nil {
 		if r == windows.PDH_NO_DATA {
-			loadavg5Logger.Infof("this metric has not data. ")
+			processorQueueLengthLogger.Infof("this metric has not data. ")
 			return nil, err
 		}
 		return nil, err
@@ -61,7 +61,7 @@ func (g *Loadavg5Generator) Generate() (metrics.Values, error) {
 		results[v.PostName] = fmtValue.DoubleValue
 	}
 
-	loadavg5Logger.Debugf("loadavg5: %q", results)
+	processorQueueLengthLogger.Debugf("loadavg5: %q", results)
 
 	return results, nil
 }

metrics/windows/loadavg5_test.go → metrics/windows/processor_queue_length_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 )
 
-func TestLoadavg5Generator(t *testing.T) {
-	g, _ := NewLoadavg5Generator()
+func TestProcessorQueueLengthGenerator(t *testing.T) {
+	g, _ := NewProcessorQueueLengthGenerator()
 
 	_, err := g.Generate()
 	if err != nil {