Fix service and downtime listing in garbage collector

Also bump go-icinga2-client to v0.0.13

Author: simu

gc/gc.go

@@ -69,13 +69,17 @@ func Collect(ts time.Time, c config.Configuration) error {
 	// Get all signalilo services
 	icinga := c.GetIcingaClient()
 	hostname := c.GetConfig().HostName
-	services, err := icinga.ListServices(fmt.Sprintf("host=%v", hostname))
+	services, err := icinga.ListServices(icinga2.QueryFilter{
+		Filter: fmt.Sprintf(`match("%v", service.host_name)`, hostname),
+	})
 	if err != nil {
 		l.Errorf(fmt.Sprintf("[Collect] Error while listing services: %v", err))
 		return err
 	}
 	l.V(2).Infof("[Collect] Found %v services with host = %v", len(services), hostname)
-	downtimes, err := icinga.ListDowntimes(fmt.Sprintf("host=%v", hostname))
+	downtimes, err := icinga.ListDowntimes(icinga2.QueryFilter{
+		Filter: fmt.Sprintf(`match("%v", downtime.host_name)`, hostname),
+	})
 	if err != nil {
 		l.Errorf(fmt.Sprintf("[Collect] Error while listing downtimes: %v", err))
 		return err

go.mod

@@ -8,6 +8,6 @@ require (
 	github.com/prometheus/alertmanager v0.21.0
 	github.com/sirupsen/logrus v1.8.0
 	github.com/stretchr/testify v1.7.0
-	github.com/vshn/go-icinga2-client v0.0.12
+	github.com/vshn/go-icinga2-client v0.0.13
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 )

go.sum

@@ -414,6 +414,7 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
@@ -424,6 +425,8 @@ github.com/vshn/go-icinga2-client v0.0.11 h1:R9AhqestE+7ct3xMvbHhup1RLP86X74Qqzh
 github.com/vshn/go-icinga2-client v0.0.11/go.mod h1:T6r6HQ22NZsSUI/u5ThOlPsQrtbnJIImZTPAvEOSCdI=
 github.com/vshn/go-icinga2-client v0.0.12 h1:HCNgId5XjUeahhe0+K3YMQ6RJi5nrKeR9b9K7l70VVk=
 github.com/vshn/go-icinga2-client v0.0.12/go.mod h1:T6r6HQ22NZsSUI/u5ThOlPsQrtbnJIImZTPAvEOSCdI=
+github.com/vshn/go-icinga2-client v0.0.13 h1:zX0xceD5zyqOojZpPfNWyiqXnMAjQpc7fgfekR6u2ts=
+github.com/vshn/go-icinga2-client v0.0.13/go.mod h1:T6r6HQ22NZsSUI/u5ThOlPsQrtbnJIImZTPAvEOSCdI=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=