sftpServerErrors

mtojek · mtojek · commit 962045271807 · 2023-05-19T12:56:44.000+02:00
diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
@@ -447,7 +447,7 @@ func (s *Server) sftpHandler(session ssh.Session) {
 		return
 	}
 	s.logger.Warn(ctx, "sftp server closed with error", slog.Error(err))
-	s.metrics.sftpServerError.Add(1)
+	s.metrics.sftpServerErrors.Add(1)
 	_ = session.Exit(1)
 }
 
diff --git a/agent/agentssh/metrics.go b/agent/agentssh/metrics.go
@@ -11,7 +11,7 @@ type sshServerMetrics struct {
 
 	// SFTP
 	sftpConnectionsTotal prometheus.Counter
-	sftpServerError      prometheus.Counter
+	sftpServerErrors     prometheus.Counter
 
 	// X11
 	x11SocketDirError  prometheus.Counter
@@ -56,10 +56,10 @@ func newSSHServerMetrics(registerer prometheus.Registerer) *sshServerMetrics {
 	})
 	registerer.MustRegister(sftpConnectionsTotal)
 
-	sftpServerError := prometheus.NewCounter(prometheus.CounterOpts{
-		Namespace: "agent", Subsystem: "ssh_server", Name: "sftp_server_error",
+	sftpServerErrors := prometheus.NewCounter(prometheus.CounterOpts{
+		Namespace: "agent", Subsystem: "ssh_server", Name: "sftp_server_errors_total",
 	})
-	registerer.MustRegister(sftpServerError)
+	registerer.MustRegister(sftpServerErrors)
 
 	x11HostnameError := prometheus.NewCounter(prometheus.CounterOpts{
 		Namespace: "agent", Subsystem: "ssh_server", Name: "x11_hostname_error",
@@ -81,7 +81,7 @@ func newSSHServerMetrics(registerer prometheus.Registerer) *sshServerMetrics {
 	return &sshServerMetrics{
 		failedConnectionsTotal: failedConnectionsTotal,
 		sftpConnectionsTotal:   sftpConnectionsTotal,
-		sftpServerError:        sftpServerError,
+		sftpServerErrors:       sftpServerErrors,
 		x11HostnameError:       x11HostnameError,
 		x11SocketDirError:      x11SocketDirError,
 		x11XauthorityError:     x11XauthorityError,

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ func (s *Server) sftpHandler(session ssh.Session) {`
`447`	`447`	`return`
`448`	`448`	`}`
`449`	`449`	`s.logger.Warn(ctx, "sftp server closed with error", slog.Error(err))`
`450`		`- s.metrics.sftpServerError.Add(1)`
	`450`	`+ s.metrics.sftpServerErrors.Add(1)`
`451`	`451`	`_ = session.Exit(1)`
`452`	`452`	`}`
`453`	`453`