Merge pull request #97 from canghai908/dev

2.1.4
1.增加网卡数据详情获取
2.增加API地址检测
3.增加延迟指标

Author: canghai908

.air.toml

@@ -6,7 +6,7 @@ tmp_dir = "tmp"
   bin = "tmp\\main.exe web"
   cmd = "go build -o ./tmp/main.exe ."
   delay = 1000
-  exclude_dir = ["assets", "tmp", "vendor", "testdata","download"]
+  exclude_dir = ["assets", "tmp", "vendor", "testdata","download","web",".idea"]
   exclude_file = []
   exclude_regex = ["_test.go"]
   exclude_unchanged = false

cmd/web.go

@@ -11,7 +11,9 @@ import (
 	"github.com/canghai908/zabbix-go"
 	"github.com/urfave/cli/v2"
 	"gopkg.in/ini.v1"
+	"net/http"
 	"os"
+	"time"
 	"zbxtable/models"
 	"zbxtable/packfile"
 	"zbxtable/routers"
@@ -124,8 +126,23 @@ func CheckZabbixAPI(args ...string) (string, error) {
 	user := args[1]
 	pass := args[2]
 	token := args[3]
+	//判断API地址是否正确，http get访问访问api地址判断状态码是不是412
+	url := address + "/api_jsonrpc.php"
+	dClient := http.Client{
+		Timeout: 3 * time.Second, // 设置超时时间为 3 秒
+	}
+	resp, err := dClient.Get(url)
+	if err != nil {
+		logs.Error("Zabbix Web get request failed:", err)
+		os.Exit(1)
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusPreconditionFailed {
+		logs.Error("Zabbix Web is incorrectly!")
+		os.Exit(1)
+	}
+	// api定义
 	API = zabbix.NewAPI(address + "/api_jsonrpc.php")
-	address = args[0]
 	if token != "" {
 		API.Auth = token
 	} else {
@@ -138,7 +155,7 @@ func CheckZabbixAPI(args ...string) (string, error) {
 	//zabbix api data get test
 	OutputPar := []string{"hostid", "host", "available", "status", "name", "error"}
 	type params map[string]interface{}
-	_, err := API.CallWithError("host.get", params{
+	_, err = API.CallWithError("host.get", params{
 		"output":  OutputPar,
 		"hostids": "10084",
 	})

control

@@ -1,6 +1,6 @@
 #!/bin/bash
 # release version
-version=2.1.3
+version=2.1.4
 
 CWD=$(cd $(dirname $0)/; pwd)
 cd $CWD

controllers/base.go

@@ -4,16 +4,35 @@ import (
 	"github.com/astaxie/beego"
 	jwtbeego "github.com/canghai908/jwt-beego"
 	jsoniter "github.com/json-iterator/go"
+	"net/http"
 )
 
-var json = jsoniter.ConfigCompatibleWithStandardLibrary
+var json = jsoniter.Config{
+	EscapeHTML:             false,
+	SortMapKeys:            true,
+	ValidateJsonRawMessage: true,
+}.Froze()
 
-//BaseController use
+// BaseController use
 type BaseController struct {
 	beego.Controller
 }
 
-//Resp Resp all
+func (c *BaseController) ServeJSON() {
+	c.Ctx.Output.Header("Content-Type", "application/json; charset=utf-8")
+	var err error
+	data := c.Data["json"]
+	encoder := json.NewEncoder(c.Ctx.Output.Context.ResponseWriter)
+	encoder.SetEscapeHTML(false)
+	encoder.SetIndent("", "  ")
+	err = encoder.Encode(data)
+	if err != nil {
+		http.Error(c.Ctx.Output.Context.ResponseWriter, err.Error(), http.StatusInternalServerError)
+		return
+	}
+}
+
+// Resp all
 type Resp struct {
 	Code    int    `json:"code"`
 	Message string `json:"message"`
@@ -23,16 +42,13 @@ type Resp struct {
 	} `json:"data"`
 }
 
-//Res var
+// Res var
 var Res = &Resp{}
 
-//API for zabbix
-//var API = &zabbix.API{}
-
-//Tuser is userinfo
+// Tuser is userinfo
 var Tuser string
 
-//Prepare Prepare login
+// Prepare login
 func (c *BaseController) Prepare() {
 	tokenString := c.Ctx.Request.Header.Get("X-Token")
 	et := jwtbeego.EasyToken{}

controllers/host.go

@@ -10,7 +10,7 @@ type HostController struct {
 	BaseController
 }
 
-//HostRes restp
+// HostRes restp
 var HostRes models.HostList
 var HostInfoRes models.HostInfo
 var HostInterfaceRes models.HostInterfaceInfo
@@ -21,6 +21,7 @@ func (c *HostController) URLMapping() {
 	c.Mapping("GetOne", c.GetOne)
 	c.Mapping("GetMonItem", c.GetMonItem)
 	c.Mapping("GetMonInterface", c.GetMonInterface)
+	c.Mapping("getOneInterface", c.GetOneInterface)
 	c.Mapping("GetMonWinFileSystem", c.GetMonWinFileSystem)
 	c.Mapping("GetMonLinFileSystem", c.GetMonLinFileSystem)
 }
@@ -55,9 +56,6 @@ func (c *HostController) Post() {
 	c.ServeJSON()
 }
 
-//ApplicationRes str
-var ApplicationRes models.ApplicationList
-
 // GetOne ...
 // @Title 获取单个设备信息
 // @Description 获取单个设备的资产信息
@@ -184,15 +182,37 @@ func (c *HostController) GetMonInterface() {
 	if err != nil {
 		HostInterfaceRes.Code = 500
 		HostInterfaceRes.Message = err.Error()
+	} else {
+		HostInterfaceRes.Code = 200
+		HostInterfaceRes.Message = "获取数据成功"
+		HostInterfaceRes.Data.Items = hs
+		HostInterfaceRes.Data.Total = int64(len(hs))
 	}
-	HostInterfaceRes.Code = 200
-	HostInterfaceRes.Message = "获取数据成功"
-	HostInterfaceRes.Data.Items = hs
-	HostInterfaceRes.Data.Total = int64(len(hs))
 	c.Data["json"] = HostInterfaceRes
 	c.ServeJSON()
 }
 
+// GetOneInterface
+// @Title 获取网络设备接口流量详情图标数据
+// @Description 获取网络设备接口流量
+// @Param	X-Token	header  string	true	"x-token in header"
+// @Param	body		body 	models.InterfaceData	true		"hosts info"
+// @Success 200 {object} models.MonItemList
+// @Failure 403
+// @router /interface/data [post]
+func (c *HostController) GetOneInterface() {
+	var v models.InterfaceData
+	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &v); err == nil {
+		b, err := models.GetInterfaceGraphData(v)
+		if err != nil {
+			c.Data["json"] = b
+			c.ServeJSON()
+		}
+		c.Data["json"] = b
+	}
+	c.ServeJSON()
+}
+
 // GetMonWinFilesystem
 // @Title 获取windows系统监控指标
 // @Description 获取windows网卡、磁盘信息

controllers/system.go

@@ -46,7 +46,7 @@ func (c *SystemController) GetOne() {
 	c.ServeJSON()
 }
 
-// GetOne ...
+// PutOne 更新初始化数据 ...
 // @Title Get One
 // @Description get Alarm by id
 // @Param	X-Token		header  string			true		"x-token in header"
@@ -58,18 +58,19 @@ func (c *SystemController) GetOne() {
 func (c *SystemController) PutOne() {
 	idStr := c.Ctx.Input.Param(":id")
 	id, _ := strconv.Atoi(idStr)
-	cpu_core := gjson.Get(string(c.Ctx.Input.RequestBody), "cpu_core").String()
-	uptime_id := gjson.Get(string(c.Ctx.Input.RequestBody), "uptime_id").String()
-	cpu_utilization_id := gjson.Get(string(c.Ctx.Input.RequestBody), "cpu_utilization_id").String()
-	group_id := gjson.Get(string(c.Ctx.Input.RequestBody), "group_id").String()
-	memory_total_id := gjson.Get(string(c.Ctx.Input.RequestBody), "memory_total_id").String()
-	memory_used_id := gjson.Get(string(c.Ctx.Input.RequestBody), "memory_used_id").String()
-	memory_utilization_id := gjson.Get(string(c.Ctx.Input.RequestBody), "memory_utilization_id").String()
+	cpuCore := gjson.Get(string(c.Ctx.Input.RequestBody), "cpu_core").String()
+	uptimeId := gjson.Get(string(c.Ctx.Input.RequestBody), "uptime_id").String()
+	cpuUtilizationId := gjson.Get(string(c.Ctx.Input.RequestBody), "cpu_utilization_id").String()
+	groupId := gjson.Get(string(c.Ctx.Input.RequestBody), "group_id").String()
+	memoryTotalId := gjson.Get(string(c.Ctx.Input.RequestBody), "memory_total_id").String()
+	memoryUsedId := gjson.Get(string(c.Ctx.Input.RequestBody), "memory_used_id").String()
+	memoryUtilizationId := gjson.Get(string(c.Ctx.Input.RequestBody), "memory_utilization_id").String()
 	model := gjson.Get(string(c.Ctx.Input.RequestBody), "model").String()
-	v := models.System{ID: int64(id), CPUCore: cpu_core, CPUUtilizationID: cpu_utilization_id,
-		GroupID: group_id, MemoryTotalID: memory_total_id, UptimeID: uptime_id, Model: model,
-		MemoryUsedID: memory_used_id, MemoryUtilizationID: memory_utilization_id,
-	}
+	pingTemplateId := gjson.Get(string(c.Ctx.Input.RequestBody), "ping_template_id").String()
+	v := models.System{ID: int64(id), CPUCore: cpuCore, CPUUtilizationID: cpuUtilizationId,
+		GroupID: groupId, MemoryTotalID: memoryTotalId, UptimeID: uptimeId, Model: model,
+		MemoryUsedID: memoryUsedId, MemoryUtilizationID: memoryUtilizationId,
+		PingTemplateID: pingTemplateId}
 	err := models.UpdateSystem(&v)
 	if err != nil {
 		SystemRes.Code = 500

models/application_mod.go

@@ -1,6 +1,6 @@
 package models
 
-//ApplicationList struct
+// ApplicationList struct
 type ApplicationList struct {
 	Code    int    `json:"code"`
 	Message string `json:"mess age"`
@@ -10,14 +10,14 @@ type ApplicationList struct {
 	} `json:"data"`
 }
 
-//Application struct
+// Application struct
 type Application struct {
 	Applicationid string            `json:"applicationid"`
 	Name          string            `json:"name"`
 	Items         []ApplicationItem `json:"items"`
 }
 
-//ApplicationItem struct
+// ApplicationItem struct
 type ApplicationItem struct {
 	ItemID    string `json:"itemid"`
 	Name      string `json:"name"`
@@ -35,15 +35,15 @@ type MonIts struct {
 		Tag   string `json:"tag"`
 		Value string `json:"value"`
 	} `json:"tags"`
-	ValutType  string `json:"value_type"`
+	SNMPOid    string `json:"snmp_oid"`
 	Trends     string `json:"trends"`
 	Units      string `json:"units"`
 	ValueType  string `json:"value_type"`
 	Delay      string `json:"delay"`
 	ValuemapID string `json:"valuemapid"`
 }
 
-//Application struct
+// Application struct
 type TagsItems struct {
 	Name  string   `json:"name"`
 	Items []MonIts `json:"items"`

models/base.go

@@ -11,8 +11,10 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	workwx "github.com/xen0n/go-workwx"
 	ini "gopkg.in/ini.v1"
+	"net/http"
 	"strconv"
 	"strings"
+	"time"
 	"zbxtable/utils"
 
 	jsoniter "github.com/json-iterator/go"
@@ -21,8 +23,12 @@ import (
 )
 
 var (
-	API        = &zabbix.API{}
-	json       = jsoniter.ConfigCompatibleWithStandardLibrary
+	API  = &zabbix.API{}
+	json = jsoniter.Config{
+		EscapeHTML:             false,
+		SortMapKeys:            true,
+		ValidateJsonRawMessage: true,
+	}.Froze()
 	RDB        = &redis.Client{}
 	ZBX_VER    string
 	ZBX_V      bool
@@ -95,7 +101,22 @@ func ModelsInit(zabbix_web, zabbix_user, zabbix_pass, zabbix_token,
 	}
 	// init admin
 	DatabaseInit()
-
+	//判断API地址是否正确，http get访问访问api地址判断状态码是不是412
+	url := zabbix_web + "/api_jsonrpc.php"
+	dClient := http.Client{
+		Timeout: 3 * time.Second, // 设置超时时间为 3 秒
+	}
+	resp, err := dClient.Get(url)
+	if err != nil {
+		logs.Error("Zabbix Web get request failed:", err)
+		os.Exit(1)
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusPreconditionFailed {
+		logs.Error("Zabbix Web is incorrectly!")
+		os.Exit(1)
+	}
+	//api变量
 	API = zabbix.NewAPI(zabbix_web + "/api_jsonrpc.php")
 	if zabbix_token != "" {
 		API.Auth = zabbix_token