Index: web-module/pom.xml
===================================================================
diff -u -rb308ba2fe0ccdfa2b7ccd7e7459dc35d8036008b -r6346c28529301c55879a17c881f863855914a355
--- web-module/pom.xml (.../pom.xml) (revision b308ba2fe0ccdfa2b7ccd7e7459dc35d8036008b)
+++ web-module/pom.xml (.../pom.xml) (revision 6346c28529301c55879a17c881f863855914a355)
@@ -17,7 +17,7 @@
Web Project by 313 DEV GRP
- 21.03.24
+ 21.03.25
Index: web-module/script/yml/monitoring/server/allinone.yml
===================================================================
diff -u -r45a6c6259c7f4eb24aee2bbe6c37b8ae4300114c -r6346c28529301c55879a17c881f863855914a355
--- web-module/script/yml/monitoring/server/allinone.yml (.../allinone.yml) (revision 45a6c6259c7f4eb24aee2bbe6c37b8ae4300114c)
+++ web-module/script/yml/monitoring/server/allinone.yml (.../allinone.yml) (revision 6346c28529301c55879a17c881f863855914a355)
@@ -224,6 +224,7 @@
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
environment:
+ ELASTICSEARCH_URL: http://es-coordinating:9200
ELASTICSEARCH_HOSTS: "http://es-coordinating:9200"
networks: *efk-network
depends_on:
@@ -232,7 +233,7 @@
mode: replicated
replicas: 1
placement:
- constraints: [node.role==manager]
+ constraints: [node.role!=manager]
logging:
driver: "json-file"
options:
@@ -540,7 +541,8 @@
depends_on:
- chronograf
volumes:
- - grafana:/var/lib/grafana
+ - grafanavar:/var/lib/grafana
+ - grafanaetc:/etc/grafana
logging:
driver: "json-file"
options:
@@ -583,7 +585,7 @@
max-size: "100m"
www313cokr:
- image: 313devgrp/jstree-service-framework-backend-app:21.01.10
+ image: 313devgrp/jstree-service-framework-backend-app:21.03.25
ports:
- "31313:8080"
deploy:
@@ -643,13 +645,20 @@
o: "addr=${NFSSERVER:-1.2.3.4},nolock,soft,rw,sync"
device: ":${NFSPATH:-/nfspath}/allinone/chronograf"
- grafana:
+ grafanavar:
driver: local
driver_opts:
type: "nfs"
o: "addr=${NFSSERVER:-1.2.3.4},nolock,soft,rw,sync"
- device: ":${NFSPATH:-/nfspath}/allinone/grafana"
+ device: ":${NFSPATH:-/nfspath}/allinone/grafana/var"
+ grafanaetc:
+ driver: local
+ driver_opts:
+ type: "nfs"
+ o: "addr=${NFSSERVER:-1.2.3.4},nolock,soft,rw,sync"
+ device: ":${NFSPATH:-/nfspath}/allinone/grafana/etc"
+
sc-extweb:
driver: local
driver_opts:
Index: web-module/script/yml/monitoring/server/portainer.yml
===================================================================
diff -u -r69f65a3cab4869c45e0cdf692df7b03645271630 -r6346c28529301c55879a17c881f863855914a355
--- web-module/script/yml/monitoring/server/portainer.yml (.../portainer.yml) (revision 69f65a3cab4869c45e0cdf692df7b03645271630)
+++ web-module/script/yml/monitoring/server/portainer.yml (.../portainer.yml) (revision 6346c28529301c55879a17c881f863855914a355)
@@ -19,6 +19,11 @@
mode: global
placement:
constraints: [node.platform.os == linux]
+ logging:
+ driver: "json-file"
+ options:
+ max-file: "5"
+ max-size: "100m"
portainer:
image: portainer/portainer
@@ -35,6 +40,11 @@
replicas: 1
placement:
constraints: [node.role == manager]
+ logging:
+ driver: "json-file"
+ options:
+ max-file: "5"
+ max-size: "100m"
networks:
agent_network:
Index: web-module/src/main/java/egovframework/api/arms/dashboardlist/service/DashboardListServiceImpl.java
===================================================================
diff -u -rb308ba2fe0ccdfa2b7ccd7e7459dc35d8036008b -r6346c28529301c55879a17c881f863855914a355
--- web-module/src/main/java/egovframework/api/arms/dashboardlist/service/DashboardListServiceImpl.java (.../DashboardListServiceImpl.java) (revision b308ba2fe0ccdfa2b7ccd7e7459dc35d8036008b)
+++ web-module/src/main/java/egovframework/api/arms/dashboardlist/service/DashboardListServiceImpl.java (.../DashboardListServiceImpl.java) (revision 6346c28529301c55879a17c881f863855914a355)
@@ -52,8 +52,8 @@
String influxdbBaseUrl = influxdbUrl + "/api/dashboards/db";
String returnResultStr = restTemplate.postForObject( influxdbBaseUrl, request, String.class);
-
- return null;
+ logger.debug("returnResultStr" + returnResultStr);
+ return 1;
}
private HttpHeaders createHttpHeaders(String user, String password)