diff --git a/modules/adot/templates/adot-values.yaml.tpl b/modules/adot/templates/adot-values.yaml.tpl index 1f70c92..1e4f9cf 100644 --- a/modules/adot/templates/adot-values.yaml.tpl +++ b/modules/adot/templates/adot-values.yaml.tpl @@ -32,55 +32,6 @@ adotCollector: endpoint: 0.0.0.0:4317 http: endpoint: 0.0.0.0:4318 - prometheus/node2: - config: - global: - scrape_interval: 60s - scrape_timeout: 10s - scrape_configs: - - job_name: kubernetes-service-endpoints - sample_limit: 10000 - kubernetes_sd_configs: - - role: endpoints - relabel_configs: - # collect if service.annotation: prometheus.io/scrape: true - - source_labels: - - __meta_kubernetes_service_annotation_prometheus_io_scrape - regex: true - action: keep - # replaces the schema - - source_labels: - - __meta_kubernetes_service_annotation_prometheus_io_scheme - regex: (https?) - action: replace - target_label: __scheme__ - - source_labels: - - __meta_kubernetes_service_annotation_prometheus_io_path - regex: (.+) - action: replace - target_label: __metrics_path__ - - source_labels: - - __address__ - - __meta_kubernetes_service_annotation_prometheus_io_port - regex: ([^:]+)(?::\d+)?;(\d+) - action: replace - replacement: $$1:$$2 - target_label: __address__ - - regex: __meta_service_pod_label_(.+) - action: labelmap - metric_relabel_configs: - - action: keep - source_labels: - - resource - regex: (pods) - - action: replace - source_labels: - - node - target_label: Node - - action: replace - source_labels: - - resource - target_label: Resource prometheus/node: config: global: @@ -209,14 +160,6 @@ adotCollector: resource_attributes: - key: Namespace value: ${accept_namespace_regex} - experimental_metricsgeneration: - rules: - - name: kube_node_status_condition_all - unit: Bytes - type: scale - metric1: kube_node_status_condition - operation: multiply - scale_by: 1 filter/metrics_include: metrics: include: @@ -270,17 +213,11 @@ adotCollector: - Resource metric_name_selectors: - kube_node_status_capacity - - dimensions: - - - Node - - Condition - - Status - metric_name_selectors: - - kube_node_status_condition - dimensions: - - Condition - Status metric_name_selectors: - - kube_node_status_condition_all + - kube_node_status_condition namespace: ContainerInsights parse_json_encoded_attr_values: - Sources @@ -360,10 +297,6 @@ adotCollector: region: "${region}" service: pipelines: - metrics/awsemf_prometheus_new: - receivers: ["prometheus/node2"] - processors: ["experimental_metricsgeneration"] - exporters: ["awsemf/prometheus"] metrics/awsemf_prometheus: receivers: ["prometheus","prometheus/node"] processors: ["resource/set_attributes"]