From 424ca8e3224e018cbe7185f389a839c3787649a6 Mon Sep 17 00:00:00 2001
From: Johannes 'fish' Ziemke <github@freigeist.org>
Date: Thu, 8 Mar 2018 12:59:48 +0100
Subject: [PATCH] Drop exec_ in boot_timestamp_seconds on *bsd (#839)

This closes #827.
---
 collector/exec_bsd.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/collector/exec_bsd.go b/collector/exec_bsd.go
index d5f3db61..ca5099cd 100644
--- a/collector/exec_bsd.go
+++ b/collector/exec_bsd.go
@@ -46,37 +46,37 @@ func NewExecCollector() (Collector, error) {
 	return &execCollector{
 		sysctls: []bsdSysctl{
 			{
-				name:        "context_switches_total",
+				name:        "exec_context_switches_total",
 				description: "Context switches since system boot.  Resets at architeture unsigned integer.",
 				mib:         "vm.stats.sys.v_swtch",
 			},
 			{
-				name:        "traps_total",
+				name:        "exec_traps_total",
 				description: "Traps since system boot.  Resets at architeture unsigned integer.",
 				mib:         "vm.stats.sys.v_trap",
 			},
 			{
-				name:        "system_calls_total",
+				name:        "exec_system_calls_total",
 				description: "System calls since system boot.  Resets at architeture unsigned integer.",
 				mib:         "vm.stats.sys.v_syscall",
 			},
 			{
-				name:        "device_interrupts_total",
+				name:        "exec_device_interrupts_total",
 				description: "Device interrupts since system boot.  Resets at architeture unsigned integer.",
 				mib:         "vm.stats.sys.v_intr",
 			},
 			{
-				name:        "software_interrupts_total",
+				name:        "exec_software_interrupts_total",
 				description: "Software interrupts since system boot.  Resets at architeture unsigned integer.",
 				mib:         "vm.stats.sys.v_soft",
 			},
 			{
-				name:        "forks_total",
+				name:        "exec_forks_total",
 				description: "Number of fork() calls since system boot.  Resets at architeture unsigned integer.",
 				mib:         "vm.stats.vm.v_forks",
 			},
 			{
-				name:        "boot_timestamp_seconds",
+				name:        "boot_time_seconds",
 				description: "Unix time of last boot, including microseconds.",
 				mib:         "kern.boottime",
 				dataType:    bsdSysctlTypeStructTimeval,
@@ -95,7 +95,7 @@ func (c *execCollector) Update(ch chan<- prometheus.Metric) error {
 
 		ch <- prometheus.MustNewConstMetric(
 			prometheus.NewDesc(
-				prometheus.BuildFQName(namespace, "exec", m.name),
+				namespace+"_"+m.name,
 				m.description,
 				nil, nil,
 			), prometheus.CounterValue, v)