apache · wodiwudi · Nov 13, 2023 · Nov 13, 2023
diff --git a/...-monitor/ozhera-monitor-server/src/main/resources/application-opensource-outer.properties b/...-monitor/ozhera-monitor-server/src/main/resources/application-opensource-outer.properties
@@ -13,6 +13,8 @@ dubbo.group.heraapp=open
 dubbo.group.alert=opensource-outer
 dubbo.group.tpc=staging-open
 
+log.path=/home/work
+
 nacos.config.addrs=nacos:80
 app.nacos=nacos:80
 

diff --git a/ozhera-monitor/ozhera-monitor-server/src/main/resources/application.properties b/ozhera-monitor/ozhera-monitor-server/src/main/resources/application.properties
@@ -24,7 +24,7 @@ resttemplate.connection.timeout=@resttemplate.connection.timeout@
 resttemplate.read.timeout=@resttemplate.read.timeout@
 
 
-log.path=/tmp
+log.path=@log.path@
 
 dev.mode=@dev.mode@
 inner.auth=@inner.auth@

diff --git a/...rvice/src/main/java/com/xiaomi/mone/monitor/service/impl/GrafanaServiceExtensionImpl.java b/...rvice/src/main/java/com/xiaomi/mone/monitor/service/impl/GrafanaServiceExtensionImpl.java
@@ -115,11 +115,11 @@ public void setFolderData(String area) {
     public void setContainerAndHostUrl(String area) {
         switch (area) {
             case "Hera":
-                ContainerAndHostUrl.put(CONTAINER_URL, grafanaDomain + grafanaContainerUrl + "${__data.fields.ip.text}");
+                ContainerAndHostUrl.put(CONTAINER_URL, grafanaDomain + grafanaContainerUrl + "${__data.fields.ip.text}&var-pod=${__data.fields.pod.text}");
                 ContainerAndHostUrl.put(HOST_URL, grafanaDomain + grafanaHostUrl + "${__data.fields.ip.text}");
                 break;
             default:
-                ContainerAndHostUrl.put(CONTAINER_URL, grafanaDomain + grafanaContainerUrl + "${__data.fields.ip.text}");
+                ContainerAndHostUrl.put(CONTAINER_URL, grafanaDomain + grafanaContainerUrl + "${__data.fields.ip.text}&var-pod=${__data.fields.pod.text}");
                 ContainerAndHostUrl.put(HOST_URL, grafanaDomain + grafanaHostUrl + "${__data.fields.ip.text}");
                 break;
         }

diff --git a/...a-monitor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/dockerMonitor.ftl b/...a-monitor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/dockerMonitor.ftl
@@ -286,7 +286,7 @@
 "uid": "${prometheusUid}"
 },
 "exemplar": true,
-"expr": "sum(rate(container_cpu_user_seconds_total{image!=\"\",ip=\"$Node\"}[5m]) * 100)",
+"expr": "sum(rate(container_cpu_user_seconds_total{image!=\"\",ip=\"$Node\"}[30s]) * 100)",
 "interval": "",
 "intervalFactor": 2,
 "legendFormat": "",
@@ -371,7 +371,7 @@
 },
 "editorMode": "code",
 "exemplar": true,
-"expr": "sum(rate(container_cpu_user_seconds_total{image!=\"\",ip=\"$Node\",pod=~\"$pod\"}[2m]) * 100) by (pod)",
+"expr": "sum(rate(container_cpu_user_seconds_total{image!=\"\",ip=\"$Node\",pod=~\"$pod\"}[30s]) * 100) by (pod)",
 "hide": false,
 "interval": "60",
 "intervalFactor": 2,
@@ -687,7 +687,7 @@
 },
 "editorMode": "code",
 "exemplar": true,
-"expr": "sum(irate(container_network_receive_bytes_total{image!=\"\",ip=\"$Node\",pod=~\"$pod\"}[5m])) by (pod,interface)",
+"expr": "sum(irate(container_network_receive_bytes_total{image!=\"\",ip=\"$Node\",pod=~\"$pod\"}[30s])) by (pod,interface)",
 "hide": false,
 "interval": "60",
 "intervalFactor": 2,
