5 files changed, 202 insertions, 2 deletions
diff --git a/weed/stats/disk.go b/weed/stats/disk.go
index e9d8baedd..8af7240a8 100644
--- a/weed/stats/disk.go
+++ b/weed/stats/disk.go
@@ -1,9 +1,13 @@
 package stats
 
-import "github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
+import (
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
+)
 
 func NewDiskStatus(path string) (disk *volume_server_pb.DiskStatus) {
 	disk = &volume_server_pb.DiskStatus{Dir: path}
 	fillInDiskStatus(disk)
+	glog.V(2).Infof("read disk size: %v", disk)
 	return
 }
diff --git a/weed/stats/disk_notsupported.go b/weed/stats/disk_notsupported.go
index ace662f6a..3d99e6ce7 100644
--- a/weed/stats/disk_notsupported.go
+++ b/weed/stats/disk_notsupported.go
@@ -1,4 +1,4 @@
-// +build windows openbsd netbsd plan9 solaris
+// +build openbsd netbsd plan9 solaris
 
 package stats
 
diff --git a/weed/stats/disk_supported.go b/weed/stats/disk_supported.go
index 0537828b0..dff580b5b 100644
--- a/weed/stats/disk_supported.go
+++ b/weed/stats/disk_supported.go
@@ -17,5 +17,7 @@ func fillInDiskStatus(disk *volume_server_pb.DiskStatus) {
 	disk.All = fs.Blocks * uint64(fs.Bsize)
 	disk.Free = fs.Bfree * uint64(fs.Bsize)
 	disk.Used = disk.All - disk.Free
+	disk.PercentFree = float32((float64(disk.Free) / float64(disk.All)) * 100)
+	disk.PercentUsed = float32((float64(disk.Used) / float64(disk.All)) * 100)
 	return
 }
