@@ -83,10 +83,6 @@ type systemdCollector struct {
8383
8484var unitStatesName = []string {"active" , "activating" , "deactivating" , "inactive" , "failed" }
8585
86- type Manager interface {
87- GetManagerProperty (prop string ) (string , error )
88- }
89-
9086func init () {
9187 registerCollector ("systemd" , defaultDisabled , NewSystemdCollector )
9288}
@@ -437,8 +433,8 @@ func (c *systemdCollector) collectSummaryMetrics(ch chan<- prometheus.Metric, su
437433 }
438434}
439435
440- func (c * systemdCollector ) collectSystemState (m Manager , ch chan <- prometheus.Metric ) error {
441- systemState , err := m .GetManagerProperty ("SystemState" )
436+ func (c * systemdCollector ) collectSystemState (conn * dbus. Conn , ch chan <- prometheus.Metric ) error {
437+ systemState , err := conn .GetManagerProperty ("SystemState" )
442438 if err != nil {
443439 return fmt .Errorf ("couldn't get system state: %w" , err )
444440 }
@@ -506,8 +502,8 @@ func filterUnits(units []unit, includePattern, excludePattern *regexp.Regexp, lo
506502 return filtered
507503}
508504
509- func (c * systemdCollector ) getSystemdVersion (m Manager ) (float64 , string ) {
510- version , err := m .GetManagerProperty ("Version" )
505+ func (c * systemdCollector ) getSystemdVersion (conn * dbus. Conn ) (float64 , string ) {
506+ version , err := conn .GetManagerProperty ("Version" )
511507 if err != nil {
512508 c .logger .Debug ("Unable to get systemd version property, defaulting to 0" )
513509 return 0 , ""
@@ -523,8 +519,8 @@ func (c *systemdCollector) getSystemdVersion(m Manager) (float64, string) {
523519 return v , version
524520}
525521
526- func (c * systemdCollector ) getSystemdVirtualization (m Manager ) string {
527- virt , err := m .GetManagerProperty ("Virtualization" )
522+ func (c * systemdCollector ) getSystemdVirtualization (conn * dbus. Conn ) string {
523+ virt , err := conn .GetManagerProperty ("Virtualization" )
528524 if err != nil {
529525 c .logger .Debug ("Could not get Virtualization property" , "err" , err )
530526 return "unknown"
0 commit comments