This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 76813bc18 [SCB-2674] Dashboard data reporting environment variables
are not submitted (#3311)
76813bc18 is described below
commit 76813bc18a2513d6797794721d0bcf72dcc4ab22
Author: lbc97 <[email protected]>
AuthorDate: Wed Aug 31 11:16:22 2022 +0800
[SCB-2674] Dashboard data reporting environment variables are not submitted
(#3311)
---
.../apache/servicecomb/dashboard/client/model/MonitorData.java | 10 ++++++++++
.../dashboard/monitor/model/MonitorDataProvider.java | 1 +
2 files changed, 11 insertions(+)
diff --git
a/clients/dashboard-client/src/main/java/org/apache/servicecomb/dashboard/client/model/MonitorData.java
b/clients/dashboard-client/src/main/java/org/apache/servicecomb/dashboard/client/model/MonitorData.java
index 70c65693c..d02facd5d 100644
---
a/clients/dashboard-client/src/main/java/org/apache/servicecomb/dashboard/client/model/MonitorData.java
+++
b/clients/dashboard-client/src/main/java/org/apache/servicecomb/dashboard/client/model/MonitorData.java
@@ -50,6 +50,8 @@ public class MonitorData {
private String serviceId;
+ private String environment;
+
private String instance;
private String instanceId;
@@ -175,4 +177,12 @@ public class MonitorData {
public void setCustoms(Map<String, Object> customs) {
this.customs = customs;
}
+
+ public String getEnvironment() {
+ return environment;
+ }
+
+ public void setEnvironment(String environment) {
+ this.environment = environment;
+ }
}
diff --git
a/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/model/MonitorDataProvider.java
b/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/model/MonitorDataProvider.java
index ced459830..bbcbe56f1 100644
---
a/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/model/MonitorDataProvider.java
+++
b/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/model/MonitorDataProvider.java
@@ -49,6 +49,7 @@ public interface MonitorDataProvider {
monitorData.setServiceId(microservice.getServiceId());
monitorData.setInstance(microserviceInstance.getHostName());
monitorData.setInstanceId(microserviceInstance.getInstanceId());
+ monitorData.setEnvironment(microserviceInstance.getEnvironment());
}
default void exactProcessInfo(MonitorData monitorData) {