Merge branch 'main' of github.com:ccfos/nightingale

center/router/router.go

@@ -367,7 +367,7 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.PUT("/notify-config", rt.auth(), rt.admin(), rt.notifyConfigPut)
 
 		pages.GET("/es-index-pattern", rt.auth(), rt.esIndexPatternGet)
-		pages.GET("/es-index-pattern-list", rt.auth(), rt.esIndexPatternGetAll)
+		pages.GET("/es-index-pattern-list", rt.auth(), rt.esIndexPatternGetList)
 		pages.POST("/es-index-pattern", rt.auth(), rt.admin(), rt.esIndexPatternAdd)
 		pages.PUT("/es-index-pattern", rt.auth(), rt.admin(), rt.esIndexPatternPut)
 		pages.DELETE("/es-index-pattern", rt.auth(), rt.admin(), rt.esIndexPatternDel)

center/router/router_es_index_pattern.go

@@ -57,8 +57,17 @@ func (rt *Router) esIndexPatternDel(c *gin.Context) {
 }
 
 // ES Index Pattern列表
-func (rt *Router) esIndexPatternGetAll(c *gin.Context) {
-	lst, err := models.EsIndexPatternGets(rt.Ctx, "")
+func (rt *Router) esIndexPatternGetList(c *gin.Context) {
+	datasourceId := ginx.QueryInt64(c, "datasource_id", 0)
+
+	var lst []*models.EsIndexPattern
+	var err error
+	if datasourceId != 0 {
+		lst, err = models.EsIndexPatternGets(rt.Ctx, "datasource_id = ?", datasourceId)
+	} else {
+		lst, err = models.EsIndexPatternGets(rt.Ctx, "")
+	}
+  
 	ginx.NewRender(c).Data(lst, err)
 }
 

docker/initsql/a-n9e.sql

@@ -632,5 +632,5 @@ CREATE TABLE `es_index_pattern` (
     `update_at` bigint default '0',
     `update_by` varchar(64) default '',
     PRIMARY KEY (`id`),
-    UNIQUE KEY (`name`, `datasource_id`)
+    UNIQUE KEY (`datasource_id`, `name`)
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
\ No newline at end of file