Repository: incubator-trafficcontrol Updated Branches: refs/heads/psql 91021764b -> 0604f3699
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/Certificate.java ---------------------------------------------------------------------- diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/Certificate.java b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/Certificate.java index f65b64c..bc8712b 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/Certificate.java +++ b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/Certificate.java @@ -1,5 +1,4 @@ /* - * Copyright 2016 Comcast Cable Communications Management, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/CertificateData.java ---------------------------------------------------------------------- diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/CertificateData.java b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/CertificateData.java index 339e7d6..202908f 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/CertificateData.java +++ b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/CertificateData.java @@ -1,5 +1,4 @@ /* - * Copyright 2016 Comcast Cable Communications Management, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java ---------------------------------------------------------------------- diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java index ae22348..99246c1 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java +++ b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java @@ -1,5 +1,4 @@ /* - * Copyright 2016 Comcast Cable Communications Management, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java ---------------------------------------------------------------------- diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java index b9f9b33..9586e6c 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java +++ b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java @@ -1,5 +1,4 @@ /* - * Copyright 2016 Comcast Cable Communications Management, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/shared/src/test/java/shared/DeliveryServiceCertificatesTest.java ---------------------------------------------------------------------- diff --git a/traffic_router/shared/src/test/java/shared/DeliveryServiceCertificatesTest.java b/traffic_router/shared/src/test/java/shared/DeliveryServiceCertificatesTest.java index ef96d5c..d78af4a 100644 --- a/traffic_router/shared/src/test/java/shared/DeliveryServiceCertificatesTest.java +++ b/traffic_router/shared/src/test/java/shared/DeliveryServiceCertificatesTest.java @@ -1,5 +1,4 @@ /* - * Copyright 2016 Comcast Cable Communications Management, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/build/build_rpm.sh ---------------------------------------------------------------------- diff --git a/traffic_stats/build/build_rpm.sh b/traffic_stats/build/build_rpm.sh index 1384528..5f9f81d 100755 --- a/traffic_stats/build/build_rpm.sh +++ b/traffic_stats/build/build_rpm.sh @@ -1,7 +1,6 @@ #!/bin/bash # -# Copyright 2015 Comcast Cable Communications Management, LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/build/traffic_stats.spec ---------------------------------------------------------------------- diff --git a/traffic_stats/build/traffic_stats.spec b/traffic_stats/build/traffic_stats.spec index 128efce..30ca284 100644 --- a/traffic_stats/build/traffic_stats.spec +++ b/traffic_stats/build/traffic_stats.spec @@ -1,5 +1,4 @@ # -# Copyright 2015 Comcast Cable Communications Management, LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,10 +21,10 @@ Version: %{traffic_control_version} Release: %{build_number} Summary: Tool to pull data from traffic monitor and store in Influxdb Packager: david_neuman2 at Cable dot Comcast dot com -Vendor: Comcast Cable +Vendor: Apache Software Foundation Group: Applications/Communications License: Apache License, Version 2.0 -URL: https://github.com/Comcast/traffic_control/ +URL: https://github.com/apache/incubator-trafficcontrol Source: %{_sourcedir}/traffic_stats-%{traffic_control_version}.tgz %description @@ -53,7 +52,7 @@ go_get_version() { } # get traffic_ops client -godir=src/github.com/Comcast/traffic_control/traffic_ops/client +godir=src/github.com/apache/incubator-trafficcontrol/traffic_ops/client ( mkdir -p "$godir" && \ cd "$godir" && \ cp -r "$TC_DIR"/traffic_ops/client/* . && \ @@ -61,7 +60,7 @@ godir=src/github.com/Comcast/traffic_control/traffic_ops/client ) || { echo "Could not build go program at $(pwd): $!"; exit 1; } #get traffic_stats client -godir=src/github.com/Comcast/traffic_control/traffic_stats +godir=src/github.com/apache/incubator-trafficcontrol/traffic_stats oldpwd=$(pwd) ( mkdir -p "$godir" && \ cd "$godir" && \ @@ -72,7 +71,7 @@ oldpwd=$(pwd) ) || { echo "Could not build go program at $(pwd): $!"; exit 1; } #build influxdb_tools -godir=src/github.com/Comcast/traffic_control/traffic_stats/influxdb_tools +godir=src/github.com/apache/incubator-trafficcontrol/traffic_stats/influxdb_tools ( mkdir -p "$godir" && \ cd "$godir" && \ cp -r "$TC_DIR"/traffic_stats/influxdb_tools/* . && \ @@ -92,7 +91,7 @@ mkdir -p "${RPM_BUILD_ROOT}"/etc/init.d mkdir -p "${RPM_BUILD_ROOT}"/etc/logrotate.d mkdir -p "${RPM_BUILD_ROOT}"/usr/share/grafana/public/dashboards/ -src=src/github.com/Comcast/traffic_control/traffic_stats +src=src/github.com/apache/incubator-trafficcontrol/traffic_stats cp -p bin/traffic_stats "${RPM_BUILD_ROOT}"/opt/traffic_stats/bin/traffic_stats cp "$src"/traffic_stats.cfg "${RPM_BUILD_ROOT}"/opt/traffic_stats/conf/traffic_stats.cfg cp "$src"/traffic_stats_seelog.xml "${RPM_BUILD_ROOT}"/opt/traffic_stats/conf/traffic_stats_seelog.xml http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/grafana/traffic_ops_cachegroup.js ---------------------------------------------------------------------- diff --git a/traffic_stats/grafana/traffic_ops_cachegroup.js b/traffic_stats/grafana/traffic_ops_cachegroup.js index 7a26197..a714a58 100644 --- a/traffic_stats/grafana/traffic_ops_cachegroup.js +++ b/traffic_stats/grafana/traffic_ops_cachegroup.js @@ -1,5 +1,4 @@ /* - Copyright 2015 Comcast Cable Communications Management, LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/grafana/traffic_ops_deliveryservice.js ---------------------------------------------------------------------- diff --git a/traffic_stats/grafana/traffic_ops_deliveryservice.js b/traffic_stats/grafana/traffic_ops_deliveryservice.js index e51b68a..2508e3c 100644 --- a/traffic_stats/grafana/traffic_ops_deliveryservice.js +++ b/traffic_stats/grafana/traffic_ops_deliveryservice.js @@ -1,5 +1,4 @@ /* - Copyright 2015 Comcast Cable Communications Management, LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/grafana/traffic_ops_scripted.js ---------------------------------------------------------------------- diff --git a/traffic_stats/grafana/traffic_ops_scripted.js b/traffic_stats/grafana/traffic_ops_scripted.js index ce5cf8d..78a5d87 100644 --- a/traffic_stats/grafana/traffic_ops_scripted.js +++ b/traffic_stats/grafana/traffic_ops_scripted.js @@ -1,5 +1,4 @@ /* - Copyright 2015 Comcast Cable Communications Management, LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/grafana/traffic_ops_server.js ---------------------------------------------------------------------- diff --git a/traffic_stats/grafana/traffic_ops_server.js b/traffic_stats/grafana/traffic_ops_server.js index 10ef058..9efcfbd 100644 --- a/traffic_stats/grafana/traffic_ops_server.js +++ b/traffic_stats/grafana/traffic_ops_server.js @@ -1,5 +1,4 @@ /* - Copyright 2015 Comcast Cable Communications Management, LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -60,8 +59,7 @@ dashboard.refresh = "30s"; { - dashboard.rows.push( - { + dashboard.rows.push( { "height": "250px", "panels": [ { @@ -73,19 +71,7 @@ dashboard.refresh = "30s"; "id": 1, "datasource": "cache_stats", "renderer": "flot", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "bps", - "short" - ], "grid": { - "leftLogBase": 1, - "leftMax": null, - "rightMax": null, - "leftMin": null, - "rightMin": null, - "rightLogBase": 1, "threshold1": null, "threshold2": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", @@ -112,7 +98,9 @@ dashboard.refresh = "30s"; "steppedLine": false, "tooltip": { "value_type": "cumulative", - "shared": true + "shared": true, + "sort": 0, + "msResolution": false }, "timeFrom": null, "timeShift": null, @@ -120,13 +108,65 @@ dashboard.refresh = "30s"; { "measurement": "bandwidth.1min", "tags": {}, - "query": "SELECT mean(value)*1000 FROM \"monthly\".\"bandwidth.1min\" WHERE hostname='" + which + "' and $timeFilter GROUP BY time(60s)", - "rawQuery": true + "query": "SELECT mean(value) FROM \"monthly\".\"bandwidth.1min\" WHERE hostname= '" + which + "' and $timeFilter GROUP BY time(60s)", + "rawQuery": true, + "refId": "A", + "policy": "default", + "dsType": "influxdb", + "resultFormat": "time_series", + "groupBy": [ + { + "type": "time", + "params": [ + "$interval" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "value" + ] + }, + { + "type": "mean", + "params": [] + } + ] + ], + "alias": "bandwidth" } ], "aliasColors": {}, "seriesOverrides": [], - "links": [] + "links": [], + "yaxes": [ + { + "show": true, + "min": null, + "max": null, + "logBase": 1, + "format": "Kbits" + }, + { + "show": true, + "min": null, + "max": null, + "logBase": 1, + "format": "short" + } + ], + "xaxis": { + "show": true + } } ], "title": "Row", @@ -145,18 +185,7 @@ dashboard.refresh = "30s"; "id": 2, "datasource": "cache_stats", "renderer": "flot", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short" - ], "grid": { - "leftLogBase": 1, - "leftMax": null, - "rightMax": null, - "leftMin": null, - "rightMin": null, - "rightLogBase": 1, "threshold1": null, "threshold2": null, "threshold1Color": "rgba(216, 200, 27, 0.27)", @@ -183,7 +212,9 @@ dashboard.refresh = "30s"; "steppedLine": false, "tooltip": { "value_type": "cumulative", - "shared": true + "shared": true, + "sort": 0, + "msResolution": false }, "timeFrom": null, "timeShift": null, @@ -191,13 +222,64 @@ dashboard.refresh = "30s"; { "measurement": "connections.1min", "tags": {}, - "query": "SELECT mean(value) FROM \"monthly\".\"connections.1min\" WHERE hostname='" + which + "' and $timeFilter GROUP BY time(60s)", - "rawQuery": true + "query": "SELECT mean(value) FROM \"monthly\".\"connections.1min\" WHERE hostname= '" + which + "' and $timeFilter GROUP BY time(60s)", + "rawQuery": true, + "refId": "A", + "policy": "default", + "dsType": "influxdb", + "resultFormat": "time_series", + "groupBy": [ + { + "type": "time", + "params": [ + "$interval" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "value" + ] + }, + { + "type": "mean", + "params": [] + } + ] + ], + "alias": "connections" } ], "aliasColors": {}, "seriesOverrides": [], - "links": [] + "links": [], + "yaxes": [ + { + "show": true, + "min": null, + "max": null, + "logBase": 1, + "format": "short" + }, + { + "show": true, + "min": null, + "max": null, + "logBase": 1 + } + ], + "xaxis": { + "show": true + } } ], "title": "Row", @@ -299,9 +381,46 @@ dashboard.refresh = "30s"; "cpu_user" ] } + ], + [ + { + "type": "field", + "params": [ + "usage_guest" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "alias", + "params": [ + "cpu_guest" + ] + } + ], + [ + { + "type": "field", + "params": [ + "usage_steal" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "alias", + "params": [ + "cpu_steal" + ] + } ] ], - "measurement": "cpu" + "measurement": "cpu", + "alias": "$col" } ], "datasource": "telegraf", @@ -355,7 +474,8 @@ dashboard.refresh = "30s"; "tooltip": { "value_type": "individual", "shared": true, - "msResolution": true + "msResolution": true, + "sort": 2 }, "timeFrom": null, "timeShift": null, @@ -418,7 +538,8 @@ dashboard.refresh = "30s"; } ] ], - "measurement": "mem" + "measurement": "mem", + "alias": "$col" } ], "datasource": "telegraf", @@ -472,7 +593,8 @@ dashboard.refresh = "30s"; "tooltip": { "value_type": "individual", "shared": true, - "msResolution": true + "msResolution": true, + "sort": 0 }, "timeFrom": null, "timeShift": null, @@ -579,7 +701,8 @@ dashboard.refresh = "30s"; } ] ], - "measurement": "system" + "measurement": "system", + "alias": "$col" } ], "datasource": "telegraf", @@ -633,7 +756,8 @@ dashboard.refresh = "30s"; "tooltip": { "value_type": "cumulative", "shared": true, - "msResolution": true + "msResolution": true, + "sort": 0 }, "timeFrom": null, "timeShift": null, @@ -685,16 +809,53 @@ dashboard.refresh = "30s"; ] }, { - "type": "mean", + "type": "sum", "params": [] }, { + "type": "non_negative_derivative", + "params": [ + "10s" + ] + }, + { "type": "alias", "params": [ "read_time" ] } - ], + ] + ], + "measurement": "diskio", + "alias": "$col" + }, + { + "refId": "B", + "policy": "default", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/" + which + "/" + } + ], + "groupBy": [ + { + "type": "time", + "params": [ + "$interval" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ [ { "type": "field", @@ -703,10 +864,16 @@ dashboard.refresh = "30s"; ] }, { - "type": "mean", + "type": "sum", "params": [] }, { + "type": "non_negative_derivative", + "params": [ + "10s" + ] + }, + { "type": "alias", "params": [ "write_time" @@ -714,7 +881,8 @@ dashboard.refresh = "30s"; } ] ], - "measurement": "diskio" + "measurement": "diskio", + "alias": "$col" } ], "datasource": "telegraf", @@ -768,6 +936,435 @@ dashboard.refresh = "30s"; "tooltip": { "value_type": "cumulative", "shared": true, + "msResolution": true, + "sort": 0 + }, + "timeFrom": null, + "timeShift": null, + "aliasColors": {}, + "seriesOverrides": [], + "links": [] + } + ] + }, + { + "title": "Wrap Count and netstat", + "height": "250px", + "editable": true, + "collapse": false, + "panels": [ + { + "title": "wrap count", + "error": false, + "span": 6, + "editable": true, + "type": "graph", + "isNew": true, + "id": 7, + "targets": [ + { + "refId": "A", + "policy": "monthly", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "hostname", + "operator": "=~", + "value": "/" + which + "/" + } + ], + "groupBy": [ + { + "type": "time", + "params": [ + "$interval" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "vol1_wrap_count" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "alias", + "params": [ + "vol1" + ] + } + ], + [ + { + "type": "field", + "params": [ + "vol2_wrap_count" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "alias", + "params": [ + "vol2" + ] + } + ] + ], + "measurement": "wrap_count.1min", + "alias": "$col" + } + ], + "datasource": "cache_stats", + "renderer": "flot", + "yaxes": [ + { + "label": null, + "show": true, + "logBase": 1, + "min": null, + "max": null, + "format": "short" + }, + { + "label": null, + "show": true, + "logBase": 1, + "min": null, + "max": null, + "format": "short" + } + ], + "xaxis": { + "show": true + }, + "grid": { + "threshold1": null, + "threshold2": null, + "threshold1Color": "rgba(216, 200, 27, 0.27)", + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + "lines": true, + "fill": 1, + "linewidth": 2, + "points": false, + "pointradius": 5, + "bars": false, + "stack": false, + "percentage": false, + "legend": { + "show": true, + "values": false, + "min": false, + "max": false, + "current": false, + "total": false, + "avg": false + }, + "nullPointMode": "connected", + "steppedLine": false, + "tooltip": { + "value_type": "cumulative", + "shared": true, + "sort": 0, + "msResolution": true + }, + "timeFrom": null, + "timeShift": null, + "aliasColors": {}, + "seriesOverrides": [], + "links": [] + }, + { + "title": "netstat", + "error": false, + "span": 6, + "editable": true, + "type": "graph", + "isNew": true, + "id": 8, + "targets": [ + { + "refId": "A", + "policy": "default", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/" + which + "/" + } + ], + "groupBy": [ + { + "type": "time", + "params": [ + "$interval" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "tcp_close" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "alias", + "params": [ + "tcp_close" + ] + } + ], + [ + { + "type": "field", + "params": [ + "tcp_close_wait" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "alias", + "params": [ + "tcp_close_wait" + ] + } + ], + [ + { + "type": "field", + "params": [ + "tcp_established" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "alias", + "params": [ + "tcp_established" + ] + } + ], + [ + { + "type": "field", + "params": [ + "tcp_time_wait" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "alias", + "params": [ + "tcp_time_wait" + ] + } + ], + [ + { + "type": "field", + "params": [ + "tcp_closing" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "alias", + "params": [ + "tcp_closing" + ] + } + ], + [ + { + "type": "field", + "params": [ + "tcp_fin_wait1" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "alias", + "params": [ + "tcp_fin_wait1" + ] + } + ], + [ + { + "type": "field", + "params": [ + "tcp_fin_wait2" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "alias", + "params": [ + "tcp_fin_wait2" + ] + } + ], + [ + { + "type": "field", + "params": [ + "tcp_last_ack" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "alias", + "params": [ + "tcp_last_ack" + ] + } + ], + [ + { + "type": "field", + "params": [ + "tcp_syn_recv" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "alias", + "params": [ + "tcp_syn_recv" + ] + } + ], + [ + { + "type": "field", + "params": [ + "tcp_syn_sent" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "alias", + "params": [ + "tcp_syn_sent" + ] + } + ] + ], + "measurement": "netstat", + "alias": "$col" + } + ], + "datasource": "telegraf", + "renderer": "flot", + "yaxes": [ + { + "label": null, + "show": true, + "logBase": 1, + "min": null, + "max": null, + "format": "short" + }, + { + "label": null, + "show": true, + "logBase": 1, + "min": null, + "max": null, + "format": "short" + } + ], + "xaxis": { + "show": true + }, + "grid": { + "threshold1": null, + "threshold2": null, + "threshold1Color": "rgba(216, 200, 27, 0.27)", + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + "lines": true, + "fill": 1, + "linewidth": 2, + "points": false, + "pointradius": 5, + "bars": false, + "stack": false, + "percentage": false, + "legend": { + "show": true, + "values": false, + "min": false, + "max": false, + "current": false, + "total": false, + "avg": false, + "hideEmpty": true, + "hideZero": true + }, + "nullPointMode": "connected", + "steppedLine": false, + "tooltip": { + "value_type": "cumulative", + "shared": true, + "sort": 2, "msResolution": true }, "timeFrom": null, http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/influxdb_tools/create_ts_databases.go ---------------------------------------------------------------------- diff --git a/traffic_stats/influxdb_tools/create_ts_databases.go b/traffic_stats/influxdb_tools/create_ts_databases.go index 8e02220..e065b30 100644 --- a/traffic_stats/influxdb_tools/create_ts_databases.go +++ b/traffic_stats/influxdb_tools/create_ts_databases.go @@ -83,6 +83,8 @@ func createCacheStats(client influx.Client, replication *string) { createContinuousQuery(client, "connections_cdn_type_1min", `CREATE CONTINUOUS QUERY connections_cdn_type_1min ON cache_stats RESAMPLE FOR 5m BEGIN SELECT sum(value) AS "value" INTO "cache_stats"."monthly"."connections.cdn.type.1min" FROM "cache_stats"."monthly"."connections.1min" GROUP BY time(1m), cdn, type END`) createContinuousQuery(client, "maxKbps_1min", `CREATE CONTINUOUS QUERY maxKbps_1min ON cache_stats RESAMPLE FOR 2m BEGIN SELECT mean(value) AS value INTO cache_stats.monthly."maxkbps.1min" FROM cache_stats.daily.maxKbps GROUP BY time(1m), * END`) createContinuousQuery(client, "maxkbps_cdn_1min", `CREATE CONTINUOUS QUERY maxkbps_cdn_1min ON cache_stats RESAMPLE FOR 5m BEGIN SELECT sum(value) AS value INTO cache_stats.monthly."maxkbps.cdn.1min" FROM cache_stats.monthly."maxkbps.1min" GROUP BY time(1m), cdn END`) + createContinuousQuery(client, "wrap_count_vol1_1m", `CREATE CONTINUOUS QUERY wrap_count_vol1_1m ON cache_stats RESAMPLE FOR 2m BEGIN SELECT mean(value) AS vol1_wrap_count INTO cache_stats.monthly."wrap_count.1min" FROM cache_stats.daily."ats.proxy.process.cache.volume_1.wrap_count" GROUP BY time(1m), * END`) + createContinuousQuery(client, "wrap_count_vol2_1m", `CREATE CONTINUOUS QUERY wrap_count_vol2_1m ON cache_stats RESAMPLE FOR 2m BEGIN SELECT mean(value) AS vol2_wrap_count INTO cache_stats.monthly."wrap_count.1min" FROM cache_stats.daily."ats.proxy.process.cache.volume_2.wrap_count" GROUP BY time(1m), * END`) } func createDeliveryServiceStats(client influx.Client, replication *string) { http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/traffic_stats.go ---------------------------------------------------------------------- diff --git a/traffic_stats/traffic_stats.go b/traffic_stats/traffic_stats.go index 8384cca..4f720c1 100644 --- a/traffic_stats/traffic_stats.go +++ b/traffic_stats/traffic_stats.go @@ -35,7 +35,7 @@ import ( "syscall" "time" - traffic_ops "github.com/Comcast/traffic_control/traffic_ops/client" + traffic_ops "github.com/apache/incubator-trafficcontrol/traffic_ops/client" log "github.com/cihub/seelog" influx "github.com/influxdata/influxdb/client/v2" ) http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_stats/traffic_stats_seelog.xml ---------------------------------------------------------------------- diff --git a/traffic_stats/traffic_stats_seelog.xml b/traffic_stats/traffic_stats_seelog.xml index a9812cd..301016a 100644 --- a/traffic_stats/traffic_stats_seelog.xml +++ b/traffic_stats/traffic_stats_seelog.xml @@ -1,3 +1,23 @@ +<?xml version='1.0'?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <seelog minlevel="info"> <outputs formatid="std:debug-short"> <file path="/opt/traffic_stats/var/log/traffic_stats/traffic_stats.log" />
