Merge pull request #70 from othalla/add_cpu_idle

Add cpu idle

Author: Aurélien HÉBERT

Readme.md

@@ -52,19 +52,21 @@ Noderig have some built-in collectors.
 <tr><td><b>Level</b></td><td><b>Metric</b></td><td><b>Description</b></td><td><b>Module</b></td></tr>
 <tr><td>0</td><td></td><td>disabled metrics</td><td></td></tr>
 <tr><td>1</td><td>os.cpu{}</td><td>combined percentage of cpu usage</td><td></td></tr>
-<tr><td rowspan="6">2</td><td>os.cpu.iowait{}</td><td>combined percentage of cpu iowait</td><td></td></tr>
+<tr><td rowspan="7">2</td><td>os.cpu.iowait{}</td><td>combined percentage of cpu iowait</td><td></td></tr>
 <tr><td>os.cpu.user{}</td><td>combined percentage of cpu user</td><td></td></tr>
 <tr><td>os.cpu.systems{}</td><td>combined percentage of cpu systems</td><td></td></tr>
 <tr><td>os.cpu.nice{}</td><td>combined percentage of cpu nice</td><td></td></tr>
 <tr><td>os.cpu.irq{}</td><td>combined percentage of cpu irq</td><td></td></tr>
 <tr><td>os.cpu.steal{}</td><td>combined percentage of cpu stolen</td><td></td></tr>
+<tr><td>os.cpu.idlel{}</td><td>combined percentage of cpu idle</td><td></td></tr>
 <tr><td>os.cpu.temperature{id=n}</td><td>temperature of cpu n</td><td>temperature</td></tr>
-<tr><td rowspan="6">3</td><td>os.cpu.iowait{chore=n}</td><td>chore percentage of cpu iowait</td><td></td></tr>
+<tr><td rowspan="7">3</td><td>os.cpu.iowait{chore=n}</td><td>chore percentage of cpu iowait</td><td></td></tr>
 <tr><td>os.cpu.user{chore=n}</td><td>chore percentage of cpu user</td><td></td></tr>
 <tr><td>os.cpu.systems{chore=n}</td><td>chore percentage of cpu systems</td><td></td></tr>
 <tr><td>os.cpu.nice{chore=n}</td><td>chore percentage of cpu nice</td><td></td></tr>
 <tr><td>os.cpu.irq{chore=n}</td><td>chore percentage of cpu irq</td><td></td></tr>
 <tr><td>os.cpu.steal{chore=n}</td><td>chore percentage of cpu stolen</td><td></td></tr>
+<tr><td>os.cpu.idle{chore=n}</td><td>chore percentage of cpu idle</td><td></td></tr>
 <tr><td>os.cpu.temperature{core=n}</td><td>temperature of cpu core n</td><td>temperature</td></tr>
 </table>
 

collectors/cpu.go

@@ -155,6 +155,14 @@ func (c *CPU) scrape() error {
 		steal = steal / float64(len(steals)) * 100
 		gts = core.GetSeriesOutput(now, class+".steal", "{}", steal)
 		c.sensision.WriteString(gts)
+
+		idle := 0.0
+		for _, v := range idles {
+			idle += v
+		}
+		idle = idle / float64(len(idles)) * 100
+		gts = core.GetSeriesOutput(now, class+".idle", "{}", idle)
+		c.sensision.WriteString(gts)
 	}
 
 	if c.level == 3 {
@@ -194,6 +202,12 @@ func (c *CPU) scrape() error {
 				fmt.Sprintf("{%v}", core.ToLabels("chore", i)), v*100)
 			c.sensision.WriteString(gts)
 		}
+
+		for i, v := range idles {
+			gts := core.GetSeriesOutput(now, fmt.Sprintf("%v.idle", class),
+				fmt.Sprintf("{%v}", core.ToLabels("chore", i)), v*100)
+			c.sensision.WriteString(gts)
+		}
 	}
 
 	for _, m := range c.modules {