Skip to content

PVs, PVCs and Ingress metrics #1846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sky333999 merged 1 commit into from
Sep 15, 2025
Merged

PVs, PVCs and Ingress metrics #1846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ exporters:
- - ClusterName
metric_name_selectors:
- namespace_number_of_running_pods
- namespace_ingress_count
- dimensions:
- - ClusterName
metric_name_selectors:
Expand Down Expand Up @@ -336,6 +337,22 @@ 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
metric_descriptors:
- metric_name: apiserver_admission_controller_admission_duration_seconds
overwrite: true
Expand Down
17 changes: 17 additions & 0 deletions translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ exporters:
- - ClusterName
metric_name_selectors:
- namespace_number_of_running_pods
- namespace_ingress_count
- dimensions:
- - ClusterName
metric_name_selectors:
Expand Down Expand Up @@ -639,6 +640,22 @@ 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
metric_descriptors:
- metric_name: apiserver_admission_controller_admission_duration_seconds
overwrite: true
Expand Down
17 changes: 17 additions & 0 deletions translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_kueue_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ exporters:
- - ClusterName
metric_name_selectors:
- namespace_number_of_running_pods
- namespace_ingress_count
- dimensions:
- - ClusterName
metric_name_selectors:
Expand Down Expand Up @@ -336,6 +337,22 @@ 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
metric_descriptors:
- metric_name: apiserver_admission_controller_admission_duration_seconds
overwrite: true
Expand Down
17 changes: 17 additions & 0 deletions translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ exporters:
- - ClusterName
metric_name_selectors:
- namespace_number_of_running_pods
- namespace_ingress_count
- dimensions:
- - ClusterName
metric_name_selectors:
Expand Down Expand Up @@ -298,6 +299,22 @@ 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
metric_descriptors:
- metric_name: apiserver_admission_controller_admission_duration_seconds
overwrite: true
Expand Down
17 changes: 17 additions & 0 deletions translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ exporters:
- - ClusterName
metric_name_selectors:
- namespace_number_of_running_pods
- namespace_ingress_count
- dimensions:
- - ClusterName
metric_name_selectors:
Expand Down Expand Up @@ -334,6 +335,22 @@ 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
metric_descriptors:
- metric_name: apiserver_admission_controller_admission_duration_seconds
overwrite: true
Expand Down
17 changes: 17 additions & 0 deletions translator/tocwconfig/sampleConfig/prometheus_and_kubernetes_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ exporters:
- - ClusterName
metric_name_selectors:
- namespace_number_of_running_pods
- namespace_ingress_count
- dimensions:
- - ClusterName
metric_name_selectors:
Expand Down Expand Up @@ -298,6 +299,22 @@ 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
metric_descriptors:
- metric_name: apiserver_admission_controller_admission_duration_seconds
overwrite: true
Expand Down
49 changes: 43 additions & 6 deletions translator/translate/otel/exporter/awsemf/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func setKubernetesMetricDeclaration(conf *confmap.Conf, cfg *awsemfexporter.Conf
kubernetesMetricDeclarations = append(kubernetesMetricDeclarations, getDaemonSetMetricDeclarations(conf)...)

// Setup namespace metrics
kubernetesMetricDeclarations = append(kubernetesMetricDeclarations, getNamespaceMetricDeclarations()...)
kubernetesMetricDeclarations = append(kubernetesMetricDeclarations, getNamespaceMetricDeclarations(conf)...)

// Setup cluster metrics
kubernetesMetricDeclarations = append(kubernetesMetricDeclarations, getClusterMetricDeclarations(conf)...)
Expand All @@ -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)

Expand Down Expand Up @@ -258,13 +260,18 @@ func getDaemonSetMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.Metric
return daemonSetMetricDeclarations
}

func getNamespaceMetricDeclarations() []*awsemfexporter.MetricDeclaration {
func getNamespaceMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.MetricDeclaration {
metricNameSelectors := []string{"namespace_number_of_running_pods"}

enhancedContainerInsightsEnabled := awscontainerinsight.EnhancedContainerInsightsEnabled(conf)
if enhancedContainerInsightsEnabled {
metricNameSelectors = append(metricNameSelectors, "namespace_ingress_count")
}

return []*awsemfexporter.MetricDeclaration{
{
Dimensions: [][]string{{"Namespace", "ClusterName"}, {"ClusterName"}},
MetricNameSelectors: []string{
"namespace_number_of_running_pods",
},
Dimensions: [][]string{{"Namespace", "ClusterName"}, {"ClusterName"}},
MetricNameSelectors: metricNameSelectors,
},
}
}
Expand Down Expand Up @@ -685,3 +692,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
}
23 changes: 22 additions & 1 deletion translator/translate/otel/exporter/awsemf/translator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}},
Expand Down Expand Up @@ -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{
{
Expand Down
Loading