Skip to content

Add ip label to all gatewayz metrics #342

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add ip label to all gatewayz metrics #342

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
50 changes: 26 additions & 24 deletions collector/gatewayz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,62 +97,62 @@ func newGateway(system, endpoint, gwType string) *gateway {
configured: prometheus.NewDesc(
prometheus.BuildFQName(system, endpoint, gwType+"_configured"),
"configured",
[]string{"gateway_name", "cid", "remote_gateway_name", "server_id"},
[]string{"gateway_name", "cid", "ip", "remote_gateway_name", "server_id"},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we name it remote_ip since it seems to be the IP of the remote gateway?

nil),
connStart: prometheus.NewDesc(
prometheus.BuildFQName(system, endpoint, gwType+"_conn_start_time_seconds"),
"conn_start_time_seconds",
[]string{"gateway_name", "cid", "remote_gateway_name", "server_id"},
[]string{"gateway_name", "cid", "ip", "remote_gateway_name", "server_id"},
nil),
connLastActivity: prometheus.NewDesc(
prometheus.BuildFQName(system, endpoint, gwType+"_conn_last_activity_seconds"),
"conn_last_activity_seconds",
[]string{"gateway_name", "cid", "remote_gateway_name", "server_id"},
[]string{"gateway_name", "cid", "ip", "remote_gateway_name", "server_id"},
nil),
connUptime: prometheus.NewDesc(
prometheus.BuildFQName(system, endpoint, gwType+"_conn_uptime_seconds"),
"conn_uptime_seconds",
[]string{"gateway_name", "cid", "remote_gateway_name", "server_id"},
[]string{"gateway_name", "cid", "ip", "remote_gateway_name", "server_id"},
nil),
connIdle: prometheus.NewDesc(
prometheus.BuildFQName(system, endpoint, gwType+"_conn_idle_seconds"),
"conn_idle_seconds",
[]string{"gateway_name", "cid", "remote_gateway_name", "server_id"},
[]string{"gateway_name", "cid", "ip", "remote_gateway_name", "server_id"},
nil),
connRtt: prometheus.NewDesc(
prometheus.BuildFQName(system, endpoint, gwType+"_conn_rtt"),
"rtt",
[]string{"gateway_name", "cid", "remote_gateway_name", "server_id"},
[]string{"gateway_name", "cid", "ip", "remote_gateway_name", "server_id"},
nil),
connPendingBytes: prometheus.NewDesc(
prometheus.BuildFQName(system, endpoint, gwType+"_conn_pending_bytes"),
"pending_bytes",
[]string{"gateway_name", "cid", "remote_gateway_name", "server_id"},
[]string{"gateway_name", "cid", "ip", "remote_gateway_name", "server_id"},
nil),
connInMsgs: prometheus.NewDesc(
prometheus.BuildFQName(system, endpoint, gwType+"_conn_in_msgs"),
"in_msgs",
[]string{"gateway_name", "cid", "remote_gateway_name", "server_id"},
[]string{"gateway_name", "cid", "ip", "remote_gateway_name", "server_id"},
nil),
connOutMsgs: prometheus.NewDesc(
prometheus.BuildFQName(system, endpoint, gwType+"_conn_out_msgs"),
"out_msgs",
[]string{"gateway_name", "cid", "remote_gateway_name", "server_id"},
[]string{"gateway_name", "cid", "ip", "remote_gateway_name", "server_id"},
nil),
connInBytes: prometheus.NewDesc(
prometheus.BuildFQName(system, endpoint, gwType+"_conn_in_bytes"),
"in_bytes",
[]string{"gateway_name", "cid", "remote_gateway_name", "server_id"},
[]string{"gateway_name", "cid", "ip", "remote_gateway_name", "server_id"},
nil),
connOutBytes: prometheus.NewDesc(
prometheus.BuildFQName(system, endpoint, gwType+"_conn_out_bytes"),
"out_bytes",
[]string{"gateway_name", "cid", "remote_gateway_name", "server_id"},
[]string{"gateway_name", "cid", "ip", "remote_gateway_name", "server_id"},
nil),
connSubscriptions: prometheus.NewDesc(
prometheus.BuildFQName(system, endpoint, gwType+"_conn_subscriptions"),
"subscriptions",
[]string{"gateway_name", "cid", "remote_gateway_name", "server_id"},
[]string{"gateway_name", "cid", "ip", "remote_gateway_name", "server_id"},
nil),
}

