Add chart management page

controller/chart.go

@@ -0,0 +1,143 @@
+package controller
+
+import (
+	"time"
+
+	"github.com/cuigh/auxo/net/web"
+	"github.com/cuigh/auxo/util/cast"
+	"github.com/cuigh/swirl/biz"
+	"github.com/cuigh/swirl/model"
+)
+
+// ChartController is a controller of metric chart.
+type ChartController struct {
+	List   web.HandlerFunc `path:"/" name:"chart.list" authorize:"!" desc:"chart list page"`
+	Query  web.HandlerFunc `path:"/query" name:"chart.query" authorize:"?" desc:"chart query"`
+	New    web.HandlerFunc `path:"/new" name:"chart.new" authorize:"!" desc:"new chart page"`
+	Create web.HandlerFunc `path:"/new" method:"post" name:"chart.create" authorize:"!" desc:"create chart"`
+	Edit   web.HandlerFunc `path:"/:name/edit" name:"chart.edit" authorize:"!" desc:"edit chart page"`
+	Delete web.HandlerFunc `path:"/:name/delete" method:"post" name:"chart.delete" authorize:"!" desc:"delete chart"`
+	Update web.HandlerFunc `path:"/:name/edit" method:"post" name:"chart.update" authorize:"!" desc:"update chart"`
+	Data   web.HandlerFunc `path:"/data" name:"chart.data" authorize:"?" desc:"fetch chart datas"`
+}
+
+// Chart creates an instance of RoleController
+func Chart() (c *ChartController) {
+	return &ChartController{
+		List:   chartList,
+		Query:  chartQuery,
+		New:    chartNew,
+		Create: chartCreate,
+		Edit:   chartEdit,
+		Update: chartUpdate,
+		Delete: chartDelete,
+		Data:   chartData,
+	}
+}
+
+func chartList(ctx web.Context) error {
+	charts, err := biz.Chart.List()
+	if err != nil {
+		return err
+	}
+
+	m := newModel(ctx).Set("Charts", charts)
+	return ctx.Render("system/chart/list", m)
+}
+
+func chartQuery(ctx web.Context) error {
+	charts, err := biz.Chart.List()
+	if err != nil {
+		return err
+	}
+
+	dashboard := ctx.Q("dashboard")
+	var list []*model.Chart
+	for _, c := range charts {
+		if c.Dashboard == dashboard || c.Dashboard == "" {
+			list = append(list, c)
+		}
+	}
+	return ctx.JSON(list)
+}
+
+func chartNew(ctx web.Context) error {
+	m := newModel(ctx).Set("Chart", &model.Chart{
+		Width:     12,
+		Height:    50,
+		Type:      "line",
+		Dashboard: "service",
+	})
+	return ctx.Render("system/chart/edit", m)
+}
+
+func chartCreate(ctx web.Context) error {
+	chart := &model.Chart{}
+	err := ctx.Bind(chart, true)
+	if err == nil {
+		err = biz.Chart.Create(chart, ctx.User())
+	}
+	return ajaxResult(ctx, err)
+}
+
+func chartEdit(ctx web.Context) error {
+	name := ctx.P("name")
+	chart, err := biz.Chart.Get(name)
+	if err != nil {
+		return err
+	}
+	if chart == nil {
+		return web.ErrNotFound
+	}
+
+	m := newModel(ctx).Set("Chart", chart)
+	return ctx.Render("system/chart/edit", m)
+}
+
+func chartUpdate(ctx web.Context) error {
+	chart := &model.Chart{}
+	err := ctx.Bind(chart)
+	if err == nil {
+		err = biz.Chart.Update(chart, ctx.User())
+	}
+	return ajaxResult(ctx, err)
+}
+
+func chartDelete(ctx web.Context) error {
+	name := ctx.P("name")
+	err := biz.Chart.Delete(name, ctx.User())
+	return ajaxResult(ctx, err)
+}
+
+// todo:
+func chartData(ctx web.Context) error {
+	period := cast.ToDuration(ctx.Q("time"), time.Hour)
+	dashboard := ctx.Q("dashboard")
+
+	var (
+		charts []*model.Chart
+		err    error
+	)
+	if dashboard == "home" {
+		var setting *model.Setting
+		setting, err = biz.Setting.Get()
+		if err != nil {
+			return err
+		}
+		charts, err = biz.Chart.Panel(setting.Dashboard.Home)
+
+	} else if dashboard == "service" {
+		id := ctx.Q("id")
+		charts, err = biz.Chart.GetServiceCharts(id)
+	}
+
+	if err != nil {
+		return err
+	}
+
+	datas, err := biz.Chart.FetchDatas(charts, period)
+	if err != nil {
+		return err
+	}
+	return ctx.JSON(datas)
+}

