Add metrics for ec2 api calls made by CNI and expose via prometheus

aws · Nov 17, 2022 · 4525da0 · 4525da0
1 parent f8bc3b8
commit 4525da0
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 0 deletions.
diff --git a/cmd/cni-metrics-helper/metrics/cni_metrics.go b/cmd/cni-metrics-helper/metrics/cni_metrics.go
@@ -147,6 +147,20 @@ var InterestingCNIMetrics = map[string]metricsConvert{
 				actionFunc: metricsAdd,
 				data:       &dataPoints{},
 				logToFile:  true}}},
+	"awscni_ec2api_req_count": {
+		actions: []metricsAction{
+			{cwMetricName: "ec2ApiReqCount",
+				matchFunc:  matchAny,
+				actionFunc: metricsAdd,
+				data:       &dataPoints{},
+				logToFile:  true}}},
+	"awscni_ec2api_error_count": {
+		actions: []metricsAction{
+			{cwMetricName: "ec2ApiErrCount",
+				matchFunc:  matchAny,
+				actionFunc: metricsAdd,
+				data:       &dataPoints{},
+				logToFile:  true}}},
 }
 
 // CNIMetricsTarget defines data structure for kube-state-metric target

diff --git a/cmd/cni-metrics-helper/metrics/cni_test1.data b/cmd/cni-metrics-helper/metrics/cni_test1.data
@@ -7,6 +7,16 @@ awscni_assigned_ip_addresses 1
 # HELP awscni_aws_api_error_count The number of times AWS API returns an error
 # TYPE awscni_aws_api_error_count counter
 awscni_aws_api_error_count{api="DeleteNetworkInterface",error="InvalidParameterValue"} 14
+# HELP awscni_ec2api_req_count The number of requests made to EC2 APIs by CNI
+# TYPE awscni_ec2api_req_count counter
+awscni_ec2api_req_count{fn="AssignPrivateIpAddresses"} 1
+awscni_ec2api_req_count{fn="AttachNetworkInterface"} 1
+awscni_ec2api_req_count{fn="CreateNetworkInterface"} 1
+awscni_ec2api_req_count{fn="DeleteNetworkInterface"} 1
+awscni_ec2api_req_count{fn="DescribeInstances"} 1
+awscni_ec2api_req_count{fn="DescribeNetworkInterfaces"} 13
+awscni_ec2api_req_count{fn="DetachNetworkInterface"} 1
+awscni_ec2api_req_count{fn="ModifyNetworkInterfaceAttribute"} 2
 # HELP awscni_aws_api_latency_ms AWS API call latency in ms
 # TYPE awscni_aws_api_latency_ms summary
 awscni_aws_api_latency_ms{api="AssignPrivateIpAddresses",error="false",quantile="0.5"} NaN

diff --git a/cmd/cni-metrics-helper/metrics/metrics_test.go b/cmd/cni-metrics-helper/metrics/metrics_test.go
@@ -72,6 +72,14 @@ func TestAPIServerMetric(t *testing.T) {
 	// verify awscni_assigned_ip_addresses value
 	assert.Equal(t, 1.0, actions[0].data.curSingleDataPoint)
 
+	// verify awscni_ec2api_req_count value
+	actions = InterestingCNIMetrics["awscni_ec2api_req_count"].actions
+	assert.Equal(t, 21.0, actions[0].data.curSingleDataPoint)
+
+	// verify awscni_ec2api_error_count value
+	actions = InterestingCNIMetrics["awscni_ec2api_error_count"].actions
+	assert.Equal(t, 0.0, actions[0].data.curSingleDataPoint)
+
 	actions = InterestingCNIMetrics["awscni_total_ip_addresses"].actions
 	// verify awscni_total_ip_addresses value
 	assert.Equal(t, 10.0, actions[0].data.curSingleDataPoint)