From be2f63d3a5f551b61c899c30d2c80275758ae3c8 Mon Sep 17 00:00:00 2001
From: Isaac Diamond <idiamond@stripe.com>
Date: Fri, 6 Jul 2018 20:55:56 -0700
Subject: [PATCH] Rename prometheus metrics to use more standard naming
 conventions

---
 pkg/aws/metadata/metrics.go | 10 +++++-----
 pkg/aws/sts/metrics.go      | 10 +++++-----
 pkg/k8s/metrics.go          |  2 +-
 pkg/server/metrics.go       |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkg/aws/metadata/metrics.go b/pkg/aws/metadata/metrics.go
index 6b44b4fe..d7425a13 100644
--- a/pkg/aws/metadata/metrics.go
+++ b/pkg/aws/metadata/metrics.go
@@ -9,7 +9,7 @@ var (
 		prometheus.HistogramOpts{
 			Namespace: "kiam",
 			Subsystem: "metadata",
-			Name:      "handlerTiming",
+			Name:      "handler_latency_milliseconds",
 			Help:      "Bucketed histogram of handler timings",
 
 			// 1ms to 5min
@@ -22,7 +22,7 @@ var (
 		prometheus.CounterOpts{
 			Namespace: "kiam",
 			Subsystem: "metadata",
-			Name:      "findRoleErrorCount",
+			Name:      "find_role_error_total",
 			Help:      "Number of errors finding the role for a pod",
 		},
 		[]string{"handler"},
@@ -32,7 +32,7 @@ var (
 		prometheus.CounterOpts{
 			Namespace: "kiam",
 			Subsystem: "metadata",
-			Name:      "emptyRoleCount",
+			Name:      "empty_role_total",
 			Help:      "Number of empty roles returned",
 		},
 		[]string{"handler"},
@@ -42,7 +42,7 @@ var (
 		prometheus.CounterOpts{
 			Namespace: "kiam",
 			Subsystem: "metadata",
-			Name:      "successCount",
+			Name:      "success_total",
 			Help:      "Number of successful responses from a handler",
 		},
 		[]string{"handler"},
@@ -52,7 +52,7 @@ var (
 		prometheus.CounterOpts{
 			Namespace: "kiam",
 			Subsystem: "metadata",
-			Name:      "responsesCount",
+			Name:      "responses_total",
 			Help:      "Responses from mocked out metadata handlers",
 		},
 		[]string{"handler", "code"},
diff --git a/pkg/aws/sts/metrics.go b/pkg/aws/sts/metrics.go
index 2ec939de..8d165b81 100644
--- a/pkg/aws/sts/metrics.go
+++ b/pkg/aws/sts/metrics.go
@@ -7,7 +7,7 @@ var (
 		prometheus.CounterOpts{
 			Namespace: "kiam",
 			Subsystem: "sts",
-			Name:      "cacheHitCount",
+			Name:      "cache_hit_total",
 			Help:      "Number of cache hits to the metadata cache",
 		},
 	)
@@ -16,7 +16,7 @@ var (
 		prometheus.CounterOpts{
 			Namespace: "kiam",
 			Subsystem: "sts",
-			Name:      "cacheMissCount",
+			Name:      "cache_miss_total",
 			Help:      "Number of cache misses to the metadata cache",
 		},
 	)
@@ -25,7 +25,7 @@ var (
 		prometheus.CounterOpts{
 			Namespace: "kiam",
 			Subsystem: "sts",
-			Name:      "errorIssuingCount",
+			Name:      "error_issuing_count",
 			Help:      "Number of errors issuing credentials",
 		},
 	)
@@ -34,7 +34,7 @@ var (
 		prometheus.HistogramOpts{
 			Namespace: "kiam",
 			Subsystem: "sts",
-			Name:      "assumeRoleTiming",
+			Name:      "assumerole_timing_milliseconds",
 			Help:      "Bucketed histogram of assumeRole timings",
 
 			// 1ms to 5min
@@ -46,7 +46,7 @@ var (
 		prometheus.GaugeOpts{
 			Namespace: "kiam",
 			Subsystem: "sts",
-			Name:      "assumeRoleExecutingCount",
+			Name:      "assume_role_executing_total",
 			Help:      "Number of assume role calls currently executing",
 		},
 	)
diff --git a/pkg/k8s/metrics.go b/pkg/k8s/metrics.go
index fd817432..1223f1a2 100644
--- a/pkg/k8s/metrics.go
+++ b/pkg/k8s/metrics.go
@@ -9,7 +9,7 @@ var (
 		prometheus.CounterOpts{
 			Namespace: "kiam",
 			Subsystem: "k8s",
-			Name:      "droppedPods",
+			Name:      "dropped_pods_total",
 			Help:      "Dropped pods because of full cache",
 		},
 	)
diff --git a/pkg/server/metrics.go b/pkg/server/metrics.go
index d9c707cb..4643989e 100644
--- a/pkg/server/metrics.go
+++ b/pkg/server/metrics.go
@@ -9,7 +9,7 @@ var (
 		prometheus.HistogramOpts{
 			Namespace: "kiam",
 			Subsystem: "server",
-			Name:      "rpcTiming",
+			Name:      "rpc_timing_milliseconds",
 			Help:      "Bucketed histogram of rpc call timings",
 
 			// 1ms to 5min