From c9d5a648338b47aee12904e27f53bed2137c1a42 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Wed, 26 May 2021 12:33:00 +0200 Subject: [PATCH 1/4] jsonnet: convert string of deprecated metrics into array --- ...g-deprecated-metrics-relabelings.libsonnet | 91 ++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet b/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet index d83368cf..58bee14c 100644 --- a/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet +++ b/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet @@ -44,7 +44,96 @@ // Drop all other metrics which are deprecated in kubernetes. { sourceLabels: ['__name__'], - regex: '(admission_quota_controller_adds|crd_autoregistration_controller_work_duration|APIServiceOpenAPIAggregationControllerQueue1_adds|AvailableConditionController_retries|crd_openapi_controller_unfinished_work_seconds|APIServiceRegistrationController_retries|admission_quota_controller_longest_running_processor_microseconds|crdEstablishing_longest_running_processor_microseconds|crdEstablishing_unfinished_work_seconds|crd_openapi_controller_adds|crd_autoregistration_controller_retries|crd_finalizer_queue_latency|AvailableConditionController_work_duration|non_structural_schema_condition_controller_depth|crd_autoregistration_controller_unfinished_work_seconds|AvailableConditionController_adds|DiscoveryController_longest_running_processor_microseconds|autoregister_queue_latency|crd_autoregistration_controller_adds|non_structural_schema_condition_controller_work_duration|APIServiceRegistrationController_adds|crd_finalizer_work_duration|crd_naming_condition_controller_unfinished_work_seconds|crd_openapi_controller_longest_running_processor_microseconds|DiscoveryController_adds|crd_autoregistration_controller_longest_running_processor_microseconds|autoregister_unfinished_work_seconds|crd_naming_condition_controller_queue_latency|crd_naming_condition_controller_retries|non_structural_schema_condition_controller_queue_latency|crd_naming_condition_controller_depth|AvailableConditionController_longest_running_processor_microseconds|crdEstablishing_depth|crd_finalizer_longest_running_processor_microseconds|crd_naming_condition_controller_adds|APIServiceOpenAPIAggregationControllerQueue1_longest_running_processor_microseconds|DiscoveryController_queue_latency|DiscoveryController_unfinished_work_seconds|crd_openapi_controller_depth|APIServiceOpenAPIAggregationControllerQueue1_queue_latency|APIServiceOpenAPIAggregationControllerQueue1_unfinished_work_seconds|DiscoveryController_work_duration|autoregister_adds|crd_autoregistration_controller_queue_latency|crd_finalizer_retries|AvailableConditionController_unfinished_work_seconds|autoregister_longest_running_processor_microseconds|non_structural_schema_condition_controller_unfinished_work_seconds|APIServiceOpenAPIAggregationControllerQueue1_depth|AvailableConditionController_depth|DiscoveryController_retries|admission_quota_controller_depth|crdEstablishing_adds|APIServiceOpenAPIAggregationControllerQueue1_retries|crdEstablishing_queue_latency|non_structural_schema_condition_controller_longest_running_processor_microseconds|autoregister_work_duration|crd_openapi_controller_retries|APIServiceRegistrationController_work_duration|crdEstablishing_work_duration|crd_finalizer_adds|crd_finalizer_depth|crd_openapi_controller_queue_latency|APIServiceOpenAPIAggregationControllerQueue1_work_duration|APIServiceRegistrationController_queue_latency|crd_autoregistration_controller_depth|AvailableConditionController_queue_latency|admission_quota_controller_queue_latency|crd_naming_condition_controller_work_duration|crd_openapi_controller_work_duration|DiscoveryController_depth|crd_naming_condition_controller_longest_running_processor_microseconds|APIServiceRegistrationController_depth|APIServiceRegistrationController_longest_running_processor_microseconds|crd_finalizer_unfinished_work_seconds|crdEstablishing_retries|admission_quota_controller_unfinished_work_seconds|non_structural_schema_condition_controller_adds|APIServiceRegistrationController_unfinished_work_seconds|admission_quota_controller_work_duration|autoregister_depth|autoregister_retries|kubeproxy_sync_proxy_rules_latency_microseconds|rest_client_request_latency_seconds|non_structural_schema_condition_controller_retries)', + regex: '(' + std.join('|', + [ + 'admission_quota_controller_adds', + 'crd_autoregistration_controller_work_duration', + 'APIServiceOpenAPIAggregationControllerQueue1_adds', + 'AvailableConditionController_retries', + 'crd_openapi_controller_unfinished_work_seconds', + 'APIServiceRegistrationController_retries', + 'admission_quota_controller_longest_running_processor_microseconds', + 'crdEstablishing_longest_running_processor_microseconds', + 'crdEstablishing_unfinished_work_seconds', + 'crd_openapi_controller_adds', + 'crd_autoregistration_controller_retries', + 'crd_finalizer_queue_latency', + 'AvailableConditionController_work_duration', + 'non_structural_schema_condition_controller_depth', + 'crd_autoregistration_controller_unfinished_work_seconds', + 'AvailableConditionController_adds', + 'DiscoveryController_longest_running_processor_microseconds', + 'autoregister_queue_latency', + 'crd_autoregistration_controller_adds', + 'non_structural_schema_condition_controller_work_duration', + 'APIServiceRegistrationController_adds', + 'crd_finalizer_work_duration', + 'crd_naming_condition_controller_unfinished_work_seconds', + 'crd_openapi_controller_longest_running_processor_microseconds', + 'DiscoveryController_adds', + 'crd_autoregistration_controller_longest_running_processor_microseconds', + 'autoregister_unfinished_work_seconds', + 'crd_naming_condition_controller_queue_latency', + 'crd_naming_condition_controller_retries', + 'non_structural_schema_condition_controller_queue_latency', + 'crd_naming_condition_controller_depth', + 'AvailableConditionController_longest_running_processor_microseconds', + 'crdEstablishing_depth', + 'crd_finalizer_longest_running_processor_microseconds', + 'crd_naming_condition_controller_adds', + 'APIServiceOpenAPIAggregationControllerQueue1_longest_running_processor_microseconds', + 'DiscoveryController_queue_latency', + 'DiscoveryController_unfinished_work_seconds', + 'crd_openapi_controller_depth', + 'APIServiceOpenAPIAggregationControllerQueue1_queue_latency', + 'APIServiceOpenAPIAggregationControllerQueue1_unfinished_work_seconds', + 'DiscoveryController_work_duration', + 'autoregister_adds', + 'crd_autoregistration_controller_queue_latency', + 'crd_finalizer_retries', + 'AvailableConditionController_unfinished_work_seconds', + 'autoregister_longest_running_processor_microseconds', + 'non_structural_schema_condition_controller_unfinished_work_seconds', + 'APIServiceOpenAPIAggregationControllerQueue1_depth', + 'AvailableConditionController_depth', + 'DiscoveryController_retries', + 'admission_quota_controller_depth', + 'crdEstablishing_adds', + 'APIServiceOpenAPIAggregationControllerQueue1_retries', + 'crdEstablishing_queue_latency', + 'non_structural_schema_condition_controller_longest_running_processor_microseconds', + 'autoregister_work_duration', + 'crd_openapi_controller_retries', + 'APIServiceRegistrationController_work_duration', + 'crdEstablishing_work_duration', + 'crd_finalizer_adds', + 'crd_finalizer_depth', + 'crd_openapi_controller_queue_latency', + 'APIServiceOpenAPIAggregationControllerQueue1_work_duration', + 'APIServiceRegistrationController_queue_latency', + 'crd_autoregistration_controller_depth', + 'AvailableConditionController_queue_latency', + 'admission_quota_controller_queue_latency', + 'crd_naming_condition_controller_work_duration', + 'crd_openapi_controller_work_duration', + 'DiscoveryController_depth', + 'crd_naming_condition_controller_longest_running_processor_microseconds', + 'APIServiceRegistrationController_depth', + 'APIServiceRegistrationController_longest_running_processor_microseconds', + 'crd_finalizer_unfinished_work_seconds', + 'crdEstablishing_retries', + 'admission_quota_controller_unfinished_work_seconds', + 'non_structural_schema_condition_controller_adds', + 'APIServiceRegistrationController_unfinished_work_seconds', + 'admission_quota_controller_work_duration', + 'autoregister_depth', + 'autoregister_retries', + 'kubeproxy_sync_proxy_rules_latency_microseconds', + 'rest_client_request_latency_seconds', + 'non_structural_schema_condition_controller_retries', + 'storage_operation_errors_total', + 'storage_operation_status_count' + ]) + ')', action: 'drop', }, ] From 448aac54e5a0c2398d78a8572676ffd0a42afeb1 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Wed, 26 May 2021 12:36:10 +0200 Subject: [PATCH 2/4] jsonnet: sort list of dropped metrics --- ...g-deprecated-metrics-relabelings.libsonnet | 178 +++++++++--------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet b/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet index 58bee14c..39eba122 100644 --- a/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet +++ b/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet @@ -45,95 +45,95 @@ { sourceLabels: ['__name__'], regex: '(' + std.join('|', - [ - 'admission_quota_controller_adds', - 'crd_autoregistration_controller_work_duration', - 'APIServiceOpenAPIAggregationControllerQueue1_adds', - 'AvailableConditionController_retries', - 'crd_openapi_controller_unfinished_work_seconds', - 'APIServiceRegistrationController_retries', - 'admission_quota_controller_longest_running_processor_microseconds', - 'crdEstablishing_longest_running_processor_microseconds', - 'crdEstablishing_unfinished_work_seconds', - 'crd_openapi_controller_adds', - 'crd_autoregistration_controller_retries', - 'crd_finalizer_queue_latency', - 'AvailableConditionController_work_duration', - 'non_structural_schema_condition_controller_depth', - 'crd_autoregistration_controller_unfinished_work_seconds', - 'AvailableConditionController_adds', - 'DiscoveryController_longest_running_processor_microseconds', - 'autoregister_queue_latency', - 'crd_autoregistration_controller_adds', - 'non_structural_schema_condition_controller_work_duration', - 'APIServiceRegistrationController_adds', - 'crd_finalizer_work_duration', - 'crd_naming_condition_controller_unfinished_work_seconds', - 'crd_openapi_controller_longest_running_processor_microseconds', - 'DiscoveryController_adds', - 'crd_autoregistration_controller_longest_running_processor_microseconds', - 'autoregister_unfinished_work_seconds', - 'crd_naming_condition_controller_queue_latency', - 'crd_naming_condition_controller_retries', - 'non_structural_schema_condition_controller_queue_latency', - 'crd_naming_condition_controller_depth', - 'AvailableConditionController_longest_running_processor_microseconds', - 'crdEstablishing_depth', - 'crd_finalizer_longest_running_processor_microseconds', - 'crd_naming_condition_controller_adds', - 'APIServiceOpenAPIAggregationControllerQueue1_longest_running_processor_microseconds', - 'DiscoveryController_queue_latency', - 'DiscoveryController_unfinished_work_seconds', - 'crd_openapi_controller_depth', - 'APIServiceOpenAPIAggregationControllerQueue1_queue_latency', - 'APIServiceOpenAPIAggregationControllerQueue1_unfinished_work_seconds', - 'DiscoveryController_work_duration', - 'autoregister_adds', - 'crd_autoregistration_controller_queue_latency', - 'crd_finalizer_retries', - 'AvailableConditionController_unfinished_work_seconds', - 'autoregister_longest_running_processor_microseconds', - 'non_structural_schema_condition_controller_unfinished_work_seconds', - 'APIServiceOpenAPIAggregationControllerQueue1_depth', - 'AvailableConditionController_depth', - 'DiscoveryController_retries', - 'admission_quota_controller_depth', - 'crdEstablishing_adds', - 'APIServiceOpenAPIAggregationControllerQueue1_retries', - 'crdEstablishing_queue_latency', - 'non_structural_schema_condition_controller_longest_running_processor_microseconds', - 'autoregister_work_duration', - 'crd_openapi_controller_retries', - 'APIServiceRegistrationController_work_duration', - 'crdEstablishing_work_duration', - 'crd_finalizer_adds', - 'crd_finalizer_depth', - 'crd_openapi_controller_queue_latency', - 'APIServiceOpenAPIAggregationControllerQueue1_work_duration', - 'APIServiceRegistrationController_queue_latency', - 'crd_autoregistration_controller_depth', - 'AvailableConditionController_queue_latency', - 'admission_quota_controller_queue_latency', - 'crd_naming_condition_controller_work_duration', - 'crd_openapi_controller_work_duration', - 'DiscoveryController_depth', - 'crd_naming_condition_controller_longest_running_processor_microseconds', - 'APIServiceRegistrationController_depth', - 'APIServiceRegistrationController_longest_running_processor_microseconds', - 'crd_finalizer_unfinished_work_seconds', - 'crdEstablishing_retries', - 'admission_quota_controller_unfinished_work_seconds', - 'non_structural_schema_condition_controller_adds', - 'APIServiceRegistrationController_unfinished_work_seconds', - 'admission_quota_controller_work_duration', - 'autoregister_depth', - 'autoregister_retries', - 'kubeproxy_sync_proxy_rules_latency_microseconds', - 'rest_client_request_latency_seconds', - 'non_structural_schema_condition_controller_retries', - 'storage_operation_errors_total', - 'storage_operation_status_count' - ]) + ')', + [ + 'admission_quota_controller_adds', + 'admission_quota_controller_depth', + 'admission_quota_controller_longest_running_processor_microseconds', + 'admission_quota_controller_queue_latency', + 'admission_quota_controller_unfinished_work_seconds', + 'admission_quota_controller_work_duration', + 'APIServiceOpenAPIAggregationControllerQueue1_adds', + 'APIServiceOpenAPIAggregationControllerQueue1_depth', + 'APIServiceOpenAPIAggregationControllerQueue1_longest_running_processor_microseconds', + 'APIServiceOpenAPIAggregationControllerQueue1_queue_latency', + 'APIServiceOpenAPIAggregationControllerQueue1_retries', + 'APIServiceOpenAPIAggregationControllerQueue1_unfinished_work_seconds', + 'APIServiceOpenAPIAggregationControllerQueue1_work_duration', + 'APIServiceRegistrationController_adds', + 'APIServiceRegistrationController_depth', + 'APIServiceRegistrationController_longest_running_processor_microseconds', + 'APIServiceRegistrationController_queue_latency', + 'APIServiceRegistrationController_retries', + 'APIServiceRegistrationController_unfinished_work_seconds', + 'APIServiceRegistrationController_work_duration', + 'autoregister_adds', + 'autoregister_depth', + 'autoregister_longest_running_processor_microseconds', + 'autoregister_queue_latency', + 'autoregister_retries', + 'autoregister_unfinished_work_seconds', + 'autoregister_work_duration', + 'AvailableConditionController_adds', + 'AvailableConditionController_depth', + 'AvailableConditionController_longest_running_processor_microseconds', + 'AvailableConditionController_queue_latency', + 'AvailableConditionController_retries', + 'AvailableConditionController_unfinished_work_seconds', + 'AvailableConditionController_work_duration', + 'crd_autoregistration_controller_adds', + 'crd_autoregistration_controller_depth', + 'crd_autoregistration_controller_longest_running_processor_microseconds', + 'crd_autoregistration_controller_queue_latency', + 'crd_autoregistration_controller_retries', + 'crd_autoregistration_controller_unfinished_work_seconds', + 'crd_autoregistration_controller_work_duration', + 'crdEstablishing_adds', + 'crdEstablishing_depth', + 'crdEstablishing_longest_running_processor_microseconds', + 'crdEstablishing_queue_latency', + 'crdEstablishing_retries', + 'crdEstablishing_unfinished_work_seconds', + 'crdEstablishing_work_duration', + 'crd_finalizer_adds', + 'crd_finalizer_depth', + 'crd_finalizer_longest_running_processor_microseconds', + 'crd_finalizer_queue_latency', + 'crd_finalizer_retries', + 'crd_finalizer_unfinished_work_seconds', + 'crd_finalizer_work_duration', + 'crd_naming_condition_controller_adds', + 'crd_naming_condition_controller_depth', + 'crd_naming_condition_controller_longest_running_processor_microseconds', + 'crd_naming_condition_controller_queue_latency', + 'crd_naming_condition_controller_retries', + 'crd_naming_condition_controller_unfinished_work_seconds', + 'crd_naming_condition_controller_work_duration', + 'crd_openapi_controller_adds', + 'crd_openapi_controller_depth', + 'crd_openapi_controller_longest_running_processor_microseconds', + 'crd_openapi_controller_queue_latency', + 'crd_openapi_controller_retries', + 'crd_openapi_controller_unfinished_work_seconds', + 'crd_openapi_controller_work_duration', + 'DiscoveryController_adds', + 'DiscoveryController_depth', + 'DiscoveryController_longest_running_processor_microseconds', + 'DiscoveryController_queue_latency', + 'DiscoveryController_retries', + 'DiscoveryController_unfinished_work_seconds', + 'DiscoveryController_work_duration', + 'kubeproxy_sync_proxy_rules_latency_microseconds', + 'non_structural_schema_condition_controller_adds', + 'non_structural_schema_condition_controller_depth', + 'non_structural_schema_condition_controller_longest_running_processor_microseconds', + 'non_structural_schema_condition_controller_queue_latency', + 'non_structural_schema_condition_controller_retries', + 'non_structural_schema_condition_controller_unfinished_work_seconds', + 'non_structural_schema_condition_controller_work_duration', + 'rest_client_request_latency_seconds', + 'storage_operation_errors_total', + 'storage_operation_status_count', + ]) + ')', action: 'drop', }, ] From 4bef6d2736487d71d4597c5cd0e18432c14e1169 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Wed, 26 May 2021 12:36:29 +0200 Subject: [PATCH 3/4] manifests: regenerate --- manifests/kubernetes-serviceMonitorApiserver.yaml | 2 +- manifests/kubernetes-serviceMonitorKubeControllerManager.yaml | 2 +- manifests/kubernetes-serviceMonitorKubelet.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/kubernetes-serviceMonitorApiserver.yaml b/manifests/kubernetes-serviceMonitorApiserver.yaml index cc6f079c..58ba773b 100644 --- a/manifests/kubernetes-serviceMonitorApiserver.yaml +++ b/manifests/kubernetes-serviceMonitorApiserver.yaml @@ -39,7 +39,7 @@ spec: sourceLabels: - __name__ - action: drop - regex: (admission_quota_controller_adds|crd_autoregistration_controller_work_duration|APIServiceOpenAPIAggregationControllerQueue1_adds|AvailableConditionController_retries|crd_openapi_controller_unfinished_work_seconds|APIServiceRegistrationController_retries|admission_quota_controller_longest_running_processor_microseconds|crdEstablishing_longest_running_processor_microseconds|crdEstablishing_unfinished_work_seconds|crd_openapi_controller_adds|crd_autoregistration_controller_retries|crd_finalizer_queue_latency|AvailableConditionController_work_duration|non_structural_schema_condition_controller_depth|crd_autoregistration_controller_unfinished_work_seconds|AvailableConditionController_adds|DiscoveryController_longest_running_processor_microseconds|autoregister_queue_latency|crd_autoregistration_controller_adds|non_structural_schema_condition_controller_work_duration|APIServiceRegistrationController_adds|crd_finalizer_work_duration|crd_naming_condition_controller_unfinished_work_seconds|crd_openapi_controller_longest_running_processor_microseconds|DiscoveryController_adds|crd_autoregistration_controller_longest_running_processor_microseconds|autoregister_unfinished_work_seconds|crd_naming_condition_controller_queue_latency|crd_naming_condition_controller_retries|non_structural_schema_condition_controller_queue_latency|crd_naming_condition_controller_depth|AvailableConditionController_longest_running_processor_microseconds|crdEstablishing_depth|crd_finalizer_longest_running_processor_microseconds|crd_naming_condition_controller_adds|APIServiceOpenAPIAggregationControllerQueue1_longest_running_processor_microseconds|DiscoveryController_queue_latency|DiscoveryController_unfinished_work_seconds|crd_openapi_controller_depth|APIServiceOpenAPIAggregationControllerQueue1_queue_latency|APIServiceOpenAPIAggregationControllerQueue1_unfinished_work_seconds|DiscoveryController_work_duration|autoregister_adds|crd_autoregistration_controller_queue_latency|crd_finalizer_retries|AvailableConditionController_unfinished_work_seconds|autoregister_longest_running_processor_microseconds|non_structural_schema_condition_controller_unfinished_work_seconds|APIServiceOpenAPIAggregationControllerQueue1_depth|AvailableConditionController_depth|DiscoveryController_retries|admission_quota_controller_depth|crdEstablishing_adds|APIServiceOpenAPIAggregationControllerQueue1_retries|crdEstablishing_queue_latency|non_structural_schema_condition_controller_longest_running_processor_microseconds|autoregister_work_duration|crd_openapi_controller_retries|APIServiceRegistrationController_work_duration|crdEstablishing_work_duration|crd_finalizer_adds|crd_finalizer_depth|crd_openapi_controller_queue_latency|APIServiceOpenAPIAggregationControllerQueue1_work_duration|APIServiceRegistrationController_queue_latency|crd_autoregistration_controller_depth|AvailableConditionController_queue_latency|admission_quota_controller_queue_latency|crd_naming_condition_controller_work_duration|crd_openapi_controller_work_duration|DiscoveryController_depth|crd_naming_condition_controller_longest_running_processor_microseconds|APIServiceRegistrationController_depth|APIServiceRegistrationController_longest_running_processor_microseconds|crd_finalizer_unfinished_work_seconds|crdEstablishing_retries|admission_quota_controller_unfinished_work_seconds|non_structural_schema_condition_controller_adds|APIServiceRegistrationController_unfinished_work_seconds|admission_quota_controller_work_duration|autoregister_depth|autoregister_retries|kubeproxy_sync_proxy_rules_latency_microseconds|rest_client_request_latency_seconds|non_structural_schema_condition_controller_retries) + regex: (admission_quota_controller_adds|admission_quota_controller_depth|admission_quota_controller_longest_running_processor_microseconds|admission_quota_controller_queue_latency|admission_quota_controller_unfinished_work_seconds|admission_quota_controller_work_duration|APIServiceOpenAPIAggregationControllerQueue1_adds|APIServiceOpenAPIAggregationControllerQueue1_depth|APIServiceOpenAPIAggregationControllerQueue1_longest_running_processor_microseconds|APIServiceOpenAPIAggregationControllerQueue1_queue_latency|APIServiceOpenAPIAggregationControllerQueue1_retries|APIServiceOpenAPIAggregationControllerQueue1_unfinished_work_seconds|APIServiceOpenAPIAggregationControllerQueue1_work_duration|APIServiceRegistrationController_adds|APIServiceRegistrationController_depth|APIServiceRegistrationController_longest_running_processor_microseconds|APIServiceRegistrationController_queue_latency|APIServiceRegistrationController_retries|APIServiceRegistrationController_unfinished_work_seconds|APIServiceRegistrationController_work_duration|autoregister_adds|autoregister_depth|autoregister_longest_running_processor_microseconds|autoregister_queue_latency|autoregister_retries|autoregister_unfinished_work_seconds|autoregister_work_duration|AvailableConditionController_adds|AvailableConditionController_depth|AvailableConditionController_longest_running_processor_microseconds|AvailableConditionController_queue_latency|AvailableConditionController_retries|AvailableConditionController_unfinished_work_seconds|AvailableConditionController_work_duration|crd_autoregistration_controller_adds|crd_autoregistration_controller_depth|crd_autoregistration_controller_longest_running_processor_microseconds|crd_autoregistration_controller_queue_latency|crd_autoregistration_controller_retries|crd_autoregistration_controller_unfinished_work_seconds|crd_autoregistration_controller_work_duration|crdEstablishing_adds|crdEstablishing_depth|crdEstablishing_longest_running_processor_microseconds|crdEstablishing_queue_latency|crdEstablishing_retries|crdEstablishing_unfinished_work_seconds|crdEstablishing_work_duration|crd_finalizer_adds|crd_finalizer_depth|crd_finalizer_longest_running_processor_microseconds|crd_finalizer_queue_latency|crd_finalizer_retries|crd_finalizer_unfinished_work_seconds|crd_finalizer_work_duration|crd_naming_condition_controller_adds|crd_naming_condition_controller_depth|crd_naming_condition_controller_longest_running_processor_microseconds|crd_naming_condition_controller_queue_latency|crd_naming_condition_controller_retries|crd_naming_condition_controller_unfinished_work_seconds|crd_naming_condition_controller_work_duration|crd_openapi_controller_adds|crd_openapi_controller_depth|crd_openapi_controller_longest_running_processor_microseconds|crd_openapi_controller_queue_latency|crd_openapi_controller_retries|crd_openapi_controller_unfinished_work_seconds|crd_openapi_controller_work_duration|DiscoveryController_adds|DiscoveryController_depth|DiscoveryController_longest_running_processor_microseconds|DiscoveryController_queue_latency|DiscoveryController_retries|DiscoveryController_unfinished_work_seconds|DiscoveryController_work_duration|kubeproxy_sync_proxy_rules_latency_microseconds|non_structural_schema_condition_controller_adds|non_structural_schema_condition_controller_depth|non_structural_schema_condition_controller_longest_running_processor_microseconds|non_structural_schema_condition_controller_queue_latency|non_structural_schema_condition_controller_retries|non_structural_schema_condition_controller_unfinished_work_seconds|non_structural_schema_condition_controller_work_duration|rest_client_request_latency_seconds|storage_operation_errors_total|storage_operation_status_count) sourceLabels: - __name__ - action: drop diff --git a/manifests/kubernetes-serviceMonitorKubeControllerManager.yaml b/manifests/kubernetes-serviceMonitorKubeControllerManager.yaml index fd9eddbf..dadc9a26 100644 --- a/manifests/kubernetes-serviceMonitorKubeControllerManager.yaml +++ b/manifests/kubernetes-serviceMonitorKubeControllerManager.yaml @@ -39,7 +39,7 @@ spec: sourceLabels: - __name__ - action: drop - regex: (admission_quota_controller_adds|crd_autoregistration_controller_work_duration|APIServiceOpenAPIAggregationControllerQueue1_adds|AvailableConditionController_retries|crd_openapi_controller_unfinished_work_seconds|APIServiceRegistrationController_retries|admission_quota_controller_longest_running_processor_microseconds|crdEstablishing_longest_running_processor_microseconds|crdEstablishing_unfinished_work_seconds|crd_openapi_controller_adds|crd_autoregistration_controller_retries|crd_finalizer_queue_latency|AvailableConditionController_work_duration|non_structural_schema_condition_controller_depth|crd_autoregistration_controller_unfinished_work_seconds|AvailableConditionController_adds|DiscoveryController_longest_running_processor_microseconds|autoregister_queue_latency|crd_autoregistration_controller_adds|non_structural_schema_condition_controller_work_duration|APIServiceRegistrationController_adds|crd_finalizer_work_duration|crd_naming_condition_controller_unfinished_work_seconds|crd_openapi_controller_longest_running_processor_microseconds|DiscoveryController_adds|crd_autoregistration_controller_longest_running_processor_microseconds|autoregister_unfinished_work_seconds|crd_naming_condition_controller_queue_latency|crd_naming_condition_controller_retries|non_structural_schema_condition_controller_queue_latency|crd_naming_condition_controller_depth|AvailableConditionController_longest_running_processor_microseconds|crdEstablishing_depth|crd_finalizer_longest_running_processor_microseconds|crd_naming_condition_controller_adds|APIServiceOpenAPIAggregationControllerQueue1_longest_running_processor_microseconds|DiscoveryController_queue_latency|DiscoveryController_unfinished_work_seconds|crd_openapi_controller_depth|APIServiceOpenAPIAggregationControllerQueue1_queue_latency|APIServiceOpenAPIAggregationControllerQueue1_unfinished_work_seconds|DiscoveryController_work_duration|autoregister_adds|crd_autoregistration_controller_queue_latency|crd_finalizer_retries|AvailableConditionController_unfinished_work_seconds|autoregister_longest_running_processor_microseconds|non_structural_schema_condition_controller_unfinished_work_seconds|APIServiceOpenAPIAggregationControllerQueue1_depth|AvailableConditionController_depth|DiscoveryController_retries|admission_quota_controller_depth|crdEstablishing_adds|APIServiceOpenAPIAggregationControllerQueue1_retries|crdEstablishing_queue_latency|non_structural_schema_condition_controller_longest_running_processor_microseconds|autoregister_work_duration|crd_openapi_controller_retries|APIServiceRegistrationController_work_duration|crdEstablishing_work_duration|crd_finalizer_adds|crd_finalizer_depth|crd_openapi_controller_queue_latency|APIServiceOpenAPIAggregationControllerQueue1_work_duration|APIServiceRegistrationController_queue_latency|crd_autoregistration_controller_depth|AvailableConditionController_queue_latency|admission_quota_controller_queue_latency|crd_naming_condition_controller_work_duration|crd_openapi_controller_work_duration|DiscoveryController_depth|crd_naming_condition_controller_longest_running_processor_microseconds|APIServiceRegistrationController_depth|APIServiceRegistrationController_longest_running_processor_microseconds|crd_finalizer_unfinished_work_seconds|crdEstablishing_retries|admission_quota_controller_unfinished_work_seconds|non_structural_schema_condition_controller_adds|APIServiceRegistrationController_unfinished_work_seconds|admission_quota_controller_work_duration|autoregister_depth|autoregister_retries|kubeproxy_sync_proxy_rules_latency_microseconds|rest_client_request_latency_seconds|non_structural_schema_condition_controller_retries) + regex: (admission_quota_controller_adds|admission_quota_controller_depth|admission_quota_controller_longest_running_processor_microseconds|admission_quota_controller_queue_latency|admission_quota_controller_unfinished_work_seconds|admission_quota_controller_work_duration|APIServiceOpenAPIAggregationControllerQueue1_adds|APIServiceOpenAPIAggregationControllerQueue1_depth|APIServiceOpenAPIAggregationControllerQueue1_longest_running_processor_microseconds|APIServiceOpenAPIAggregationControllerQueue1_queue_latency|APIServiceOpenAPIAggregationControllerQueue1_retries|APIServiceOpenAPIAggregationControllerQueue1_unfinished_work_seconds|APIServiceOpenAPIAggregationControllerQueue1_work_duration|APIServiceRegistrationController_adds|APIServiceRegistrationController_depth|APIServiceRegistrationController_longest_running_processor_microseconds|APIServiceRegistrationController_queue_latency|APIServiceRegistrationController_retries|APIServiceRegistrationController_unfinished_work_seconds|APIServiceRegistrationController_work_duration|autoregister_adds|autoregister_depth|autoregister_longest_running_processor_microseconds|autoregister_queue_latency|autoregister_retries|autoregister_unfinished_work_seconds|autoregister_work_duration|AvailableConditionController_adds|AvailableConditionController_depth|AvailableConditionController_longest_running_processor_microseconds|AvailableConditionController_queue_latency|AvailableConditionController_retries|AvailableConditionController_unfinished_work_seconds|AvailableConditionController_work_duration|crd_autoregistration_controller_adds|crd_autoregistration_controller_depth|crd_autoregistration_controller_longest_running_processor_microseconds|crd_autoregistration_controller_queue_latency|crd_autoregistration_controller_retries|crd_autoregistration_controller_unfinished_work_seconds|crd_autoregistration_controller_work_duration|crdEstablishing_adds|crdEstablishing_depth|crdEstablishing_longest_running_processor_microseconds|crdEstablishing_queue_latency|crdEstablishing_retries|crdEstablishing_unfinished_work_seconds|crdEstablishing_work_duration|crd_finalizer_adds|crd_finalizer_depth|crd_finalizer_longest_running_processor_microseconds|crd_finalizer_queue_latency|crd_finalizer_retries|crd_finalizer_unfinished_work_seconds|crd_finalizer_work_duration|crd_naming_condition_controller_adds|crd_naming_condition_controller_depth|crd_naming_condition_controller_longest_running_processor_microseconds|crd_naming_condition_controller_queue_latency|crd_naming_condition_controller_retries|crd_naming_condition_controller_unfinished_work_seconds|crd_naming_condition_controller_work_duration|crd_openapi_controller_adds|crd_openapi_controller_depth|crd_openapi_controller_longest_running_processor_microseconds|crd_openapi_controller_queue_latency|crd_openapi_controller_retries|crd_openapi_controller_unfinished_work_seconds|crd_openapi_controller_work_duration|DiscoveryController_adds|DiscoveryController_depth|DiscoveryController_longest_running_processor_microseconds|DiscoveryController_queue_latency|DiscoveryController_retries|DiscoveryController_unfinished_work_seconds|DiscoveryController_work_duration|kubeproxy_sync_proxy_rules_latency_microseconds|non_structural_schema_condition_controller_adds|non_structural_schema_condition_controller_depth|non_structural_schema_condition_controller_longest_running_processor_microseconds|non_structural_schema_condition_controller_queue_latency|non_structural_schema_condition_controller_retries|non_structural_schema_condition_controller_unfinished_work_seconds|non_structural_schema_condition_controller_work_duration|rest_client_request_latency_seconds|storage_operation_errors_total|storage_operation_status_count) sourceLabels: - __name__ - action: drop diff --git a/manifests/kubernetes-serviceMonitorKubelet.yaml b/manifests/kubernetes-serviceMonitorKubelet.yaml index dc329395..9e3ec0d5 100644 --- a/manifests/kubernetes-serviceMonitorKubelet.yaml +++ b/manifests/kubernetes-serviceMonitorKubelet.yaml @@ -40,7 +40,7 @@ spec: sourceLabels: - __name__ - action: drop - regex: (admission_quota_controller_adds|crd_autoregistration_controller_work_duration|APIServiceOpenAPIAggregationControllerQueue1_adds|AvailableConditionController_retries|crd_openapi_controller_unfinished_work_seconds|APIServiceRegistrationController_retries|admission_quota_controller_longest_running_processor_microseconds|crdEstablishing_longest_running_processor_microseconds|crdEstablishing_unfinished_work_seconds|crd_openapi_controller_adds|crd_autoregistration_controller_retries|crd_finalizer_queue_latency|AvailableConditionController_work_duration|non_structural_schema_condition_controller_depth|crd_autoregistration_controller_unfinished_work_seconds|AvailableConditionController_adds|DiscoveryController_longest_running_processor_microseconds|autoregister_queue_latency|crd_autoregistration_controller_adds|non_structural_schema_condition_controller_work_duration|APIServiceRegistrationController_adds|crd_finalizer_work_duration|crd_naming_condition_controller_unfinished_work_seconds|crd_openapi_controller_longest_running_processor_microseconds|DiscoveryController_adds|crd_autoregistration_controller_longest_running_processor_microseconds|autoregister_unfinished_work_seconds|crd_naming_condition_controller_queue_latency|crd_naming_condition_controller_retries|non_structural_schema_condition_controller_queue_latency|crd_naming_condition_controller_depth|AvailableConditionController_longest_running_processor_microseconds|crdEstablishing_depth|crd_finalizer_longest_running_processor_microseconds|crd_naming_condition_controller_adds|APIServiceOpenAPIAggregationControllerQueue1_longest_running_processor_microseconds|DiscoveryController_queue_latency|DiscoveryController_unfinished_work_seconds|crd_openapi_controller_depth|APIServiceOpenAPIAggregationControllerQueue1_queue_latency|APIServiceOpenAPIAggregationControllerQueue1_unfinished_work_seconds|DiscoveryController_work_duration|autoregister_adds|crd_autoregistration_controller_queue_latency|crd_finalizer_retries|AvailableConditionController_unfinished_work_seconds|autoregister_longest_running_processor_microseconds|non_structural_schema_condition_controller_unfinished_work_seconds|APIServiceOpenAPIAggregationControllerQueue1_depth|AvailableConditionController_depth|DiscoveryController_retries|admission_quota_controller_depth|crdEstablishing_adds|APIServiceOpenAPIAggregationControllerQueue1_retries|crdEstablishing_queue_latency|non_structural_schema_condition_controller_longest_running_processor_microseconds|autoregister_work_duration|crd_openapi_controller_retries|APIServiceRegistrationController_work_duration|crdEstablishing_work_duration|crd_finalizer_adds|crd_finalizer_depth|crd_openapi_controller_queue_latency|APIServiceOpenAPIAggregationControllerQueue1_work_duration|APIServiceRegistrationController_queue_latency|crd_autoregistration_controller_depth|AvailableConditionController_queue_latency|admission_quota_controller_queue_latency|crd_naming_condition_controller_work_duration|crd_openapi_controller_work_duration|DiscoveryController_depth|crd_naming_condition_controller_longest_running_processor_microseconds|APIServiceRegistrationController_depth|APIServiceRegistrationController_longest_running_processor_microseconds|crd_finalizer_unfinished_work_seconds|crdEstablishing_retries|admission_quota_controller_unfinished_work_seconds|non_structural_schema_condition_controller_adds|APIServiceRegistrationController_unfinished_work_seconds|admission_quota_controller_work_duration|autoregister_depth|autoregister_retries|kubeproxy_sync_proxy_rules_latency_microseconds|rest_client_request_latency_seconds|non_structural_schema_condition_controller_retries) + regex: (admission_quota_controller_adds|admission_quota_controller_depth|admission_quota_controller_longest_running_processor_microseconds|admission_quota_controller_queue_latency|admission_quota_controller_unfinished_work_seconds|admission_quota_controller_work_duration|APIServiceOpenAPIAggregationControllerQueue1_adds|APIServiceOpenAPIAggregationControllerQueue1_depth|APIServiceOpenAPIAggregationControllerQueue1_longest_running_processor_microseconds|APIServiceOpenAPIAggregationControllerQueue1_queue_latency|APIServiceOpenAPIAggregationControllerQueue1_retries|APIServiceOpenAPIAggregationControllerQueue1_unfinished_work_seconds|APIServiceOpenAPIAggregationControllerQueue1_work_duration|APIServiceRegistrationController_adds|APIServiceRegistrationController_depth|APIServiceRegistrationController_longest_running_processor_microseconds|APIServiceRegistrationController_queue_latency|APIServiceRegistrationController_retries|APIServiceRegistrationController_unfinished_work_seconds|APIServiceRegistrationController_work_duration|autoregister_adds|autoregister_depth|autoregister_longest_running_processor_microseconds|autoregister_queue_latency|autoregister_retries|autoregister_unfinished_work_seconds|autoregister_work_duration|AvailableConditionController_adds|AvailableConditionController_depth|AvailableConditionController_longest_running_processor_microseconds|AvailableConditionController_queue_latency|AvailableConditionController_retries|AvailableConditionController_unfinished_work_seconds|AvailableConditionController_work_duration|crd_autoregistration_controller_adds|crd_autoregistration_controller_depth|crd_autoregistration_controller_longest_running_processor_microseconds|crd_autoregistration_controller_queue_latency|crd_autoregistration_controller_retries|crd_autoregistration_controller_unfinished_work_seconds|crd_autoregistration_controller_work_duration|crdEstablishing_adds|crdEstablishing_depth|crdEstablishing_longest_running_processor_microseconds|crdEstablishing_queue_latency|crdEstablishing_retries|crdEstablishing_unfinished_work_seconds|crdEstablishing_work_duration|crd_finalizer_adds|crd_finalizer_depth|crd_finalizer_longest_running_processor_microseconds|crd_finalizer_queue_latency|crd_finalizer_retries|crd_finalizer_unfinished_work_seconds|crd_finalizer_work_duration|crd_naming_condition_controller_adds|crd_naming_condition_controller_depth|crd_naming_condition_controller_longest_running_processor_microseconds|crd_naming_condition_controller_queue_latency|crd_naming_condition_controller_retries|crd_naming_condition_controller_unfinished_work_seconds|crd_naming_condition_controller_work_duration|crd_openapi_controller_adds|crd_openapi_controller_depth|crd_openapi_controller_longest_running_processor_microseconds|crd_openapi_controller_queue_latency|crd_openapi_controller_retries|crd_openapi_controller_unfinished_work_seconds|crd_openapi_controller_work_duration|DiscoveryController_adds|DiscoveryController_depth|DiscoveryController_longest_running_processor_microseconds|DiscoveryController_queue_latency|DiscoveryController_retries|DiscoveryController_unfinished_work_seconds|DiscoveryController_work_duration|kubeproxy_sync_proxy_rules_latency_microseconds|non_structural_schema_condition_controller_adds|non_structural_schema_condition_controller_depth|non_structural_schema_condition_controller_longest_running_processor_microseconds|non_structural_schema_condition_controller_queue_latency|non_structural_schema_condition_controller_retries|non_structural_schema_condition_controller_unfinished_work_seconds|non_structural_schema_condition_controller_work_duration|rest_client_request_latency_seconds|storage_operation_errors_total|storage_operation_status_count) sourceLabels: - __name__ port: https-metrics From e37d34ba2d69e6ac88ed3c2aa60889ddb50c43fa Mon Sep 17 00:00:00 2001 From: Philip Gough Date: Mon, 5 Jul 2021 11:18:57 +0100 Subject: [PATCH 4/4] ci: Extend e2e test matrix with v1.21.1 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d4a86114..1dae051b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -53,7 +53,7 @@ jobs: matrix: kind-image: - 'kindest/node:v1.20.0' - # - 'kindest/node:v1.21.0' #TODO(paulfantom): enable as soon as image is available + - 'kindest/node:v1.21.1' steps: - uses: actions/checkout@v2 with: