Added metric for config server requests and updated libraries.

Author: Janos Pasztor

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 0.9.5: Security configuration
 
-This release adds support for the new [security library](https://github.com/containerssh/security).
+This release adds support for the new [security library](https://github.com/containerssh/security). It also adds a metric for config server requests and updates several libraries to their latest versions.
 
 ## 0.9.4: New docker and kubernetes backends
 

client_factory.go

@@ -6,6 +6,9 @@ import (
 	"github.com/containerssh/metrics"
 )
 
+// MetricNameConfigBackendRequests is the number of requests to the config server
+const MetricNameConfigBackendRequests = "containerssh_config_server_requests"
+
 // MetricNameConfigBackendFailure is the number of request failures to the configuration backend.
 const MetricNameConfigBackendFailure = "containerssh_config_server_failures"
 
@@ -23,17 +26,20 @@ func NewClient(
 			return nil, err
 		}
 	}
-	backendFailureMetric, err := metricsCollector.CreateCounter(
+	backendRequestsMetric := metricsCollector.MustCreateCounter(
+		MetricNameConfigBackendRequests,
+		"requests",
+		"The number of requests sent to the configuration server.",
+	)
+	backendFailureMetric := metricsCollector.MustCreateCounter(
 		MetricNameConfigBackendFailure,
-		"",
-		"The number of request failures to the configuration backend.",
+		"requests",
+		"The number of request failures to the configuration server.",
 	)
-	if err != nil {
-		return nil, err
-	}
 	return &client{
-		httpClient:           httpClient,
-		logger:               logger,
-		backendFailureMetric: backendFailureMetric,
+		httpClient:            httpClient,
+		logger:                logger,
+		backendRequestsMetric: backendRequestsMetric,
+		backendFailureMetric:  backendFailureMetric,
 	}, nil
 }

client_impl.go

@@ -14,9 +14,10 @@ import (
 )
 
 type client struct {
-	httpClient           http.Client
-	logger               log.Logger
-	backendFailureMetric metrics.SimpleCounter
+	httpClient            http.Client
+	logger                log.Logger
+	backendRequestsMetric metrics.SimpleCounter
+	backendFailureMetric  metrics.SimpleCounter
 }
 
 func (c *client) Get(
@@ -34,6 +35,7 @@ func (c *client) Get(
 loop:
 	for {
 		lastLabels = []metrics.MetricLabel{}
+		c.backendRequestsMetric.Increment()
 		statusCode, err := c.httpClient.Post("", &request, &response)
 		lastError = err
 		if err != nil {

go.mod

@@ -5,12 +5,12 @@ go 1.14
 require (
 	github.com/containerssh/auditlog v0.9.5
 	github.com/containerssh/auth v0.9.3
-	github.com/containerssh/docker v0.9.3
+	github.com/containerssh/docker v0.9.5
 	github.com/containerssh/geoip v0.9.3
 	github.com/containerssh/http v0.9.4
-	github.com/containerssh/kubernetes v0.9.1
+	github.com/containerssh/kubernetes v0.9.2
 	github.com/containerssh/log v0.9.7
-	github.com/containerssh/metrics v0.9.3
+	github.com/containerssh/metrics v0.9.5
 	github.com/containerssh/security v0.9.0
 	github.com/containerssh/service v0.9.0
 	github.com/containerssh/sshserver v0.9.14