Index: arms/html/searchEngine/content-container.html =================================================================== diff -u -r15dd2a6b1985a5fdba831e49da766811c236a191 -r5233854f8c4e7b699798a7841cc293030a126f94 --- arms/html/searchEngine/content-container.html (.../content-container.html) (revision 15dd2a6b1985a5fdba831e49da766811c236a191) +++ arms/html/searchEngine/content-container.html (.../content-container.html) (revision 5233854f8c4e7b699798a7841cc293030a126f94) @@ -48,8 +48,12 @@ +
  • + +
  • -
  • +
  • 검색 조건 : - +
    • @@ -90,8 +93,7 @@
    + class="search_main_wrapper col-lg-12 col-layer">
    @@ -170,14 +172,15 @@
    - +
    + - + +
    +
    + +
    + id="log_section">

    - APM(Application Performance Monitoring) - 성능 모니터링 결과 + 로그(log) 검색 결과

    - 검색 결과입니다. 자세한 정보를 보시려면 해당 항목을 선택해주세요. + 로그 검색 결과가 입니다. 자세한 정보를 보시려면 해당 항목을 선택해주세요.
    -
    - <!– 검색 결과 생성 시, append 하는 방식으로? –> -
    -
    - - - :sparkles: - -  A-RMS 는 IT 위기를 해결 할 수 있어요 - -
    -
    -

    - 카테고리 fluentd-20240204 -

    -

    - 2024-02-15 15:18 KST -

    -
    -
    -
    - - 10.0.1.206 - - [04/Feb/2024:17:59:57 +0900] "POST - /php/matomo/matomo.php?action_name=A-RMS%20By%20313DEVGRP&idsite=1&rec=1&r=470936&h=17&m=59&s=57&url=http%3A%2F%2Fwww.a-rms.net%2Farms%2Ftemplate.html%3Fpage%3Ddashboard&_id=db14431d39b7ad70&_idn=0&send_image=0&_refts=0&pdf=1&qt=0&realp=0&wma=0&fla=0&java=0&ag=0&cookie=1&res=1728x1117&pv_id=UMPI0X&pf_net=0&pf_srv=1&pf_tfr=7&pf_dm1=90&uadata=%7B%7D - HTTP/1.1" 204 0 "http://www.a-rms.net/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:122.0) - Gecko/20100101 Firefox/122.0" "211.201.140.91" - -
    -
    -
    -
    -
    - - - :sparkles: - -  A-RMS 는 IT 위기를 해결 할 수 있어요 - -
    -
    -

    - 카테고리 fluentd-20240123 -

    -
    -
    -
    - - 2024-01-23 17:14:00.493 DEBUG 1 --- [r-http-epoll-11] o.s.http.codec.json.Jackson2JsonDecoder : - [2d8d7f6] [636415dd-3, L:/172.18.0.23:41310 - R:hsyang206.atlassian.net/43.202.69.1:443] Decoded - [지라이슈_데이터(id=10018, key=YHS-19, self=https://hsyang206.atlassian.net/rest/api/3/issue/10018, - fields=n (truncated)...] - -
    -
    -
    -

    Can I use CSS3 Radial-Gradient?

    -

    okendoken.com

    -

    - Yes you can! Further more, you should! It let's you create really beautiful images either for elements - or for the entire background. -

    -
    -
    +
    +
    +
    -
    --> +
    +
    +
    +
    +

    + + 로그 집계 +

    +
    + + + + + + + + + + + + + + + + + + +
    +
    +
    +
    + 집계 결과 상위 5 항목 입니다. +
    + +
    +
    +
    +
    +    +
    +
    +
    +
    Index: arms/js/searchEngine.js =================================================================== diff -u -r15dd2a6b1985a5fdba831e49da766811c236a191 -r5233854f8c4e7b699798a7841cc293030a126f94 --- arms/js/searchEngine.js (.../searchEngine.js) (revision 15dd2a6b1985a5fdba831e49da766811c236a191) +++ arms/js/searchEngine.js (.../searchEngine.js) (revision 5233854f8c4e7b699798a7841cc293030a126f94) @@ -113,7 +113,7 @@ }); //검색 결과 리스트 클릭 이벤트 - $("#search_main_wrapper .search_result_group .search_result_items").on("click", function (event) { + $(".search_main_wrapper .search_result_group .search_result_items").on("click", function (event) { console.log($(event.target).closest(".search-result")[0]); var clicked_content_id = $(event.target).closest(".search-result").find(".search_head").attr("id"); if (!clicked_content_id.includes("no_search_result")) { @@ -161,9 +161,14 @@ let start = (rangeDate["start-date"] ? SearchApiModule.setMidnightToZero(rangeDate["start-date"]) : "" ); let end = (rangeDate["end-date"] ? new Date(rangeDate["end-date"]).toLocaleString('ko-KR', {timeZone: 'Asia/Seoul'}) : ""); let rangeText = start+ " ~ " + end; + let blannk = `  ` + if(searchRangeType ==="all-time") { + rangeText = ""; + blannk = ``; + } $("#filter_list").html(""); $("#filter_list").append( - `
  • ${rangeText}
    • ` + `
  • ${blannk}${rangeText}
    • ` ); if(searchString) { @@ -194,39 +199,39 @@ function search_with_date(search_string, range_date) { let start_date = null; let end_date = null; - if(range_date) { - if(range_date["start-date"]) { + if (range_date) { + if (range_date["start-date"]) { start_date = range_date["start-date"]; } - if(range_date["end-date"]) { + if (range_date["end-date"]) { end_date = range_date["end-date"]; } } $(".spinner").html( - '로딩 ' + + "\"로딩\" " + "검색 결과 로딩 중입니다..." ); $.ajax({ url: "/engine-search-api/engine/jira/dashboard/search/jiraissue/with-date", type: "GET", - data: { "search_string": search_string, "page" : 0, "size": 10, "from": start_date, "to" : end_date }, + data: { "search_string": search_string, "page": 0, "size": 10, "from": start_date, "to": end_date }, dataType: "json", success: function(result) { console.log("[searchEngine :: search_with_date] :: jiraissue_search_results 실행"); const current_page = 1; //현재 페이지 초기화 const items_per_Page = 10; //페이지당 아이템 수 - SearchApiModule.setSearchResult("jiraissue",result, current_page, items_per_Page); + SearchApiModule.setSearchResult("jiraissue", result, current_page, items_per_Page); } }); $.ajax({ url: "/engine-search-api/engine/jira/dashboard/search/log/with-date", type: "GET", - data: { "search_string": search_string, "page" : 0, "size": 10,"from": start_date, "to" : end_date }, + data: { "search_string": search_string, "page": 0, "size": 10, "from": start_date, "to": end_date }, dataType: "json", success: function(result) { console.log("[searchEngine :: search_with_date] :: fluentd_search_results 실행"); @@ -235,14 +240,16 @@ SearchApiModule.setSearchResult("log", result, current_page, items_per_Page); } }); + + getTop5LogName(search_string,range_date); } function getTop5LogName(search_string, range_date){ console.log("[searchEngine :: getTop5LogName] 실행"); - $(".spinner").html( +/* $(".spinner").html( '로딩 ' + "집계 결과 로딩 중입니다..." - ); + );*/ let start_date = null; let end_date = null; Index: arms/js/searchEngine/searchApiModule.js =================================================================== diff -u -rad1964b69fbf8ca7b3751addb54eedafecc86d5a -r5233854f8c4e7b699798a7841cc293030a126f94 --- arms/js/searchEngine/searchApiModule.js (.../searchApiModule.js) (revision ad1964b69fbf8ca7b3751addb54eedafecc86d5a) +++ arms/js/searchEngine/searchApiModule.js (.../searchApiModule.js) (revision 5233854f8c4e7b699798a7841cc293030a126f94) @@ -24,6 +24,7 @@ break; case "all-time": searchRangeDate["start-date"] = null; + searchRangeDate["end-date"] = null; break; case "previous-hour": let oneHourAgo = new Date(today.getTime() - (1 * 60 * 60 * 1000));