Skip to content

feat: add the build tag to the member (serf_lan/wan) labels #228

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

Open
ylmrx wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: add the build tag to the member (serf_lan/wan) labels #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11a0a18
feat: add the build tag to the member (serf_lan/wan) labels
ylmrx May 25, 2022
413d3b8
test the new label set
ylmrx May 25, 2022
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
12 changes: 8 additions & 4 deletions pkg/exporter/consul_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ var (
memberStatus = prometheus.NewDesc(
prometheus.BuildFQName(namespace, "", "serf_lan_member_status"),
"Status of member in the cluster. 1=Alive, 2=Leaving, 3=Left, 4=Failed.",
[]string{"member"}, nil,
[]string{"member", "build"}, nil,
)
memberWanStatus = prometheus.NewDesc(
prometheus.BuildFQName(namespace, "", "serf_wan_member_status"),
"Status of member in the wan cluster. 1=Alive, 2=Leaving, 3=Left, 4=Failed.",
[]string{"member", "dc"}, nil,
[]string{"member", "dc", "build"}, nil,
)
serviceCount = prometheus.NewDesc(
prometheus.BuildFQName(namespace, "", "catalog_services"),
Expand Down Expand Up @@ -275,8 +275,10 @@ func (e *Exporter) collectMembersMetric(ch chan<- prometheus.Metric) bool {
return false
}
for _, entry := range members {
build := strings.Split(entry.Tags["build"], ":")[0]
ch <- prometheus.MustNewConstMetric(
memberStatus, prometheus.GaugeValue, float64(entry.Status), entry.Name,
memberStatus, prometheus.GaugeValue, float64(entry.Status),
entry.Name, build,
)
}
return true
Expand All @@ -289,8 +291,10 @@ func (e *Exporter) collectMembersWanMetric(ch chan<- prometheus.Metric) bool {
return false
}
for _, entry := range members {
build := strings.Split(entry.Tags["build"], ":")[0]
ch <- prometheus.MustNewConstMetric(
memberWanStatus, prometheus.GaugeValue, float64(entry.Status), entry.Name, entry.Tags["dc"],
memberWanStatus, prometheus.GaugeValue, float64(entry.Status),
entry.Name, entry.Tags["dc"], build,
)
}
return true
Expand Down
2 changes: 1 addition & 1 deletion pkg/exporter/consul_exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ consul_raft_leader 1
consul_raft_peers 1
# HELP consul_serf_lan_member_status Status of member in the cluster. 1=Alive, 2=Leaving, 3=Left, 4=Failed.
# TYPE consul_serf_lan_member_status gauge
consul_serf_lan_member_status{member="{{ .Node }}"} 1
consul_serf_lan_member_status{build="1.8.19",member="{{ .Node }}"} 1
# HELP consul_serf_lan_members How many members are in the cluster.
# TYPE consul_serf_lan_members gauge
consul_serf_lan_members 1
Expand Down