diff --git a/grafana/Dockerfile b/grafana/Dockerfile index 70e139b03..bcd24e81c 100644 --- a/grafana/Dockerfile +++ b/grafana/Dockerfile @@ -1,4 +1,4 @@ -FROM grafana/grafana:5.0.4 +FROM grafana/grafana:5.1.0 COPY grafana/dashboards /var/lib/grafana/dashboards COPY grafana/dashboards/top-line.json /usr/share/grafana/public/dashboards/home.json diff --git a/grafana/dashboards/deployment.json b/grafana/dashboards/deployment.json index 830404dd3..9b17c0c72 100644 --- a/grafana/dashboards/deployment.json +++ b/grafana/dashboards/deployment.json @@ -16,13 +16,13 @@ "gnetId": null, "graphTooltip": 1, "id": null, - "iteration": 1524697688078, + "iteration": 1524965907080, "links": [], "panels": [ { "content": "
\n  \n deploy/$deployment\n
", "gridPos": { - "h": 2, + "h": 2.4, "w": 24, "x": 0, "y": 0 @@ -57,7 +57,7 @@ "h": 4, "w": 8, "x": 0, - "y": 2 + "y": 2.4 }, "id": 5, "interval": null, @@ -141,7 +141,7 @@ "h": 4, "w": 8, "x": 8, - "y": 2 + "y": 2.4 }, "id": 4, "interval": null, @@ -225,7 +225,7 @@ "h": 4, "w": 4, "x": 16, - "y": 2 + "y": 2.4 }, "id": 11, "interval": null, @@ -264,7 +264,7 @@ "tableColumn": "", "targets": [ { - "expr": "count(count(request_total{dst_namespace=\"$namespace\", dst_deployment=\"$deployment\", direction=\"outbound\"}) by (namespace, deployment))", + "expr": "count(count(request_total{dst_namespace=\"$namespace\", deployment!=\"\", dst_deployment!=\"\", dst_deployment=\"$deployment\", direction=\"outbound\"}) by (namespace, deployment))", "format": "time_series", "intervalFactor": 1, "legendFormat": "", @@ -307,7 +307,7 @@ "h": 4, "w": 4, "x": 20, - "y": 2 + "y": 2.4 }, "id": 15, "interval": null, @@ -370,10 +370,10 @@ { "content": "
\n INBOUND TRAFFIC\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 6 + "y": 6.4 }, "id": 17, "links": [], @@ -393,7 +393,7 @@ "h": 7, "w": 8, "x": 0, - "y": 8 + "y": 8.6 }, "id": 67, "legend": { @@ -461,7 +461,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -474,7 +478,7 @@ "h": 7, "w": 8, "x": 8, - "y": 8 + "y": 8.6 }, "id": 2, "legend": { @@ -542,7 +546,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -555,7 +563,7 @@ "h": 7, "w": 8, "x": 16, - "y": 8 + "y": 8.6 }, "id": 68, "legend": { @@ -638,7 +646,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "collapsed": true, @@ -646,7 +658,7 @@ "h": 1, "w": 24, "x": 0, - "y": 15 + "y": 15.6 }, "id": 148, "panels": [ @@ -879,7 +891,7 @@ "h": 1, "w": 24, "x": 0, - "y": 16 + "y": 16.6 }, "id": 152, "panels": [], @@ -889,10 +901,10 @@ { "content": "
\n INBOUND DEPLOYMENTS\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 17 + "y": 17.6 }, "id": 76, "links": [], @@ -907,7 +919,7 @@ "h": 1, "w": 24, "x": 0, - "y": 19 + "y": 19.8 }, "id": 59, "panels": [ @@ -963,7 +975,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum(irate(response_total{classification=\"success\", deployment=\"$inbound\", dst_namespace=\"$namespace\", dst_deployment=\"$deployment\", direction=\"outbound\"}[20s])) by (deployment, pod) / sum(irate(response_total{deployment=\"$inbound\", dst_namespace=\"$namespace\", dst_deployment=\"$deployment\", direction=\"outbound\"}[20s])) by (deployment, pod)", + "expr": "sum(irate(response_total{classification=\"success\", deployment!=\"\", deployment=\"$inbound\", dst_namespace=\"$namespace\", dst_deployment=\"$deployment\", direction=\"outbound\"}[20s])) by (deployment, pod) / sum(irate(response_total{deployment!=\"\", deployment=\"$inbound\", dst_namespace=\"$namespace\", dst_deployment=\"$deployment\", direction=\"outbound\"}[20s])) by (deployment, pod)", "format": "time_series", "instant": false, "intervalFactor": 1, @@ -1045,7 +1057,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum(irate(request_total{deployment=\"$inbound\", dst_namespace=\"$namespace\", dst_deployment=\"$deployment\", direction=\"outbound\"}[20s])) by (deployment, pod)", + "expr": "sum(irate(request_total{deployment!=\"\", deployment=\"$inbound\", dst_namespace=\"$namespace\", dst_deployment=\"$deployment\", direction=\"outbound\"}[20s])) by (deployment, pod)", "format": "time_series", "intervalFactor": 1, "legendFormat": "po/{{pod}}", @@ -1126,21 +1138,21 @@ "steppedLine": false, "targets": [ { - "expr": "histogram_quantile(0.5, sum(rate(response_latency_ms_bucket{deployment=\"$inbound\", dst_namespace=\"$namespace\", dst_deployment=\"$deployment\", direction=\"outbound\"}[20s])) by (le, deployment))", + "expr": "histogram_quantile(0.5, sum(rate(response_latency_ms_bucket{deployment!=\"\", deployment=\"$inbound\", dst_namespace=\"$namespace\", dst_deployment=\"$deployment\", direction=\"outbound\"}[20s])) by (le, deployment))", "format": "time_series", "intervalFactor": 1, "legendFormat": "P50 deploy/{{deployment}}", "refId": "A" }, { - "expr": "histogram_quantile(0.95, sum(rate(response_latency_ms_bucket{deployment=\"$inbound\", dst_namespace=\"$namespace\", dst_deployment=\"$deployment\", direction=\"outbound\"}[20s])) by (le, deployment))", + "expr": "histogram_quantile(0.95, sum(rate(response_latency_ms_bucket{deployment!=\"\", deployment=\"$inbound\", dst_namespace=\"$namespace\", dst_deployment=\"$deployment\", direction=\"outbound\"}[20s])) by (le, deployment))", "format": "time_series", "intervalFactor": 1, "legendFormat": "P95 deploy/{{deployment}}", "refId": "B" }, { - "expr": "histogram_quantile(0.99, sum(rate(response_latency_ms_bucket{deployment=\"$inbound\", dst_namespace=\"$namespace\", dst_deployment=\"$deployment\", direction=\"outbound\"}[20s])) by (le, deployment))", + "expr": "histogram_quantile(0.99, sum(rate(response_latency_ms_bucket{deployment!=\"\", deployment=\"$inbound\", dst_namespace=\"$namespace\", dst_deployment=\"$deployment\", direction=\"outbound\"}[20s])) by (le, deployment))", "format": "time_series", "intervalFactor": 1, "legendFormat": "P99 deploy/{{deployment}}", @@ -1194,7 +1206,7 @@ "h": 1, "w": 24, "x": 0, - "y": 20 + "y": 20.8 }, "id": 34, "panels": [], @@ -1205,10 +1217,10 @@ { "content": "
\n OUTBOUND TRAFFIC\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 21 + "y": 21.8 }, "id": 32, "links": [], @@ -1228,7 +1240,7 @@ "h": 7, "w": 8, "x": 0, - "y": 23 + "y": 24 }, "id": 77, "legend": { @@ -1296,7 +1308,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -1309,7 +1325,7 @@ "h": 7, "w": 8, "x": 8, - "y": 23 + "y": 24 }, "id": 78, "legend": { @@ -1376,7 +1392,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -1389,7 +1409,7 @@ "h": 7, "w": 8, "x": 16, - "y": 23 + "y": 24 }, "id": 79, "legend": { @@ -1456,7 +1476,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "collapsed": true, @@ -1464,7 +1488,7 @@ "h": 1, "w": 24, "x": 0, - "y": 30 + "y": 31 }, "id": 154, "panels": [ @@ -1479,7 +1503,7 @@ "h": 7, "w": 8, "x": 0, - "y": 31 + "y": 32 }, "id": 157, "legend": { @@ -1547,7 +1571,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -1560,7 +1588,7 @@ "h": 7, "w": 8, "x": 8, - "y": 31 + "y": 32 }, "id": 166, "legend": { @@ -1627,7 +1655,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "cards": { @@ -1647,7 +1679,7 @@ "h": 7, "w": 8, "x": 16, - "y": 31 + "y": 32 }, "heatmap": {}, "highlightCards": true, @@ -1684,6 +1716,7 @@ "show": true, "splitFactor": null }, + "yBucketBound": "auto", "yBucketNumber": null, "yBucketSize": null } @@ -1697,7 +1730,7 @@ "h": 1, "w": 24, "x": 0, - "y": 31 + "y": 32 }, "id": 156, "panels": [], @@ -1707,10 +1740,10 @@ { "content": "
\n OUTBOUND DEPLOYMENTS\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 32 + "y": 33 }, "id": 80, "links": [], @@ -1725,7 +1758,7 @@ "h": 1, "w": 24, "x": 0, - "y": 34 + "y": 35.2 }, "id": 27, "panels": [ @@ -1735,7 +1768,7 @@ "h": 2, "w": 24, "x": 0, - "y": 31 + "y": 36.2 }, "id": 40, "links": [], @@ -1755,7 +1788,7 @@ "h": 7, "w": 8, "x": 0, - "y": 33 + "y": 38.2 }, "id": 28, "legend": { @@ -1823,7 +1856,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -1836,7 +1873,7 @@ "h": 7, "w": 8, "x": 8, - "y": 33 + "y": 38.2 }, "id": 35, "legend": { @@ -1903,7 +1940,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -1916,7 +1957,7 @@ "h": 7, "w": 8, "x": 16, - "y": 33 + "y": 38.2 }, "id": 41, "legend": { @@ -1997,7 +2038,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } } ], "repeat": "outbound", @@ -2021,7 +2066,7 @@ "multi": false, "name": "namespace", "options": [], - "query": "label_values(request_total{conduit_io_control_plane_component=\"\"}, namespace)", + "query": "label_values(request_total{conduit_io_control_plane_component=\"\", deployment!=\"\"}, namespace)", "refresh": 2, "regex": "", "sort": 1, @@ -2061,7 +2106,7 @@ "multi": false, "name": "inbound", "options": [], - "query": "label_values(request_total{dst_namespace=\"$namespace\", dst_deployment=\"$deployment\"}, deployment)", + "query": "label_values(request_total{dst_namespace=\"$namespace\", dst_deployment=\"$deployment\", conduit_io_control_plane_component=\"\"}, deployment)", "refresh": 2, "regex": "", "sort": 1, @@ -2081,7 +2126,7 @@ "multi": false, "name": "outbound", "options": [], - "query": "label_values(request_total{namespace=\"$namespace\", deployment=\"$deployment\"}, dst_deployment)", + "query": "label_values(request_total{namespace=\"$namespace\", deployment=\"$deployment\", conduit_io_control_plane_component=\"\"}, dst_deployment)", "refresh": 2, "regex": "", "sort": 1, @@ -2125,5 +2170,5 @@ "timezone": "", "title": "Conduit Deployment", "uid": "6svnwykmk", - "version": 3 + "version": 1 } diff --git a/grafana/dashboards/pod.json b/grafana/dashboards/pod.json index e0af3ea51..3adb4079b 100644 --- a/grafana/dashboards/pod.json +++ b/grafana/dashboards/pod.json @@ -16,13 +16,13 @@ "gnetId": null, "graphTooltip": 1, "id": null, - "iteration": 1524001430592, + "iteration": 1524860857295, "links": [], "panels": [ { "content": "
\n  \n po/$pod\n
", "gridPos": { - "h": 2, + "h": 2.4, "w": 24, "x": 0, "y": 0 @@ -57,7 +57,7 @@ "h": 4, "w": 8, "x": 0, - "y": 2 + "y": 2.4 }, "id": 5, "interval": null, @@ -141,7 +141,7 @@ "h": 4, "w": 8, "x": 8, - "y": 2 + "y": 2.4 }, "id": 4, "interval": null, @@ -225,7 +225,7 @@ "h": 4, "w": 4, "x": 16, - "y": 2 + "y": 2.4 }, "id": 11, "interval": null, @@ -264,8 +264,9 @@ "tableColumn": "", "targets": [ { - "expr": "count(count(request_total{dst_namespace=\"$namespace\", dst_pod=\"$pod\", direction=\"outbound\"}) by (namespace, pod))", + "expr": "count(count(request_total{dst_namespace=\"$namespace\", dst_pod!=\"\", dst_pod=\"$pod\", direction=\"outbound\"}) by (namespace, pod))", "format": "time_series", + "interval": "", "intervalFactor": 1, "legendFormat": "", "refId": "A" @@ -307,7 +308,7 @@ "h": 4, "w": 4, "x": 20, - "y": 2 + "y": 2.4 }, "id": 15, "interval": null, @@ -370,10 +371,10 @@ { "content": "
\n INBOUND TRAFFIC\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 6 + "y": 6.4 }, "id": 17, "links": [], @@ -393,7 +394,7 @@ "h": 7, "w": 8, "x": 0, - "y": 8 + "y": 8.6 }, "id": 67, "legend": { @@ -461,7 +462,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -474,7 +479,7 @@ "h": 7, "w": 8, "x": 8, - "y": 8 + "y": 8.6 }, "id": 2, "legend": { @@ -542,7 +547,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -555,7 +564,7 @@ "h": 7, "w": 8, "x": 16, - "y": 8 + "y": 8.6 }, "id": 68, "legend": { @@ -638,15 +647,19 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "content": "
\n INBOUND PODS\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 15 + "y": 15.6 }, "id": 80, "links": [], @@ -666,7 +679,7 @@ "h": 7, "w": 8, "x": 0, - "y": 17 + "y": 17.8 }, "id": 81, "legend": { @@ -692,7 +705,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum(irate(response_total{classification=\"success\", dst_namespace=\"$namespace\", dst_pod=\"$pod\", direction=\"outbound\"}[20s])) by (pod) / sum(irate(response_total{dst_namespace=\"$namespace\", dst_pod=\"$pod\", direction=\"outbound\"}[20s])) by (pod)", + "expr": "sum(irate(response_total{classification=\"success\", dst_namespace=\"$namespace\", dst_pod!=\"\", dst_pod=\"$pod\", direction=\"outbound\"}[20s])) by (pod) / sum(irate(response_total{dst_namespace=\"$namespace\", dst_pod!=\"\", dst_pod=\"$pod\", direction=\"outbound\"}[20s])) by (pod)", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -735,7 +748,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -748,7 +765,7 @@ "h": 7, "w": 8, "x": 8, - "y": 17 + "y": 17.8 }, "id": 82, "legend": { @@ -774,7 +791,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum(irate(request_total{dst_namespace=\"$namespace\", dst_pod=\"$pod\", direction=\"outbound\"}[20s])) by (pod)", + "expr": "sum(irate(request_total{dst_namespace=\"$namespace\", dst_pod!=\"\", dst_pod=\"$pod\", direction=\"outbound\"}[20s])) by (pod)", "format": "time_series", "intervalFactor": 1, "legendFormat": "po/{{pod}}", @@ -816,7 +833,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -829,7 +850,7 @@ "h": 7, "w": 8, "x": 16, - "y": 17 + "y": 17.8 }, "id": 83, "legend": { @@ -855,14 +876,14 @@ "steppedLine": false, "targets": [ { - "expr": "histogram_quantile(0.5, sum(irate(response_latency_ms_bucket{dst_namespace=\"$namespace\", dst_pod=\"$pod\", direction=\"outbound\"}[20s])) by (le, pod))", + "expr": "histogram_quantile(0.5, sum(irate(response_latency_ms_bucket{dst_namespace=\"$namespace\", dst_pod!=\"\", dst_pod=\"$pod\", direction=\"outbound\"}[20s])) by (le, pod))", "format": "time_series", "intervalFactor": 1, "legendFormat": "p50 po/{{pod}}", "refId": "A" }, { - "expr": "histogram_quantile(0.95, sum(irate(response_latency_ms_bucket{dst_namespace=\"$namespace\", dst_pod=\"$pod\", direction=\"outbound\"}[20s])) by (le, pod))", + "expr": "histogram_quantile(0.95, sum(irate(response_latency_ms_bucket{dst_namespace=\"$namespace\", dst_pod!=\"\", dst_pod=\"$pod\", direction=\"outbound\"}[20s])) by (le, pod))", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -870,7 +891,7 @@ "refId": "B" }, { - "expr": "histogram_quantile(0.99, sum(irate(response_latency_ms_bucket{dst_namespace=\"$namespace\", dst_pod=\"$pod\", direction=\"outbound\"}[20s])) by (le, pod))", + "expr": "histogram_quantile(0.99, sum(irate(response_latency_ms_bucket{dst_namespace=\"$namespace\", dst_pod!=\"\", dst_pod=\"$pod\", direction=\"outbound\"}[20s])) by (le, pod))", "format": "time_series", "intervalFactor": 1, "legendFormat": "p99 po/{{pod}}", @@ -912,15 +933,19 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "content": "
\n OUTBOUND TRAFFIC\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 24 + "y": 24.8 }, "id": 88, "links": [], @@ -940,7 +965,7 @@ "h": 7, "w": 8, "x": 0, - "y": 26 + "y": 27 }, "id": 89, "legend": { @@ -1009,7 +1034,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -1022,7 +1051,7 @@ "h": 7, "w": 8, "x": 8, - "y": 26 + "y": 27 }, "id": 90, "legend": { @@ -1090,7 +1119,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -1103,7 +1136,7 @@ "h": 7, "w": 8, "x": 16, - "y": 26 + "y": 27 }, "id": 91, "legend": { @@ -1186,15 +1219,19 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "content": "
\n OUTBOUND PODS\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 33 + "y": 34 }, "id": 84, "links": [], @@ -1214,7 +1251,7 @@ "h": 7, "w": 8, "x": 0, - "y": 35 + "y": 36.2 }, "id": 85, "legend": { @@ -1283,7 +1320,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -1296,7 +1337,7 @@ "h": 7, "w": 8, "x": 8, - "y": 35 + "y": 36.2 }, "id": 86, "legend": { @@ -1364,7 +1405,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -1377,7 +1422,7 @@ "h": 7, "w": 8, "x": 16, - "y": 35 + "y": 36.2 }, "id": 87, "legend": { @@ -1460,7 +1505,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } } ], "refresh": "5s", diff --git a/grafana/dashboards/replication-controller.json b/grafana/dashboards/replication-controller.json index 17b1e6f61..0f59f0d3d 100644 --- a/grafana/dashboards/replication-controller.json +++ b/grafana/dashboards/replication-controller.json @@ -16,13 +16,13 @@ "gnetId": null, "graphTooltip": 1, "id": null, - "iteration": 1523660761961, + "iteration": 1524963428641, "links": [], "panels": [ { "content": "
\n  \n rc/$replication_controller\n
", "gridPos": { - "h": 2, + "h": 2.4, "w": 24, "x": 0, "y": 0 @@ -57,7 +57,7 @@ "h": 4, "w": 8, "x": 0, - "y": 2 + "y": 2.4 }, "id": 5, "interval": null, @@ -141,7 +141,7 @@ "h": 4, "w": 8, "x": 8, - "y": 2 + "y": 2.4 }, "id": 4, "interval": null, @@ -225,7 +225,7 @@ "h": 4, "w": 4, "x": 16, - "y": 2 + "y": 2.4 }, "id": 11, "interval": null, @@ -264,7 +264,7 @@ "tableColumn": "", "targets": [ { - "expr": "count(count(request_total{dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\", direction=\"outbound\"}) by (namespace, replication_controller))", + "expr": "count(count(request_total{dst_namespace=\"$namespace\", replication_controller!=\"\", dst_replication_controller!=\"\", dst_replication_controller=\"$replication_controller\", direction=\"outbound\"}) by (namespace, replication_controller))", "format": "time_series", "intervalFactor": 1, "legendFormat": "", @@ -307,7 +307,7 @@ "h": 4, "w": 4, "x": 20, - "y": 2 + "y": 2.4 }, "id": 15, "interval": null, @@ -370,10 +370,10 @@ { "content": "
\n INBOUND TRAFFIC\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 6 + "y": 6.4 }, "id": 17, "links": [], @@ -393,7 +393,7 @@ "h": 7, "w": 8, "x": 0, - "y": 8 + "y": 8.6 }, "id": 67, "legend": { @@ -461,7 +461,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -474,7 +478,7 @@ "h": 7, "w": 8, "x": 8, - "y": 8 + "y": 8.6 }, "id": 2, "legend": { @@ -542,7 +546,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -555,7 +563,7 @@ "h": 7, "w": 8, "x": 16, - "y": 8 + "y": 8.6 }, "id": 68, "legend": { @@ -638,15 +646,19 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "content": "
\n INBOUND REPLICATION CONTROLLERS\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 15 + "y": 15.6 }, "id": 76, "links": [], @@ -661,7 +673,7 @@ "h": 1, "w": 24, "x": 0, - "y": 17 + "y": 17.8 }, "id": 59, "panels": [ @@ -671,7 +683,7 @@ "h": 2, "w": 24, "x": 0, - "y": 18 + "y": 18.6 }, "id": 39, "links": [], @@ -691,7 +703,7 @@ "h": 7, "w": 8, "x": 0, - "y": 20 + "y": 20.6 }, "id": 36, "legend": { @@ -717,7 +729,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum(irate(response_total{classification=\"success\", replication_controller=\"$inbound\", dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\", direction=\"outbound\"}[20s])) by (replication_controller, pod) / sum(irate(response_total{replication_controller=\"$inbound\", dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\", direction=\"outbound\"}[20s])) by (replication_controller, pod)", + "expr": "sum(irate(response_total{classification=\"success\", replication_controller!=\"\", replication_controller=\"$inbound\", dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\", direction=\"outbound\"}[20s])) by (replication_controller, pod) / sum(irate(response_total{replication_controller!=\"\", replication_controller=\"$inbound\", dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\", direction=\"outbound\"}[20s])) by (replication_controller, pod)", "format": "time_series", "instant": false, "intervalFactor": 1, @@ -760,7 +772,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -773,7 +789,7 @@ "h": 7, "w": 8, "x": 8, - "y": 20 + "y": 20.6 }, "id": 22, "legend": { @@ -799,7 +815,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum(irate(request_total{replication_controller=\"$inbound\", dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\", direction=\"outbound\"}[20s])) by (replication_controller, pod)", + "expr": "sum(irate(request_total{replication_controller!=\"\", replication_controller=\"$inbound\", dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\", direction=\"outbound\"}[20s])) by (replication_controller, pod)", "format": "time_series", "intervalFactor": 1, "legendFormat": "po/{{pod}}", @@ -841,7 +857,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -854,7 +874,7 @@ "h": 7, "w": 8, "x": 16, - "y": 20 + "y": 20.6 }, "id": 29, "legend": { @@ -880,21 +900,21 @@ "steppedLine": false, "targets": [ { - "expr": "histogram_quantile(0.5, sum(rate(response_latency_ms_bucket{replication_controller=\"$inbound\", dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\", direction=\"outbound\"}[20s])) by (le, replication_controller))", + "expr": "histogram_quantile(0.5, sum(rate(response_latency_ms_bucket{replication_controller!=\"\", replication_controller=\"$inbound\", dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\", direction=\"outbound\"}[20s])) by (le, replication_controller))", "format": "time_series", "intervalFactor": 1, "legendFormat": "P50 rc/{{replication_controller}}", "refId": "A" }, { - "expr": "histogram_quantile(0.95, sum(rate(response_latency_ms_bucket{replication_controller=\"$inbound\", dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\", direction=\"outbound\"}[20s])) by (le, replication_controller))", + "expr": "histogram_quantile(0.95, sum(rate(response_latency_ms_bucket{replication_controller!=\"\", replication_controller=\"$inbound\", dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\", direction=\"outbound\"}[20s])) by (le, replication_controller))", "format": "time_series", "intervalFactor": 1, "legendFormat": "P95 rc/{{replication_controller}}", "refId": "B" }, { - "expr": "histogram_quantile(0.99, sum(rate(response_latency_ms_bucket{replication_controller=\"$inbound\", dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\", direction=\"outbound\"}[20s])) by (le, replication_controller))", + "expr": "histogram_quantile(0.99, sum(rate(response_latency_ms_bucket{replication_controller!=\"\", replication_controller=\"$inbound\", dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\", direction=\"outbound\"}[20s])) by (le, replication_controller))", "format": "time_series", "intervalFactor": 1, "legendFormat": "P99 rc/{{replication_controller}}", @@ -935,7 +955,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } } ], "repeat": "inbound", @@ -948,7 +972,7 @@ "h": 1, "w": 24, "x": 0, - "y": 18 + "y": 18.8 }, "id": 34, "panels": [], @@ -959,10 +983,10 @@ { "content": "
\n OUTBOUND TRAFFIC\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 19 + "y": 19.8 }, "id": 32, "links": [], @@ -982,7 +1006,7 @@ "h": 7, "w": 8, "x": 0, - "y": 21 + "y": 22 }, "id": 77, "legend": { @@ -1050,7 +1074,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -1063,7 +1091,7 @@ "h": 7, "w": 8, "x": 8, - "y": 21 + "y": 22 }, "id": 78, "legend": { @@ -1130,7 +1158,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -1143,7 +1175,7 @@ "h": 7, "w": 8, "x": 16, - "y": 21 + "y": 22 }, "id": 79, "legend": { @@ -1210,15 +1242,19 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "content": "
\n OUTBOUND REPLICATION CONTROLLERS\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 28 + "y": 29 }, "id": 80, "links": [], @@ -1233,7 +1269,7 @@ "h": 1, "w": 24, "x": 0, - "y": 30 + "y": 31.2 }, "id": 27, "panels": [ @@ -1243,7 +1279,7 @@ "h": 2, "w": 24, "x": 0, - "y": 31 + "y": 32 }, "id": 40, "links": [], @@ -1263,7 +1299,7 @@ "h": 7, "w": 8, "x": 0, - "y": 33 + "y": 34 }, "id": 28, "legend": { @@ -1331,7 +1367,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -1344,7 +1384,7 @@ "h": 7, "w": 8, "x": 8, - "y": 33 + "y": 34 }, "id": 35, "legend": { @@ -1411,7 +1451,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -1424,7 +1468,7 @@ "h": 7, "w": 8, "x": 16, - "y": 33 + "y": 34 }, "id": 41, "legend": { @@ -1505,7 +1549,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } } ], "repeat": "outbound", @@ -1529,7 +1577,7 @@ "multi": false, "name": "namespace", "options": [], - "query": "label_values(request_total{conduit_io_control_plane_component=\"\"}, namespace)", + "query": "label_values(request_total{conduit_io_control_plane_component=\"\", replication_controller!=\"\"}, namespace)", "refresh": 2, "regex": "", "sort": 1, @@ -1569,7 +1617,7 @@ "multi": false, "name": "inbound", "options": [], - "query": "label_values(request_total{dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\"}, replication_controller)", + "query": "label_values(request_total{dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\", conduit_io_control_plane_component=\"\"}, replication_controller)", "refresh": 2, "regex": "", "sort": 1, @@ -1589,7 +1637,7 @@ "multi": false, "name": "outbound", "options": [], - "query": "label_values(request_total{namespace=\"$namespace\", replication_controller=\"$replication_controller\"}, dst_replication_controller)", + "query": "label_values(request_total{namespace=\"$namespace\", replication_controller=\"$replication_controller\", conduit_io_control_plane_component=\"\"}, dst_replication_controller)", "refresh": 2, "regex": "", "sort": 1, diff --git a/grafana/dashboards/service.json b/grafana/dashboards/service.json index b526cc0be..03cbc1809 100644 --- a/grafana/dashboards/service.json +++ b/grafana/dashboards/service.json @@ -16,13 +16,13 @@ "gnetId": null, "graphTooltip": 1, "id": null, - "iteration": 1524170189431, + "iteration": 1524963590602, "links": [], "panels": [ { "content": "
\n  \n svc/$service\n
", "gridPos": { - "h": 2, + "h": 2.4, "w": 24, "x": 0, "y": 0 @@ -57,7 +57,7 @@ "h": 4, "w": 8, "x": 0, - "y": 2 + "y": 2.4 }, "id": 5, "interval": null, @@ -141,7 +141,7 @@ "h": 4, "w": 8, "x": 8, - "y": 2 + "y": 2.4 }, "id": 4, "interval": null, @@ -225,7 +225,7 @@ "h": 4, "w": 8, "x": 16, - "y": 2 + "y": 2.4 }, "id": 81, "interval": null, @@ -289,10 +289,10 @@ { "content": "
\n TOP-LINE TRAFFIC\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 6 + "y": 6.4 }, "id": 17, "links": [], @@ -312,7 +312,7 @@ "h": 7, "w": 8, "x": 0, - "y": 8 + "y": 8.6 }, "id": 67, "legend": { @@ -380,7 +380,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -393,7 +397,7 @@ "h": 7, "w": 8, "x": 8, - "y": 8 + "y": 8.6 }, "id": 2, "legend": { @@ -461,7 +465,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -474,7 +482,7 @@ "h": 7, "w": 8, "x": 16, - "y": 8 + "y": 8.6 }, "id": 68, "legend": { @@ -557,15 +565,19 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "content": "
\n INBOUND TRAFFIC BY DEPLOYMENT\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 15 + "y": 15.6 }, "id": 32, "links": [], @@ -585,7 +597,7 @@ "h": 7, "w": 8, "x": 0, - "y": 17 + "y": 17.8 }, "id": 77, "legend": { @@ -653,7 +665,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -666,7 +682,7 @@ "h": 7, "w": 8, "x": 8, - "y": 17 + "y": 17.8 }, "id": 78, "legend": { @@ -733,7 +749,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -746,7 +766,7 @@ "h": 7, "w": 8, "x": 16, - "y": 17 + "y": 17.8 }, "id": 79, "legend": { @@ -813,15 +833,19 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "content": "
\n INBOUND TRAFFIC BY POD\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 24 + "y": 24.8 }, "id": 82, "links": [], @@ -841,7 +865,7 @@ "h": 7, "w": 8, "x": 0, - "y": 26 + "y": 27 }, "id": 83, "legend": { @@ -909,7 +933,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -922,7 +950,7 @@ "h": 7, "w": 8, "x": 8, - "y": 26 + "y": 27 }, "id": 84, "legend": { @@ -989,7 +1017,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -1002,7 +1034,7 @@ "h": 7, "w": 8, "x": 16, - "y": 26 + "y": 27 }, "id": 85, "legend": { @@ -1069,7 +1101,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } } ], "refresh": "5s", @@ -1128,7 +1164,7 @@ "multi": false, "name": "inbound", "options": [], - "query": "label_values(request_total{dst_namespace=\"$namespace\", dst_service=\"$service\"}, deployment)", + "query": "label_values(request_total{dst_namespace=\"$namespace\", dst_service=\"$service\", conduit_io_control_plane_component=\"\"}, deployment)", "refresh": 2, "regex": "", "sort": 1, @@ -1148,7 +1184,7 @@ "multi": false, "name": "outbound", "options": [], - "query": "label_values(request_total{namespace=\"$namespace\", deployment=\"$deployment\"}, dst_deployment)", + "query": "label_values(request_total{namespace=\"$namespace\", deployment=\"$deployment\", conduit_io_control_plane_component=\"\"}, dst_deployment)", "refresh": 2, "regex": "", "sort": 1, diff --git a/grafana/dashboards/top-line.json b/grafana/dashboards/top-line.json index 123bdb045..57028ef11 100644 --- a/grafana/dashboards/top-line.json +++ b/grafana/dashboards/top-line.json @@ -16,7 +16,7 @@ "gnetId": null, "graphTooltip": 1, "id": null, - "iteration": 1523665070192, + "iteration": 1524861055004, "links": [], "panels": [ { @@ -366,7 +366,7 @@ { "content": "
\n TOP LINE\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, "y": 7 @@ -390,7 +390,7 @@ "h": 7, "w": 8, "x": 0, - "y": 9 + "y": 9.2 }, "id": 21, "legend": { @@ -457,7 +457,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -470,7 +474,7 @@ "h": 7, "w": 8, "x": 8, - "y": 9 + "y": 9.2 }, "id": 22, "legend": { @@ -537,7 +541,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -550,7 +558,7 @@ "h": 7, "w": 8, "x": 16, - "y": 9 + "y": 9.2 }, "id": 23, "legend": { @@ -617,15 +625,19 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "content": "
\n NAMESPACES\n
", "gridPos": { - "h": 2, + "h": 2.2, "w": 24, "x": 0, - "y": 16 + "y": 16.2 }, "height": "1px", "id": 19, @@ -641,7 +653,7 @@ "h": 1, "w": 24, "x": 0, - "y": 18 + "y": 18.4 }, "id": 40, "panels": [], @@ -655,7 +667,7 @@ "h": 2, "w": 24, "x": 0, - "y": 19 + "y": 19.4 }, "height": "1px", "id": 13, @@ -676,7 +688,7 @@ "h": 7, "w": 8, "x": 0, - "y": 21 + "y": 21.4 }, "id": 6, "legend": { @@ -743,7 +755,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -756,7 +772,7 @@ "h": 7, "w": 8, "x": 8, - "y": 21 + "y": 21.4 }, "id": 8, "legend": { @@ -823,7 +839,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -836,7 +856,7 @@ "h": 7, "w": 8, "x": 16, - "y": 21 + "y": 21.4 }, "id": 9, "legend": { @@ -904,7 +924,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } } ], "refresh": "5s", @@ -943,7 +967,7 @@ "multi": false, "name": "deployment", "options": [], - "query": "label_values(request_total{conduit_io_control_plane_component=\"\"}, deployment)", + "query": "label_values(request_total{conduit_io_control_plane_component=\"\", deployment!=\"\"}, deployment)", "refresh": 2, "regex": "", "sort": 1,