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

Jump to bottom

Include the account in the detailed connection #291

Merged
merged 1 commit into from
Jun 24, 2024
Merged

Include the account in the detailed connection #291

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
10 changes: 7 additions & 3 deletions collector/connz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ func createConnzCollector(system string) *connzCollector {

func createConnzDetailedCollector(system string) *connzCollector {
connzCollector := createConnzCollector(system)
detailLabels := []string{"server_id", "cid", "kind", "type", "ip", "port", "name", "name_tag", "lang",
"version", "tls_version", "tls_cipher_suite"}
detailLabels := []string{"server_id", "cid", "kind", "type", "ip", "port", "name", "name_tag",
"account", "lang", "version", "tls_version", "tls_cipher_suite"}
connzCollector.pendingBytes = prometheus.NewDesc(
prometheus.BuildFQName(system, connzEndpoint, "pending_bytes"),
"pending_bytes",
Expand Down Expand Up @@ -254,7 +254,7 @@ func (nc *connzCollector) Collect(ch chan<- prometheus.Metric) {
outMsgs += conn.OutMsgs
if nc.detailed {
detailLabelValues := []string{server.ID, conn.Cid, conn.Kind, conn.Type, conn.IP, conn.Port,
conn.Name, conn.NameTag, conn.Lang, conn.Version, conn.TLSVersion, conn.TLSCipherSuite}
conn.Name, conn.NameTag, conn.Account, conn.Lang, conn.Version, conn.TLSVersion, conn.TLSCipherSuite}
ch <- prometheus.MustNewConstMetric(nc.pendingBytes, prometheus.GaugeValue, conn.PendingBytes, detailLabelValues...)
ch <- prometheus.MustNewConstMetric(nc.subscriptions, prometheus.GaugeValue, conn.Subscriptions,
detailLabelValues...)
Expand Down Expand Up @@ -313,6 +313,7 @@ type ConnzConnection struct {
Subscriptions float64 `json:"subscriptions"`
Name string `json:"name"`
NameTag string `json:"name_tag"`
Account string `json:"account"`
Lang string `json:"lang"`
Version string `json:"version"`
TLSVersion string `json:"tls_version"`
Expand Down Expand Up @@ -386,6 +387,9 @@ func (c *ConnzConnection) UnmarshalJSON(data []byte) error {
if val, exists := connection["name_tag"]; exists {
c.NameTag = val.(string)
}
if val, exists := connection["account"]; exists {
c.Account = val.(string)
}
if val, exists := connection["lang"]; exists {
c.Lang = val.(string)
}
Expand Down