linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stop special-casing conduit controller in Grafana (#984) 

The Grafana dashboards were explicitly filtering out Conduit
control-plane data.

Remove control-plane filtering from Grafana dashboards. This brings
Grafana in-line with web, and also encourages better dog-fooding of our
proxy metrics and dashboards. Also update Grafana to 5.1.3, update the
BUILD.md architecture diagram to include Promethues and Grafana, and
introduce a Prometheus Benchmark dashboard, courtesy of Robust
Perception.

Fixes #908

Signed-off-by: Andrew Seigner <siggy@buoyant.io>
This commit is contained in:
Andrew Seigner 2018-05-23 13:47:20 -07:00 committed by GitHub
parent 84e6eb5c87
commit 6fccdee58e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 2785 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BUILD.md
View File

@ -73,18 +73,26 @@ conduit_components
"proxy" [color=orange];
"cli" -> "public-api";
"web" -> "public-api";
"destination" -> "kubernetes";
"web" -> "public-api";
"web" -> "grafana";
"public-api" -> "tap";
"public-api" -> "kubernetes api";
"public-api" -> "prometheus";
"tap" -> "kubernetes api";
"tap" -> "proxy";
"proxy" -> "proxy-api";
"proxy-api" -> "destination";
"public-api" -> "tap";
"destination" -> "kubernetes api";
"tap" -> "kubernetes";
"tap" -> "proxy";
"grafana" -> "prometheus";
"prometheus" -> "kubernetes api";
"prometheus" -> "proxy";
}
conduit_components
</details>

2
grafana/Dockerfile
View File

@ -1,4 +1,4 @@
FROM grafana/grafana:5.1.0
FROM grafana/grafana:5.1.3
COPY grafana/dashboards /var/lib/grafana/dashboards
COPY grafana/dashboards/top-line.json /usr/share/grafana/public/dashboards/home.json

8
grafana/dashboards/deployment.json
View File

@ -2068,7 +2068,7 @@
"multi": false,
"name": "namespace",
"options": [],
"query": "label_values(request_total{conduit_io_control_plane_component=\"\", deployment!=\"\"}, namespace)",
"query": "label_values(request_total{deployment!=\"\"}, namespace)",
"refresh": 2,
"regex": "",
"sort": 1,
@ -2088,7 +2088,7 @@
"multi": false,
"name": "deployment",
"options": [],
"query": "label_values(request_total{namespace=\"$namespace\", conduit_io_control_plane_component=\"\"}, deployment)",
"query": "label_values(request_total{namespace=\"$namespace\"}, deployment)",
"refresh": 2,
"regex": "",
"sort": 1,
@ -2108,7 +2108,7 @@
"multi": false,
"name": "inbound",
"options": [],
"query": "label_values(request_total{dst_namespace=\"$namespace\", dst_deployment=\"$deployment\", conduit_io_control_plane_component=\"\"}, deployment)",
"query": "label_values(request_total{dst_namespace=\"$namespace\", dst_deployment=\"$deployment\"}, deployment)",
"refresh": 2,
"regex": "",
"sort": 1,
@ -2128,7 +2128,7 @@
"multi": false,
"name": "outbound",
"options": [],
"query": "label_values(request_total{namespace=\"$namespace\", deployment=\"$deployment\", conduit_io_control_plane_component=\"\"}, dst_deployment)",
"query": "label_values(request_total{namespace=\"$namespace\", deployment=\"$deployment\"}, dst_deployment)",
"refresh": 2,
"regex": "",
"sort": 1,

4
grafana/dashboards/pod.json
View File

@ -1530,7 +1530,7 @@
"multi": false,
"name": "namespace",
"options": [],
"query": "label_values(request_total{conduit_io_control_plane_component=\"\"}, namespace)",
"query": "label_values(request_total, namespace)",
"refresh": 2,
"regex": "",
"sort": 1,
@ -1550,7 +1550,7 @@
"multi": false,
"name": "pod",
"options": [],
"query": "label_values(request_total{namespace=\"$namespace\", conduit_io_control_plane_component=\"\"}, pod)",
"query": "label_values(request_total{namespace=\"$namespace\"}, pod)",
"refresh": 2,
"regex": "",
"sort": 1,

