Skip to content

feat: enrich bamboo agent metrics with detailed information #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HeZephyr merged 1 commit into from
Nov 28, 2024
Merged

feat: enrich bamboo agent metrics with detailed information #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions collector/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package collector

import (
"os"
"crypto/tls"
"encoding/json"
"errors"
"fmt"
"io"
"net/http"
"os"
"strconv"
"sync"

"log/slog"
Expand Down Expand Up @@ -42,8 +43,10 @@ type Config struct {
type BambooAgent struct {
ID int64 `json:"id"`
Name string `json:"name"`
Type string `json:"type"`
IsActive bool `json:"active"`
IsBusy bool `json:"busy"`
Enabled bool `json:"enabled"`
}

// BambooQueue represents the build queue data fetched from the Bamboo API.
Expand Down Expand Up @@ -76,8 +79,8 @@ func NewExporter(config *Config, logger *slog.Logger) *Exporter {
agents: prometheus.NewGaugeVec(prometheus.GaugeOpts{
Namespace: namespace,
Name: "agents_status",
Help: "Status of Bamboo agents (active/busy).",
}, []string{"name", "status"}),
Help: "Status of Bamboo agents (enabled/active/busy).",
}, []string{"id", "name", "type", "enabled", "active", "busy"}),
queue: prometheus.NewGauge(prometheus.GaugeOpts{
Namespace: namespace,
Name: "queue_size",
Expand Down Expand Up @@ -112,7 +115,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
e.mutex.Lock()
defer e.mutex.Unlock()

success := e.scrapeMetrics(ch)
success := e.scrapeMetrics()
ch <- prometheus.MustNewConstMetric(e.up, prometheus.GaugeValue, success)
e.failures.Collect(ch)
e.agents.Collect(ch)
Expand All @@ -122,7 +125,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
}

// scrapeMetrics fetches metrics from Bamboo and processes them.
func (e *Exporter) scrapeMetrics(ch chan<- prometheus.Metric) float64 {
func (e *Exporter) scrapeMetrics() float64 {
if err := e.scrapeAgents(); err != nil {
e.logger.Error("Failed to scrape agents", "error", err)
e.failures.Inc()
Expand Down Expand Up @@ -155,17 +158,16 @@ func (e *Exporter) scrapeAgents() error {
busyCount := 0

for _, agent := range agents {
status := "inactive"
if agent.IsActive {
status = "active"
activeCount++
}
e.agents.WithLabelValues(agent.Name, status).Set(1)

if agent.IsBusy {
e.agents.WithLabelValues(agent.Name, "busy").Set(1)
busyCount++
}
e.agents.WithLabelValues(strconv.FormatInt(agent.ID, 10), agent.Name, agent.Type,
fmt.Sprintf("%t", agent.Enabled), fmt.Sprintf("%t", agent.IsActive),
fmt.Sprintf("%t", agent.IsBusy)).Set(1)
}

if activeCount > 0 {
Expand Down