Merge pull request #48106 from timstclair/audit-metrics

Automatic merge from submit-queue (batch tested with PRs 48106, 46761) s/count/total/ in audit prometheus metrics Responding to https://github.com/kubernetes/kubernetes/pull/46732#discussion_r124057806, making the metric names conform with the [metric naming convention](https://prometheus.io/docs/practices/naming/#metric-names). kubernetes/features#22 /cc @ericchiang @ihmccreery

Merge pull request #48106 from timstclair/audit-metrics
fd884b7e · Kubernetes Submit Queue · GitHub · a7f16b55 · b34d6ab8 · fd884b7e
Commit fd884b7e authored Jun 27, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 27, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

metrics.go staging/src/k8s.io/apiserver/pkg/audit/metrics.go +3 -3

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/audit/metrics.go
+++ b/staging/src/k8s.io/apiserver/pkg/audit/metrics.go
@@ -32,13 +32,13 @@ var (
 	eventCounter = prometheus.NewCounter(
 		prometheus.CounterOpts{
 			Subsystem: subsystem,
-			Name:      "event_count",
+			Name:      "event_total",
 			Help:      "Counter of audit events generated and sent to the audit backend.",
 		})
 	errorCounter = prometheus.NewCounterVec(
 		prometheus.CounterOpts{
 			Subsystem: subsystem,
-			Name:      "error_count",
+			Name:      "error_total",
 			Help: "Counter of audit events that failed to be audited properly. " +
 				"Plugin identifies the plugin affected by the error.",
 		},
@@ -47,7 +47,7 @@ var (
 	levelCounter = prometheus.NewCounterVec(
 		prometheus.CounterOpts{
 			Subsystem: subsystem,
-			Name:      "level_count",
+			Name:      "level_total",
 			Help:      "Counter of policy levels for audit events (1 per request).",
 		},
 		[]string{"level"},