wrote meminfo parser

Author: deven96

inspector/df.go renamed to inspector/disk.go

@@ -6,14 +6,15 @@ import (
 	"strings"
 )
 
+// DFMetrics : Metrics used by DF
 type DFMetrics struct {
-	size        float64
-	used        float64
-	available   float64
-	percentFull int
+	Size        float64
+	Used        float64
+	Available   float64
+	PercentFull int
 }
 
-// DF : Parsing the `df` output for memory monitoring
+// DF : Parsing the `df` output for disk monitoring
 type DF struct {
 	fields
 	// The values read from the command output string are defaultly in KB
@@ -63,10 +64,10 @@ func (i *DF) Parse(output string) {
 
 func (i DF) createMetric(columns []string, percent int) DFMetrics {
 	return DFMetrics{
-		size:        NewByteSize(columns[1], i.RawByteSize).format(i.DisplayByteSize),
-		used:        NewByteSize(columns[2], i.RawByteSize).format(i.DisplayByteSize),
-		available:   NewByteSize(columns[3], i.RawByteSize).format(i.DisplayByteSize),
-		percentFull: percent,
+		Size:        NewByteSize(columns[1], i.RawByteSize).format(i.DisplayByteSize),
+		Used:        NewByteSize(columns[2], i.RawByteSize).format(i.DisplayByteSize),
+		Available:   NewByteSize(columns[3], i.RawByteSize).format(i.DisplayByteSize),
+		PercentFull: percent,
 	}
 }
 

inspector/df_test.go renamed to inspector/disk_test.go

@@ -15,7 +15,8 @@ const (
 )
 
 var inspectorMap = map[string]Inspector{
-	`disk`: NewDF(),
+	`disk`:    NewDF(),
+	`meminfo`: NewMemInfo(),
 }
 
 type fields struct {

inspector/inspector.go

@@ -0,0 +1,71 @@
+package inspector
+
+import (
+	log "github.com/sirupsen/logrus"
+	"strings"
+)
+
+// Metrics used by MemInfo
+type MemInfoMetrics struct {
+	MemTotal  float64
+	MemFree   float64
+	Cached    float64
+	SwapTotal float64
+	SwapFree  float64
+}
+
+// MemInfo : Parsing the `/proc/meminfo` file output for memory monitoring
+type MemInfo struct {
+	fields
+	// The values read from the command output string are defaultly in KB
+	RawByteSize string
+	// We want do display disk values in GB
+	DisplayByteSize string
+	// Values of metrics being read
+	Values MemInfoMetrics
+}
+
+// Parse : run custom parsing on output of the command
+func (i *MemInfo) Parse(output string) {
+	log.Debug("Parsing ouput string in MemInfo inspector")
+	memTotal := i.getMatching("MemTotal", output)
+	memFree := i.getMatching("MemFree", output)
+	cached := i.getMatching("Cached", output)
+	swapTotal := i.getMatching("SwapTotal", output)
+	swapFree := i.getMatching("SwapFree", output)
+	i.Values = i.createMetric([]string{memTotal, memFree, cached, swapTotal, swapFree})
+}
+
+func (i MemInfo) getMatching(metric string, rows string) string {
+	lines := strings.Split(rows, "\n")
+	for _, line := range lines {
+		if strings.HasPrefix(line, metric) {
+			columns := strings.Fields(line)
+			return columns[1]
+		}
+	}
+	return `0`
+}
+
+func (i MemInfo) createMetric(columns []string) MemInfoMetrics {
+	return MemInfoMetrics{
+		MemTotal:  NewByteSize(columns[0], i.RawByteSize).format(i.DisplayByteSize),
+		MemFree:   NewByteSize(columns[1], i.RawByteSize).format(i.DisplayByteSize),
+		Cached:    NewByteSize(columns[2], i.RawByteSize).format(i.DisplayByteSize),
+		SwapTotal: NewByteSize(columns[3], i.RawByteSize).format(i.DisplayByteSize),
+		SwapFree:  NewByteSize(columns[4], i.RawByteSize).format(i.DisplayByteSize),
+	}
+}
+
+// NewMemInfo : Initialize a new MemInfo instance
+func NewMemInfo() *MemInfo {
+	return &MemInfo{
+		fields: fields{
+			Type:     File,
+			FilePath: `/proc/meminfo`,
+		},
+		RawByteSize:     `KB`,
+		DisplayByteSize: `MB`,
+	}
+
+}

inspector/meminfo.go

@@ -0,0 +1,14 @@
+// +build !windows
+
+package inspector
+
+import (
+	"testing"
+)
+
+func TestMemInfo(t *testing.T) {
+	d := NewMemInfo()
+	if d.Type != File || d.FilePath != `/proc/meminfo` {
+		t.Error("Initialized meminfo wrongly")
+	}
+}

inspector/meminfo_test.go

@@ -18,3 +18,17 @@ func TestDFonSSH(t *testing.T) {
 	i.Parse(output)
 	fmt.Printf(`%#v`, i.Values)
 }
+
+func TestMemInfoonSSH(t *testing.T) {
+	d := driver.NewSSHForTest()
+	i := inspector.NewMemInfo()
+	output, err := d.ReadFile(i.String())
+	if err != nil {
+		t.Error(err)
+	}
+	i.Parse(output)
+	if i.Values.MemTotal == 0 {
+		t.Error("showing percent used as 0")
+	}
+	fmt.Printf(`%#v`, i.Values)
+}

integration/integration_test.go

@@ -19,5 +19,23 @@ func TestDFonLocal(t *testing.T) {
 		t.Error(err)
 	}
 	i.Parse(output)
+	if i.Values[0].Used == 0 {
+		t.Error("showing percent used as 0")
+	}
+	fmt.Printf(`%#v`, i.Values)
+}
+
+func TestMemInfoonLocal(t *testing.T) {
+	d := driver.Local{}
+	// can either use NewDF() or get the interface and perform type assertion
+	i := (inspector.GetInspector(`meminfo`)).(*inspector.MemInfo)
+	output, err := d.ReadFile(i.String())
+	if err != nil {
+		t.Error(err)
+	}
+	i.Parse(output)
+	if i.Values.MemTotal == 0 {
+		t.Error("showing percent used as 0")
+	}
 	fmt.Printf(`%#v`, i.Values)
 }