diff --git a/prometheus/Chart.yaml b/prometheus/Chart.yaml index 12fddcbbaa32d5d009637e00b07aa2c370b031ab..71a62649d5d432cae446fe981d41122d63aee12d 100644 --- a/prometheus/Chart.yaml +++ b/prometheus/Chart.yaml @@ -1,5 +1,5 @@ name: prometheus -version: 8.3.0 +version: 8.5.0 appVersion: 2.6.0 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ diff --git a/prometheus/scrape_configs/elasticsearch_sc.yaml b/prometheus/scrape_configs/elasticsearch_sc.yaml new file mode 100644 index 0000000000000000000000000000000000000000..8f5b74e6617f87fb2a4a0ad19487ce355f2c3d4b --- /dev/null +++ b/prometheus/scrape_configs/elasticsearch_sc.yaml @@ -0,0 +1,21 @@ +- job_name: 'elasticsearch-exporter' + honor_labels: true + + kubernetes_sd_configs: + - role: service + + relabel_configs: + - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_scrape] + action: keep + regex: true + - source_labels: [__address__, __meta_kubernetes_service_annotation_nynja_biz_scrape_port] + action: replace + target_label: __address__ + regex: ([^:]+)(?::\d+)?;(\d+) + replacement: $1:$2 + - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_probe] + action: keep + regex: efkexporter + - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_env] + action: replace + target_label: env diff --git a/prometheus/scrape_configs/fluent-bit.yaml b/prometheus/scrape_configs/fluent-bit.yaml new file mode 100644 index 0000000000000000000000000000000000000000..e060423e9e1ff58d4e2ba28174734e77b9c0f562 --- /dev/null +++ b/prometheus/scrape_configs/fluent-bit.yaml @@ -0,0 +1,12 @@ +- job_name: 'fluent-bit' + metrics_path: /api/v1/metrics/prometheus + kubernetes_sd_configs: + - role: pod + + relabel_configs: + - source_labels: [__meta_kubernetes_namespace] + action: keep + regex: 'logging' + - source_labels: [__meta_kubernetes_pod_name] + action: keep + regex: 'fluent-bit-.*'