From 711138ee1b17f04e0a682ca9b7f7238765303b7a Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Wed, 22 Nov 2023 17:40:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B1=8F=E5=92=8C?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=9A=84OSS=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml            |  4 ++--
 script/docker/app/prometheus/config/prometheus.yml    |  8 +++++++-
 .../docker/app/prometheus/dashboard/bladex-linux.json | 11 -----------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/blade-ops/blade-resource/src/main/resources/application-dev.yml b/blade-ops/blade-resource/src/main/resources/application-dev.yml
index 2c1a7306..0fca26fc 100644
--- a/blade-ops/blade-resource/src/main/resources/application-dev.yml
+++ b/blade-ops/blade-resource/src/main/resources/application-dev.yml
@@ -15,9 +15,9 @@ oss:
   #租户模式
   tenant-mode: true
   #oss服务地址
-  endpoint: http://192.168.2.100:9000
+  endpoint: http://192.168.10.100:9000
   #minio转换服务地址，用于内网上传后将返回地址改为转换的外网地址
-  transform-endpoint: http://192.168.2.100:9000
+  transform-endpoint: http://192.168.10.100:9000
   #访问key
   access-key: minio
   #密钥key
diff --git a/script/docker/app/prometheus/config/prometheus.yml b/script/docker/app/prometheus/config/prometheus.yml
index b272d0a0..bc503ed4 100644
--- a/script/docker/app/prometheus/config/prometheus.yml
+++ b/script/docker/app/prometheus/config/prometheus.yml
@@ -22,11 +22,17 @@ scrape_configs:
     static_configs:
       - targets: ['172.30.0.90:9090'] #填写prometheus服务ip:端口
   # 监控 linux
-  - job_name: linux
+  - job_name: linux-ops
     static_configs:
       - targets: ['172.30.0.93:9100'] #填写node-exporter的docker服务ip:端口或者宿主机ip:映射的端口
         labels:
           instance: localhost:linux #实例名称或ip
+  # 监控 linux
+  - job_name: linux-app
+    static_configs:
+      - targets: [ '172.30.0.93:9100' ] #填写node-exporter的docker服务ip:端口或者宿主机ip:映射的端口
+        labels:
+          instance: localhost:linux #实例名称或ip
   # 监控 mysql
   - job_name: 'mysql'
     static_configs:
diff --git a/script/docker/app/prometheus/dashboard/bladex-linux.json b/script/docker/app/prometheus/dashboard/bladex-linux.json
index f67ff761..50f9d2c1 100644
--- a/script/docker/app/prometheus/dashboard/bladex-linux.json
+++ b/script/docker/app/prometheus/dashboard/bladex-linux.json
@@ -18,17 +18,6 @@
   "graphTooltip": 1,
   "id": 34,
   "iteration": 1612446791794,
-  "links": [
-    {
-      "icon": "cloud",
-      "tags": [],
-      "targetBlank": true,
-      "title": "BladeX",
-      "tooltip": "",
-      "type": "link",
-      "url": "https://bladex.vip"
-    }
-  ],
   "panels": [
     {
       "collapsed": false,