Merge pull request #6 from Bo0mer/develop

Expose AppMonitor and Emitter objects

Author: Bo0mer

README.md

@@ -3,6 +3,15 @@
 
 Pull metrics for Cloud Foundry applications and forward them to Riemann.
 
+This repo provides two functionalities - a `mozzle` Go package and a mozzle
+command-line tool.
+
+Package mozzle provides an API for monitoring infrastructure metrics of
+Cloud Foundry applications and emitting them to a 3rd party monitoring system.
+
+The `mozzle` command-line tool emits metrics for Cloud Foundry applications
+to a specified Riemann instance. The rest of this document describes its usage.
+
 ## User's guide
 ```
 Usage of mozzle:
@@ -30,7 +39,7 @@ Example:
 The following command will emit metrics for all applications under the `NASA`
 organization, within the `rocket` space.
 ```
-mozzle -api api.bosh-lite.com -org NASA -space rocket
+mozzle -api https://api.bosh-lite.com -org NASA -space rocket
 ```
 
 ### Demo usage

app.go

@@ -0,0 +1,25 @@
+package mozzle
+
+import "github.com/Bo0mer/ccv2"
+
+type applicationEvent struct {
+	ccv2.Event
+	App application
+}
+
+func (e applicationEvent) EmitTo(emitter Emitter) {
+	attributes := attributes(e.App)
+	attributes["event"] = e.Entity.Type
+	attributes["actee"] = e.Entity.ActeeName
+	attributes["actee_type"] = e.Entity.ActeeType
+	attributes["actor"] = e.Entity.ActorName
+	attributes["actor_type"] = e.Entity.ActorType
+
+	emitter.Emit(forApp(e.App, Metric{
+		Time:       e.Entity.Timestamp.Unix(),
+		Service:    "app event",
+		Metric:     1,
+		State:      "ok",
+		Attributes: attributes,
+	}))
+}

appeventmetrics.go

@@ -0,0 +1,33 @@
+package mozzle
+
+import "github.com/Bo0mer/ccv2"
+
+type applicationMetrics struct {
+	ccv2.ApplicationSummary
+	App application
+}
+
+func (m applicationMetrics) EmitTo(e Emitter) {
+	attributes := attributes(m.App)
+	state := "ok"
+	if m.RunningInstances < m.Instances {
+		state = "warn"
+		if m.RunningInstances == 0 {
+			state = "critical"
+		}
+	}
+
+	e.Emit(forApp(m.App, Metric{
+		Service:    "instance running_count",
+		Metric:     m.RunningInstances,
+		State:      state,
+		Attributes: attributes,
+	}))
+
+	e.Emit(forApp(m.App, Metric{
+		Service:    "instance configured_count",
+		Metric:     m.Instances,
+		State:      state,
+		Attributes: attributes,
+	}))
+}

appmetrics.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"log"
 	"os"
 	"os/signal"
 
@@ -23,7 +22,7 @@ var (
 
 	riemannAddr string
 
-	eventsTtl float64
+	eventsTTL float64
 	queueSize int
 )
 
@@ -37,13 +36,20 @@ func init() {
 
 	flag.StringVar(&riemannAddr, "riemann", "127.0.0.1:5555", "Address of the Riemann endpoint")
 
-	flag.Float64Var(&eventsTtl, "events-ttl", 30.0, "TTL for emitted events (in seconds)")
+	flag.Float64Var(&eventsTTL, "events-ttl", 30.0, "TTL for emitted events (in seconds)")
 	flag.IntVar(&queueSize, "events-queue-size", 256, "Queue size for outgoing events")
 }
 
 func main() {
 	flag.Parse()
-	mozzle.Initialize(riemannAddr, float32(eventsTtl), queueSize)
+	riemann := &mozzle.RiemannEmitter{}
+	riemann.Initialize(riemannAddr, float32(eventsTTL), queueSize)
+	defer func() {
+		if err := riemann.Close(); err != nil {
+			fmt.Printf("mozzle: error closing riemann emitter: %v\n", err)
+		}
+	}()
+
 	t := mozzle.Target{
 		API:      apiAddr,
 		Username: username,
@@ -62,7 +68,7 @@ func main() {
 		cancel()
 	}()
 
-	if err := mozzle.Monitor(ctx, t); err != nil {
-		log.Fatal(err)
+	if err := mozzle.Monitor(ctx, t, riemann); err != nil {
+		fmt.Printf("mozzle: error occured during Monitor: %v\n", err)
 	}
 }

cmd/mozzle/main.go

@@ -0,0 +1,62 @@
+package mozzle
+
+import (
+	"strconv"
+
+	cfevent "github.com/cloudfoundry/sonde-go/events"
+)
+
+type containerMetrics struct {
+	*cfevent.ContainerMetric
+	App application
+}
+
+func (m containerMetrics) EmitTo(e Emitter) {
+	attributes := attributes(m.App)
+	attributes["instance"] = strconv.Itoa(int(m.GetInstanceIndex()))
+
+	e.Emit(forApp(m.App, Metric{
+		Service:    "memory used_bytes",
+		Metric:     int(m.GetMemoryBytes()),
+		State:      "ok",
+		Attributes: attributes,
+	}))
+	e.Emit(forApp(m.App, Metric{
+		Service:    "memory total_bytes",
+		Metric:     int(m.GetMemoryBytesQuota()),
+		State:      "ok",
+		Attributes: attributes,
+	}))
+	e.Emit(forApp(m.App, Metric{
+		Service:    "memory used_ratio",
+		Metric:     ratio(m.GetMemoryBytes(), m.GetMemoryBytesQuota()),
+		State:      "ok",
+		Attributes: attributes,
+	}))
+
+	e.Emit(forApp(m.App, Metric{
+		Service:    "disk used_bytes",
+		Metric:     int(m.GetDiskBytes()),
+		State:      "ok",
+		Attributes: attributes,
+	}))
+	e.Emit(forApp(m.App, Metric{
+		Service:    "disk total_bytes",
+		Metric:     int(m.GetDiskBytesQuota()),
+		State:      "ok",
+		Attributes: attributes,
+	}))
+	e.Emit(forApp(m.App, Metric{
+		Service:    "disk used_ratio",
+		Metric:     ratio(m.GetDiskBytes(), m.GetDiskBytesQuota()),
+		State:      "ok",
+		Attributes: attributes,
+	}))
+
+	e.Emit(forApp(m.App, Metric{
+		Service:    "cpu_percent",
+		Metric:     m.GetCpuPercentage(),
+		State:      "ok",
+		Attributes: attributes,
+	}))
+}

containermetrics.go

@@ -0,0 +1 @@
+.vagrant

demo/mib/.gitignore

@@ -32,7 +32,7 @@ Vagrant.configure(2) do |config|
   config.vm.provision "shell", keep_color: true, path: "scripts/riemann.sh"
 
   # Provision Grafana dashboards
-  config.vm.provision "file", source: "dashboards/summary.json", destination: "~/summary.json"
+  config.vm.provision "file", source: "dashboards/", destination: "~/dashboards/"
   config.vm.provision "shell", keep_color: true, path: "scripts/configure_dashboards.sh"
 
 end