Revert "feat(SPRE-1819,SPRE-1626) New metrics (#7469)" (#7487)

This reverts commit c78a234.

Author: rubenmgx

components/monitoring/prometheus/base/monitoringstack/monitoringstack.yaml

@@ -141,6 +141,7 @@ spec:
         - '{__name__="kube_statefulset_status_replicas_ready", namespace="gitops-service-argocd"}'
         - '{__name__="kube_statefulset_replicas", namespace="gitops-service-argocd"}'
         - '{__name__="openshift_route_status", namespace="gitops-service-argocd"}'
+
         - '{__name__="kube_deployment_status_replicas_ready", namespace="gitops-service-argocd"}'
         - '{__name__="kube_deployment_spec_replicas", namespace=~"gitops-service-argocd"}'
 
@@ -234,22 +235,12 @@ spec:
         - '{__name__="kube_deployment_status_replicas_available", namespace="konflux-user-support"}'
         - '{__name__="kube_deployment_spec_replicas", namespace="konflux-user-support"}'
 
-        # API Server Metrics:
-        - '{__name__="apiserver_admission_webhook_rejection_count", name="vpipelineruns.konflux-ci.dev"}'
-        - '{__name__="apiserver_watch_events_total"}'
-        - '{__name__="apiserver_storage_objects"}'
-        - '{__name__="apiserver_current_inflight_requests"}'
-        - '{__name__="resource_verb:apiserver_request_total:rate5m"}'
-        - '{__name__="code:apiserver_request_total:rate5m"}'
-        - '{__name__="instance:apiserver_request_total:rate5m"}'
-        - '{__name__="process_resident_memory_bytes", job="apiserver"}'
-        - '{__name__="write:apiserver_request_total:rate5m}'
-        - '{__name__="read:apiserver_request_total:rate5m}'
-        - '{__name__="resource:apiserver_longrunning_requests:sum"}'
-        - '{__name__="flow_schema_priority_level_reason:apiserver_flowcontrol_rejected_requests_total:rate5m"}'
-        - '{__name__="cluster:apiserver_tls_handshake_errors_total:rate5m"}'
-
-        # etcd Metrics:
+        - '{__name__="argocd_app_reconcile_bucket", namespace="gitops-service-argocd"}'
+        - '{__name__="argocd_app_info", namespace="gitops-service-argocd"}'
+        - '{__name__="container_cpu_usage_seconds_total", namespace="release-service"}'
+        - '{__name__="container_cpu_usage_seconds_total", namespace="openshift-etcd"}'
+        - '{__name__="container_memory_usage_bytes", namespace="release-service"}'
+        - '{__name__="container_memory_usage_bytes", namespace="openshift-etcd"}'
         - '{__name__="etcd_disk_wal_fsync_duration_seconds_bucket"}'
         - '{__name__="etcd_disk_backend_commit_duration_seconds_bucket"}'
         - '{__name__="etcd_server_proposals_failed_total"}'
@@ -262,16 +253,7 @@ spec:
         - '{__name__="etcd_server_received_total", namespace="openshift-etcd"}'
         - '{__name__="etcd_network_active_peers", namespace="openshift-etcd"}'
         - '{__name__="etcd_network_peer_round_trip_time_seconds_bucket"}'
-        - '{__name__="etcd_shield_trigger"}'
-        - '{__name__="etcd_shield_alert_triggered"}'
         - '{__name__="etcd_disk_defrag_inflight"}'
-
-        - '{__name__="argocd_app_reconcile_bucket", namespace="gitops-service-argocd"}'
-        - '{__name__="argocd_app_info", namespace="gitops-service-argocd"}'
-        - '{__name__="container_cpu_usage_seconds_total", namespace="release-service"}'
-        - '{__name__="container_cpu_usage_seconds_total", namespace="openshift-etcd"}'
-        - '{__name__="container_memory_usage_bytes", namespace="release-service"}'
-        - '{__name__="container_memory_usage_bytes", namespace="openshift-etcd"}'
         - '{__name__="kube_job_spec_completions"}'
         - '{__name__="kube_job_status_succeeded"}'
         - '{__name__="kube_job_status_failed"}'
@@ -280,22 +262,26 @@ spec:
         - '{__name__="node_memory_MemAvailable_bytes"}'
         - '{__name__="platform:hypershift_hostedclusters:max"}'
         - '{__name__="kube_node_role"}'
+        - '{__name__="etcd_shield_trigger"}'
+        - '{__name__="etcd_shield_alert_triggered"}'
+        - '{__name__="apiserver_admission_webhook_rejection_count", name="vpipelineruns.konflux-ci.dev"}'
+        - '{__name__="apiserver_watch_events_total"}'
+        - '{__name__="apiserver_storage_objects"}'
+        - '{__name__="apiserver_current_inflight_requests"}'
+        - '{__name__="resource_verb:apiserver_request_total:rate5m"}'
+        - '{__name__="code:apiserver_request_total:rate5m"}'
+        - '{__name__="instance:apiserver_request_total:rate5m"}'
         - '{__name__="prometheus_ready"}'
         - '{__name__="process_cpu_seconds_total", job="apiserver"}'
-        - '{__name__="kube_node_status_allocatable", resource=~"cpu|memory"}'
-        - '{__name__="kube_node_status_condition", condition="MemoryPressure", status="true"}'
-
         - '{__name__="namespace:container_memory_usage_bytes:sum", namespace=~"openshift-etcd|openshift-kube-apiserver|build-service|image-controller|integration-service|konflux-ui|product-kubearchive|openshift-kueue-operator|tekton-kueue|kueue-external-admission|mintmaker|multi-platform-controller|namespace-lister|openshift-pipelines|tekton-results|project-controller|smee|smee-client"}'
         - '{__name__="namespace:container_cpu_usage:sum", namespace=~"openshift-etcd|openshift-kube-apiserver|build-service|image-controller|integration-service|konflux-ui|product-kubearchive|openshift-kueue-operator|tekton-kueue|kueue-external-admission|mintmaker|multi-platform-controller|namespace-lister|openshift-pipelines|tekton-results|project-controller|smee|smee-client"}'
+        - '{__name__="node_namespace_pod:kube_pod_info:", namespace=~"openshift-etcd|openshift-kube-apiserver|build-service|image-controller|integration-service|konflux-ui|product-kubearchive|openshift-kueue-operator|tekton-kueue|kueue-external-admission|mintmaker|multi-platform-controller|namespace-lister|openshift-pipelines|tekton-results|project-controller|smee|smee-client"}'
+        - '{__name__="kube_node_status_allocatable", resource=~"cpu|memory"}'
+        - '{__name__="kube_node_status_condition", condition="MemoryPressure", status="true"}'
         - '{__name__="namespace_memory:kube_pod_container_resource_requests:sum", namespace=~"openshift-etcd|openshift-kube-apiserver|build-service|image-controller|integration-service|konflux-ui|product-kubearchive|openshift-kueue-operator|tekton-kueue|kueue-external-admission|mintmaker|multi-platform-controller|namespace-lister|openshift-pipelines|tekton-results|project-controller|smee|smee-client"}'
         - '{__name__="namespace_cpu:kube_pod_container_resource_requests:sum", namespace=~"openshift-etcd|openshift-kube-apiserver|build-service|image-controller|integration-service|konflux-ui|product-kubearchive|openshift-kueue-operator|tekton-kueue|kueue-external-admission|mintmaker|multi-platform-controller|namespace-lister|openshift-pipelines|tekton-results|project-controller|smee|smee-client"}'
         - '{__name__="namespace_memory:kube_pod_container_resource_limits:sum", namespace=~"openshift-etcd|openshift-kube-apiserver|build-service|image-controller|integration-service|konflux-ui|product-kubearchive|openshift-kueue-operator|tekton-kueue|kueue-external-admission|mintmaker|multi-platform-controller|namespace-lister|openshift-pipelines|tekton-results|project-controller|smee|smee-client"}'
         - '{__name__="namespace_cpu:kube_pod_container_resource_limits:sum", namespace=~"openshift-etcd|openshift-kube-apiserver|build-service|image-controller|integration-service|konflux-ui|product-kubearchive|openshift-kueue-operator|tekton-kueue|kueue-external-admission|mintmaker|multi-platform-controller|namespace-lister|openshift-pipelines|tekton-results|project-controller|smee|smee-client"}'
-        - '{__name__="container_fs_writes_bytes_total", namespace=~"openshift-etcd|openshift-kube-apiserver|build-service|image-controller|integration-service|konflux-ui|product-kubearchive|openshift-kueue-operator|tekton-kueue|kueue-external-admission|mintmaker|multi-platform-controller|namespace-lister|openshift-pipelines|tekton-results|project-controller|smee|smee-client"}'
-        - '{__name__="container_fs_reads_bytes_total", namespace=~"openshift-etcd|openshift-kube-apiserver|build-service|image-controller|integration-service|konflux-ui|product-kubearchive|openshift-kueue-operator|tekton-kueue|kueue-external-admission|mintmaker|multi-platform-controller|namespace-lister|openshift-pipelines|tekton-results|project-controller|smee|smee-client"}'
-        - '{__name__="container_network_receive_bytes_total", namespace=~"openshift-etcd|openshift-kube-apiserver|build-service|image-controller|integration-service|konflux-ui|product-kubearchive|openshift-kueue-operator|tekton-kueue|kueue-external-admission|mintmaker|multi-platform-controller|namespace-lister|openshift-pipelines|tekton-results|project-controller|smee|smee-client"}'
-        - '{__name__="container_network_transmit_bytes_total", namespace=~"openshift-etcd|openshift-kube-apiserver|build-service|image-controller|integration-service|konflux-ui|product-kubearchive|openshift-kueue-operator|tekton-kueue|kueue-external-admission|mintmaker|multi-platform-controller|namespace-lister|openshift-pipelines|tekton-results|project-controller|smee|smee-client"}'
-
 
     relabelings:
     # override the target's address by the prometheus-k8s service name.