Index: web-module/profiles/dev/support.properties =================================================================== diff -u -r30b38db11720fa1190bcdab45f31b2e4df45e5a3 -rd5de351ee43a30d067dc5d1339b88d788ea02f03 --- web-module/profiles/dev/support.properties (.../support.properties) (revision 30b38db11720fa1190bcdab45f31b2e4df45e5a3) +++ web-module/profiles/dev/support.properties (.../support.properties) (revision d5de351ee43a30d067dc5d1339b88d788ea02f03) @@ -37,7 +37,9 @@ allinone.monitoring.topbeatindex = topbeat-* allinone.monitoring.apmindex = apm-* -allinone.monitoring.influx.url = http://192.168.25.46:3000/api/datasources/proxy/1/query?db=scouterCounter&q=SHOW TAG VALUES FROM counter WITH KEY = obj +allinone.monitoring.influx.url = http://192.168.25.46:3000 +allinone.monitoring.influx.path = /api/datasources/proxy/ +allinone.monitoring.influx.query = /query?db=scouterCounter&q=SHOW TAG VALUES FROM counter WITH KEY = obj allinone.monitoring.influxdb.url = http://192.168.25.46:3000 allinone.monitoring.influxdb.datasource = InfluxDB - Scouter,Elasticsearch - APM,Elasticsearch - Filebeat,Elasticsearch - Heartbeat,Elasticsearch - Metricbeat,Elasticsearch - Packetbeat,Elasticsearch - Topbeat \ No newline at end of file Index: web-module/profiles/operation/support.properties =================================================================== diff -u -r9bdbf848cb92b56a9ab00e105e192d1ae1136f6e -rd5de351ee43a30d067dc5d1339b88d788ea02f03 --- web-module/profiles/operation/support.properties (.../support.properties) (revision 9bdbf848cb92b56a9ab00e105e192d1ae1136f6e) +++ web-module/profiles/operation/support.properties (.../support.properties) (revision d5de351ee43a30d067dc5d1339b88d788ea02f03) @@ -37,7 +37,9 @@ allinone.monitoring.topbeatindex = topbeat-* allinone.monitoring.apmindex = apm-* -allinone.monitoring.influx.url = http://192.168.25.46:3000/api/datasources/proxy/1/query?db=scouterCounter&q=SHOW TAG VALUES FROM counter WITH KEY = obj +allinone.monitoring.influx.url = http://192.168.25.46:3000 +allinone.monitoring.influx.path = /api/datasources/proxy/ +allinone.monitoring.influx.query = /query?db=scouterCounter&q=SHOW TAG VALUES FROM counter WITH KEY = obj allinone.monitoring.influxdb.url = http://192.168.25.46:3000 allinone.monitoring.influxdb.datasource = InfluxDB - Scouter,Elasticsearch - APM,Elasticsearch - Filebeat,Elasticsearch - Heartbeat,Elasticsearch - Metricbeat,Elasticsearch - Packetbeat,Elasticsearch - Topbeat \ No newline at end of file Index: web-module/src/main/java/egovframework/api/arms/devicelist/service/DeviceListServiceImpl.java =================================================================== diff -u -r7bfac2dedf4ff4a333187f06154b3cb15686f715 -rd5de351ee43a30d067dc5d1339b88d788ea02f03 --- web-module/src/main/java/egovframework/api/arms/devicelist/service/DeviceListServiceImpl.java (.../DeviceListServiceImpl.java) (revision 7bfac2dedf4ff4a333187f06154b3cb15686f715) +++ web-module/src/main/java/egovframework/api/arms/devicelist/service/DeviceListServiceImpl.java (.../DeviceListServiceImpl.java) (revision d5de351ee43a30d067dc5d1339b88d788ea02f03) @@ -12,16 +12,15 @@ import org.json.simple.parser.JSONParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; +import org.springframework.http.*; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.client.RestTemplate; import java.util.ArrayList; +import java.util.Base64; import java.util.List; /** @@ -272,8 +271,12 @@ HttpEntity request = new HttpEntity(headers); String influxdbBaseUrl = EgovProperties.getProperty("allinone.monitoring.influx.url"); - logger.info("====>" + influxdbBaseUrl); - String returnResultStr = restTemplate.postForObject( influxdbBaseUrl, request, String.class); + String influxdbBasePath = EgovProperties.getProperty("allinone.monitoring.influx.path"); + String datasourceId = getDatasourceID(); + String influxdbBaseQuery = EgovProperties.getProperty("allinone.monitoring.influx.query"); + logger.info("====>" + influxdbBaseUrl+influxdbBasePath+datasourceId+influxdbBaseQuery); + String fullUrl = influxdbBaseUrl+influxdbBasePath+datasourceId+influxdbBaseQuery; + String returnResultStr = restTemplate.postForObject(fullUrl , request, String.class); JSONParser jsonParser = new JSONParser(); Object jsonObj = jsonParser.parse( returnResultStr ); @@ -296,4 +299,41 @@ return returnJsonArray; } + + public String getDatasourceID(){ + + String influxdbBaseUrl = EgovProperties.getProperty("allinone.monitoring.influx.url"); + String theUrl = influxdbBaseUrl + "/api/datasources/name/InfluxDB - Scouter"; + RestTemplate restTemplate = new RestTemplate(); + String returnStr = ""; + try { + HttpHeaders headers = createHttpHeaders("admin","qwe123"); + HttpEntity entity = new HttpEntity("parameters", headers); + ResponseEntity response = restTemplate.exchange(theUrl, HttpMethod.GET, entity, String.class); + System.out.println("Result - status ("+ response.getStatusCode() + ") has body: " + response.hasBody()); + + logger.info(response.getBody().toString()); + JSONParser jsonParser = new JSONParser(); + Object jsonObj = jsonParser.parse( response.getBody().toString() ); + JSONObject hostStrJsonObj = (JSONObject) jsonObj; + logger.info(hostStrJsonObj.get("id").toString()); + + returnStr = hostStrJsonObj.get("id").toString(); + } + catch (Exception eek) { + System.out.println("** Exception: "+ eek.getMessage()); + } + + return returnStr; + } + + private HttpHeaders createHttpHeaders(String user, String password) + { + String notEncoded = user + ":" + password; + String encodedAuth = Base64.getEncoder().encodeToString(notEncoded.getBytes()); + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + headers.add("Authorization", "Basic " + encodedAuth); + return headers; + } } Index: web-module/src/main/resources/egovframework/egovProps/globals.properties =================================================================== diff -u -r9bdbf848cb92b56a9ab00e105e192d1ae1136f6e -rd5de351ee43a30d067dc5d1339b88d788ea02f03 --- web-module/src/main/resources/egovframework/egovProps/globals.properties (.../globals.properties) (revision 9bdbf848cb92b56a9ab00e105e192d1ae1136f6e) +++ web-module/src/main/resources/egovframework/egovProps/globals.properties (.../globals.properties) (revision d5de351ee43a30d067dc5d1339b88d788ea02f03) @@ -60,6 +60,8 @@ allinone.monitoring.apmindex = ${allinone.monitoring.apmindex} allinone.monitoring.influx.url = ${allinone.monitoring.influx.url} +allinone.monitoring.influx.path = ${allinone.monitoring.influx.path} +allinone.monitoring.influx.query = ${allinone.monitoring.influx.query} allinone.monitoring.influxdb.url = ${allinone.monitoring.influxdb.url} allinone.monitoring.influxdb.datasource = ${allinone.monitoring.influxdb.datasource} \ No newline at end of file Index: web-module/src/test/java/egovframework/com/ext/jstree/support/util/Java8LambdaTest.java =================================================================== diff -u -red072260ebb280bd3da1a3eee4b684d7405db5e2 -rd5de351ee43a30d067dc5d1339b88d788ea02f03 --- web-module/src/test/java/egovframework/com/ext/jstree/support/util/Java8LambdaTest.java (.../Java8LambdaTest.java) (revision ed072260ebb280bd3da1a3eee4b684d7405db5e2) +++ web-module/src/test/java/egovframework/com/ext/jstree/support/util/Java8LambdaTest.java (.../Java8LambdaTest.java) (revision d5de351ee43a30d067dc5d1339b88d788ea02f03) @@ -378,10 +378,10 @@ } - //@Test + @Test public void getDatasourceByNameTest() throws ParseException { - String theUrl = "http://192.168.25.46:3000/api/datasources/name/Elasticsearch - TopBeat"; + String theUrl = "http://192.168.25.46:3000/api/datasources/name/InfluxDB - Scouter"; RestTemplate restTemplate = new RestTemplate(); try { HttpHeaders headers = createHttpHeaders("admin","qwe123"); @@ -390,6 +390,11 @@ System.out.println("Result - status ("+ response.getStatusCode() + ") has body: " + response.hasBody()); logger.info(response.getBody().toString()); + JSONParser jsonParser = new JSONParser(); + Object jsonObj = jsonParser.parse( response.getBody().toString() ); + JSONObject hostStrJsonObj = (JSONObject) jsonObj; + logger.info(hostStrJsonObj.get("id").toString()); + } catch (Exception eek) { System.out.println("** Exception: "+ eek.getMessage()); @@ -543,6 +548,18 @@ } } + @Test + public void containStringTest() throws ParseException { + String mainStr = "/a6bc99072812/www313cokr"; + String searchStr = "a6bc99072812"; + + if(StringUtils.contains(mainStr, searchStr)){ + logger.info("true"); + }else{ + logger.info("false"); + } + } + private HttpHeaders createHttpHeaders(String user, String password) { String notEncoded = user + ":" + password;