From 1f1af51c6f2ece02a729f7bc49ba4f0c3effcbdb Mon Sep 17 00:00:00 2001 From: zhanghan2021 Date: Wed, 4 Jan 2023 10:53:15 +0800 Subject: [PATCH] fix prometheus plugin router --- prometheus/server/main.go | 6 +++--- prometheus/server/router/router.go | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/prometheus/server/main.go b/prometheus/server/main.go index 2bffeb3a..c91da897 100644 --- a/prometheus/server/main.go +++ b/prometheus/server/main.go @@ -16,9 +16,9 @@ func main() { Description: "Prometheus开源系统监视和警报工具包", Author: "zhanghan", Email: "zhanghan@kylinos.cn", - Url: "http://10.1.167.93:9090/", - ReverseDest: "http://10.1.167.93:9090/", + Url: "http://localhost:8090", + ReverseDest: "http://localhost:9090", }) - client.Serve(":99090") + client.Serve(":8090") } diff --git a/prometheus/server/router/router.go b/prometheus/server/router/router.go index d2c03c1d..c326c786 100644 --- a/prometheus/server/router/router.go +++ b/prometheus/server/router/router.go @@ -22,16 +22,16 @@ func DefaultClient(desc *plugin.PluginInfo) *plugin.Client { pg := router.Group("/plugin/" + desc.Name) { pg.GET("/query", func(c *gin.Context) { - c.Set("__internal__reverse_dest", dest) - QueryRange(c) + c.Set("query", dest) + Query(c) }) pg.GET("/query_range", func(c *gin.Context) { - c.Set("__internal__reverse_dest", dest) + c.Set("query_range", dest) QueryRange(c) }) - pg.GET("/rules", func(c *gin.Context) { - c.Set("__internal__reverse_dest", dest) - QueryRange(c) + pg.GET("/targets", func(c *gin.Context) { + c.Set("targets", dest) + Targets(c) }) } @@ -42,7 +42,7 @@ func DefaultClient(desc *plugin.PluginInfo) *plugin.Client { } func Query(c *gin.Context) { - remote := c.GetString("__internal__reverse_dest") + remote := c.GetString("query") if remote == "" { fmt.Println("get reverse dest failed!") return @@ -59,7 +59,7 @@ func Query(c *gin.Context) { } func QueryRange(c *gin.Context) { - remote := c.GetString("__internal__reverse_dest") + remote := c.GetString("query_range") if remote == "" { fmt.Println("get reverse dest failed!") return @@ -75,8 +75,8 @@ func QueryRange(c *gin.Context) { proxy.ServeHTTP(c.Writer, c.Request) } -func Rules(c *gin.Context) { - remote := c.GetString("__internal__reverse_dest") +func Targets(c *gin.Context) { + remote := c.GetString("targets") if remote == "" { fmt.Println("get reverse dest failed!") return @@ -88,6 +88,6 @@ func Rules(c *gin.Context) { proxy := httputil.NewSingleHostReverseProxy(url) - c.Request.URL.Path = "api/v1/rules" //请求API + c.Request.URL.Path = "api/v1/targets" //请求API proxy.ServeHTTP(c.Writer, c.Request) } -- Gitee