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.
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
MON-2693: Scrape profiles #1785
Merged
openshift-merge-robot
merged 12 commits into
openshift:master
from
JoaoBraveCoding:mon-2693
Mar 3, 2023
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
fbe68eb
Adds scrapeProfile configuration
JoaoBraveCoding c4417ce
Adds jsonnet for scrape profile
JoaoBraveCoding 39dbf31
Adds YAML generated
JoaoBraveCoding 11f6f8e
Adds code to create new ServiceMonitors
JoaoBraveCoding 2063a2b
Added scrapeProfile ServiceMonitors for kubelet, etcd and nodeExporter
JoaoBraveCoding 20f64ff
Adds ScrapeConfig type
JoaoBraveCoding 736da81
Removes uponly profile and renames operational to minimal
JoaoBraveCoding a3be939
Refactors generation of Minimal ServiceMonitors to use lib
JoaoBraveCoding f8e8f58
Adds missing metrics necessary for dashboards
JoaoBraveCoding 08476f4
Added TechPreview switch for ScrapeProfiles
JoaoBraveCoding b57ebb0
Rename feature to collection profile
JoaoBraveCoding ad0a06d
Moved to string.Builder and slices.Contains
JoaoBraveCoding File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| apiVersion: monitoring.coreos.com/v1 | ||
| kind: ServiceMonitor | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: etcd | ||
| k8s-app: etcd | ||
| monitoring.openshift.io/collection-profile: minimal | ||
| name: etcd-minimal | ||
| namespace: openshift-monitoring | ||
| spec: | ||
| endpoints: | ||
| - interval: 30s | ||
| metricRelabelings: | ||
| - action: keep | ||
| regex: (etcd_disk_backend_commit_duration_seconds_bucket|etcd_disk_wal_fsync_duration_seconds_bucket|etcd_mvcc_db_total_size_in_bytes|etcd_mvcc_db_total_size_in_use_in_bytes|etcd_network_peer_round_trip_time_seconds_bucket|etcd_network_peer_sent_failures_total|etcd_server_has_leader|etcd_server_is_leader|etcd_server_proposals_failed_total|etcd_server_quota_backend_bytes|grpc_server_handled_total|grpc_server_handling_seconds_bucket|grpc_server_started_total|process_start_time_seconds) | ||
| sourceLabels: | ||
| - __name__ | ||
| port: etcd-metrics | ||
| scheme: https | ||
| tlsConfig: | ||
| caFile: /etc/prometheus/secrets/kube-etcd-client-certs/etcd-client-ca.crt | ||
| certFile: /etc/prometheus/secrets/kube-etcd-client-certs/etcd-client.crt | ||
| keyFile: /etc/prometheus/secrets/kube-etcd-client-certs/etcd-client.key | ||
| jobLabel: k8s-app | ||
| namespaceSelector: | ||
| matchNames: | ||
| - openshift-etcd | ||
| selector: | ||
| matchLabels: | ||
| k8s-app: etcd |
106 changes: 106 additions & 0 deletions
106
assets/control-plane/minimal-service-monitor-kubelet.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| apiVersion: monitoring.coreos.com/v1 | ||
| kind: ServiceMonitor | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: kubelet | ||
| app.kubernetes.io/part-of: openshift-monitoring | ||
| k8s-app: kubelet | ||
| monitoring.openshift.io/collection-profile: minimal | ||
| name: kubelet-minimal | ||
| namespace: openshift-monitoring | ||
| spec: | ||
| endpoints: | ||
| - bearerTokenFile: "" | ||
| honorLabels: true | ||
| interval: 30s | ||
| metricRelabelings: | ||
| - action: keep | ||
| regex: (apiserver_audit_event_total|container_cpu_cfs_periods_total|container_cpu_cfs_throttled_periods_total|container_cpu_usage_seconds_total|container_fs_reads_bytes_total|container_fs_reads_total|container_fs_usage_bytes|container_fs_writes_bytes_total|container_fs_writes_total|container_memory_cache|container_memory_rss|container_memory_swap|container_memory_usage_bytes|container_memory_working_set_bytes|container_network_receive_bytes_total|container_network_receive_packets_dropped_total|container_network_receive_packets_total|container_network_transmit_bytes_total|container_network_transmit_packets_dropped_total|container_network_transmit_packets_total|container_spec_cpu_shares|kubelet_certificate_manager_client_expiration_renew_errors|kubelet_containers_per_pod_count_sum|kubelet_node_name|kubelet_pleg_relist_duration_seconds_bucket|kubelet_pod_worker_duration_seconds_bucket|kubelet_server_expiration_renew_errors|kubelet_volume_stats_available_bytes|kubelet_volume_stats_capacity_bytes|kubelet_volume_stats_inodes|kubelet_volume_stats_inodes_free|kubelet_volume_stats_inodes_used|kubelet_volume_stats_used_bytes|machine_cpu_cores|machine_memory_bytes|process_start_time_seconds|rest_client_requests_total|storage_operation_duration_seconds_count) | ||
| sourceLabels: | ||
| - __name__ | ||
| port: https-metrics | ||
| relabelings: | ||
| - sourceLabels: | ||
| - __metrics_path__ | ||
| targetLabel: metrics_path | ||
| scheme: https | ||
| scrapeTimeout: 30s | ||
| tlsConfig: | ||
| caFile: /etc/prometheus/configmaps/kubelet-serving-ca-bundle/ca-bundle.crt | ||
| certFile: /etc/prometheus/secrets/metrics-client-certs/tls.crt | ||
| insecureSkipVerify: false | ||
| keyFile: /etc/prometheus/secrets/metrics-client-certs/tls.key | ||
| - bearerTokenFile: "" | ||
| honorLabels: true | ||
| honorTimestamps: false | ||
| interval: 30s | ||
| metricRelabelings: | ||
| - action: labeldrop | ||
| regex: __tmp_keep_metric | ||
| - action: keep | ||
| regex: (apiserver_audit_event_total|container_cpu_cfs_periods_total|container_cpu_cfs_throttled_periods_total|container_cpu_usage_seconds_total|container_fs_reads_bytes_total|container_fs_reads_total|container_fs_usage_bytes|container_fs_writes_bytes_total|container_fs_writes_total|container_memory_cache|container_memory_rss|container_memory_swap|container_memory_usage_bytes|container_memory_working_set_bytes|container_network_receive_bytes_total|container_network_receive_packets_dropped_total|container_network_receive_packets_total|container_network_transmit_bytes_total|container_network_transmit_packets_dropped_total|container_network_transmit_packets_total|container_spec_cpu_shares|kubelet_certificate_manager_client_expiration_renew_errors|kubelet_containers_per_pod_count_sum|kubelet_node_name|kubelet_pleg_relist_duration_seconds_bucket|kubelet_pod_worker_duration_seconds_bucket|kubelet_server_expiration_renew_errors|kubelet_volume_stats_available_bytes|kubelet_volume_stats_capacity_bytes|kubelet_volume_stats_inodes|kubelet_volume_stats_inodes_free|kubelet_volume_stats_inodes_used|kubelet_volume_stats_used_bytes|machine_cpu_cores|machine_memory_bytes|process_start_time_seconds|rest_client_requests_total|storage_operation_duration_seconds_count) | ||
| sourceLabels: | ||
| - __name__ | ||
| path: /metrics/cadvisor | ||
| port: https-metrics | ||
| relabelings: | ||
| - sourceLabels: | ||
| - __metrics_path__ | ||
| targetLabel: metrics_path | ||
| scheme: https | ||
| scrapeTimeout: 30s | ||
| tlsConfig: | ||
| caFile: /etc/prometheus/configmaps/kubelet-serving-ca-bundle/ca-bundle.crt | ||
| certFile: /etc/prometheus/secrets/metrics-client-certs/tls.crt | ||
| insecureSkipVerify: false | ||
| keyFile: /etc/prometheus/secrets/metrics-client-certs/tls.key | ||
| - bearerTokenFile: "" | ||
| honorLabels: true | ||
| interval: 30s | ||
| metricRelabelings: | ||
| - action: keep | ||
| regex: (apiserver_audit_event_total|container_cpu_cfs_periods_total|container_cpu_cfs_throttled_periods_total|container_cpu_usage_seconds_total|container_fs_reads_bytes_total|container_fs_reads_total|container_fs_usage_bytes|container_fs_writes_bytes_total|container_fs_writes_total|container_memory_cache|container_memory_rss|container_memory_swap|container_memory_usage_bytes|container_memory_working_set_bytes|container_network_receive_bytes_total|container_network_receive_packets_dropped_total|container_network_receive_packets_total|container_network_transmit_bytes_total|container_network_transmit_packets_dropped_total|container_network_transmit_packets_total|container_spec_cpu_shares|kubelet_certificate_manager_client_expiration_renew_errors|kubelet_containers_per_pod_count_sum|kubelet_node_name|kubelet_pleg_relist_duration_seconds_bucket|kubelet_pod_worker_duration_seconds_bucket|kubelet_server_expiration_renew_errors|kubelet_volume_stats_available_bytes|kubelet_volume_stats_capacity_bytes|kubelet_volume_stats_inodes|kubelet_volume_stats_inodes_free|kubelet_volume_stats_inodes_used|kubelet_volume_stats_used_bytes|machine_cpu_cores|machine_memory_bytes|process_start_time_seconds|rest_client_requests_total|storage_operation_duration_seconds_count) | ||
| sourceLabels: | ||
| - __name__ | ||
| path: /metrics/probes | ||
| port: https-metrics | ||
| relabelings: | ||
| - sourceLabels: | ||
| - __metrics_path__ | ||
| targetLabel: metrics_path | ||
| scheme: https | ||
| scrapeTimeout: 30s | ||
| tlsConfig: | ||
| caFile: /etc/prometheus/configmaps/kubelet-serving-ca-bundle/ca-bundle.crt | ||
| certFile: /etc/prometheus/secrets/metrics-client-certs/tls.crt | ||
| insecureSkipVerify: false | ||
| keyFile: /etc/prometheus/secrets/metrics-client-certs/tls.key | ||
| - interval: 30s | ||
| metricRelabelings: | ||
| - action: keep | ||
| regex: (apiserver_audit_event_total|container_cpu_cfs_periods_total|container_cpu_cfs_throttled_periods_total|container_cpu_usage_seconds_total|container_fs_reads_bytes_total|container_fs_reads_total|container_fs_usage_bytes|container_fs_writes_bytes_total|container_fs_writes_total|container_memory_cache|container_memory_rss|container_memory_swap|container_memory_usage_bytes|container_memory_working_set_bytes|container_network_receive_bytes_total|container_network_receive_packets_dropped_total|container_network_receive_packets_total|container_network_transmit_bytes_total|container_network_transmit_packets_dropped_total|container_network_transmit_packets_total|container_spec_cpu_shares|kubelet_certificate_manager_client_expiration_renew_errors|kubelet_containers_per_pod_count_sum|kubelet_node_name|kubelet_pleg_relist_duration_seconds_bucket|kubelet_pod_worker_duration_seconds_bucket|kubelet_server_expiration_renew_errors|kubelet_volume_stats_available_bytes|kubelet_volume_stats_capacity_bytes|kubelet_volume_stats_inodes|kubelet_volume_stats_inodes_free|kubelet_volume_stats_inodes_used|kubelet_volume_stats_used_bytes|machine_cpu_cores|machine_memory_bytes|process_start_time_seconds|rest_client_requests_total|storage_operation_duration_seconds_count) | ||
| sourceLabels: | ||
| - __name__ | ||
| port: https-metrics | ||
| relabelings: | ||
| - action: replace | ||
| regex: (.+)(?::\d+) | ||
| replacement: $1:9537 | ||
| sourceLabels: | ||
| - __address__ | ||
| targetLabel: __address__ | ||
| - action: replace | ||
| replacement: crio | ||
| sourceLabels: | ||
| - endpoint | ||
| targetLabel: endpoint | ||
| - action: replace | ||
| replacement: crio | ||
| targetLabel: job | ||
| jobLabel: k8s-app | ||
| namespaceSelector: | ||
| matchNames: | ||
| - kube-system | ||
| selector: | ||
| matchLabels: | ||
| k8s-app: kubelet |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| apiVersion: monitoring.coreos.com/v1 | ||
| kind: ServiceMonitor | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/component: exporter | ||
| app.kubernetes.io/name: kube-state-metrics | ||
| app.kubernetes.io/part-of: openshift-monitoring | ||
| app.kubernetes.io/version: 2.8.1 | ||
| monitoring.openshift.io/collection-profile: minimal | ||
| name: kube-state-metrics-minimal | ||
| namespace: openshift-monitoring | ||
| spec: | ||
| endpoints: | ||
| - bearerTokenFile: "" | ||
| honorLabels: true | ||
| interval: 1m | ||
| metricRelabelings: | ||
| - action: labeldrop | ||
| regex: instance | ||
| - action: keep | ||
| regex: (kube_daemonset_status_current_number_scheduled|kube_daemonset_status_desired_number_scheduled|kube_daemonset_status_number_available|kube_daemonset_status_number_misscheduled|kube_daemonset_status_updated_number_scheduled|kube_deployment_metadata_generation|kube_deployment_spec_replicas|kube_deployment_status_observed_generation|kube_deployment_status_replicas_available|kube_deployment_status_replicas_updated|kube_horizontalpodautoscaler_spec_max_replicas|kube_horizontalpodautoscaler_spec_min_replicas|kube_horizontalpodautoscaler_status_current_replicas|kube_horizontalpodautoscaler_status_desired_replicas|kube_job_failed|kube_job_status_active|kube_job_status_start_time|kube_node_info|kube_node_labels|kube_node_role|kube_node_spec_taint|kube_node_spec_unschedulable|kube_node_status_allocatable|kube_node_status_capacity|kube_node_status_condition|kube_persistentvolume_info|kube_persistentvolume_status_phase|kube_persistentvolumeclaim_access_mode|kube_persistentvolumeclaim_info|kube_persistentvolumeclaim_labels|kube_persistentvolumeclaim_resource_requests_storage_bytes|kube_pod_container_resource_limits|kube_pod_container_resource_requests|kube_pod_container_status_last_terminated_reason|kube_pod_container_status_restarts_total|kube_pod_container_status_waiting_reason|kube_pod_info|kube_pod_owner|kube_pod_status_phase|kube_pod_status_ready|kube_pod_status_unschedulable|kube_poddisruptionbudget_status_current_healthy|kube_poddisruptionbudget_status_desired_healthy|kube_poddisruptionbudget_status_expected_pods|kube_replicaset_owner|kube_replicationcontroller_owner|kube_resourcequota|kube_state_metrics_list_total|kube_state_metrics_watch_total|kube_statefulset_metadata_generation|kube_statefulset_replicas|kube_statefulset_status_current_revision|kube_statefulset_status_observed_generation|kube_statefulset_status_replicas|kube_statefulset_status_replicas_ready|kube_statefulset_status_replicas_updated|kube_statefulset_status_update_revision|kube_storageclass_info|process_start_time_seconds) | ||
| sourceLabels: | ||
| - __name__ | ||
| port: https-main | ||
| relabelings: | ||
| - action: labeldrop | ||
| regex: pod | ||
| scheme: https | ||
| scrapeTimeout: 1m | ||
| tlsConfig: | ||
| caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt | ||
| certFile: /etc/prometheus/secrets/metrics-client-certs/tls.crt | ||
| insecureSkipVerify: false | ||
| keyFile: /etc/prometheus/secrets/metrics-client-certs/tls.key | ||
| serverName: kube-state-metrics.openshift-monitoring.svc | ||
| - bearerTokenFile: "" | ||
| interval: 1m | ||
| metricRelabelings: | ||
| - action: keep | ||
| regex: (kube_daemonset_status_current_number_scheduled|kube_daemonset_status_desired_number_scheduled|kube_daemonset_status_number_available|kube_daemonset_status_number_misscheduled|kube_daemonset_status_updated_number_scheduled|kube_deployment_metadata_generation|kube_deployment_spec_replicas|kube_deployment_status_observed_generation|kube_deployment_status_replicas_available|kube_deployment_status_replicas_updated|kube_horizontalpodautoscaler_spec_max_replicas|kube_horizontalpodautoscaler_spec_min_replicas|kube_horizontalpodautoscaler_status_current_replicas|kube_horizontalpodautoscaler_status_desired_replicas|kube_job_failed|kube_job_status_active|kube_job_status_start_time|kube_node_info|kube_node_labels|kube_node_role|kube_node_spec_taint|kube_node_spec_unschedulable|kube_node_status_allocatable|kube_node_status_capacity|kube_node_status_condition|kube_persistentvolume_info|kube_persistentvolume_status_phase|kube_persistentvolumeclaim_access_mode|kube_persistentvolumeclaim_info|kube_persistentvolumeclaim_labels|kube_persistentvolumeclaim_resource_requests_storage_bytes|kube_pod_container_resource_limits|kube_pod_container_resource_requests|kube_pod_container_status_last_terminated_reason|kube_pod_container_status_restarts_total|kube_pod_container_status_waiting_reason|kube_pod_info|kube_pod_owner|kube_pod_status_phase|kube_pod_status_ready|kube_pod_status_unschedulable|kube_poddisruptionbudget_status_current_healthy|kube_poddisruptionbudget_status_desired_healthy|kube_poddisruptionbudget_status_expected_pods|kube_replicaset_owner|kube_replicationcontroller_owner|kube_resourcequota|kube_state_metrics_list_total|kube_state_metrics_watch_total|kube_statefulset_metadata_generation|kube_statefulset_replicas|kube_statefulset_status_current_revision|kube_statefulset_status_observed_generation|kube_statefulset_status_replicas|kube_statefulset_status_replicas_ready|kube_statefulset_status_replicas_updated|kube_statefulset_status_update_revision|kube_storageclass_info|process_start_time_seconds) | ||
| sourceLabels: | ||
| - __name__ | ||
| port: https-self | ||
| scheme: https | ||
| scrapeTimeout: 1m | ||
| tlsConfig: | ||
| caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt | ||
| certFile: /etc/prometheus/secrets/metrics-client-certs/tls.crt | ||
| insecureSkipVerify: false | ||
| keyFile: /etc/prometheus/secrets/metrics-client-certs/tls.key | ||
| serverName: kube-state-metrics.openshift-monitoring.svc | ||
| jobLabel: app.kubernetes.io/name | ||
| selector: | ||
| matchLabels: | ||
| app.kubernetes.io/component: exporter | ||
| app.kubernetes.io/name: kube-state-metrics | ||
| app.kubernetes.io/part-of: openshift-monitoring | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
kube_node_labelsis kept, but nowe have following bugs to keep the above metrics
https://bugzilla.redhat.com/show_bug.cgi?id=2011698
https://bugzilla.redhat.com/show_bug.cgi?id=2015386
https://bugzilla.redhat.com/show_bug.cgi?id=2018431
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added these but I'll have to investigate why the tool I developed didn't pick up these, I'll open an issue on the project and add a task to the GA epic
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay looking quickly at the bugs these seem to be metrics that are not used in our default alerting so it's normal that they got excluded from the list. The minimal profile is very restrictive and should only contain metrics that are essential to default alerts, default rules, console and telemetry
Note that
kube_persistentvolumeclaim_labelsit's already on the listThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've also searched on the CMO repo for those metrics to double check and they are not used, so from my POV things are working correctly and those metrics should be excluded (except
kube_persistentvolumeclaim_labels, which was already on the list). But do let me know if I missed somethingThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks, it makes sense