storytold/terraform-aws-observability-accelerator
2
0
Fork 0
mirror of https://github.com/storytold/terraform-aws-observability-accelerator.git synced 2026-10-28 08:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Default scrape interval (#49)

Browse Source 
* Enable higher but configurable scrape intervals

* Use global parameters per job level

* Remove scrape limit
This commit is contained in:
Rodrigue Koffi
2022-10-04 18:20:14 +02:00
committed by GitHub
parent 27e9cc84ea
commit 6032c6da23
7 changed files with 117 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/workloads/infra/otel-config/templates/opentelemetrycollector.yaml
+32 -42
View File
@@ -11,12 +11,14 @@ spec:
prometheus:
config:
global:
scrape_interval: {{ .Values.scrapeInterval }}
scrape_timeout: {{ .Values.scrapeTimeout }}
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeTimeout }}
external_labels:
cluster: {{ .Values.ekscluster }}
scrape_configs:
- job_name: 'kubernetes-kubelet'
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeTimeout }}
scheme: https
tls_config:
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
@@ -52,9 +54,8 @@ spec:
replacement: /api/v1/nodes/$${1}/proxy/metrics/cadvisor
- job_name: serviceMonitor/default/kube-prometheus-stack-prometheus-node-exporter/0
honor_timestamps: true
scrape_interval: 30s
scrape_timeout: 10s
metrics_path: /metrics
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeInterval }}
scheme: http
follow_redirects: true
enable_http2: true
@@ -156,9 +157,8 @@ spec:
- default
- job_name: serviceMonitor/default/kube-prometheus-stack-prometheus/0
honor_timestamps: true
scrape_interval: 30s
scrape_timeout: 10s
metrics_path: /metrics
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeTimeout }}
scheme: http
follow_redirects: true
enable_http2: true
@@ -260,9 +260,8 @@ spec:
- job_name: serviceMonitor/default/kube-prometheus-stack-operator/0
honor_labels: true
honor_timestamps: true
scrape_interval: 30s
scrape_timeout: 10s
metrics_path: /metrics
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeTimeout }}
scheme: https
tls_config:
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
@@ -362,8 +361,8 @@ spec:
- job_name: serviceMonitor/default/kube-prometheus-stack-kubelet/2
honor_labels: true
honor_timestamps: true
scrape_interval: 30s
scrape_timeout: 10s
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeTimeout }}
metrics_path: /metrics/probes
scheme: https
authorization:
@@ -479,8 +478,8 @@ spec:
- job_name: serviceMonitor/default/kube-prometheus-stack-kubelet/1
honor_labels: true
honor_timestamps: true
scrape_interval: 30s
scrape_timeout: 10s
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeTimeout }}
metrics_path: /metrics/cadvisor
scheme: https
authorization:
@@ -596,9 +595,8 @@ spec:
- job_name: serviceMonitor/default/kube-prometheus-stack-kubelet/0
honor_labels: true
honor_timestamps: true
scrape_interval: 30s
scrape_timeout: 10s
metrics_path: /metrics
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeTimeout }}
scheme: https
authorization:
type: Bearer
@@ -713,9 +711,8 @@ spec:
- job_name: serviceMonitor/default/kube-prometheus-stack-kube-state-metrics/0
honor_labels: true
honor_timestamps: true
scrape_interval: 30s
scrape_timeout: 10s
metrics_path: /metrics
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeTimeout }}
scheme: http
follow_redirects: true
enable_http2: true
@@ -817,9 +814,8 @@ spec:
- default
- job_name: serviceMonitor/default/kube-prometheus-stack-kube-scheduler/0
honor_timestamps: true
scrape_interval: 30s
scrape_timeout: 10s
metrics_path: /metrics
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeTimeout }}
scheme: http
authorization:
type: Bearer
@@ -924,9 +920,8 @@ spec:
- kube-system
- job_name: serviceMonitor/default/kube-prometheus-stack-kube-proxy/0
honor_timestamps: true
scrape_interval: 30s
scrape_timeout: 10s
metrics_path: /metrics
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeTimeout }}
scheme: http
authorization:
type: Bearer
@@ -1031,9 +1026,8 @@ spec:
- kube-system
- job_name: serviceMonitor/default/kube-prometheus-stack-kube-etcd/0
honor_timestamps: true
scrape_interval: 30s
scrape_timeout: 10s
metrics_path: /metrics
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeTimeout }}
scheme: http
authorization:
type: Bearer
@@ -1138,9 +1132,8 @@ spec:
- kube-system
- job_name: serviceMonitor/default/kube-prometheus-stack-kube-controller-manager/0
honor_timestamps: true
scrape_interval: 30s
scrape_timeout: 10s
metrics_path: /metrics
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeTimeout }}
scheme: http
authorization:
type: Bearer
@@ -1245,9 +1238,8 @@ spec:
- kube-system
- job_name: serviceMonitor/default/kube-prometheus-stack-coredns/0
honor_timestamps: true
scrape_interval: 30s
scrape_timeout: 10s
metrics_path: /metrics
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeTimeout }}
scheme: http
authorization:
type: Bearer
@@ -1350,9 +1342,8 @@ spec:
- kube-system
- job_name: serviceMonitor/default/kube-prometheus-stack-apiserver/0
honor_timestamps: true
scrape_interval: 30s
scrape_timeout: 10s
metrics_path: /metrics
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeTimeout }}
scheme: https
authorization:
type: Bearer
@@ -1455,9 +1446,8 @@ spec:
- default
- job_name: serviceMonitor/default/kube-prometheus-stack-alertmanager/0
honor_timestamps: true
scrape_interval: 30s
scrape_timeout: 10s
metrics_path: /metrics
scrape_interval: {{ .Values.globalScrapeInterval }}
scrape_timeout: {{ .Values.globalScrapeTimeout }}
scheme: http
follow_redirects: true
enable_http2: true
modules/workloads/infra/otel-config/values.yaml
+40 -5
View File
@@ -1,8 +1,43 @@
ampurl: ${amp_url}
region: ${region}
prometheusMetricsEndpoint: ${prometheus_metrics_endpoint}
prometheusMetricsPort: ${prometheus_metrics_port}
scrapeInterval: ${scrape_interval}
scrapeTimeout: ${scrape_timeout}
scrapeSampleLimit: ${scrape_sample_limit}
ekscluster: ${eks_cluster}
globalScrapeTimeout: ${global_scrape_timeout}
globalScrapeSampleLimit: ${global_scrape_sample_limit}
# TODO: enable after terraform 1.3 as defaults will be optional
#nodeExporterScrapeInterval: ${node_exporter_scrape_interval}
#nodeExporterScrapeTimeout: ${node_exporter_scrape_timeout}
#kubeletScrapeInterval: ${kubelet_scrape_interval}
#kubeletScrapeTimeout: ${kubelet_scrape_timeout}
#operatorScrapeInterval: ${operator_scrape_interval}
#operatorScrapeTimeout: ${operator_scrape_timeout}
#kubeletScrapeInterval: ${operator_scrape_interval}
#kubeletScrapeTimeout: ${operator_scrape_timeout}
#ksmScrapeInterval: ${ksm_scrape_interval}
#ksmScrapeTimeout: ${ksm_scrape_timeout}
#schedulerScrapeInterval: ${scheduler_scrape_interval}
#schedulerScrapeTimeout: ${scheduler_scrape_timeout}
#proxyScrapeInterval: ${proxy_scrape_interval}
#proxyScrapeTimeout: ${proxy_scrape_timeout}
#etcdScrapeInterval: ${etcd_scrape_interval}
#etcdScrapeTimeout: ${etcd_scrape_timeout}
#controllerManagerScrapeInterval: ${controller_manager_scrape_interval}
#controllerManagerScrapeTimeout: ${controller_manager_scrape_timeout}
#corednsScrapeInterval: ${coredns_scrape_interval}
#corednsScrapeTimeout: ${coredns_scrape_timeout}
#apiserverScrapeInterval: ${apiserver_scrape_interval}
#apiserverScrapeTimeout: ${apiserver_scrape_timeout}
#alertmanagerScrapeInterval: ${alertmnager_scrape_interval}
#alertmanagerScrapeTimeout: ${alertmnager_scrape_timeout}