From 991a3e2ab582158538245db0c446f5a01dd32801 Mon Sep 17 00:00:00 2001
From: JeffreyBool <1402992668@qq.com>
Date: Sat, 25 Dec 2021 22:11:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20n9e-webapi=20=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E9=87=87=E9=9B=86=20(#848)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 添加自定义发现文件

* 添加 webapi 指标
---
 docker/prometc/prometheus.yml | 5 +++++
 docker/prometc/targets.json   | 7 +++++++
 2 files changed, 12 insertions(+)
 create mode 100644 docker/prometc/targets.json

diff --git a/docker/prometc/prometheus.yml b/docker/prometc/prometheus.yml
index af33d870..9dc19861 100644
--- a/docker/prometc/prometheus.yml
+++ b/docker/prometc/prometheus.yml
@@ -27,3 +27,8 @@ scrape_configs:
 
     static_configs:
     - targets: ['localhost:9090']
+
+  - job_name: 'file_ds'
+    file_sd_configs:
+    - files:
+      - targets.json
diff --git a/docker/prometc/targets.json b/docker/prometc/targets.json
new file mode 100644
index 00000000..e036e964
--- /dev/null
+++ b/docker/prometc/targets.json
@@ -0,0 +1,7 @@
+[
+  {
+    "targets": [
+      "nwebapi:18000"
+    ]
+  }
+]

From ef6f6f95c06c6e3a2fedae4e1be4c51309c6094f Mon Sep 17 00:00:00 2001
From: JeffreyBool <1402992668@qq.com>
Date: Sat, 25 Dec 2021 22:31:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20server=20=20=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E9=87=87=E9=9B=86=20(#850)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 修改名称

* 增加 server 指标采集
---
 docker/prometc/prometheus.yml | 2 +-
 docker/prometc/targets.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/prometc/prometheus.yml b/docker/prometc/prometheus.yml
index 9dc19861..cad869dc 100644
--- a/docker/prometc/prometheus.yml
+++ b/docker/prometc/prometheus.yml
@@ -28,7 +28,7 @@ scrape_configs:
     static_configs:
     - targets: ['localhost:9090']
 
-  - job_name: 'file_ds'
+  - job_name: 'n9e'
     file_sd_configs:
     - files:
       - targets.json
diff --git a/docker/prometc/targets.json b/docker/prometc/targets.json
index e036e964..2f050d8f 100644
--- a/docker/prometc/targets.json
+++ b/docker/prometc/targets.json
@@ -1,7 +1,7 @@
 [
   {
     "targets": [
-      "nwebapi:18000"
+      "nwebapi:18000","nserver:19000"
     ]
   }
 ]