sftpConnectionsTotal

mtojek · mtojek · commit 6eb1a95e34d4 · 2023-05-19T12:34:39.000+02:00
diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
@@ -408,7 +408,7 @@ func (s *Server) startPTYSession(session ptySession, m sessionMetricsObject, cmd
 }
 
 func (s *Server) sftpHandler(session ssh.Session) {
-	s.metrics.sftpHandler.Add(1)
+	s.metrics.sftpConnectionsTotal.Add(1)
 
 	ctx := session.Context()
 
diff --git a/agent/agentssh/metrics.go b/agent/agentssh/metrics.go
@@ -10,8 +10,8 @@ type sshServerMetrics struct {
 	failedConnectionsTotal prometheus.Counter
 
 	// SFTP
-	sftpHandler     prometheus.Counter
-	sftpServerError prometheus.Counter
+	sftpConnectionsTotal prometheus.Counter
+	sftpServerError      prometheus.Counter
 
 	// X11
 	x11SocketDirError  prometheus.Counter
@@ -52,10 +52,10 @@ func newSSHServerMetrics(registerer prometheus.Registerer) *sshServerMetrics {
 	})
 	registerer.MustRegister(failedConnectionsTotal)
 
-	sftpHandler := prometheus.NewCounter(prometheus.CounterOpts{
-		Namespace: "agent", Subsystem: "ssh_server", Name: "sftp_handler",
+	sftpConnectionsTotal := prometheus.NewCounter(prometheus.CounterOpts{
+		Namespace: "agent", Subsystem: "ssh_server", Name: "sftp_connections_total",
 	})
-	registerer.MustRegister(sftpHandler)
+	registerer.MustRegister(sftpConnectionsTotal)
 
 	sftpServerError := prometheus.NewCounter(prometheus.CounterOpts{
 		Namespace: "agent", Subsystem: "ssh_server", Name: "sftp_server_error",
@@ -81,7 +81,7 @@ func newSSHServerMetrics(registerer prometheus.Registerer) *sshServerMetrics {
 
 	return &sshServerMetrics{
 		failedConnectionsTotal: failedConnectionsTotal,
-		sftpHandler:            sftpHandler,
+		sftpConnectionsTotal:   sftpConnectionsTotal,
 		sftpServerError:        sftpServerError,
 		x11HostnameError:       x11HostnameError,
 		x11SocketDirError:      x11SocketDirError,

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ func (s *Server) startPTYSession(session ptySession, m sessionMetricsObject, cmd`
`408`	`408`	`}`
`409`	`409`
`410`	`410`	`func (s *Server) sftpHandler(session ssh.Session) {`
`411`		`- s.metrics.sftpHandler.Add(1)`
	`411`	`+ s.metrics.sftpConnectionsTotal.Add(1)`
`412`	`412`
`413`	`413`	`ctx := session.Context()`
`414`	`414`