2755
grafana/dashboards/prometheus-benchmark.json Normal file
View File

File diff suppressed because it is too large Load Diff

8
grafana/dashboards/replication-controller.json
View File

@ -1579,7 +1579,7 @@
"multi": false,
"name": "namespace",
"options": [],
"query": "label_values(request_total{conduit_io_control_plane_component=\"\", replication_controller!=\"\"}, namespace)",
"query": "label_values(request_total{replication_controller!=\"\"}, namespace)",
"refresh": 2,
"regex": "",
"sort": 1,
@ -1599,7 +1599,7 @@
"multi": false,
"name": "replication_controller",
"options": [],
"query": "label_values(request_total{namespace=\"$namespace\", conduit_io_control_plane_component=\"\"}, replication_controller)",
"query": "label_values(request_total{namespace=\"$namespace\"}, replication_controller)",
"refresh": 2,
"regex": "",
"sort": 1,
@ -1619,7 +1619,7 @@
"multi": false,
"name": "inbound",
"options": [],
"query": "label_values(request_total{dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\", conduit_io_control_plane_component=\"\"}, replication_controller)",
"query": "label_values(request_total{dst_namespace=\"$namespace\", dst_replication_controller=\"$replication_controller\"}, replication_controller)",
"refresh": 2,
"regex": "",
"sort": 1,
@ -1639,7 +1639,7 @@
"multi": false,
"name": "outbound",
"options": [],
"query": "label_values(request_total{namespace=\"$namespace\", replication_controller=\"$replication_controller\", conduit_io_control_plane_component=\"\"}, dst_replication_controller)",
"query": "label_values(request_total{namespace=\"$namespace\", replication_controller=\"$replication_controller\"}, dst_replication_controller)",
"refresh": 2,
"regex": "",
"sort": 1,

8
grafana/dashboards/service.json
View File

@ -1126,7 +1126,7 @@
"multi": false,
"name": "namespace",
"options": [],
"query": "label_values(request_total{conduit_io_control_plane_component=\"\"}, namespace)",
"query": "label_values(request_total, namespace)",
"refresh": 2,
"regex": "",
"sort": 1,
@ -1146,7 +1146,7 @@
"multi": false,
"name": "service",
"options": [],
"query": "label_values(request_total{namespace=\"$namespace\", conduit_io_control_plane_component=\"\"}, dst_service)",
"query": "label_values(request_total{namespace=\"$namespace\"}, dst_service)",
"refresh": 2,
"regex": "",
"sort": 1,
@ -1166,7 +1166,7 @@
"multi": false,
"name": "inbound",
"options": [],
"query": "label_values(request_total{dst_namespace=\"$namespace\", dst_service=\"$service\", conduit_io_control_plane_component=\"\"}, deployment)",
"query": "label_values(request_total{dst_namespace=\"$namespace\", dst_service=\"$service\"}, deployment)",
"refresh": 2,
"regex": "",
"sort": 1,
@ -1186,7 +1186,7 @@
"multi": false,
"name": "outbound",
"options": [],
"query": "label_values(request_total{namespace=\"$namespace\", deployment=\"$deployment\", conduit_io_control_plane_component=\"\"}, dst_deployment)",
"query": "label_values(request_total{namespace=\"$namespace\", deployment=\"$deployment\"}, dst_deployment)",
"refresh": 2,
"regex": "",
"sort": 1,

4
grafana/dashboards/top-line.json
View File

@ -949,7 +949,7 @@
"multi": false,
"name": "namespace",
"options": [],
"query": "label_values(request_total{conduit_io_control_plane_component=\"\"}, namespace)",
"query": "label_values(request_total, namespace)",
"refresh": 2,
"regex": "",
"sort": 1,
@ -969,7 +969,7 @@
"multi": false,
"name": "deployment",
"options": [],
"query": "label_values(request_total{conduit_io_control_plane_component=\"\", deployment!=\"\"}, deployment)",
"query": "label_values(request_total{deployment!=\"\"}, deployment)",
"refresh": 2,
"regex": "",
"sort": 1,