Compare commits
2 Commits
d82a83cca1
...
228ec26904
Author | SHA1 | Date | |
---|---|---|---|
228ec26904 | |||
0f4c565250 |
@ -35,12 +35,12 @@ func (h *Handler) HTTPClient(ctx context.Context, params map[string]string, _ ..
|
|||||||
|
|
||||||
url := params["url"]
|
url := params["url"]
|
||||||
if !strings.HasPrefix(url, "http") {
|
if !strings.HasPrefix(url, "http") {
|
||||||
url = fmt.Sprintf("http://localhost:%d/%s", config.Config.App.Port, url)
|
url = fmt.Sprintf("http://127.0.0.1:%d%s", config.Config.App.Port, url)
|
||||||
}
|
}
|
||||||
|
|
||||||
body := params["body"]
|
body := params["body"]
|
||||||
|
|
||||||
req, err := http.NewRequestWithContext(ctx, method, "https://api.imbytecat.com/ip", strings.NewReader(body)) // TODO: if empty use http.NoBody
|
req, err := http.NewRequestWithContext(ctx, method, url, strings.NewReader(body)) // TODO: if empty use http.NoBody
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errs.Wrapf(err, "failed to create request")
|
return nil, errs.Wrapf(err, "failed to create request")
|
||||||
}
|
}
|
||||||
@ -57,7 +57,7 @@ func (h *Handler) HTTPClient(ctx context.Context, params map[string]string, _ ..
|
|||||||
return nil, errs.Wrapf(err, "failed to read the response")
|
return nil, errs.Wrapf(err, "failed to read the response")
|
||||||
}
|
}
|
||||||
|
|
||||||
return string(data), nil
|
return method + url + body + string(data), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewHandler creates a new handler with initialized clients for system and tcp calls.
|
// NewHandler creates a new handler with initialized clients for system and tcp calls.
|
||||||
|
@ -84,9 +84,9 @@ func (p *zabbixAgentPlugin) registerMetrics() error {
|
|||||||
),
|
),
|
||||||
handler: h.GetAppVersion,
|
handler: h.GetAppVersion,
|
||||||
},
|
},
|
||||||
"onvif.client": {
|
"onvif.httpclient": {
|
||||||
metric: metric.New(
|
metric: metric.New(
|
||||||
"ONVIF client",
|
"ONVIF HTTP client",
|
||||||
[]*metric.Param{
|
[]*metric.Param{
|
||||||
metric.NewParam("method", "HTTP request method."),
|
metric.NewParam("method", "HTTP request method."),
|
||||||
metric.NewParam("url", "HTTP request URL."),
|
metric.NewParam("url", "HTTP request URL."),
|
||||||
|
18
main.go
18
main.go
@ -62,16 +62,14 @@ func main() {
|
|||||||
/**
|
/**
|
||||||
* Zabbix agent
|
* Zabbix agent
|
||||||
*/
|
*/
|
||||||
//go func() {
|
go func() {
|
||||||
// zabbixagent.Run()
|
err = zabbixagent.Launch()
|
||||||
//}()
|
if err != nil {
|
||||||
//
|
return
|
||||||
//select {}
|
}
|
||||||
|
|
||||||
err = zabbixagent.Launch()
|
panic(err)
|
||||||
if err != nil {
|
}()
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
panic(err)
|
select {}
|
||||||
}
|
}
|
||||||
|
@ -4,8 +4,8 @@ import (
|
|||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Ping(c *gin.Context) {
|
func Hello(c *gin.Context) {
|
||||||
c.JSON(200, gin.H{
|
c.JSON(200, gin.H{
|
||||||
"message": "pong",
|
"message": "Hello, World!",
|
||||||
})
|
})
|
||||||
}
|
}
|
@ -7,7 +7,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func SetupRoutes(r *gin.Engine) {
|
func SetupRoutes(r *gin.Engine) {
|
||||||
r.GET("/ping", handler.Ping)
|
r.GET("/", handler.Hello)
|
||||||
|
|
||||||
userGroup := r.Group("/onvif")
|
userGroup := r.Group("/onvif")
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user