PVs, PVCs and Ingress metrics

Author: aadam19

translator/tocwconfig/sampleConfig/base_container_insights_config.yaml

@@ -123,6 +123,7 @@ exporters:
                 - - ClusterName
               metric_name_selectors:
                 - namespace_number_of_running_pods
+                - namespace_ingress_count
             - dimensions:
                 - - ClusterName
               metric_name_selectors:

translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml

@@ -336,6 +336,28 @@ exporters:
                 - node_diskio_ebs_ec2_instance_performance_exceeded_iops
                 - node_diskio_ebs_ec2_instance_performance_exceeded_tp
                 - node_diskio_ebs_volume_queue_length
+            - dimensions:
+                - - ClusterName
+                - - ClusterName
+                  - Namespace
+                - - ClusterName
+                  - Namespace
+                  - PersistentVolumeClaimName
+              metric_name_selectors:
+                - persistent_volume_claim_status_bound
+                - persistent_volume_claim_status_lost
+                - persistent_volume_claim_status_pending
+                - persistent_volume_claim_count
+            - dimensions:
+                - - ClusterName
+              metric_name_selectors:
+                - persistent_volume_count
+            - dimensions:
+                - - ClusterName
+                - - ClusterName
+                  - Namespace
+              metric_name_selectors:
+                - namespace_ingress_count
         metric_descriptors:
             - metric_name: apiserver_admission_controller_admission_duration_seconds
               overwrite: true

translator/translate/otel/exporter/awsemf/kubernetes.go

@@ -56,6 +56,8 @@ func setKubernetesMetricDeclaration(conf *confmap.Conf, cfg *awsemfexporter.Conf
 
 	kubernetesMetricDeclarations = append(kubernetesMetricDeclarations, getEBSMetricDeclarations(conf)...)
 
+	kubernetesMetricDeclarations = append(kubernetesMetricDeclarations, getVolumesMetricDeclarations(conf)...)
+
 	cfg.MetricDeclarations = kubernetesMetricDeclarations
 	cfg.MetricDescriptors = getControlPlaneMetricDescriptors(conf)
 
@@ -264,6 +266,7 @@ func getNamespaceMetricDeclarations() []*awsemfexporter.MetricDeclaration {
 			Dimensions: [][]string{{"Namespace", "ClusterName"}, {"ClusterName"}},
 			MetricNameSelectors: []string{
 				"namespace_number_of_running_pods",
+				"namespace_ingress_count",
 			},
 		},
 	}
@@ -685,3 +688,33 @@ func getEBSMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.MetricDeclar
 	}
 	return metricDeclarations
 }
+
+func getVolumesMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.MetricDeclaration {
+	var metricDeclarations []*awsemfexporter.MetricDeclaration
+	if awscontainerinsight.EnhancedContainerInsightsEnabled(conf) {
+		metricDeclarations = []*awsemfexporter.MetricDeclaration{
+			{
+				Dimensions: [][]string{
+					{"ClusterName"},
+					{"ClusterName", "Namespace"},
+					{"ClusterName", "Namespace", "PersistentVolumeClaimName"},
+				},
+				MetricNameSelectors: []string{
+					"persistent_volume_claim_status_bound",
+					"persistent_volume_claim_status_lost",
+					"persistent_volume_claim_status_pending",
+					"persistent_volume_claim_count",
+				},
+			},
+			{
+				Dimensions: [][]string{
+					{"ClusterName"},
+				},
+				MetricNameSelectors: []string{
+					"persistent_volume_count",
+				},
+			},
+		}
+	}
+	return metricDeclarations
+}

translator/translate/otel/exporter/awsemf/translator_test.go

@@ -179,7 +179,7 @@ func TestTranslator(t *testing.T) {
 					},
 					{
 						Dimensions:          [][]string{{"Namespace", "ClusterName"}, {"ClusterName"}},
-						MetricNameSelectors: []string{"namespace_number_of_running_pods"},
+						MetricNameSelectors: []string{"namespace_number_of_running_pods", "namespace_ingress_count"},
 					},
 					{
 						Dimensions:          [][]string{{"ClusterName"}},
@@ -248,7 +248,7 @@ func TestTranslator(t *testing.T) {
 					},
 					{
 						Dimensions:          [][]string{{"Namespace", "ClusterName"}, {"ClusterName"}},
-						MetricNameSelectors: []string{"namespace_number_of_running_pods"},
+						MetricNameSelectors: []string{"namespace_number_of_running_pods", "namespace_ingress_count"},
 					},
 					{
 						Dimensions:          [][]string{{"ClusterName"}},
@@ -360,7 +360,7 @@ func TestTranslator(t *testing.T) {
 					},
 					{
 						Dimensions:          [][]string{{"Namespace", "ClusterName"}, {"ClusterName"}},
-						MetricNameSelectors: []string{"namespace_number_of_running_pods"},
+						MetricNameSelectors: []string{"namespace_number_of_running_pods", "namespace_ingress_count"},
 					},
 					{
 						Dimensions:          [][]string{{"ClusterName"}},
@@ -516,6 +516,27 @@ func TestTranslator(t *testing.T) {
 							"node_diskio_ebs_ec2_instance_performance_exceeded_iops", "node_diskio_ebs_ec2_instance_performance_exceeded_tp", "node_diskio_ebs_volume_queue_length",
 						},
 					},
+					{
+						Dimensions: [][]string{
+							{"ClusterName"},
+							{"ClusterName", "Namespace"},
+							{"ClusterName", "Namespace", "PersistentVolumeClaimName"},
+						},
+						MetricNameSelectors: []string{
+							"persistent_volume_claim_status_bound",
+							"persistent_volume_claim_status_lost",
+							"persistent_volume_claim_status_pending",
+							"persistent_volume_claim_count",
+						},
+					},
+					{
+						Dimensions: [][]string{
+							{"ClusterName"},
+						},
+						MetricNameSelectors: []string{
+							"persistent_volume_count",
+						},
+					},
 				},
 				"metric_descriptors": []awsemfexporter.MetricDescriptor{
 					{