public_git
/
unpoller_unpoller
mirror of https://github.com/unpoller/unpoller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

deprecate path too

This commit is contained in:
davidnewhall2 2020-06-15 05:06:14 -07:00
parent 51814bf195
commit 378466472c
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
integrations/promunifi/collector.go
View File

@ -144,26 +144,33 @@ func (u *promUnifi) Run(c poller.Collect) error {
// ScrapeHandler allows prometheus to scrape a single source, instead of all sources. // ScrapeHandler allows prometheus to scrape a single source, instead of all sources.
func (u *promUnifi) ScrapeHandler(w http.ResponseWriter, r *http.Request) { func (u *promUnifi) ScrapeHandler(w http.ResponseWriter, r *http.Request) {
t := &target{u: u, Filter: &poller.Filter{ t := &target{u: u, Filter: &poller.Filter{
Name: r.URL.Query().Get("input"), // "unifi" Name: r.URL.Query().Get("input"), // "unifi"
Path: r.URL.Query().Get("path"), // url: "https://127.0.0.1:8443" Path: r.URL.Query().Get("target"), // NEW (target): "https://127.0.0.1:8443"
Role: r.URL.Query().Get("role"), // configured role in up.conf.
}} }}
if t.Name == "" { if t.Name == "" {
t.Name = "unifi" // the default t.Name = "unifi" // the default
} }
if t.Role != "" { if pathOld := r.URL.Query().Get("path"); pathOld != "" {
u.Collector.LogErrorf("deprecated 'role' parameter used; update your config to use 'path'") u.Collector.LogErrorf("deprecated 'path' parameter used; update your config to use 'target'")
if t.Path == "" { if t.Path == "" {
t.Path = t.Role t.Path = pathOld
}
}
if roleOld := r.URL.Query().Get("role"); roleOld != "" {
u.Collector.LogErrorf("deprecated 'role' parameter used; update your config to use 'target'")
if t.Path == "" {
t.Path = roleOld
} }
} }
if t.Path == "" { if t.Path == "" {
u.Collector.LogErrorf("path parameter missing on scrape from %v", r.RemoteAddr) u.Collector.LogErrorf("'target' parameter missing on scrape from %v", r.RemoteAddr)
http.Error(w, "'path' parameter must be specified: configured OR unconfigured url", 400) http.Error(w, "'target' parameter must be specified: configured OR unconfigured url", 400)
return return
} }