From cb7ab5119a07f2e3c80a4d1728fa7b6d07c650e6 Mon Sep 17 00:00:00 2001
From: Jeffrey Stoke <me@arhat.dev>
Date: Fri, 12 Jun 2020 10:26:30 +0200
Subject: [PATCH] Fix collectors' build tags

Signed-off-by: Jeffrey Stoke <me@arhat.dev>
---
 collector/drbd_linux.go            | 2 ++
 collector/filesystem_linux_test.go | 2 --
 collector/kvm_bsd.go               | 2 +-
 collector/mountstats_linux.go      | 2 ++
 collector/nfs_linux.go             | 2 ++
 collector/nfsd_linux.go            | 2 ++
 collector/perf_linux.go            | 2 ++
 collector/schedstat_linux.go       | 2 ++
 collector/sysctl_bsd.go            | 2 +-
 collector/wifi_linux.go            | 2 ++
 collector/xfs_linux.go             | 2 ++
 collector/zfs_freebsd.go           | 2 ++
 collector/zfs_linux.go             | 2 ++
 collector/zfs_solaris.go           | 1 +
 14 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/collector/drbd_linux.go b/collector/drbd_linux.go
index 6815c5f0e0..4beb31db0f 100644
--- a/collector/drbd_linux.go
+++ b/collector/drbd_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !nodrbd
+
 package collector
 
 import (
diff --git a/collector/filesystem_linux_test.go b/collector/filesystem_linux_test.go
index 973cd14463..e40177906f 100644
--- a/collector/filesystem_linux_test.go
+++ b/collector/filesystem_linux_test.go
@@ -11,8 +11,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !nofilesystem
-
 package collector
 
 import (
diff --git a/collector/kvm_bsd.go b/collector/kvm_bsd.go
index b4e95e6a69..8798736385 100644
--- a/collector/kvm_bsd.go
+++ b/collector/kvm_bsd.go
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !nomeminfo
+// +build !nokvm
 // +build freebsd dragonfly
 
 package collector
diff --git a/collector/mountstats_linux.go b/collector/mountstats_linux.go
index 3fa1597e39..4102067161 100644
--- a/collector/mountstats_linux.go
+++ b/collector/mountstats_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !nomountstats
+
 package collector
 
 import (
diff --git a/collector/nfs_linux.go b/collector/nfs_linux.go
index 55f9e191b4..a540bb308a 100644
--- a/collector/nfs_linux.go
+++ b/collector/nfs_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !nonfs
+
 package collector
 
 import (
diff --git a/collector/nfsd_linux.go b/collector/nfsd_linux.go
index b6f2f8eed7..8cb1e0508e 100644
--- a/collector/nfsd_linux.go
+++ b/collector/nfsd_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !nonfsd
+
 package collector
 
 import (
diff --git a/collector/perf_linux.go b/collector/perf_linux.go
index e452754c59..3a2f7394db 100644
--- a/collector/perf_linux.go
+++ b/collector/perf_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !noperf
+
 package collector
 
 import (
diff --git a/collector/schedstat_linux.go b/collector/schedstat_linux.go
index d2f04f69c1..9e5b744d91 100644
--- a/collector/schedstat_linux.go
+++ b/collector/schedstat_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !noshedstat
+
 package collector
 
 import (
diff --git a/collector/sysctl_bsd.go b/collector/sysctl_bsd.go
index 3038f415e5..a671bc2cdd 100644
--- a/collector/sysctl_bsd.go
+++ b/collector/sysctl_bsd.go
@@ -12,7 +12,7 @@
 // limitations under the License.
 
 // +build freebsd dragonfly openbsd netbsd darwin
-// +build !nomeminfo
+// +build cgo
 
 package collector
 
diff --git a/collector/wifi_linux.go b/collector/wifi_linux.go
index 118e714331..b4b375933c 100644
--- a/collector/wifi_linux.go
+++ b/collector/wifi_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !nowifi
+
 package collector
 
 import (
diff --git a/collector/xfs_linux.go b/collector/xfs_linux.go
index 77824c53ec..36dfff5000 100644
--- a/collector/xfs_linux.go
+++ b/collector/xfs_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !noxfs
+
 package collector
 
 import (
diff --git a/collector/zfs_freebsd.go b/collector/zfs_freebsd.go
index a625bbc97e..92661e43db 100644
--- a/collector/zfs_freebsd.go
+++ b/collector/zfs_freebsd.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !nozfs
+
 package collector
 
 import (
diff --git a/collector/zfs_linux.go b/collector/zfs_linux.go
index e2c9749a9b..2449c2638e 100644
--- a/collector/zfs_linux.go
+++ b/collector/zfs_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !nozfs
+
 package collector
 
 import (
diff --git a/collector/zfs_solaris.go b/collector/zfs_solaris.go
index bfda64f316..1c0460c186 100644
--- a/collector/zfs_solaris.go
+++ b/collector/zfs_solaris.go
@@ -12,6 +12,7 @@
 // limitations under the License.
 
 // +build solaris
+// +build !nozfs
 
 package collector