@@ -704,7 +704,7 @@
 },
 "editorMode": "code",
 "exemplar": true,
-"expr": "sum(irate(container_network_receive_bytes_total{image!=\"\",ip=\"$Node\",container=\"POD\",interface=\"eth0\",pod=~\"$pod\"}[5m])) by (pod,interface)",
+"expr": "sum(irate(container_network_receive_bytes_total{image!=\"\",ip=\"$Node\",container=\"POD\",interface=\"eth0\",pod=~\"$pod\"}[30s])) by (pod,interface)",
 "hide": false,
 "interval": "60",
 "legendFormat": "{{pod}} -- {{interface}}",
@@ -801,7 +801,7 @@
 },
 "editorMode": "code",
 "exemplar": true,
-"expr": "sum(irate(container_network_transmit_bytes_total{image!=\"\",ip=\"$Node\",pod=~\"$pod\"}[5m])) by (pod,interface)",
+"expr": "sum(irate(container_network_transmit_bytes_total{image!=\"\",ip=\"$Node\",pod=~\"$pod\"}[30s])) by (pod,interface)",
 "hide": false,
 "interval": "60",
 "intervalFactor": 2,
@@ -817,7 +817,7 @@
 },
 "editorMode": "code",
 "exemplar": true,
-"expr": "sum(irate(container_network_receive_bytes_total{image!=\"\",ip=\"$Node\",container=\"POD\",interface=\"eth0\",pod=~\"$pod\"}[5m])) by (pod,interface)",
+"expr": "sum(irate(container_network_receive_bytes_total{image!=\"\",ip=\"$Node\",container=\"POD\",interface=\"eth0\",pod=~\"$pod\"}[30s])) by (pod,interface)",
 "hide": false,
 "interval": "60",
 "legendFormat": "{{pod}} -- {{interface}}",
@@ -1000,7 +1000,7 @@
 },
 "editorMode": "code",
 "exemplar": true,
-"expr": "sum(rate(container_fs_reads_bytes_total{image!=\"\",ip=\"$Node\",pod=~\"$pod\"}[1m])) without (device)",
+"expr": "sum(rate(container_fs_reads_bytes_total{image!=\"\",ip=\"$Node\",pod=~\"$pod\"}[30s])) without (device)",
 "hide": false,
 "interval": "60",
 "legendFormat": "{{pod}}",
@@ -1091,7 +1091,7 @@
 },
 "editorMode": "code",
 "exemplar": true,
-"expr": "sum(rate(container_fs_writes_bytes_total{image!=\"\",ip=\"$Node\",pod=~\"$pod\"}[1m])) without (device)",
+"expr": "sum(rate(container_fs_writes_bytes_total{image!=\"\",ip=\"$Node\",pod=~\"$pod\"}[30s])) without (device)",
 "hide": false,
 "interval": "60",
 "legendFormat": "{{pod}}",
@@ -1270,7 +1270,7 @@
 "version": 15,
 "weekStart": ""
 },
-"overwrite":false,
+"overwrite":true,
 "folderUid":"Hera",
-"message":"Hera容器监控V1.0"
+"message":"Hera容器监控V1.1"
 }
diff --git a/...tor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/dubboConsumerMarket.ftl b/...tor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/dubboConsumerMarket.ftl
@@ -368,7 +368,7 @@
 "version": 12,
 "weekStart": ""
 },
-"overwrite":false,
+"overwrite":true,
 "folderUid":"Hera",
 "message":"Hera-DubboConsumer大盘V1.0"
 }
diff --git a/...r/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/dubboConsumerOverview.ftl b/...r/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/dubboConsumerOverview.ftl
@@ -1296,7 +1296,7 @@
 "version": 1,
 "weekStart": ""
 },
-"overwrite":false,
+"overwrite":true,
 "folderUid":"Hera",
 "message":"Hera-DubboConsumer总览V1.0"
 }
diff --git a/...tor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/dubboProviderMarket.ftl b/...tor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/dubboProviderMarket.ftl
@@ -298,7 +298,7 @@
 "version": 1,
 "weekStart": ""
 },
