add status_replicas_available/unavailable metrics for kubernetes (aws…

…#375)
sethAmazon · Aug 9, 2023 · a52e5af · a52e5af
1 parent 0354092
commit a52e5af
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 33 deletions.
diff --git a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml
@@ -115,22 +115,20 @@ exporters:
         label_matchers: [ ]
         metric_name_selectors:
           - service_number_of_running_pods
-      # deployment metrics
+      # deployment/stateful set/replica set metrics
       - dimensions: [ [ ClusterName, Namespace, PodName ], [ ClusterName ] ]
         label_matchers: [ ]
         metric_name_selectors:
-          - deployment_spec_replicas
-          - deployment_status_replicas
-          - deployment_status_replicas_available
-          - deployment_status_replicas_unavailable
-      # daemonset metrics
+          - replicas_desired
+          - replicas_ready
+          - status_replicas_available
+          - status_replicas_unavailable
+      # daemon set metrics
       - dimensions: [ [ ClusterName, Namespace, PodName ], [ ClusterName ] ]
         label_matchers: [ ]
         metric_name_selectors:
           - daemonset_status_number_available
           - daemonset_status_number_unavailable
-          - daemonset_status_desired_number_scheduled
-          - daemonset_status_current_number_scheduled
       # namespace metrics
       - dimensions: [ [ ClusterName, Namespace ], [ ClusterName ] ]
         label_matchers: [ ]

diff --git a/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml b/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml
@@ -87,22 +87,20 @@ exporters:
         label_matchers: [ ]
         metric_name_selectors:
           - service_number_of_running_pods
-      # deployment metrics
+      # deployment/stateful set/replica set metrics
       - dimensions: [ [ ClusterName, Namespace, PodName ], [ ClusterName ] ]
         label_matchers: [ ]
         metric_name_selectors:
-          - deployment_spec_replicas
-          - deployment_status_replicas
-          - deployment_status_replicas_available
-          - deployment_status_replicas_unavailable
-      # daemonset metrics
+          - replicas_desired
+          - replicas_ready
+          - status_replicas_available
+          - status_replicas_unavailable
+      # daemon set metrics
       - dimensions: [ [ ClusterName, Namespace, PodName ], [ ClusterName ] ]
         label_matchers: [ ]
         metric_name_selectors:
           - daemonset_status_number_available
           - daemonset_status_number_unavailable
-          - daemonset_status_desired_number_scheduled
-          - daemonset_status_current_number_scheduled
       # namespace metrics
       - dimensions: [ [ ClusterName, Namespace ], [ ClusterName ] ]
         label_matchers: [ ]

diff --git a/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml b/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml
@@ -115,22 +115,20 @@ exporters:
         label_matchers: [ ]
         metric_name_selectors:
           - service_number_of_running_pods
-      # deployment metrics
+      # deployment/stateful set/replica set metrics
       - dimensions: [ [ ClusterName, Namespace, PodName ], [ ClusterName ] ]
         label_matchers: [ ]
         metric_name_selectors:
-          - deployment_spec_replicas
-          - deployment_status_replicas
-          - deployment_status_replicas_available
-          - deployment_status_replicas_unavailable
+          - replicas_desired
+          - replicas_ready
+          - status_replicas_available
+          - status_replicas_unavailable
       # daemon set metrics
       - dimensions: [ [ ClusterName, Namespace, PodName ], [ ClusterName ] ]
         label_matchers: [ ]
         metric_name_selectors:
           - daemonset_status_number_available
           - daemonset_status_number_unavailable
-          - daemonset_status_desired_number_scheduled
-          - daemonset_status_current_number_scheduled
       # namespace metrics
       - dimensions: [ [ ClusterName, Namespace ], [ ClusterName ] ]
         label_matchers: [ ]

diff --git a/translator/translate/otel/exporter/awsemf/kubernetes.go b/translator/translate/otel/exporter/awsemf/kubernetes.go
@@ -188,7 +188,7 @@ func getDeploymentMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.Metri
 			{
 				Dimensions: [][]string{{"PodName", "Namespace", "ClusterName"}, {"ClusterName"}},
 				MetricNameSelectors: []string{
-					"deployment_spec_replicas", "deployment_status_replicas", "deployment_status_replicas_available", "deployment_status_replicas_unavailable",
+					"replicas_desired", "replicas_ready", "status_replicas_available", "status_replicas_unavailable",
 				},
 			},
 		}...)
@@ -205,7 +205,6 @@ func getDaemonSetMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.Metric
 				Dimensions: [][]string{{"PodName", "Namespace", "ClusterName"}, {"ClusterName"}},
 				MetricNameSelectors: []string{
 					"daemonset_status_number_available", "daemonset_status_number_unavailable",
-					"daemonset_status_desired_number_scheduled", "daemonset_status_current_number_scheduled",
 				},
 			},
 		}...)

diff --git a/translator/translate/otel/exporter/awsemf/translator_test.go b/translator/translate/otel/exporter/awsemf/translator_test.go
@@ -301,12 +301,11 @@ func TestTranslator(t *testing.T) {
 					},
 					{
 						Dimensions:          [][]string{{"PodName", "Namespace", "ClusterName"}, {"ClusterName"}},
-						MetricNameSelectors: []string{"deployment_spec_replicas", "deployment_status_replicas", "deployment_status_replicas_available", "deployment_status_replicas_unavailable"},
+						MetricNameSelectors: []string{"replicas_desired", "replicas_ready", "status_replicas_available", "status_replicas_unavailable"},
 					},
 					{
-						Dimensions: [][]string{{"PodName", "Namespace", "ClusterName"}, {"ClusterName"}},
-						MetricNameSelectors: []string{"daemonset_status_number_available", "daemonset_status_number_unavailable",
-							"daemonset_status_desired_number_scheduled", "daemonset_status_current_number_scheduled"},
+						Dimensions:          [][]string{{"PodName", "Namespace", "ClusterName"}, {"ClusterName"}},
+						MetricNameSelectors: []string{"daemonset_status_number_available", "daemonset_status_number_unavailable"},
 					},
 					{
 						Dimensions:          [][]string{{"Namespace", "ClusterName"}, {"ClusterName"}},
@@ -398,12 +397,11 @@ func TestTranslator(t *testing.T) {
 					},
 					{
 						Dimensions:          [][]string{{"PodName", "Namespace", "ClusterName"}, {"ClusterName"}},
-						MetricNameSelectors: []string{"deployment_spec_replicas", "deployment_status_replicas", "deployment_status_replicas_available", "deployment_status_replicas_unavailable"},
+						MetricNameSelectors: []string{"replicas_desired", "replicas_ready", "status_replicas_available", "status_replicas_unavailable"},
 					},
 					{
-						Dimensions: [][]string{{"PodName", "Namespace", "ClusterName"}, {"ClusterName"}},
-						MetricNameSelectors: []string{"daemonset_status_number_available", "daemonset_status_number_unavailable",
-							"daemonset_status_desired_number_scheduled", "daemonset_status_current_number_scheduled"},
+						Dimensions:          [][]string{{"PodName", "Namespace", "ClusterName"}, {"ClusterName"}},
+						MetricNameSelectors: []string{"daemonset_status_number_available", "daemonset_status_number_unavailable"},
 					},
 					{
 						Dimensions:          [][]string{{"Namespace", "ClusterName"}, {"ClusterName"}},