Code

Add localprom package into project

Author: YLonely

localprom/localprom.go

@@ -0,0 +1,13 @@
+package localprom
+
+var tasks = []PromTask{}
+
+func Register(t PromTask) {
+	tasks = append(tasks, t)
+}
+
+func RunMetrics() {
+	for _, t := range tasks {
+		t.Run()
+	}
+}

localprom/task.go

@@ -0,0 +1,63 @@
+package localprom
+
+import (
+	"github.com/YLonely/sysdig-monitor/log"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+// PromTask contains logic to record the prometheus metrics
+type PromTask interface {
+	// Run() should be nonblocking
+	Run()
+}
+
+type taskHandler func() error
+type promTask struct {
+	th taskHandler
+}
+
+func NewCounterTask(counter *prometheus.Counter, h func(*prometheus.Counter) error) PromTask {
+	th := func() error { return h(counter) }
+	return &promTask{th: th}
+}
+
+func NewCounterVecTask(counterVec *prometheus.CounterVec, h func(*prometheus.CounterVec) error) PromTask {
+	th := func() error { return h(counterVec) }
+	return &promTask{th: th}
+}
+
+func NewGaugeTask(gauge *prometheus.Gauge, h func(*prometheus.Gauge) error) PromTask {
+	th := func() error { return h(gauge) }
+	return &promTask{th: th}
+}
+
+func NewGaugeVecTask(gaugeVec *prometheus.GaugeVec, h func(*prometheus.GaugeVec) error) PromTask {
+	th := func() error { return h(gaugeVec) }
+	return &promTask{th: th}
+}
+func NewHistogramTask(histogram *prometheus.Histogram, h func(*prometheus.Histogram) error) PromTask {
+	th := func() error { return h(histogram) }
+	return &promTask{th: th}
+}
+
+func NewHistogramVecTask(histogramVec *prometheus.HistogramVec, h func(*prometheus.HistogramVec) error) PromTask {
+	th := func() error { return h(histogramVec) }
+	return &promTask{th: th}
+}
+
+func NewSummaryTask(summary *prometheus.Summary, h func(*prometheus.Summary) error) PromTask {
+	th := func() error { return h(summary) }
+	return &promTask{th: th}
+}
+
+func NewSummaryVecTask(summaryVec *prometheus.SummaryVec, h func(*prometheus.SummaryVec) error) PromTask {
+	th := func() error { return h(summaryVec) }
+	return &promTask{th: th}
+}
+
+func (pt *promTask) Run() {
+	err := pt.th()
+	if err != nil {
+		log.L.WithError(err).Error()
+	}
+}

main.go

@@ -17,6 +17,7 @@ func main() {
 	app := cli.NewApp()
 	app.Name = "sysdig-monitor"
 	app.Usage = "Monitor using sysdig to trace all containers running on host."
+	app.Version = "v0.0.1"
 
 	app.Flags = []cli.Flag{
 		cli.StringFlag{

server/controller/container/container.go

@@ -12,10 +12,10 @@ import (
 	"github.com/YLonely/sysdig-monitor/sysdig"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
+
 )
 
-// Container represents a top level controller for container
-type ContainerController struct {
+type containerController struct {
 	containerRouter router.Router
 	// event chan
 	ec chan sysdig.Event
@@ -54,7 +54,7 @@ const incompleteContainerName = "incomplete"
 func NewController(ctx context.Context, serverErrorChannel chan<- error) (controller.Controller, error) {
 	r := router.NewGroupRouter("/container")
 	sysdigServer := sysdig.NewServer()
-	res := &ContainerController{containerRouter: r, ec: sysdigServer.Subscribe(), containers: map[string]*mutexContainer{}, containerCh: map[string]chan containerEvent{}}
+	res := &containerController{containerRouter: r, ec: sysdigServer.Subscribe(), containers: map[string]*mutexContainer{}, containerCh: map[string]chan containerEvent{}}
 
 	cli, err := client.NewClientWithOpts(client.FromEnv)
 	if err != nil {
@@ -77,18 +77,18 @@ func NewController(ctx context.Context, serverErrorChannel chan<- error) (contro
 	return res, nil
 }
 
-var _ controller.Controller = &ContainerController{}
+var _ controller.Controller = &containerController{}
 
-func (cc *ContainerController) BindedRoutes() []router.Route {
+func (cc *containerController) BindedRoutes() []router.Route {
 	return cc.containerRouter.Routes()
 }
 
-func (cc *ContainerController) initRouter() {
+func (cc *containerController) initRouter() {
 	cc.containerRouter.AddRoute("/", router.MethodGet, cc.getAllContainers)
 	cc.containerRouter.AddRoute("/:id", router.MethodGet, cc.getContainer)
 }
 
-func (cc *ContainerController) start(ctx context.Context) error {
+func (cc *containerController) start(ctx context.Context) error {
 	go func() {
 		var (
 			e      sysdig.Event
@@ -140,15 +140,15 @@ func (cc *ContainerController) start(ctx context.Context) error {
 	return nil
 }
 
-func (cc *ContainerController) containerJSON(ctx context.Context, id string) (*types.ContainerJSON, error) {
+func (cc *containerController) containerJSON(ctx context.Context, id string) (*types.ContainerJSON, error) {
 	j, err := cc.dockerCli.ContainerInspect(ctx, id)
 	if err != nil {
 		return nil, err
 	}
 	return &j, nil
 }
 
-func (cc *ContainerController) containerProcessLoop(ctx context.Context, container *mutexContainer, ch chan containerEvent) {
+func (cc *containerController) containerProcessLoop(ctx context.Context, container *mutexContainer, ch chan containerEvent) {
 	log.L.WithField("container-id", container.ID).Info("processLoop start")
 	err := processLoop(ctx, container, ch)
 	log.L.WithField("container-id", container.ID).Info("processLoop exits")

server/controller/container/prometheus.go

@@ -0,0 +1,2 @@
+package container
+

server/controller/container/routes.go

@@ -5,7 +5,7 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func (cc *ContainerController) getAllContainers(c *gin.Context) {
+func (cc *containerController) getAllContainers(c *gin.Context) {
 	res := map[string]string{}
 	cc.cm.RLock()
 	for id, container := range cc.containers {
@@ -26,7 +26,7 @@ type GetContainerResponse struct {
 	AccessedLayers    []*model.LayerInfo  `json:"accessed_layers"`
 }
 
-func (cc *ContainerController) getContainer(c *gin.Context) {
+func (cc *containerController) getContainer(c *gin.Context) {
 	cid := c.Param("id")
 	cc.cm.RLock()
 	container, exists := cc.containers[cid]
@@ -47,4 +47,4 @@ func (cc *ContainerController) getContainer(c *gin.Context) {
 	}
 
 	c.JSON(200, GetContainerResponse{Container: container.Container, ActiveConnections: flattenConns, AccessedLayers: flattenLayersInfo})
-}
+}

server/controller/prometheus/prometheus.go

@@ -0,0 +1,30 @@
+package prometheus
+
+import (
+	"context"
+	"net/http"
+
+
+	"github.com/YLonely/sysdig-monitor/server/controller"
+	"github.com/YLonely/sysdig-monitor/server/router"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+)
+
+type prometheusContorller struct {
+	router  router.Router
+	handler http.Handler
+}
+
+func NewController(ctx context.Context) controller.Controller {
+	res := &prometheusContorller{router: router.NewRouter(), handler: promhttp.Handler()}
+	res.initRouter()
+	return res
+}
+
+func (pc *prometheusContorller) BindedRoutes() []router.Route {
+	return pc.router.Routes()
+}
+
+func (pc *prometheusContorller) initRouter() {
+	pc.router.AddRoute("/metrics", router.MethodGet, pc.metrics)
+}

server/controller/prometheus/routes.go

@@ -0,0 +1,11 @@
+package prometheus
+
+import (
+	"github.com/YLonely/sysdig-monitor/localprom"
+	"github.com/gin-gonic/gin"
+)
+
+func (pc *prometheusContorller) metrics(c *gin.Context) {
+	localprom.RunMetrics()
+	pc.handler.ServeHTTP(c.Writer, c.Request)
+}

server/server.go

@@ -6,6 +6,8 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/YLonely/sysdig-monitor/server/controller/prometheus"
+
 	"github.com/YLonely/sysdig-monitor/server/controller"
 
 	"github.com/gin-gonic/gin"
@@ -37,14 +39,15 @@ func NewServer(conf Config) Server {
 func (s *server) Start(ctx context.Context) chan error {
 	errch := make(chan error, 1)
 	containerContorller, err := container.NewController(ctx, errch)
+	promContorller := prometheus.NewController(ctx)
 	if err != nil {
 		errch <- err
 		return errch
 	}
 	gin.SetMode(gin.ReleaseMode)
 	gin.DefaultWriter = ioutil.Discard
 	ginServer := gin.Default()
-	initRoutes(ginServer, containerContorller) // may be more controller?
+	initRoutes(ginServer, containerContorller, promContorller) // may be more controller?
 	s.httpServer = &http.Server{Addr: s.conf.Port, Handler: ginServer}
 	go func() {
 		if err := s.httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {