diff --git a/deploy/helm/prometheus-overrides.yaml b/deploy/helm/prometheus-overrides.yaml index be17f95c83..017f005a45 100644 --- a/deploy/helm/prometheus-overrides.yaml +++ b/deploy/helm/prometheus-overrides.yaml @@ -75,13 +75,13 @@ prometheus: url: http://collection-sumologic.sumologic.svc.cluster.local:9888/prometheus.metrics.apiserver writeRelabelConfigs: - action: keep - regex: apiserver;(?:apiserver_request_count|apiserver_request_latencies.*|etcd_request_cache_get_latencies_summary.*|etcd_request_cache_add_latencies_summary.*|etcd_helper_cache_hit_count|etcd_helper_cache_miss_count) + regex: apiserver;(?:apiserver_request_(?:count|total)|apiserver_request_(?:latencies|duration_seconds).*|etcd_request_cache_get_(?:latencies_summary|duration_seconds).*|etcd_request_cache_add_(?:latencies_summary|duration_seconds).*|etcd_helper_cache_hit_(?:count|total)|etcd_helper_cache_miss_(?:count|total)) sourceLabels: [job, __name__] - # kubelet metrics url: http://collection-sumologic.sumologic.svc.cluster.local:9888/prometheus.metrics.kubelet writeRelabelConfigs: - action: keep - regex: kubelet;(?:kubelet_docker_operations_errors|kubelet_docker_operations_latency_microseconds|kubelet_running_container_count|kubelet_running_pod_count|kubelet_runtime_operations_latency_microseconds.*) + regex: kubelet;(?:kubelet_docker_operations_errors.*|kubelet_docker_operations_(?:latency_micro|duration_)seconds.*|kubelet_running_container_count|kubelet_running_pod_count|kubelet_runtime_operations_(?:latency_micro|duration_)seconds.*) sourceLabels: [job, __name__] - # cadvisor container metrics url: http://collection-sumologic.sumologic.svc.cluster.local:9888/prometheus.metrics.container diff --git a/deploy/helm/sumologic/conf/metrics/metrics.conf b/deploy/helm/sumologic/conf/metrics/metrics.conf index c5787bd07e..0ea2cd6f8b 100644 --- a/deploy/helm/sumologic/conf/metrics/metrics.conf +++ b/deploy/helm/sumologic/conf/metrics/metrics.conf @@ -10,6 +10,15 @@ @label @DATAPOINT