-"overwrite":false,
+"overwrite":true,
 "folderUid":"Hera",
 "message":"Hera-DubboProvider大盘V1.0"
 }
diff --git a/...r/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/dubboProviderOverview.ftl b/...r/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/dubboProviderOverview.ftl
@@ -1295,7 +1295,7 @@
   "version": 38,
   "weekStart": ""
 },
-"overwrite":false,
+"overwrite":true,
 "folderUid":"Hera",
 "message":"Hera-DubboProvider总览V1.0"
 }
diff --git a/...onitor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/httpServerMarket.ftl b/...onitor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/httpServerMarket.ftl
@@ -392,7 +392,7 @@
 "version": 63,
 "weekStart": ""
 },
-"overwrite":false,
+"overwrite":true,
 "folderUid":"Hera",
 "message":"Hera-HTTPServer大盘V1.0"
 }
diff --git a/...itor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/httpServerOverview.ftl b/...itor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/httpServerOverview.ftl
@@ -870,7 +870,7 @@
 "version": 23,
 "weekStart": ""
 },
-"overwrite":false,
+"overwrite":true,
 "folderUid":"Hera",
 "message":"Hera-HTTPServer-总览V1.0"
 }
diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/jaegerQuery.ftl b/ozhera-monitor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/jaegerQuery.ftl
@@ -208,7 +208,8 @@
 "names": [
 "ip",
 "podIp",
-"Value"
+"Value",
+"pod"
 ]
 }
 }
@@ -226,7 +227,8 @@
 "id": "organize",
 "options": {
 "excludeByName": {
-"jumpIp": false
+"jumpIp": false,
+"pod": false
 },
 "indexByName": {
 "Last (not null)": 2,
@@ -241,8 +243,8 @@
 }
 ],
 "datasource": {
-"type": "prometheus",
-"uid": "${prometheusUid}"
+"uid": "${prometheusUid}",
+"type": "prometheus"
 },
 "pluginVersion": "9.2.0",
 "description": "点击实例下方的IP可以跳转到服务所在的物理机监控\n\n点击容器启动时间下方的时间可以跳转到服务所在的容器监控",
@@ -338,12 +340,12 @@
 "id": "mappings",
 "value": [
 {
+"type": "value",
 "options": {
 "0": {
 "text": "宕机"
 }
-},
-"type": "value"
+}
 },
 {
 "options": {
@@ -473,7 +475,7 @@
 },
 "editorMode": "code",
 "exemplar": true,
-"expr": "sum(container_last_seen{application=\"$application\",podIp=~\"$instance\"}) by (podIp,ip)",
+"expr": "sum(container_last_seen{application=\"$application\",podIp=~\"$instance\"}) by (podIp,ip,pod)",
 "format": "table",
 "hide": false,
 "instant": true,
@@ -5477,5 +5479,5 @@
 "overwrite":false,
 "folderId":${folderId},
 "folderUid":"${folderUid}",
-"message":"hera V1.1"
+"message":"hera V1.2"
 }
diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/nodeMonitor.ftl b/ozhera-monitor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/nodeMonitor.ftl
@@ -4350,7 +4350,7 @@
 "version": 1,
 "weekStart": ""
 },
-"overwrite":false,
+"overwrite":true,
 "folderUid":"Hera",
 "message":"Hera物理机监控V1.0"
 }
diff --git a/...tor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/resourceUtilization.ftl b/...tor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/resourceUtilization.ftl
@@ -1459,7 +1459,7 @@
 "version": 8,
 "weekStart": ""
 },
-"overwrite":false,
+"overwrite":true,
 "folderUid":"Hera",
 "message":"Hera-k8s资源使用率大盘V1.0"
 }
diff --git a/...a-monitor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/serviceMarket.ftl b/...a-monitor/ozhera-monitor-service/src/main/resources/heraGrafanaTemplate/serviceMarket.ftl
@@ -1138,7 +1138,7 @@
 "version": 1,
 "weekStart": ""
 },
-"overwrite":false,
+"overwrite":true,
 "folderUid":"Hera",
 "message":"Hera-服务大盘V1.0"
 }