refactor: replace namespace to flxpeters

collector/chassis_collector.go

@@ -34,6 +34,7 @@ var (
 type ChassisCollector struct {
 	redfishClient         *gofish.APIClient
 	metrics               map[string]Metric
+	logger                *slog.Logger
 	collectorScrapeStatus *prometheus.GaugeVec
 }
 
@@ -87,12 +88,13 @@ func createChassisMetricMap() map[string]Metric {
 }
 
 // NewChassisCollector returns a collector that collecting chassis statistics
-func NewChassisCollector(redfishClient *gofish.APIClient) *ChassisCollector {
+func NewChassisCollector(redfishClient *gofish.APIClient, logger *slog.Logger) *ChassisCollector {
 	// get service from redfish client
 
 	return &ChassisCollector{
 		redfishClient: redfishClient,
 		metrics:       chassisMetrics,
+		logger:        logger,
 		collectorScrapeStatus: prometheus.NewGaugeVec(
 			prometheus.GaugeOpts{
 				Namespace: namespace,
@@ -116,7 +118,7 @@ func (c *ChassisCollector) Describe(ch chan<- *prometheus.Desc) {
 // Collect implemented prometheus.Collector
 func (c *ChassisCollector) Collect(ch chan<- prometheus.Metric) {
 
-	logger := slog.Default().With(slog.String("collector", "ChassisCollector"))
+	logger := c.logger.With(slog.String("collector", "ChassisCollector"))
 	service := c.redfishClient.Service
 
 	// get a list of chassis from service

collector/manager_collector.go

@@ -23,6 +23,7 @@ var (
 type ManagerCollector struct {
 	redfishClient         *gofish.APIClient
 	metrics               map[string]Metric
+	logger                *slog.Logger
 	collectorScrapeStatus *prometheus.GaugeVec
 }
 
@@ -39,10 +40,11 @@ func createManagerMetricMap() map[string]Metric {
 }
 
 // NewManagerCollector returns a collector that collecting memory statistics
-func NewManagerCollector(redfishClient *gofish.APIClient) *ManagerCollector {
+func NewManagerCollector(redfishClient *gofish.APIClient, logger *slog.Logger) *ManagerCollector {
 	return &ManagerCollector{
 		redfishClient: redfishClient,
 		metrics:       managerMetrics,
+		logger:        logger,
 		collectorScrapeStatus: prometheus.NewGaugeVec(
 			prometheus.GaugeOpts{
 				Namespace: namespace,
@@ -66,7 +68,7 @@ func (m *ManagerCollector) Describe(ch chan<- *prometheus.Desc) {
 // Collect implemented prometheus.Collector
 func (m *ManagerCollector) Collect(ch chan<- prometheus.Metric) {
 
-	logger := slog.Default().With(slog.String("collector", "ManagerCollector"))
+	logger := m.logger.With(slog.String("collector", "ManagerCollector"))
 	service := m.redfishClient.Service
 
 	// get a list of managers from service

collector/redfish_collector.go

@@ -39,13 +39,15 @@ type RedfishCollector struct {
 func NewRedfishCollector(host string, username string, password string) *RedfishCollector {
 	var collectors map[string]prometheus.Collector
 
+	targetLogger := slog.Default().With(slog.String("target", host))
+
 	redfishClient, err := newRedfishClient(host, username, password)
 	if err != nil {
 		slog.Error("error creating redfish client", slog.Any("error", err))
 	} else {
-		chassisCollector := NewChassisCollector(redfishClient)
-		systemCollector := NewSystemCollector(redfishClient)
-		managerCollector := NewManagerCollector(redfishClient)
+		chassisCollector := NewChassisCollector(redfishClient, targetLogger)
+		systemCollector := NewSystemCollector(redfishClient, targetLogger)
+		managerCollector := NewManagerCollector(redfishClient, targetLogger)
 
 		collectors = map[string]prometheus.Collector{
 			"chassis": chassisCollector,

collector/system_collector.go

@@ -33,6 +33,7 @@ var (
 type SystemCollector struct {
 	redfishClient *gofish.APIClient
 	metrics       map[string]Metric
+	logger        *slog.Logger
 	prometheus.Collector
 	collectorScrapeStatus *prometheus.GaugeVec
 }
@@ -93,10 +94,11 @@ func createSystemMetricMap() map[string]Metric {
 }
 
 // NewSystemCollector returns a collector that collecting memory statistics
-func NewSystemCollector(redfishClient *gofish.APIClient) *SystemCollector {
+func NewSystemCollector(redfishClient *gofish.APIClient, logger *slog.Logger) *SystemCollector {
 	return &SystemCollector{
 		redfishClient: redfishClient,
 		metrics:       systemMetrics,
+		logger:        logger,
 		collectorScrapeStatus: prometheus.NewGaugeVec(
 			prometheus.GaugeOpts{
 				Namespace: namespace,
@@ -119,7 +121,7 @@ func (s *SystemCollector) Describe(ch chan<- *prometheus.Desc) {
 // Collect implements prometheus.Collector.
 func (s *SystemCollector) Collect(ch chan<- prometheus.Metric) {
 
-	logger := slog.Default().With(slog.String("collector", "SystemCollector"))
+	logger := s.logger.With(slog.String("collector", "SystemCollector"))
 	service := s.redfishClient.Service
 
 	// get a list of systems from service

go.mod

@@ -1,4 +1,4 @@
-module github.com/jenningsloy318/redfish_exporter
+module github.com/flxpeters/redfish_exporter
 
 go 1.21
 

main.go

@@ -11,8 +11,8 @@ import (
 
 	"log/slog"
 
+	"github.com/flxpeters/redfish_exporter/collector"
 	kitlog "github.com/go-kit/log"
-	"github.com/jenningsloy318/redfish_exporter/collector"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"