diff --git a/.changelog/3832.fixed.txt b/.changelog/3832.fixed.txt new file mode 100644 index 000000000..4e92f031f --- /dev/null +++ b/.changelog/3832.fixed.txt @@ -0,0 +1 @@ +fix(metrics): Correct the name of k8s hpa metrics (part of kube-state-metrics) \ No newline at end of file diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index c57ac7fe3..a2217aed8 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -1119,11 +1119,11 @@ kube-prometheus-stack: ## kube_statefulset_replicas ## kube_statefulset_status_observed_generation ## kube_statefulset_status_replicas - ## kube_hpa_spec_max_replicas - ## kube_hpa_spec_min_replicas - ## kube_hpa_status_condition - ## kube_hpa_status_current_replicas - ## kube_hpa_status_desired_replicas + ## kube_horizontalpodautoscaler_spec_max_replicas + ## kube_horizontalpodautoscaler_spec_min_replicas + ## kube_horizontalpodautoscaler_status_condition + ## kube_horizontalpodautoscaler_status_current_replicas + ## kube_horizontalpodautoscaler_status_desired_replicas ## kube pod state metrics ## kube_pod_container_info ## kube_pod_container_resource_limits @@ -1140,7 +1140,7 @@ kube-prometheus-stack: ## kube_service_status_load_balancer_ingress metricRelabelings: - action: keep - regex: (?:kube_statefulset_status_observed_generation|kube_statefulset_status_replicas|kube_statefulset_replicas|kube_statefulset_metadata_generation|kube_daemonset_status_current_number_scheduled|kube_daemonset_status_desired_number_scheduled|kube_daemonset_status_number_misscheduled|kube_daemonset_status_number_unavailable|kube_deployment_spec_replicas|kube_deployment_status_replicas_available|kube_deployment_status_replicas_unavailable|kube_node_info|kube_node_status_allocatable|kube_node_status_capacity|kube_node_status_condition|kube_hpa_spec_max_replicas|kube_hpa_spec_min_replicas|kube_hpa_status_(condition|(current|desired)_replicas)|kube_pod_container_info|kube_pod_container_resource_requests|kube_pod_container_resource_limits|kube_pod_container_status_ready|kube_pod_container_status_terminated_reason|kube_pod_container_status_waiting_reason|kube_pod_container_status_restarts_total|kube_pod_status_phase|kube_pod_info|kube_service_info|kube_service_spec_external_ip|kube_service_spec_type|kube_service_status_load_balancer_ingress) + regex: (?:kube_statefulset_status_observed_generation|kube_statefulset_status_replicas|kube_statefulset_replicas|kube_statefulset_metadata_generation|kube_daemonset_status_current_number_scheduled|kube_daemonset_status_desired_number_scheduled|kube_daemonset_status_number_misscheduled|kube_daemonset_status_number_unavailable|kube_deployment_spec_replicas|kube_deployment_status_replicas_available|kube_deployment_status_replicas_unavailable|kube_node_info|kube_node_status_allocatable|kube_node_status_capacity|kube_node_status_condition|kube_horizontalpodautoscaler_spec_max_replicas|kube_horizontalpodautoscaler_spec_min_replicas|kube_horizontalpodautoscaler_status_(condition|(current|desired)_replicas)|kube_pod_container_info|kube_pod_container_resource_requests|kube_pod_container_resource_limits|kube_pod_container_status_ready|kube_pod_container_status_terminated_reason|kube_pod_container_status_waiting_reason|kube_pod_container_status_restarts_total|kube_pod_status_phase|kube_pod_info|kube_service_info|kube_service_spec_external_ip|kube_service_spec_type|kube_service_status_load_balancer_ingress) sourceLabels: [__name__] ## Drop unnecessary labels Prometheus adds to these metrics ## We don't want container=kube-state-metrics on everything diff --git a/docs/scraped-metrics.md b/docs/scraped-metrics.md index 4ae868d15..bf763e412 100644 --- a/docs/scraped-metrics.md +++ b/docs/scraped-metrics.md @@ -37,114 +37,114 @@ The following table contains information about metrics scraped by Sumo Logic's m - name - name of the metric - source - originated source of the metric -| name | source | -| ------------------------------------------------- | ------------------ | -| `apiserver_request_count` | apiserver | -| `apiserver_request_total` | apiserver | -| `kubelet_docker_operations_errors` | kubelet | -| `kubelet_docker_operations_errors_total` | kubelet | -| `kubelet_running_container_count` | kubelet | -| `kubelet_running_containers` | kubelet | -| `kubelet_running_pod_count` | kubelet | -| `kubelet_running_pods` | kubelet | -| `kubelet_docker_operations_latency_microseconds` | kubelet | -| `kubelet_runtime_operations_latency_microseconds` | kubelet | -| `container_cpu_usage_seconds_total` | cadvisor | -| `container_fs_limit_bytes` | cadvisor | -| `container_fs_usage_bytes` | cadvisor | -| `container_memory_working_set_bytes` | cadvisor | -| `container_cpu_cfs_throttled_seconds_total` | cadvisor | -| `container_network_receive_bytes_total` | cadvisor | -| `container_network_transmit_bytes_total` | cadvisor | -| `coredns_cache_size` | coredns | -| `coredns_cache_entries` | coredns | -| `coredns_cache_hits_total` | coredns | -| `coredns_cache_misses_total` | coredns | -| `coredns_dns_request_count_total` | coredns | -| `coredns_dns_requests_total` | coredns | -| `coredns_dns_response_rcode_count_total` | coredns | -| `coredns_dns_responses_total` | coredns | -| `coredns_forward_request_count_total` | coredns | -| `coredns_forward_requests_total` | coredns | -| `process_cpu_seconds_total` | coredns | -| `process_open_fds` | coredns | -| `process_resident_memory_bytes` | coredns | -| `etcd_helper_cache_hit_count` | kube-etcd | -| `etcd_helper_cache_hit_total` | kube-etcd | -| `etcd_helper_cache_miss_count` | kube-etcd | -| `etcd_helper_cache_miss_total` | kube-etcd | -| `etcd_debugging_mvcc_db_total_size_in_bytes` | etcd-server | -| `etcd_debugging_store_expires_total` | etcd-server | -| `etcd_debugging_store_watchers` | etcd-server | -| `etcd_grpc_proxy_cache_hits_total` | etcd-server | -| `etcd_grpc_proxy_cache_misses_total` | etcd-server | -| `etcd_network_client_grpc_received_bytes_total` | etcd-server | -| `etcd_network_client_grpc_sent_bytes_total` | etcd-server | -| `etcd_server_has_leader` | etcd-server | -| `etcd_server_leader_changes_seen_total` | etcd-server | -| `etcd_server_proposals_applied_total` | etcd-server | -| `etcd_server_proposals_committed_total` | etcd-server | -| `etcd_server_proposals_failed_total` | etcd-server | -| `etcd_server_proposals_pending` | etcd-server | -| `process_cpu_seconds_total` | etcd-server | -| `process_open_fds` | etcd-server | -| `process_resident_memory_bytes` | etcd-server | -| `scheduler` metrics_latency_microseconds | kube-scheduler | -| `kube_daemonset_status_current_number_scheduled` | kube-state-metrics | -| `kube_daemonset_status_desired_number_scheduled` | kube-state-metrics | -| `kube_daemonset_status_number_misscheduled` | kube-state-metrics | -| `kube_daemonset_status_number_unavailable` | kube-state-metrics | -| `kube_deployment_spec_replicas` | kube-state-metrics | -| `kube_deployment_status_replicas_available` | kube-state-metrics | -| `kube_deployment_status_replicas_unavailable` | kube-state-metrics | -| `kube_node_info` | kube-state-metrics | -| `kube_node_status_allocatable` | kube-state-metrics | -| `kube_node_status_capacity` | kube-state-metrics | -| `kube_node_status_condition` | kube-state-metrics | -| `kube_statefulset_metadata_generation` | kube-state-metrics | -| `kube_statefulset_replicas` | kube-state-metrics | -| `kube_statefulset_status_observed_generation` | kube-state-metrics | -| `kube_statefulset_status_replicas` | kube-state-metrics | -| `kube_hpa_spec_max_replicas` | kube-state-metrics | -| `kube_hpa_spec_min_replicas` | kube-state-metrics | -| `kube_hpa_status_condition` | kube-state-metrics | -| `kube_hpa_status_current_replicas` | kube-state-metrics | -| `kube_hpa_status_desired_replicas` | kube-state-metrics | -| `kube` pod state metrics | kube-state-metrics | -| `kube_pod_container_info` | kube-state-metrics | -| `kube_pod_container_resource_limits` | kube-state-metrics | -| `kube_pod_container_resource_requests` | kube-state-metrics | -| `kube_pod_container_status_ready` | kube-state-metrics | -| `kube_pod_container_status_restarts_total` | kube-state-metrics | -| `kube_pod_container_status_terminated_reason` | kube-state-metrics | -| `kube_pod_container_status_waiting_reason` | kube-state-metrics | -| `kube_pod_status_phase` | kube-state-metrics | -| `kube_pod_info` | kube-state-metrics | -| `kube_service_info` | kube-state-metrics | -| `kube_service_spec_external_ip` | kube-state-metrics | -| `kube_service_spec_type` | kube-state-metrics | -| `kube_service_status_load_balancer_ingress` | kube-state-metrics | -| `node_cpu_seconds_total` | node-exporter | -| `node_load1` | node-exporter | -| `node_load5` | node-exporter | -| `node_load15` | node-exporter | -| `node_disk_io_time_weighted_seconds_total` | node-exporter | -| `node_disk_io_time_seconds_total` | node-exporter | -| `node_vmstat_pgpgin` | node-exporter | -| `node_vmstat_pgpgout` | node-exporter | -| `node_memory_MemFree_bytes` | node-exporter | -| `node_memory_MemAvailable_bytes` | node-exporter | -| `node_memory_Cached_bytes` | node-exporter | -| `node_memory_Buffers_bytes` | node-exporter | -| `node_memory_MemTotal_bytes` | node-exporter | -| `node_network_receive_drop_total` | node-exporter | -| `node_network_transmit_drop_total` | node-exporter | -| `node_network_receive_bytes_total` | node-exporter | -| `node_network_transmit_bytes_total` | node-exporter | -| `node_filesystem_avail_bytes` | node-exporter | -| `node_filesystem_size_bytes` | node-exporter | -| `node_filesystem_files_free` | node-exporter | -| `node_filesystem_files` | node-exporter | +| name | source | +| ------------------------------------------------------ | ------------------ | +| `apiserver_request_count` | apiserver | +| `apiserver_request_total` | apiserver | +| `kubelet_docker_operations_errors` | kubelet | +| `kubelet_docker_operations_errors_total` | kubelet | +| `kubelet_running_container_count` | kubelet | +| `kubelet_running_containers` | kubelet | +| `kubelet_running_pod_count` | kubelet | +| `kubelet_running_pods` | kubelet | +| `kubelet_docker_operations_latency_microseconds` | kubelet | +| `kubelet_runtime_operations_latency_microseconds` | kubelet | +| `container_cpu_usage_seconds_total` | cadvisor | +| `container_fs_limit_bytes` | cadvisor | +| `container_fs_usage_bytes` | cadvisor | +| `container_memory_working_set_bytes` | cadvisor | +| `container_cpu_cfs_throttled_seconds_total` | cadvisor | +| `container_network_receive_bytes_total` | cadvisor | +| `container_network_transmit_bytes_total` | cadvisor | +| `coredns_cache_size` | coredns | +| `coredns_cache_entries` | coredns | +| `coredns_cache_hits_total` | coredns | +| `coredns_cache_misses_total` | coredns | +| `coredns_dns_request_count_total` | coredns | +| `coredns_dns_requests_total` | coredns | +| `coredns_dns_response_rcode_count_total` | coredns | +| `coredns_dns_responses_total` | coredns | +| `coredns_forward_request_count_total` | coredns | +| `coredns_forward_requests_total` | coredns | +| `process_cpu_seconds_total` | coredns | +| `process_open_fds` | coredns | +| `process_resident_memory_bytes` | coredns | +| `etcd_helper_cache_hit_count` | kube-etcd | +| `etcd_helper_cache_hit_total` | kube-etcd | +| `etcd_helper_cache_miss_count` | kube-etcd | +| `etcd_helper_cache_miss_total` | kube-etcd | +| `etcd_debugging_mvcc_db_total_size_in_bytes` | etcd-server | +| `etcd_debugging_store_expires_total` | etcd-server | +| `etcd_debugging_store_watchers` | etcd-server | +| `etcd_grpc_proxy_cache_hits_total` | etcd-server | +| `etcd_grpc_proxy_cache_misses_total` | etcd-server | +| `etcd_network_client_grpc_received_bytes_total` | etcd-server | +| `etcd_network_client_grpc_sent_bytes_total` | etcd-server | +| `etcd_server_has_leader` | etcd-server | +| `etcd_server_leader_changes_seen_total` | etcd-server | +| `etcd_server_proposals_applied_total` | etcd-server | +| `etcd_server_proposals_committed_total` | etcd-server | +| `etcd_server_proposals_failed_total` | etcd-server | +| `etcd_server_proposals_pending` | etcd-server | +| `process_cpu_seconds_total` | etcd-server | +| `process_open_fds` | etcd-server | +| `process_resident_memory_bytes` | etcd-server | +| `scheduler` metrics_latency_microseconds | kube-scheduler | +| `kube_daemonset_status_current_number_scheduled` | kube-state-metrics | +| `kube_daemonset_status_desired_number_scheduled` | kube-state-metrics | +| `kube_daemonset_status_number_misscheduled` | kube-state-metrics | +| `kube_daemonset_status_number_unavailable` | kube-state-metrics | +| `kube_deployment_spec_replicas` | kube-state-metrics | +| `kube_deployment_status_replicas_available` | kube-state-metrics | +| `kube_deployment_status_replicas_unavailable` | kube-state-metrics | +| `kube_node_info` | kube-state-metrics | +| `kube_node_status_allocatable` | kube-state-metrics | +| `kube_node_status_capacity` | kube-state-metrics | +| `kube_node_status_condition` | kube-state-metrics | +| `kube_statefulset_metadata_generation` | kube-state-metrics | +| `kube_statefulset_replicas` | kube-state-metrics | +| `kube_statefulset_status_observed_generation` | kube-state-metrics | +| `kube_statefulset_status_replicas` | kube-state-metrics | +| `kube_horizontalpodautoscaler_spec_max_replicas` | kube-state-metrics | +| `kube_horizontalpodautoscaler_spec_min_replicas` | kube-state-metrics | +| `kube_horizontalpodautoscaler_status_condition` | kube-state-metrics | +| `kube_horizontalpodautoscaler_status_current_replicas` | kube-state-metrics | +| `kube_horizontalpodautoscaler_status_desired_replicas` | kube-state-metrics | +| `kube` pod state metrics | kube-state-metrics | +| `kube_pod_container_info` | kube-state-metrics | +| `kube_pod_container_resource_limits` | kube-state-metrics | +| `kube_pod_container_resource_requests` | kube-state-metrics | +| `kube_pod_container_status_ready` | kube-state-metrics | +| `kube_pod_container_status_restarts_total` | kube-state-metrics | +| `kube_pod_container_status_terminated_reason` | kube-state-metrics | +| `kube_pod_container_status_waiting_reason` | kube-state-metrics | +| `kube_pod_status_phase` | kube-state-metrics | +| `kube_pod_info` | kube-state-metrics | +| `kube_service_info` | kube-state-metrics | +| `kube_service_spec_external_ip` | kube-state-metrics | +| `kube_service_spec_type` | kube-state-metrics | +| `kube_service_status_load_balancer_ingress` | kube-state-metrics | +| `node_cpu_seconds_total` | node-exporter | +| `node_load1` | node-exporter | +| `node_load5` | node-exporter | +| `node_load15` | node-exporter | +| `node_disk_io_time_weighted_seconds_total` | node-exporter | +| `node_disk_io_time_seconds_total` | node-exporter | +| `node_vmstat_pgpgin` | node-exporter | +| `node_vmstat_pgpgout` | node-exporter | +| `node_memory_MemFree_bytes` | node-exporter | +| `node_memory_MemAvailable_bytes` | node-exporter | +| `node_memory_Cached_bytes` | node-exporter | +| `node_memory_Buffers_bytes` | node-exporter | +| `node_memory_MemTotal_bytes` | node-exporter | +| `node_network_receive_drop_total` | node-exporter | +| `node_network_transmit_drop_total` | node-exporter | +| `node_network_receive_bytes_total` | node-exporter | +| `node_network_transmit_bytes_total` | node-exporter | +| `node_filesystem_avail_bytes` | node-exporter | +| `node_filesystem_size_bytes` | node-exporter | +| `node_filesystem_files_free` | node-exporter | +| `node_filesystem_files` | node-exporter | ## Aggregations (removed) diff --git a/tests/integration/internal/constants.go b/tests/integration/internal/constants.go index 0db4f8d59..cbbd2d8e5 100644 --- a/tests/integration/internal/constants.go +++ b/tests/integration/internal/constants.go @@ -89,6 +89,11 @@ var ( "kube_statefulset_status_replicas", "kube_statefulset_replicas", "kube_statefulset_metadata_generation", + "kube_horizontalpodautoscaler_status_desired_replicas", + "kube_horizontalpodautoscaler_status_current_replicas", + "kube_horizontalpodautoscaler_status_condition", + "kube_horizontalpodautoscaler_spec_min_replicas", + "kube_horizontalpodautoscaler_spec_max_replicas", } KubeDaemonSetMetrics = []string{ "kube_daemonset_status_current_number_scheduled", // used by Kubernetes App