Revert "Add build constraint for linux collectors."

collector/bonding.go

@@ -1,4 +1,4 @@
-// +build linux,!nobonding
+// +build !nobonding
 
 package collector
 

collector/diskstats.go

@@ -1,4 +1,4 @@
-// +build linux,!nodiskstats
+// +build !nodiskstats
 
 package collector
 

collector/filesystem.go

@@ -1,4 +1,4 @@
-// +build linux,!nofilesystem
+// +build !nofilesystem
 
 package collector
 

collector/interrupts.go

@@ -1,4 +1,4 @@
-// +build linux,!nointerrupts
+// +build !nointerrupts
 
 package collector
 

collector/lastlogin.go

@@ -1,4 +1,4 @@
-// +build linux,!nolastlogin
+// +build !nolastlogin
 
 package collector
 

collector/megacli.go

@@ -1,4 +1,4 @@
-// +build linux,!nomegacli
+// +build !nomegacli
 
 package collector
 

collector/meminfo_linux.go

@@ -1,4 +1,4 @@
-// +build linux,!nomeminfo
+// +build !nomeminfo
 
 package collector
 

collector/netdev.go

@@ -1,4 +1,4 @@
-// +build linux,!nonetdev
+// +build !nonetdev
 
 package collector
 

collector/netstat.go

@@ -1,4 +1,4 @@
-// +build linux,!nonetstat
+// +build !nonetstat
 
 package collector
 

collector/stat.go

@@ -1,4 +1,4 @@
-// +build linux,!nostat
+// +build !nostat
 
 package collector
 
@@ -98,11 +98,11 @@ func (c *statCollector) Update(ch chan<- prometheus.Metric) (err error) {
 			// Only some of these may be present, depending on kernel version.
 			cpuFields := []string{"user", "nice", "system", "idle", "iowait", "irq", "softirq", "steal", "guest"}
 			// OpenVZ guests lack the "guest" CPU field, which needs to be ignored.
-			expectedFieldNum := len(cpuFields) + 1
+			expectedFieldNum := len(cpuFields)+1
 			if expectedFieldNum > len(parts) {
 				expectedFieldNum = len(parts)
 			}
-			for i, v := range parts[1:expectedFieldNum] {
+			for i, v := range parts[1 : expectedFieldNum] {
 				value, err := strconv.ParseFloat(v, 64)
 				if err != nil {
 					return err

collector/tcpstat.go

@@ -1,4 +1,4 @@
-// +build linux,!notcpstat
+// +build !notcpstat
 
 package collector