Expand Down Expand Up @@ -182,31 +182,32 @@ func (gw *gateway) Collect(server *CollectedServer, lgwName, rgwName string,
idle, _ := time.ParseDuration(rgw.Connection.Idle)
rtt, _ := time.ParseDuration(rgw.Connection.RTT)
uptime, _ := time.ParseDuration(rgw.Connection.Uptime)
ip := rgw.Connection.IP

ch <- prometheus.MustNewConstMetric(gw.configured, prometheus.GaugeValue,
boolToFloat(rgw.IsConfigured), lgwName, cid, rgwName, server.ID)
boolToFloat(rgw.IsConfigured), lgwName, cid, ip, rgwName, server.ID)
ch <- prometheus.MustNewConstMetric(gw.connStart, prometheus.GaugeValue,
float64(rgw.Connection.Start.Unix()), lgwName, cid, rgwName, server.ID)
float64(rgw.Connection.Start.Unix()), lgwName, cid, ip, rgwName, server.ID)
ch <- prometheus.MustNewConstMetric(gw.connLastActivity, prometheus.GaugeValue,
float64(rgw.Connection.LastActivity.Unix()), lgwName, cid, rgwName, server.ID)
float64(rgw.Connection.LastActivity.Unix()), lgwName, cid, ip, rgwName, server.ID)
ch <- prometheus.MustNewConstMetric(gw.connUptime, prometheus.GaugeValue,
uptime.Seconds(), lgwName, cid, rgwName, server.ID)
uptime.Seconds(), lgwName, cid, ip, rgwName, server.ID)
ch <- prometheus.MustNewConstMetric(gw.connIdle, prometheus.GaugeValue,
idle.Seconds(), lgwName, cid, rgwName, server.ID)
idle.Seconds(), lgwName, cid, ip, rgwName, server.ID)
ch <- prometheus.MustNewConstMetric(gw.connRtt, prometheus.GaugeValue,
rtt.Seconds(), lgwName, cid, rgwName, server.ID)
rtt.Seconds(), lgwName, cid, ip, rgwName, server.ID)
ch <- prometheus.MustNewConstMetric(gw.connPendingBytes, prometheus.GaugeValue,
float64(rgw.Connection.Pending), lgwName, cid, rgwName, server.ID)
float64(rgw.Connection.Pending), lgwName, cid, ip, rgwName, server.ID)
ch <- prometheus.MustNewConstMetric(gw.connInMsgs, prometheus.GaugeValue,
float64(rgw.Connection.InMsgs), lgwName, cid, rgwName, server.ID)
float64(rgw.Connection.InMsgs), lgwName, cid, ip, rgwName, server.ID)
ch <- prometheus.MustNewConstMetric(gw.connOutMsgs, prometheus.GaugeValue,
float64(rgw.Connection.OutMsgs), lgwName, cid, rgwName, server.ID)
float64(rgw.Connection.OutMsgs), lgwName, cid, ip, rgwName, server.ID)
ch <- prometheus.MustNewConstMetric(gw.connInBytes, prometheus.GaugeValue,
float64(rgw.Connection.InBytes), lgwName, cid, rgwName, server.ID)
float64(rgw.Connection.InBytes), lgwName, cid, ip, rgwName, server.ID)
ch <- prometheus.MustNewConstMetric(gw.connOutBytes, prometheus.GaugeValue,
float64(rgw.Connection.OutBytes), lgwName, cid, rgwName, server.ID)
float64(rgw.Connection.OutBytes), lgwName, cid, ip, rgwName, server.ID)
ch <- prometheus.MustNewConstMetric(gw.connSubscriptions, prometheus.GaugeValue,
float64(rgw.Connection.NumSubs), lgwName, cid, rgwName, server.ID)
float64(rgw.Connection.NumSubs), lgwName, cid, ip, rgwName, server.ID)
}

// Gatewayz output
Expand All @@ -230,6 +231,7 @@ type ConnInfo struct {
RTT string `json:"rtt,omitempty"`
Uptime string `json:"uptime"`
Idle string `json:"idle"`
IP string `json:"ip"`
Pending int `json:"pending_bytes"`
InMsgs int64 `json:"in_msgs"`
OutMsgs int64 `json:"out_msgs"`
Expand Down