Skip to content
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

Update Account Total Connections Metric and Check #197

Merged
merged 2 commits into from
May 2, 2024
Merged

Update Account Total Connections Metric and Check #197

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebc069f
Correct account total conns metric
samuelattwood May 1, 2024
82b829c
Report JS metrics for inactive accounts
samuelattwood May 1, 2024
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: 9 additions & 11 deletions surveyor/collector_statz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ func (sc *StatzCollector) buildDescs() {

// Metrics reported per-server
sc.descs.accConnCount = newPromDesc("account_conn_count", "The number of client connections to this account", serverAndAccLabel)
sc.descs.accTotalConnCount = newPromDesc("account_total_conn_count", "Total number of client connections serviced for this account", serverAndAccLabel)
sc.descs.accTotalConnCount = newPromDesc("account_total_conn_count", "The combined current number of client and leafnode connections to this account", serverAndAccLabel)
sc.descs.accLeafCount = newPromDesc("account_leaf_count", "The number of leafnode connections to this account", serverAndAccLabel)
sc.descs.accSubCount = newPromDesc("account_sub_count", "The number of subscriptions on this account", serverAndAccLabel)
sc.descs.accSlowConsumerCount = newPromDesc("account_slow_consumer_count", "The number of slow consumers detected in this account", serverAndAccLabel)
Expand Down Expand Up @@ -598,8 +598,11 @@ func (sc *StatzCollector) pollAccountInfo() error {
jsInfos := sc.getJSInfos(nc)
for accID, jsInfo := range jsInfos {
sts, ok := accStats[accID]
// If no account stats returned, still report JS metrics
if !ok {
continue
sts = &accountStats{
accountID: accID,
}
}
sts.jetstreamEnabled = 1.0
sts.jetstreamMemoryUsed = float64(jsInfo.Memory)
Expand Down Expand Up @@ -643,7 +646,7 @@ func (sc *StatzCollector) pollAccountInfo() error {
}
}
}
accStats[jsInfo.Id] = sts
accStats[accID] = sts
}

sc.Lock()
Expand Down Expand Up @@ -740,6 +743,7 @@ func (sc *StatzCollector) getAccStatz(nc *nats.Conn) (map[string][]*accStat, err

for _, msg := range msgs {
var a accStatz

if err = unmarshalMsg(msg, &a); err != nil {
sc.logger.Warnf("Error deserializing account stats: %s", err.Error())
continue
Expand All @@ -759,15 +763,10 @@ func (sc *StatzCollector) getAccStatz(nc *nats.Conn) (map[string][]*accStat, err
accStats := make(map[string][]*accStat)
for _, statz := range res {
for _, acc := range statz.Data.Accounts {
// always skip if account has never connected
if acc.TotalConns == 0 {
continue
}

// optimization to stop reporting a server/account pair
// when a server is continuously reporting 0 conns for that account
zeroConnKey := statz.Server.ID + ":" + acc.Account
if acc.Conns == 0 {
if acc.TotalConns == 0 {
count := sc.accStatZeroConn[zeroConnKey]
if count >= accStatZeroConnSkip {
// at limit for continuous polls with 0 conns
Expand All @@ -778,7 +777,6 @@ func (sc *StatzCollector) getAccStatz(nc *nats.Conn) (map[string][]*accStat, err
} else {
sc.accStatZeroConn[zeroConnKey] = 0
}

accInfo := accStats[acc.Account]
accStats[acc.Account] = append(accInfo, &accStat{
Server: statz.Server,
Expand Down Expand Up @@ -1089,7 +1087,7 @@ func (sc *StatzCollector) Collect(ch chan<- prometheus.Metric) {
for _, as := range stat.stats {
serverAndAccLabels := append(sc.serverLabelValues(as.Server), accLabels...)
metrics.newGaugeMetric(sc.descs.accConnCount, float64(as.Data.Conns), serverAndAccLabels)
metrics.newCounterMetric(sc.descs.accTotalConnCount, float64(as.Data.TotalConns), serverAndAccLabels)
metrics.newGaugeMetric(sc.descs.accTotalConnCount, float64(as.Data.TotalConns), serverAndAccLabels)
metrics.newGaugeMetric(sc.descs.accLeafCount, float64(as.Data.LeafNodes), serverAndAccLabels)
metrics.newGaugeMetric(sc.descs.accSubCount, float64(as.Data.NumSubs), serverAndAccLabels)
metrics.newGaugeMetric(sc.descs.accSlowConsumerCount, float64(as.Data.SlowConsumers), serverAndAccLabels)
Expand Down