Merge pull request #337 from uliian/feat-router-search

feat:新增路由搜索功能
feiyu563 · Nov 15, 2023 · 08d0d7d · 08d0d7d
2 parents d4afcdd + 05aba25
commit 08d0d7d
Show file tree

Hide file tree

Showing 5 changed files with 190 additions and 146 deletions.
diff --git a/controllers/WebAlertRouter.go b/controllers/WebAlertRouter.go
@@ -7,7 +7,7 @@ import (
  "strconv"
 )
 
-//router
+// router
 func (c *MainController) AlertRouter() {
  if !CheckAccount(c.Ctx) {
  c.Redirect("/login", 302)
@@ -16,14 +16,19 @@ func (c *MainController) AlertRouter() {
  c.Data["IsAlertRouter"] = true
  c.Data["IsAlertManageMenu"] = true
  c.TplName = "alertrouter.html"
-
- GlobalAlertRouter, _ = models.GetAllAlertRouter()
+ query := models.AlertRouterQuery{}
+ query.Name = c.GetString("name", "")
+ query.Webhook = c.GetString("webhook", "")
+ //刷新告警路由AlertRouter
+ GlobalAlertRouter, _ = models.GetAllAlertRouter(query)
  c.Data["AlertRouter"] = GlobalAlertRouter
 
  c.Data["IsLogin"] = CheckAccount(c.Ctx)
+ c.Data["SearchName"] = query.Name
+ c.Data["SearchWebhook"] = query.Webhook
 }
 
-//router add
+// router add
 func (c *MainController) RouterAdd() {
  if !CheckAccount(c.Ctx) {
  c.Redirect("/login", 302)
@@ -83,7 +88,7 @@ func (c *MainController) AddRouter() {
  c.ServeJSON()
 }
 
-//router edit
+// router edit
 func (c *MainController) RouterEdit() {
  if !CheckAccount(c.Ctx) {
  c.Redirect("/login", 302)

diff --git a/controllers/WebTemplate.go b/controllers/WebTemplate.go
@@ -3,13 +3,13 @@ package controllers
 import (
  "PrometheusAlert/models"
  "encoding/json"
+ "github.com/astaxie/beego"
  "github.com/astaxie/beego/logs"
- "github.com/astaxie/beego"
  "strconv"
  "strings"
 )
 
-//template page
+// template page
 func (c *MainController) Template() {
  if !CheckAccount(c.Ctx) {
  c.Redirect("/login", 302)
@@ -26,7 +26,7 @@ func (c *MainController) Template() {
  c.Data["IsLogin"] = CheckAccount(c.Ctx)
 }
 
-//template add
+// template add
 func (c *MainController) TemplateAdd() {
  if !CheckAccount(c.Ctx) {
  c.Redirect("/login", 302)
@@ -65,7 +65,7 @@ func (c *MainController) AddTpl() {
  resp = err
  GlobalPrometheusAlertTpl, _ = models.GetAllTpl()
  }
- GlobalAlertRouter, _ = models.GetAllAlertRouter()
+ GlobalAlertRouter, _ = models.GetAllAlertRouter(models.AlertRouterQuery{})
  c.Data["json"] = resp
  c.ServeJSON()
 }
@@ -88,7 +88,7 @@ func (c *MainController) ImportTpl() {
  }
 
  GlobalPrometheusAlertTpl, _ = models.GetAllTpl()
- GlobalAlertRouter, _ = models.GetAllAlertRouter()
+ GlobalAlertRouter, _ = models.GetAllAlertRouter(models.AlertRouterQuery{})
  c.Data["json"] = resp
  c.ServeJSON()
  } else {

diff --git a/controllers/prometheusalert.go b/controllers/prometheusalert.go
@@ -165,8 +165,11 @@ func (c *PrometheusAlertController) PrometheusAlert() {
  if pMsg.Split != "false" && PrometheusAlertTpl.Tpluse == "Prometheus" {
  //判断告警路由AlertRouter列表是否为空
  if GlobalAlertRouter == nil {
+ query := models.AlertRouterQuery{}
+ query.Name = c.GetString("name", "")
+ query.Webhook = c.GetString("webhook", "")
  //刷新告警路由AlertRouter
- GlobalAlertRouter, _ = models.GetAllAlertRouter()
+ GlobalAlertRouter, _ = models.GetAllAlertRouter(query)
  }
  Alerts_Value, _ := p_alertmanager_json["alerts"].([]interface{})
  //拆分告警消息

diff --git a/models/AlertRouter.go b/models/AlertRouter.go
@@ -16,6 +16,11 @@ type AlertRouter struct {
  Created time.Time
 }
 
+type AlertRouterQuery struct {
+ Name string
+ Webhook string
+}
+
 func AddAlertRouter(id int, tplid int, name, rules, url_or_phone, at_some_one string, sendResolved bool) error {
  tpl, _ := GetTpl(tplid)
  o := orm.NewOrm()
@@ -61,10 +66,16 @@ func DelAlertRouter(id int) error {
  return err
 }
 
-func GetAllAlertRouter() ([]*AlertRouter, error) {
+func GetAllAlertRouter(query AlertRouterQuery) ([]*AlertRouter, error) {
  o := orm.NewOrm()
  Tpl_all := make([]*AlertRouter, 0)
  qs := o.QueryTable("AlertRouter")
+ if len(query.Name) > 0 {
+ qs = qs.Filter("name__icontains", query.Name)
+ }
+ if len(query.Webhook) > 0 {
+ qs = qs.Filter("url_or_phone__istartswith", query.Webhook)
+ }
  _, err := qs.RelatedSel().All(&Tpl_all)
  return Tpl_all, err
 }