From e4e1c8f89daf59764af9b98d36da2f361bbebc2a Mon Sep 17 00:00:00 2001
From: Dimitar Zafirov <Dimitar.Zafirov@bulpros.com>
Date: Fri, 1 Feb 2019 10:03:38 +0200
Subject: [PATCH] new scrape config files were created for EFK exporters

---
 prometheus/Chart.yaml                         |  2 +-
 .../scrape_configs/elasticsearch_sc.yaml      | 21 +++++++++++++++++++
 prometheus/scrape_configs/fluent-bit.yaml     | 12 +++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 prometheus/scrape_configs/elasticsearch_sc.yaml
 create mode 100644 prometheus/scrape_configs/fluent-bit.yaml

diff --git a/prometheus/Chart.yaml b/prometheus/Chart.yaml
index 12fddcb..71a6264 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 0000000..8f5b74e
--- /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 0000000..e060423
--- /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-.*'
-- 
GitLab