diff --git a/weed/stats/disk_windows.go b/weed/stats/disk_windows.go
new file mode 100644
index 000000000..3cfa52c0b
--- /dev/null
+++ b/weed/stats/disk_windows.go
@@ -0,0 +1,47 @@
+package stats
+
+import (
+	"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
+	"golang.org/x/sys/windows"
+	"syscall"
+	"unsafe"
+)
+
+var (
+	kernel32           = windows.NewLazySystemDLL("Kernel32.dll")
+	getDiskFreeSpaceEx = kernel32.NewProc("GetDiskFreeSpaceExW")
+)
+
+func fillInDiskStatus(disk *volume_server_pb.DiskStatus) {
+
+	ptr, err := syscall.UTF16PtrFromString(disk.Dir)
+
+	if err != nil {
+		return
+	}
+	var _temp uint64
+	/* #nosec */
+	r, _, e := syscall.Syscall6(
+		getDiskFreeSpaceEx.Addr(),
+		4,
+		uintptr(unsafe.Pointer(ptr)),
+		uintptr(unsafe.Pointer(&disk.Free)),
+		uintptr(unsafe.Pointer(&disk.All)),
+		uintptr(unsafe.Pointer(&_temp)),
+		0,
+		0,
+	)
+
+	if r == 0 {
+		if e != 0 {
+			return
+		}
+
+		return
+	}
+	disk.Used = disk.All - disk.Free
+	disk.PercentFree = float32((float64(disk.Free) / float64(disk.All)) * 100)
+	disk.PercentUsed = float32((float64(disk.Used) / float64(disk.All)) * 100)
+
+	return
+}
diff --git a/weed/stats/metrics.go b/weed/stats/metrics.go
new file mode 100644
index 000000000..7ff09a388
--- /dev/null
+++ b/weed/stats/metrics.go
@@ -0,0 +1,147 @@
+package stats
+
+import (
+	"fmt"
+	"os"
+	"strings"
+	"time"
+
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/push"
+
+	"github.com/chrislusf/seaweedfs/weed/glog"
+)
+
+var (
+	FilerGather        = prometheus.NewRegistry()
+	VolumeServerGather = prometheus.NewRegistry()
+
+	FilerRequestCounter = prometheus.NewCounterVec(
+		prometheus.CounterOpts{
+			Namespace: "SeaweedFS",
+			Subsystem: "filer",
+			Name:      "request_total",
+			Help:      "Counter of filer requests.",
+		}, []string{"type"})
+
+	FilerRequestHistogram = prometheus.NewHistogramVec(
+		prometheus.HistogramOpts{
+			Namespace: "SeaweedFS",
+			Subsystem: "filer",
+			Name:      "request_seconds",
+			Help:      "Bucketed histogram of filer request processing time.",
+			Buckets:   prometheus.ExponentialBuckets(0.0001, 2, 24),
+		}, []string{"type"})
+
+	FilerStoreCounter = prometheus.NewCounterVec(
+		prometheus.CounterOpts{
+			Namespace: "SeaweedFS",
+			Subsystem: "filerStore",
+			Name:      "request_total",
+			Help:      "Counter of filer store requests.",
+		}, []string{"store", "type"})
+
+	FilerStoreHistogram = prometheus.NewHistogramVec(
+		prometheus.HistogramOpts{
+			Namespace: "SeaweedFS",
+			Subsystem: "filerStore",
+			Name:      "request_seconds",
+			Help:      "Bucketed histogram of filer store request processing time.",
+			Buckets:   prometheus.ExponentialBuckets(0.0001, 2, 24),
+		}, []string{"store", "type"})
+
+	VolumeServerRequestCounter = prometheus.NewCounterVec(
+		prometheus.CounterOpts{
+			Namespace: "SeaweedFS",
+			Subsystem: "volumeServer",
+			Name:      "request_total",
+			Help:      "Counter of volume server requests.",
+		}, []string{"type"})
+
+	VolumeServerRequestHistogram = prometheus.NewHistogramVec(
+		prometheus.HistogramOpts{
+			Namespace: "SeaweedFS",
+			Subsystem: "volumeServer",
+			Name:      "request_seconds",
+			Help:      "Bucketed histogram of volume server request processing time.",
+			Buckets:   prometheus.ExponentialBuckets(0.0001, 2, 24),
+		}, []string{"type"})
+
+	VolumeServerVolumeCounter = prometheus.NewGaugeVec(
+		prometheus.GaugeOpts{
+			Namespace: "SeaweedFS",
+			Subsystem: "volumeServer",
+			Name:      "volumes",
+			Help:      "Number of volumes or shards.",
+		}, []string{"collection", "type"})
+
+	VolumeServerMaxVolumeCounter = prometheus.NewGauge(
+		prometheus.GaugeOpts{
+			Namespace: "SeaweedFS",
+			Subsystem: "volumeServer",
+			Name:      "max_volumes",
+			Help:      "Maximum number of volumes.",
+		})
+
+	VolumeServerDiskSizeGauge = prometheus.NewGaugeVec(
+		prometheus.GaugeOpts{
+			Namespace: "SeaweedFS",
+			Subsystem: "volumeServer",
+			Name:      "total_disk_size",
+			Help:      "Actual disk size used by volumes.",
+		}, []string{"collection", "type"})
+)
+
+func init() {
+
+	FilerGather.MustRegister(FilerRequestCounter)
+	FilerGather.MustRegister(FilerRequestHistogram)
+	FilerGather.MustRegister(FilerStoreCounter)
+	FilerGather.MustRegister(FilerStoreHistogram)
+	FilerGather.MustRegister(prometheus.NewGoCollector())
+
+	VolumeServerGather.MustRegister(VolumeServerRequestCounter)
+	VolumeServerGather.MustRegister(VolumeServerRequestHistogram)
+	VolumeServerGather.MustRegister(VolumeServerVolumeCounter)
+	VolumeServerGather.MustRegister(VolumeServerMaxVolumeCounter)
+	VolumeServerGather.MustRegister(VolumeServerDiskSizeGauge)
+
+}
+
+func LoopPushingMetric(name, instance string, gatherer *prometheus.Registry, fnGetMetricsDest func() (addr string, intervalSeconds int)) {
+
+	if fnGetMetricsDest == nil {
+		return
+	}
+
+	addr, intervalSeconds := fnGetMetricsDest()
+	pusher := push.New(addr, name).Gatherer(gatherer).Grouping("instance", instance)
+	currentAddr := addr
+
+	for {
+		if currentAddr != "" {
+			err := pusher.Push()
+			if err != nil && !strings.HasPrefix(err.Error(), "unexpected status code 200") {
+				glog.V(0).Infof("could not push metrics to prometheus push gateway %s: %v", addr, err)
+			}
+		}
+		if intervalSeconds <= 0 {
+			intervalSeconds = 15
+		}
+		time.Sleep(time.Duration(intervalSeconds) * time.Second)
+		addr, intervalSeconds = fnGetMetricsDest()
+		if currentAddr != addr {
+			pusher = push.New(addr, name).Gatherer(gatherer).Grouping("instance", instance)
+			currentAddr = addr
+		}
+
+	}
+}
+
+func SourceName(port uint32) string {
+	hostname, err := os.Hostname()
+	if err != nil {
+		return "unknown"
+	}
+	return fmt.Sprintf("%s:%d", hostname, port)
+}