diff --git a/helm-charts/seldon-core-analytics/files/prometheus/prometheus-config.yaml b/helm-charts/seldon-core-analytics/files/prometheus/prometheus-config.yaml index 44c1df315e..a4ee6a09ec 100644 --- a/helm-charts/seldon-core-analytics/files/prometheus/prometheus-config.yaml +++ b/helm-charts/seldon-core-analytics/files/prometheus/prometheus-config.yaml @@ -4,7 +4,9 @@ global: scrape_timeout: 1s evaluation_interval: 1s rule_files: -- /etc/prometheus-rules/*.rules + - /etc/prometheus-rules/*.rules.yml + - /etc/prometheus-rules/model-usage/*.rules.yml + - /etc/prometheus-rules/extra-rules/*.rules.yml alerting: alertmanagers: - static_configs: @@ -119,41 +121,6 @@ scrape_configs: - __meta_kubernetes_pod_name action: replace target_label: kubernetes_pod_name -- job_name: seldon-slow-scrape - scrape_interval: 2m - scrape_timeout: 20s - kubernetes_sd_configs: - - role: pod - relabel_configs: - - source_labels: - - __meta_kubernetes_pod_annotation_prometheus_io_scrape_slow - action: keep - regex: true - - source_labels: [__meta_kubernetes_pod_container_port_name] - action: keep - regex: metrics(-.*)? - - source_labels: - - __meta_kubernetes_pod_annotation_prometheus_io_path - action: replace - target_label: __metrics_path__ - regex: (.+) - - source_labels: - - __address__ - - __meta_kubernetes_pod_annotation_prometheus_io_port - action: replace - regex: (.+):(?:\d+);(\d+) - replacement: ${1}:${2} - target_label: __address__ - - action: labelmap - regex: __meta_kubernetes_pod_label_(.+) - - source_labels: - - __meta_kubernetes_namespace - action: replace - target_label: kubernetes_namespace - - source_labels: - - __meta_kubernetes_pod_name - action: replace - target_label: kubernetes_pod_name # Scrape config for Kubelet cAdvisor. # This is required for Kubernetes 1.7.3 and later, where cAdvisor metrics # (those whose names begin with 'container_') have been removed from the