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

Change text to use source/target terminology in events and metrics (#4527) 

Change terminology from local/remote to source/target in events and metrics.

This does not change any variable, function, struct, or field names since
testing is still improving

Signed-off-by: Kevin Leimkuhler <kevin@kleimkuhler.com>
This commit is contained in:
Kevin Leimkuhler 2020-06-03 15:02:39 -04:00 committed by GitHub
parent 33308e397f
commit 8a932ac905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controller/cmd/service-mirror/metrics.go
View File

@ -9,7 +9,7 @@ import (
const (
gatewayNameLabel = "gateway_name"
gatewayNamespaceLabel = "gateway_namespace"
gatewayClusterName = "remote_cluster_name"
gatewayClusterName = "target_cluster_name"
eventTypeLabelName = "event_type"
probeSuccessfulLabel = "probe_successful"
)
@ -67,7 +67,7 @@ func newProbeMetricVecs() probeMetricVecs {
latencies := promauto.NewHistogramVec(
prometheus.HistogramOpts{
Name: "gateway_probe_latency_ms",
Help: "A histogram of latencies to a remote gateway.",
Help: "A histogram of latencies to a gateway in a target cluster.",
Buckets: []float64{
1, 2, 3, 4, 5,
10, 20, 30, 40, 50,

32
grafana/dashboards/multicluster.json
View File

@ -98,7 +98,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum(irate(response_total{classification=\"success\", dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", direction=\"outbound\"}[30s])) / sum(irate(response_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", direction=\"outbound\"}[30s]))",
"expr": "sum(irate(response_total{classification=\"success\", dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", direction=\"outbound\"}[30s])) / sum(irate(response_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", direction=\"outbound\"}[30s]))",
"format": "time_series",
"instant": false,
"intervalFactor": 1,
@ -183,7 +183,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum(irate(request_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", direction=\"outbound\"}[30s]))",
"expr": "sum(irate(request_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", direction=\"outbound\"}[30s]))",
"format": "time_series",
"instant": false,
"intervalFactor": 1,
@ -268,7 +268,7 @@
"tableColumn": "",
"targets": [
{
"expr": "histogram_quantile(0.95, sum(irate(response_latency_ms_bucket{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", direction=\"outbound\"}[30s])) by (le))",
"expr": "histogram_quantile(0.95, sum(irate(response_latency_ms_bucket{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", direction=\"outbound\"}[30s])) by (le))",
"format": "time_series",
"instant": false,
"intervalFactor": 1,
@ -344,7 +344,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(irate(response_total{classification=\"success\", dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", direction=\"outbound\"}[30s])) by (dst_remote_gateway) / sum(irate(response_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", direction=\"outbound\"}[30s])) by (dst_remote_gateway)",
"expr": "sum(irate(response_total{classification=\"success\", dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", direction=\"outbound\"}[30s])) by (dst_remote_gateway) / sum(irate(response_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", direction=\"outbound\"}[30s])) by (dst_remote_gateway)",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "gateway/{{dst_remote_gateway}}",
@ -431,14 +431,14 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(irate(request_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", direction=\"outbound\", tls=\"true\"}[30s])) by (dst_remote_gateway)",
"expr": "sum(irate(request_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", direction=\"outbound\", tls=\"true\"}[30s])) by (dst_remote_gateway)",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "🔒gateway/{{dst_remote_gateway}}",
"refId": "A"
},
{
"expr": "sum(irate(request_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", tls!=\"true\"}[30s])) by (dst_remote_gateway)",
"expr": "sum(irate(request_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", tls!=\"true\"}[30s])) by (dst_remote_gateway)",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "gatewy/{{dst_remote_gateway}}",
@ -525,14 +525,14 @@
"steppedLine": false,
"targets": [
{
"expr": "histogram_quantile(0.5, sum(irate(response_latency_ms_bucket{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", direction=\"outbound\"}[30s])) by (le, dst_remote_gateway))",
"expr": "histogram_quantile(0.5, sum(irate(response_latency_ms_bucket{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", direction=\"outbound\"}[30s])) by (le, dst_remote_gateway))",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "p50 gateway/{{dst_remote_gateway}}",
"refId": "A"
},
{
"expr": "histogram_quantile(0.95, sum(irate(response_latency_ms_bucket{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", direction=\"outbound\"}[30s])) by (le, dst_remote_gateway))",
"expr": "histogram_quantile(0.95, sum(irate(response_latency_ms_bucket{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", direction=\"outbound\"}[30s])) by (le, dst_remote_gateway))",
"format": "time_series",
"hide": false,
"intervalFactor": 1,
@ -540,7 +540,7 @@
"refId": "B"
},
{
"expr": "histogram_quantile(0.99, sum(irate(response_latency_ms_bucket{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", direction=\"outbound\"}[30s])) by (le, dst_remote_gateway))",
"expr": "histogram_quantile(0.99, sum(irate(response_latency_ms_bucket{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", direction=\"outbound\"}[30s])) by (le, dst_remote_gateway))",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "p99 gateway/{{dst_remote_gateway}}",
@ -643,7 +643,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(irate(response_total{classification=\"success\", dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", direction=\"outbound\"}[30s])) by (dst_remote_service) / sum(irate(response_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", direction=\"outbound\"}[30s])) by (dst_remote_service)",
"expr": "sum(irate(response_total{classification=\"success\", dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", direction=\"outbound\"}[30s])) by (dst_remote_service) / sum(irate(response_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", direction=\"outbound\"}[30s])) by (dst_remote_service)",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "remote-svc/{{dst_remote_service}}",
@ -730,14 +730,14 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(irate(request_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", tls=\"true\"}[30s])) by (dst_remote_service)",
"expr": "sum(irate(request_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", tls=\"true\"}[30s])) by (dst_remote_service)",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "🔒remote-svc/{{dst_remote_service}}",
"refId": "A"
},
{
"expr": "sum(irate(request_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", tls!=\"true\"}[30s])) by (dst_remote_service)",
"expr": "sum(irate(request_total{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", tls!=\"true\"}[30s])) by (dst_remote_service)",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "remote-svc/{{dst_remote_service}}",
@ -823,7 +823,7 @@
"steppedLine": false,
"targets": [
{
"expr": "histogram_quantile(0.95, sum(rate(response_latency_ms_bucket{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_remote_cluster=\"$cluster\", dst_remote_cluster!=\"\", direction=\"outbound\"}[30s])) by (le, dst_remote_service))",
"expr": "histogram_quantile(0.95, sum(rate(response_latency_ms_bucket{dst_remote_gateway=\"$gateway\", dst_remote_gateway!=\"\", dst_target_cluster=\"$cluster\", dst_target_cluster!=\"\", direction=\"outbound\"}[30s])) by (le, dst_remote_service))",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "P95 remote-svc/{{dst_remote_service}}",
@ -894,7 +894,7 @@
"multi": false,
"name": "cluster",
"options": [],
"query": "label_values(request_total, dst_remote_cluster)",
"query": "label_values(request_total, dst_target_cluster)",
"refresh": 2,
"regex": "",
"skipUrlSync": false,
@ -919,7 +919,7 @@
"multi": false,
"name": "gateway",
"options": [],
"query": "label_values(request_total{dst_remote_cluster=\"$cluster\"}, dst_remote_gateway)",
"query": "label_values(request_total{dst_target_cluster=\"$cluster\"}, dst_remote_gateway)",
"refresh": 2,
"regex": "",
"skipUrlSync": false,
@ -965,4 +965,4 @@
"title": "Linkerd Multicluster",
"uid": "linkerd-multicluster",
"version": 1
}
}