zhengjie преди 9 месеца
родител
ревизия
fe68e5d39a
променени са 5 файла, в които са добавени 62 реда и са изтрити 22 реда
  1. 11 2
      docker/monitor/yml/prometheus.yml
  2. 10 0
      gateway/pom.xml
  3. 18 10
      gateway/src/main/resources/application.yml
  4. 14 1
      pom.xml
  5. 9 9
      service/his-service/src/main/resources/application.yml

+ 11 - 2
docker/monitor/yml/prometheus.yml

@@ -13,10 +13,19 @@ scrape_configs:
   - job_name: 'node-exporter'
     static_configs:
       - targets: ['monitor-node:9100']
-        -
+
+  - job_name: 'docker-ghip'
+    static_configs:
+      - targets: ['192.168.8.2:9080']
+
   - job_name: 'nacos'
     scrape_interval: 60s
     metrics_path: '/nacos/actuator/prometheus'
     static_configs:
       - targets:
-          - 192.168.8.2:8848
+          - 192.168.8.2:8848
+  - job_name: 'gateway'
+    metrics_path: '/actuator/prometheus'
+    scrape_interval: 15s
+    static_configs:
+      - targets: ['192.168.8.2:9001','192.168.8.2:9002']

+ 10 - 0
gateway/pom.xml

@@ -33,6 +33,11 @@
             </exclusions>
         </dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
@@ -47,5 +52,10 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
+
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-registry-prometheus</artifactId>
+		</dependency>
     </dependencies>
 </project>

+ 18 - 10
gateway/src/main/resources/application.yml

@@ -1,21 +1,29 @@
-
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  metrics:
+    export:
+      prometheus:
+        enabled: true
 spring:
   application:
     name: gateway-service
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_SERVER}
-        username: config
-        password: cfg123456
+        server-addr: ${NACOS_SERVER:localhost}:${NACOS_PORT:8848}
+        username: ${NACOS_USERNAME:config}
+        password: ${NACOS_PASSWORD:cfg123456}
       config:
-        server-addr: ${NACOS_SERVER}
+        server-addr: ${NACOS_SERVER:localhost}:${NACOS_PORT:8848}
         file-extension: yaml
-        username: config
-        password: cfg123456
+        username: ${NACOS_USERNAME:config}
+        password: ${NACOS_PASSWORD:cfg123456}
   config:
-    import: "nacos:gateway-service-${spring.profiles.default}.yaml?group=DEFAULT_GROUP&data-type=yaml"
+    import: "nacos:gateway-service-${spring.profiles.active}.yaml?group=DEFAULT_GROUP&data-type=yaml"
   profiles:
-    default: dev
+    active: ${SPRING_PROFILES_ACTIVE:dev}
 server:
-  port: 9001
+  port: ${PORT:9001}

+ 14 - 1
pom.xml

@@ -38,6 +38,8 @@
         <spring.build.version>3.1.5</spring.build.version>
         <java.source.version>1.8</java.source.version>
 
+		<prometheus.version>1.9.14</prometheus.version>
+
 
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		<maven.source.skip>true</maven.source.skip>
@@ -49,7 +51,6 @@
 
     <dependencyManagement>
         <dependencies>
-
             <!-- Spring Dependencies -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
@@ -81,6 +82,12 @@
                 <version>${spring-boot.version}</version>
             </dependency>
 
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-starter-actuator</artifactId>
+				<version>${spring-boot.version}</version>
+			</dependency>
+
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-autoconfigure</artifactId>
@@ -122,6 +129,12 @@
                 <version>${spring-boot.version}</version>
             </dependency>
 
+			<dependency>
+				<groupId>io.micrometer</groupId>
+				<artifactId>micrometer-registry-prometheus</artifactId>
+				<version>${prometheus.version}</version>
+			</dependency>
+
         </dependencies>
     </dependencyManagement>
 

+ 9 - 9
service/his-service/src/main/resources/application.yml

@@ -5,17 +5,17 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_SERVER}
-        username: config
-        password: cfg123456
+        server-addr: ${NACOS_SERVER:localhost}:${NACOS_PORT:8848}
+        username: ${NACOS_USERNAME:config}
+        password: ${NACOS_PASSWORD:cfg123456}
       config:
-        server-addr: ${NACOS_SERVER}
+        server-addr: ${NACOS_SERVER:localhost}:${NACOS_PORT:8848}
         file-extension: yaml
-        username: config
-        password: cfg123456
+        username: ${NACOS_USERNAME:config}
+        password: ${NACOS_PASSWORD:cfg123456}
   config:
-    import: "nacos:his-service-${spring.profiles.default}.yaml?group=DEFAULT_GROUP&data-type=yaml"
+    import: "nacos:his-service-${spring.profiles.active}.yaml?group=DEFAULT_GROUP&data-type=yaml"
   profiles:
-    default: dev
+    active: ${SPRING_PROFILES_ACTIVE:dev}
 server:
-  port: 9002
+  port: ${PORT:9001}