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

fix up logging

This commit is contained in:
davidnewhall2 2020-06-25 22:26:30 -07:00
parent 79ede65882
commit 57470c3073
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integrations/inputunifi/input.go
View File

@ -67,7 +67,9 @@ type Metrics struct {
} }
func init() { // nolint: gochecknoinits func init() { // nolint: gochecknoinits
u := &InputUnifi{} u := &InputUnifi{
dynamic: make(map[string]*Controller),
}
poller.NewInput(&poller.InputPlugin{ poller.NewInput(&poller.InputPlugin{
Name: PluginName, Name: PluginName,

28
integrations/inputunifi/interface.go
View File

@ -24,8 +24,8 @@ func (u *InputUnifi) Initialize(l poller.Logger) error {
u.Config = &Config{Disable: true} u.Config = &Config{Disable: true}
} }
if u.Disable { if u.Logger = l; u.Disable {
l.Logf("UniFi input plugin disabled or missing configuration!") u.Logf("UniFi input plugin disabled or missing configuration!")
return nil return nil
} }
@ -34,12 +34,10 @@ func (u *InputUnifi) Initialize(l poller.Logger) error {
} }
if len(u.Controllers) == 0 { if len(u.Controllers) == 0 {
l.Logf("No controllers configured. Polling dynamic controllers only!") u.Logf("No controllers configured. Polling dynamic controllers only! Defaults:")
u.logController(&u.Default)
} }
u.dynamic = make(map[string]*Controller)
u.Logger = l
for i, c := range u.Controllers { for i, c := range u.Controllers {
switch err := u.getUnifi(u.setControllerDefaults(c)); err { switch err := u.getUnifi(u.setControllerDefaults(c)); err {
case nil: case nil:
@ -47,9 +45,9 @@ func (u *InputUnifi) Initialize(l poller.Logger) error {
u.LogErrorf("checking sites on %s: %v", c.URL, err) u.LogErrorf("checking sites on %s: %v", c.URL, err)
} }
u.Logf("Configured UniFi Controller %d:", i+1) u.Logf("Configured UniFi Controller %d of %d:", i+1, len(u.Controllers))
default: default:
u.LogErrorf("Controller %d Auth or Connection Error, retrying: %v", i+1, err) u.LogErrorf("Controller %d of %d Auth or Connection Error, retrying: %v", i+1, len(u.Controllers), err)
} }
u.logController(c) u.logController(c)
@ -59,19 +57,17 @@ func (u *InputUnifi) Initialize(l poller.Logger) error {
} }
func (u *InputUnifi) logController(c *Controller) { func (u *InputUnifi) logController(c *Controller) {
u.Logf(" => URL: %s", c.URL) u.Logf(" => URL: %s (verify SSL: %v)", c.URL, *c.VerifySSL)
if c.Unifi != nil { if c.Unifi != nil {
u.Logf(" => Version: %s", c.Unifi.ServerVersion) u.Logf(" => Version: %s (%s)", c.Unifi.ServerVersion, c.Unifi.UUID)
} }
u.Logf(" => Username: %s (has password: %v)", c.User, c.Pass != "") u.Logf(" => Username: %s (has password: %v)", c.User, c.Pass != "")
u.Logf(" => Hash PII: %v", *c.HashPII) u.Logf(" => Hash PII / Poll Sites: %v / %s", *c.HashPII, strings.Join(c.Sites, ", "))
u.Logf(" => Verify SSL: %v", *c.VerifySSL) u.Logf(" => Save Sites / Save DPI: %v / %v (metrics)", *c.SaveSites, *c.SaveDPI)
u.Logf(" => Save DPI: %v", *c.SaveDPI) u.Logf(" => Save Events / Save IDS: %v / %v (logs)", *c.SaveEvents, *c.SaveIDS)
u.Logf(" => Save IDS: %v", *c.SaveIDS) u.Logf(" => Save Alarms / Anomalies: %v / %v (logs)", *c.SaveAlarms, *c.SaveAnomal)
u.Logf(" => Save Events: %v", *c.SaveEvents)
u.Logf(" => Save Sites: %v", *c.SaveSites)
} }
// Events allows you to pull only events (and IDS) from the UniFi Controller. // Events allows you to pull only events (and IDS) from the UniFi Controller.