Merge pull request #4817 from hashicorp/b-vault-client-tweaks

Vault API Client Tweaks

client/vaultclient/vaultclient.go

@@ -4,10 +4,12 @@ import (
 	"container/heap"
 	"fmt"
 	"math/rand"
+	"net/http"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/armon/go-metrics"
 	hclog "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/nomad/nomad/structs"
 	"github.com/hashicorp/nomad/nomad/structs/config"
@@ -157,6 +159,10 @@ func NewVaultClient(config *config.VaultConfig, logger hclog.Logger, tokenDerive
 		return nil, err
 	}
 
+	client.SetHeaders(http.Header{
+		"User-Agent": []string{"hashicorp/nomad"},
+	})
+
 	c.client = client
 
 	return c, nil
@@ -298,6 +304,7 @@ func (c *vaultClient) RenewToken(token string, increment int) (<-chan error, err
 	// error channel.
 	if err := c.renew(renewalReq); err != nil {
 		c.logger.Error("error during renewal of token", "error", err)
+		metrics.IncrCounter([]string{"client", "vault", "renew_token_failure"}, 1)
 		return nil, err
 	}
 
@@ -335,6 +342,7 @@ func (c *vaultClient) RenewLease(leaseId string, increment int) (<-chan error, e
 	// Renew the secret and send any error to the dedicated error channel
 	if err := c.renew(renewalReq); err != nil {
 		c.logger.Error("error during renewal of lease", "error", err)
+		metrics.IncrCounter([]string{"client", "vault", "renew_lease_error"}, 1)
 		return nil, err
 	}
 
@@ -531,6 +539,7 @@ func (c *vaultClient) run() {
 		case <-renewalCh:
 			if err := c.renew(renewalReq); err != nil {
 				c.logger.Error("error renewing token", "error", err)
+				metrics.IncrCounter([]string{"client", "vault", "renew_token_error"}, 1)
 			}
 		case <-c.updateCh:
 			continue

nomad/server.go

@@ -1433,6 +1433,7 @@ func (s *Server) Stats() map[string]map[string]string {
 		"raft":    s.raft.Stats(),
 		"serf":    s.serf.Stats(),
 		"runtime": stats.RuntimeStats(),
+		"vault":   s.vault.Stats(),
 	}
 
 	return stats