From 0329b3e3e154961914eda702cabb70891ad309d1 Mon Sep 17 00:00:00 2001
From: kongfei <kongfei605@gmail.com>
Date: Tue, 12 Jul 2022 19:43:25 +0800
Subject: [PATCH 1/2] add out_of_cluster_scrape config && disable prometheus

---
 conf/in_cluster_scrape.yaml     |  1 -
 conf/out_of_cluster_scrape.yaml | 47 +++++++++++++++++++++++++++++++++
 conf/prometheus.toml            |  2 +-
 3 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 conf/out_of_cluster_scrape.yaml

diff --git a/conf/in_cluster_scrape.yaml b/conf/in_cluster_scrape.yaml
index ced04b93..60aa7f18 100644
--- a/conf/in_cluster_scrape.yaml
+++ b/conf/in_cluster_scrape.yaml
@@ -15,7 +15,6 @@ scrape_configs:
       - role: endpoints
     scheme: https
     tls_config:
-      ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
       insecure_skip_verify: true
     authorization:
       credentials_file: /var/run/secrets/kubernetes.io/serviceaccount/token
diff --git a/conf/out_of_cluster_scrape.yaml b/conf/out_of_cluster_scrape.yaml
new file mode 100644
index 00000000..78f8623d
--- /dev/null
+++ b/conf/out_of_cluster_scrape.yaml
@@ -0,0 +1,47 @@
+global:
+  scrape_interval: 15s
+  #external_labels:
+  #  cluster: test
+  #  replica: 0
+
+scrape_configs:
+  - job_name: "categraf-out"
+    static_configs:
+      - targets: ["172.16.6.171:8080"]
+  - job_name: "categraf-out-apiserver"
+    metrics_path: "/metrics"
+    kubernetes_sd_configs:
+      - role: endpoints
+        kubeconfig_file: /path/to/.kube/config
+    scheme: https
+    tls_config:
+      insecure_skip_verify: true
+    authorization:
+      credentials_file: /path/to/token
+    relabel_configs:
+      - source_labels:
+          [
+            __meta_kubernetes_namespace,
+            __meta_kubernetes_service_name,
+            __meta_kubernetes_endpoint_port_name,
+          ]
+        action: keep
+        regex: default;kubernetes;https
+  - job_name: "categraf-out-coredns"
+    metrics_path: "/metrics"
+    kubernetes_sd_configs:
+      - role: endpoints
+        kubeconfig_file: /path/to/.kube/config
+    scheme: http
+    relabel_configs:
+      - source_labels:
+          [
+            __meta_kubernetes_namespace,
+            __meta_kubernetes_service_name,
+            __meta_kubernetes_endpoint_port_name,
+          ]
+        action: keep
+        regex: kube-system;kube-dns;metrics
+
+remote_write:
+  - url: 'http://172.31.62.213/prometheus/v1/write'
diff --git a/conf/prometheus.toml b/conf/prometheus.toml
index f28bf41c..a1704fbd 100644
--- a/conf/prometheus.toml
+++ b/conf/prometheus.toml
@@ -1,5 +1,5 @@
 [prometheus]
-  enable=true
+  enable=false
   scrape_config_file="/path/to/in_cluster_scrape.yaml"
   ## log level, debug warn info error
   log_level="info"

From a9fa3344da13637e24f8f9a407cd05e3c52aee6e Mon Sep 17 00:00:00 2001
From: kongfei <kongfei605@gmail.com>
Date: Tue, 12 Jul 2022 19:52:55 +0800
Subject: [PATCH 2/2] update logs configure

---
 conf/logs.toml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/conf/logs.toml b/conf/logs.toml
index f60f2072..ee7afa78 100644
--- a/conf/logs.toml
+++ b/conf/logs.toml
@@ -1,36 +1,36 @@
 [logs]
-## key 占位符
+## just a placholder
 api_key = "ef4ahfbwzwwtlwfpbertgq1i6mq0ab1q"
-## 是否开启日志采集
+## enable log collect or not
 enable = false
-## 接受日志的server地址, http/tcp/kafka, 只有kafka支持多个地址（broker）用逗号分割
+## the server receive logs, http/tcp/kafka, only kafka brokers can be multiple ip:ports with concatenation character ","
 send_to = "127.0.0.1:17878"
-## 发送日志的协议 http/tcp/kafka
+## send logs with protocol: http/tcp/kafka
 send_type = "http"
 topic = "flashcatcloud"
-## 是否压缩发送
+## send logs with compression or not 
 use_compress = false
-## 是否采用ssl
+## use ssl or not
 send_with_tls = false
-##
+## send logs in batchs
 batch_wait = 5
-## 日志offset信息保存目录
+## save offset in this path 
 run_path = "/opt/categraf/run"
-## 最多同时采集多少个日志文件
+## max files can be open 
 open_files_limit = 100
-## 定期扫描目录下是否有新增日志
+## scan config file in 10 seconds
 scan_period = 10
-## udp 读buffer的大小
+## read buffer of udp 
 frame_size = 9000
 ##
 collect_container_all = true
-  ## 全局的处理规则
+  ## glog processing rules
   [[logs.Processing_rules]]
-  ## 单个日志采集配置
+  ## single log configure
   [[logs.items]]
   ## file/journald/tcp/udp
   type = "file"
-  ## type=file时 path必填，type=journald/tcp/udp时 port必填
+  ## type=file, path is required; type=journald/tcp/udp, port is required
   path = "/opt/tomcat/logs/*.txt"
   source = "tomcat"
-  service = "my_service"
\ No newline at end of file
+  service = "my_service"