controller/home.go

@@ -32,8 +32,10 @@ func Home() (c *HomeController) {
 
 func homeIndex(ctx web.Context) (err error) {
 	var (
-		count int
-		m     = newModel(ctx)
+		count   int
+		setting *model.Setting
+		charts  []*model.Chart
+		m       = newModel(ctx)
 	)
 
 	if count, err = docker.NodeCount(); err != nil {
@@ -56,6 +58,15 @@ func homeIndex(ctx web.Context) (err error) {
 	}
 	m.Set("StackCount", count)
 
+	if setting, err = biz.Setting.Get(); err != nil {
+		return
+	}
+	charts, err = biz.Chart.Panel(setting.Dashboard.Home)
+	if err != nil {
+		return err
+	}
+	m.Set("Charts", charts)
+
 	return ctx.Render("index", m)
 }
 

controller/service.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cuigh/auxo/data"
 	"github.com/cuigh/auxo/data/set"
 	"github.com/cuigh/auxo/errors"
 	"github.com/cuigh/auxo/net/web"
@@ -32,7 +31,6 @@ type ServiceController struct {
 	PermEdit   web.HandlerFunc `path:"/:name/perm" name:"service.perm.edit" authorize:"!" perm:"write,service,name"`
 	PermUpdate web.HandlerFunc `path:"/:name/perm" method:"post" name:"service.perm.update" authorize:"!" perm:"write,service,name"`
 	Stats      web.HandlerFunc `path:"/:name/stats" name:"service.stats" authorize:"!" perm:"read,service,name"`
-	Metrics    web.HandlerFunc `path:"/:name/metrics" name:"service.metrics" authorize:"?"`
 }
 
 // Service creates an instance of ServiceController
@@ -52,7 +50,6 @@ func Service() (c *ServiceController) {
 		PermEdit:   servicePermEdit,
 		PermUpdate: permUpdate("service", "name"),
 		Stats:      serviceStats,
-		Metrics:    serviceMetrics,
 	}
 }
 
@@ -297,13 +294,9 @@ func serviceStats(ctx web.Context) error {
 		return err
 	}
 
-	var charts []model.ChartInfo
+	var charts []*model.Chart
 	if setting.Metrics.Prometheus != "" {
-		var categories []string
-		if label := service.Spec.Labels["swirl.metrics"]; label != "" {
-			categories = strings.Split(label, ",")
-		}
-		charts = biz.Metric.GetServiceCharts(name, categories)
+		charts, err = biz.Chart.GetServiceCharts(name)
 	}
 
 	period := cast.ToDuration(ctx.Q("time"), time.Hour)
@@ -312,31 +305,3 @@ func serviceStats(ctx web.Context) error {
 		Set("Refresh", refresh).Set("Charts", charts)
 	return ctx.Render("service/stats", m)
 }
-
-func serviceMetrics(ctx web.Context) error {
-	name := ctx.P("name")
-	service, _, err := docker.ServiceInspect(name)
-	if err != nil {
-		return err
-	}
-
-	var categories []string
-	if label := service.Spec.Labels["swirl.metrics"]; label != "" {
-		categories = strings.Split(label, ",")
-	}
-	charts := biz.Metric.GetServiceCharts(name, categories)
-
-	period := cast.ToDuration(ctx.Q("time"), time.Hour)
-	end := time.Now()
-	start := end.Add(-period)
-
-	m := data.Map{}
-	for _, c := range charts {
-		matrix, err := biz.Metric.GetMatrix(c.Query, c.Label, start, end)
-		if err != nil {
-			return err
-		}
-		m[c.Name] = matrix
-	}
-	return ctx.JSON(m)
-}