Index: /branches/amp_3_7/extensions/monitoring/webui/resource/resource.service.js =================================================================== --- /branches/amp_3_7/extensions/monitoring/webui/resource/resource.service.js (revision 2470) +++ /branches/amp_3_7/extensions/monitoring/webui/resource/resource.service.js (working copy) @@ -409,7 +409,7 @@ // { // "id": "3", // "type": "filters", - // "settings": { "filters": [{ "query": "tag.header:APP-HTTP", "label": "-" }] } + // "settings": { "filters": [{ "query": "tag.header:AN_WELF_LOG", "label": "-" }] } // }, { "type": "terms", "field": "adc.httpstatuscode", "id": "4", "settings": { "size": "0", "order": "desc", "orderBy": "_key" } } ], @@ -447,7 +447,7 @@ { "id": "3", "type": "filters", - "settings": { "filters": [{ "query": "tag.header:APP-HTTP", "label": $filter('T')("Visit Number") }] } + "settings": { "filters": [{ "query": "tag.header:AN_WELF_LOG", "label": $filter('T')("Visit Number") }] } }, { "type": "date_histogram", "field": "@timestamp", "id": "1" } ], @@ -1601,8 +1601,8 @@ server_protocol = service.protocol; adv_filter = true; } - if (service_type.indexOf("SLB_vs") != -1) { - var http_code = { + if (service_type.indexOf("SLB_vs") !== -1) { + let http_code = { "name": "statusCode", "icon": "pie-chart", "verbose_name": 'HTTP Status Code Ratio', @@ -1629,12 +1629,12 @@ { "id": "3", "type": "filters", - "settings": { "filters": [{ "query": "adc.vs_name:" + service_name, "label": "server_id:" + service_name }] } + "settings": { "filters": [{ "query": "adc.serverip:" + service_ip, "label": "server_id:" + service_name }] } }, // { // "id": "4", // "type": "filters", - // "settings": { "filters": [{ "query": "tag.header:APP-HTTP", "label": "-" }] } + // "settings": { "filters": [{ "query": "tag.header:AN_WELF_LOG", "label": "-" }] } // }, { "type": "terms", "field": "adc.httpstatuscode", "id": "5", "settings": { "size": "0", "order": "desc", "orderBy": "_key" } } ], @@ -1644,7 +1644,7 @@ } }; if (adv_filter) { - if (server_protocol == '4' || server_protocol == '5') { + if (server_protocol === '4' || server_protocol === '5') { widgets.push(http_code); } } else { @@ -1680,12 +1680,12 @@ { "id": "3", "type": "filters", - "settings": { "filters": [{ "query": "adc.vs_name:" + service_name, "label": "server_id:" + service_name }] } + "settings": { "filters": [{ "query": "adc.serverip:" + service_ip, "label": "server_id:" + service_name }] } }, { "id": "4", "type": "filters", - "settings": { "filters": [{ "query": "tag.header:APP-HTTP", "label": $filter('T')("Visit Number") }] } + "settings": { "filters": [{ "query": "tag.header:AN_WELF_LOG", "label": $filter('T')("Visit Number") }] } }, { "type": "date_histogram", "field": "@timestamp", "id": "1" } ], @@ -1694,50 +1694,6 @@ } } }, { - "name": "responseTime", - "icon": "line-chart", - "verbose_name": 'Virtual Service Response Time', - "description": "Virtual Service Response Time(Processing time from receiving HTTP plaintext request from SSL unloading to sending HTTP plaintext response to SSL)", - "cls": "LineGraphWidget", - "args": { - "params": { - "flush": "10s" - }, - "chart": { - "XAxisName": "Time", - "YAxisName": "Duration(ms)", - "unit": "ms", - "seriesName": [$filter('T')("Response Time")] - }, - "datasource": { - "from": "now-15m", - "to": "now", - "queries": [{ - "datasourceId": 4, - "timeField": "@timestamp", - "bucketAggs": [ - { - "id": "2", - "type": "filters", - "settings": { "filters": [{ "query": "tag.remote_ip:" + device_ip, "label": "agent_host:" + device_ip }] } - }, - { - "id": "3", - "type": "filters", - "settings": { "filters": [{ "query": "adc.vs_name:" + service_name, "label": "server_id:" + service_name }] } - }, - { - "id": "4", - "type": "filters", - "settings": { "filters": [{ "query": "tag.header:*", "label": $filter('T')("Response Time") }] } - }, - { "type": "date_histogram", "field": "@timestamp", "id": "1" } - ], - "metrics": [{ "type": "percentiles", "field": "adc.responsetime", "id": "0", "settings": { "percents": ["50", "95", "99"] } }] - }] - } - } - }, { "name": "rtt", "icon": "line-chart", "verbose_name": 'Client To Device Time', @@ -1768,7 +1724,7 @@ { "id": "3", "type": "filters", - "settings": { "filters": [{ "query": "adc.vs_name:" + service_name, "label": "server_id:" + service_name }] } + "settings": { "filters": [{ "query": "adc.serverip:" + service_ip, "label": "server_id:" + service_name }] } }, { "id": "4", @@ -1777,143 +1733,190 @@ }, { "type": "date_histogram", "field": "@timestamp", "id": "1" } ], - "metrics": [{ "type": "percentiles", "field": "adc.rtt", "id": "0", "settings": { "percents": ["50", "95", "99"] } }] - }] - } - } - }, { - "name": "processRequestTime", - "icon": "line-chart", - "verbose_name": 'Device Processing Request Time', - "description": "Device Request Processing Time(processing time from receiving HTTP plaintext request during SSL unloading to sending HTTP plaintext request to back-end server)", - "cls": "LineGraphWidget", - "args": { - "params": { - "flush": "10s" - }, - "chart": { - "XAxisName": "Time", - "YAxisName": "Duration(ms)", - "unit": "ms", - "seriesName": [$filter('T')("Processing Time")] - }, - "datasource": { - "from": "now-15m", - "to": "now", - "queries": [{ - "datasourceId": 4, - "timeField": "@timestamp", - "bucketAggs": [ - { - "id": "2", - "type": "filters", - "settings": { "filters": [{ "query": "tag.remote_ip:" + device_ip, "label": "agent_host:" + device_ip }] } - }, - { - "id": "3", - "type": "filters", - "settings": { "filters": [{ "query": "adc.vs_name:" + service_name, "label": "server_id:" + service_name }] } - }, - { - "id": "4", - "type": "filters", - "settings": { "filters": [{ "query": "tag.header:*", "label": $filter('T')("Processing Time") }] } - }, - { "type": "date_histogram", "field": "@timestamp", "id": "1" } - ], - "metrics": [{ "type": "percentiles", "field": "adc.h_req_time", "id": "0", "settings": { "percents": ["50", "95", "99"] } }] - }] - } - } - }, { - "name": "serverResponseTime", - "icon": "line-chart", - "verbose_name": 'Server Response Time', - "description": "Server Response Time(processing time from sending HTTP plaintext request to back end server to receiving HTTP plaintext response from back end server)", - "cls": "LineGraphWidget", - "args": { - "params": { - "flush": "10s" - }, - "chart": { - "XAxisName": "Time", - "YAxisName": "Duration(ms)", - "unit": "ms", - "seriesName": [$filter('T')("Response Time")] - }, - "datasource": { - "from": "now-15m", - "to": "now", - "queries": [{ - "datasourceId": 4, - "timeField": "@timestamp", - "bucketAggs": [ - { - "id": "2", - "type": "filters", - "settings": { "filters": [{ "query": "tag.remote_ip:" + device_ip, "label": "agent_host:" + device_ip }] } - }, - { - "id": "3", - "type": "filters", - "settings": { "filters": [{ "query": "adc.vs_name:" + service_name, "label": "server_id:" + service_name }] } - }, - { - "id": "4", - "type": "filters", - "settings": { "filters": [{ "query": "tag.header:*", "label": $filter('T')("Response Time") }] } - }, - { "type": "date_histogram", "field": "@timestamp", "id": "1" } - ], - "metrics": [{ "type": "percentiles", "field": "adc.s_res_time", "id": "0", "settings": { "percents": ["50", "95", "99"] } }] + "metrics": [{ "type": "percentiles", "field": "adc.duration", "id": "0", "settings": { "percents": ["50", "95", "99"] } }] }] } } - }, { - "name": "processResponseTime", - "icon": "line-chart", - "verbose_name": 'Device Processing Response Time', - "description": "Device Processing Response Time(from receiving HTTP plaintext response from back-end server to sending HTTP plaintext response to SSL processing time)", - "cls": "LineGraphWidget", - "args": { - "params": { - "flush": "10s" - }, - "chart": { - "XAxisName": "Time", - "YAxisName": "Duration(ms)", - "unit": "ms", - "seriesName": [$filter('T')("Processing Time")] - }, - "datasource": { - "from": "now-15m", - "to": "now", - "queries": [{ - "datasourceId": 4, - "timeField": "@timestamp", - "bucketAggs": [ - { - "id": "2", - "type": "filters", - "settings": { "filters": [{ "query": "tag.remote_ip:" + device_ip, "label": "agent_host:" + device_ip }] } - }, - { - "id": "3", - "type": "filters", - "settings": { "filters": [{ "query": "adc.vs_name:" + service_name, "label": "server_id:" + service_name }] } - }, - { - "id": "4", - "type": "filters", - "settings": { "filters": [{ "query": "tag.header:*", "label": $filter('T')("Processing Time") }] } - }, - { "type": "date_histogram", "field": "@timestamp", "id": "1" } - ], - "metrics": [{ "type": "percentiles", "field": "adc.h_res_time", "id": "0", "settings": { "percents": ["50", "95", "99"] } }] - }] + }) + let responseCharts = [ + { + "name": "responseTime", + "icon": "line-chart", + "verbose_name": 'Virtual Service Response Time', + "description": "Virtual Service Response Time(Processing time from receiving HTTP plaintext request from SSL unloading to sending HTTP plaintext response to SSL)", + "cls": "LineGraphWidget", + "args": { + "params": { + "flush": "10s" + }, + "chart": { + "XAxisName": "Time", + "YAxisName": "Duration(ms)", + "unit": "ms", + "seriesName": [$filter('T')("Response Time")] + }, + "datasource": { + "from": "now-15m", + "to": "now", + "queries": [{ + "datasourceId": 4, + "timeField": "@timestamp", + "bucketAggs": [ + { + "id": "2", + "type": "filters", + "settings": { "filters": [{ "query": "tag.remote_ip:" + device_ip, "label": "agent_host:" + device_ip }] } + }, + { + "id": "3", + "type": "filters", + "settings": { "filters": [{ "query": "adc.serverip:" + service_ip, "label": "server_id:" + service_name }] } + }, + { + "id": "4", + "type": "filters", + "settings": { "filters": [{ "query": "tag.header:*", "label": $filter('T')("Response Time") }] } + }, + { "type": "date_histogram", "field": "@timestamp", "id": "1" } + ], + "metrics": [{ "type": "percentiles", "field": "adc.responsetime", "id": "0", "settings": { "percents": ["50", "95", "99"] } }] + }] + } + } + }, { + "name": "processRequestTime", + "icon": "line-chart", + "verbose_name": 'Device Processing Request Time', + "description": "Device Request Processing Time(processing time from receiving HTTP plaintext request during SSL unloading to sending HTTP plaintext request to back-end server)", + "cls": "LineGraphWidget", + "args": { + "params": { + "flush": "10s" + }, + "chart": { + "XAxisName": "Time", + "YAxisName": "Duration(ms)", + "unit": "ms", + "seriesName": [$filter('T')("Processing Time")] + }, + "datasource": { + "from": "now-15m", + "to": "now", + "queries": [{ + "datasourceId": 4, + "timeField": "@timestamp", + "bucketAggs": [ + { + "id": "2", + "type": "filters", + "settings": { "filters": [{ "query": "tag.remote_ip:" + device_ip, "label": "agent_host:" + device_ip }] } + }, + { + "id": "3", + "type": "filters", + "settings": { "filters": [{ "query": "adc.serverip:" + service_ip, "label": "server_id:" + service_name }] } + }, + { + "id": "4", + "type": "filters", + "settings": { "filters": [{ "query": "tag.header:*", "label": $filter('T')("Processing Time") }] } + }, + { "type": "date_histogram", "field": "@timestamp", "id": "1" } + ], + "metrics": [{ "type": "percentiles", "field": "adc.h_req_time", "id": "0", "settings": { "percents": ["50", "95", "99"] } }] + }] + } + } + }, { + "name": "serverResponseTime", + "icon": "line-chart", + "verbose_name": 'Server Response Time', + "description": "Server Response Time(processing time from sending HTTP plaintext request to back end server to receiving HTTP plaintext response from back end server)", + "cls": "LineGraphWidget", + "args": { + "params": { + "flush": "10s" + }, + "chart": { + "XAxisName": "Time", + "YAxisName": "Duration(ms)", + "unit": "ms", + "seriesName": [$filter('T')("Response Time")] + }, + "datasource": { + "from": "now-15m", + "to": "now", + "queries": [{ + "datasourceId": 4, + "timeField": "@timestamp", + "bucketAggs": [ + { + "id": "2", + "type": "filters", + "settings": { "filters": [{ "query": "tag.remote_ip:" + device_ip, "label": "agent_host:" + device_ip }] } + }, + { + "id": "3", + "type": "filters", + "settings": { "filters": [{ "query": "adc.serverip:" + service_ip, "label": "server_id:" + service_name }] } + }, + { + "id": "4", + "type": "filters", + "settings": { "filters": [{ "query": "tag.header:*", "label": $filter('T')("Response Time") }] } + }, + { "type": "date_histogram", "field": "@timestamp", "id": "1" } + ], + "metrics": [{ "type": "percentiles", "field": "adc.s_res_time", "id": "0", "settings": { "percents": ["50", "95", "99"] } }] + }] + } + } + }, { + "name": "processResponseTime", + "icon": "line-chart", + "verbose_name": 'Device Processing Response Time', + "description": "Device Processing Response Time(from receiving HTTP plaintext response from back-end server to sending HTTP plaintext response to SSL processing time)", + "cls": "LineGraphWidget", + "args": { + "params": { + "flush": "10s" + }, + "chart": { + "XAxisName": "Time", + "YAxisName": "Duration(ms)", + "unit": "ms", + "seriesName": [$filter('T')("Processing Time")] + }, + "datasource": { + "from": "now-15m", + "to": "now", + "queries": [{ + "datasourceId": 4, + "timeField": "@timestamp", + "bucketAggs": [ + { + "id": "2", + "type": "filters", + "settings": { "filters": [{ "query": "tag.remote_ip:" + device_ip, "label": "agent_host:" + device_ip }] } + }, + { + "id": "3", + "type": "filters", + "settings": { "filters": [{ "query": "adc.serverip:" + service_ip, "label": "server_id:" + service_name }] } + }, + { + "id": "4", + "type": "filters", + "settings": { "filters": [{ "query": "tag.header:*", "label": $filter('T')("Processing Time") }] } + }, + { "type": "date_histogram", "field": "@timestamp", "id": "1" } + ], + "metrics": [{ "type": "percentiles", "field": "adc.h_res_time", "id": "0", "settings": { "percents": ["50", "95", "99"] } }] + }] + } } } - }) + ] var ssl_monitor1 = { "name": "sslHandshakeRatio", "icon": "pie-chart", @@ -1945,7 +1948,7 @@ { "id": "3", "type": "filters", - "settings": { "filters": [{ "query": "adc.vs_name:" + service_name, "label": "server_id:" + service_name }] } + "settings": { "filters": [{ "query": "adc.serverip:" + service_ip, "label": "server_id:" + service_name }] } }, { "id": "4", @@ -2024,7 +2027,7 @@ { "id": "3", "type": "filters", - "settings": { "filters": [{ "query": "adc.vs_name:" + service_name, "label": "server_id:" + service_name }] } + "settings": { "filters": [{ "query": "adc.serverip:" + service_ip, "label": "server_id:" + service_name }] } }, { "id": "4", @@ -2074,7 +2077,7 @@ { "id": "3", "type": "filters", - "settings": { "filters": [{ "query": "adc.vs_name:" + service_name, "label": "server_id:" + service_name }] } + "settings": { "filters": [{ "query": "adc.serverip:" + service_ip, "label": "server_id:" + service_name }] } }, { "id": "4", @@ -2088,35 +2091,36 @@ } } } - if (adv_filter) { - if (server_protocol == '3' || server_protocol == '5' || server_protocol == '6') { - ssl_monitor1['args']['datasource']['queries'][0]['bucketAggs'][1] = { - "id": "3", - "type": "filters", - "settings": { "filters": [{ "query": "adc.serverip:" + service_ip + " AND adc.serverport:" + service_port, "label": "server_id:" + service_name }] } - } - ssl_monitor2['args']['datasource']['queries'][0]['bucketAggs'][1] = { - "id": "3", - "type": "filters", - "settings": { "filters": [{ "query": "adc.serverip:" + service_ip + " AND adc.serverport:" + service_port, "label": "server_id:" + service_name }] } - } - ssl_monitor3['args']['datasource']['queries'][0]['bucketAggs'][1] = { - "id": "3", - "type": "filters", - "settings": { "filters": [{ "query": "adc.serverip:" + service_ip + " AND adc.serverport:" + service_port, "label": "server_id:" + service_name }] } - } - widgets.push(ssl_monitor1); - widgets.push(ssl_monitor2); - widgets.push(ssl_monitor3); - } - } else { - widgets.push(ssl_monitor1); - widgets.push(ssl_monitor2); - widgets.push(ssl_monitor3); - } + // SSL logs never incorporated to APV-10.4 - will uncomment once the logs are available. + // if (adv_filter) { + // if (server_protocol == '3' || server_protocol == '5' || server_protocol == '6') { + // ssl_monitor1['args']['datasource']['queries'][0]['bucketAggs'][1] = { + // "id": "3", + // "type": "filters", + // "settings": { "filters": [{ "query": "adc.serverip:" + service_ip + " AND adc.serverport:" + service_port, "label": "server_id:" + service_name }] } + // } + // ssl_monitor2['args']['datasource']['queries'][0]['bucketAggs'][1] = { + // "id": "3", + // "type": "filters", + // "settings": { "filters": [{ "query": "adc.serverip:" + service_ip + " AND adc.serverport:" + service_port, "label": "server_id:" + service_name }] } + // } + // ssl_monitor3['args']['datasource']['queries'][0]['bucketAggs'][1] = { + // "id": "3", + // "type": "filters", + // "settings": { "filters": [{ "query": "adc.serverip:" + service_ip + " AND adc.serverport:" + service_port, "label": "server_id:" + service_name }] } + // } + // widgets.push(ssl_monitor1); + // widgets.push(ssl_monitor2); + // widgets.push(ssl_monitor3); + // } + // } else { + // widgets.push(ssl_monitor1); + // widgets.push(ssl_monitor2); + // widgets.push(ssl_monitor3); + // } } return widgets - }; + } function get_adc_ssl_cert(roleId) { let postData = { @@ -2190,3 +2194,4 @@ ]); +