Allow edges queries to see cross-namespace edges (#54)

* Allow edges queries to see cross-namespace edges Signed-off-by: Alex Leong <[email protected]> * gofmt Signed-off-by: Alex Leong <[email protected]>
servicemeshinterface · Mar 11, 2020 · 1e08ed0 · 1e08ed0
1 parent 6dba3c6
commit 1e08ed0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/chart/linkerd.yaml b/chart/linkerd.yaml
@@ -88,7 +88,8 @@ linkerd:
                         sum(
                           irate(
                             response_latency_ms_bucket{
-                              namespace=~"{{.namespace}}",
+                              namespace=~"{{default ".+" .namespace}}",
+                              dst_namespace=~"{{default ".+" .toNamespace}}",
                               {{lower .kind}}=~"{{default ".+" .fromName}}",
                               dst_{{lower .kind}}=~"{{default ".+" .toName}}"
                             }[{{.window}}]
@@ -107,7 +108,8 @@ linkerd:
                         sum(
                           irate(
                             response_latency_ms_bucket{
-                              namespace=~"{{.namespace}}",
+                              namespace=~"{{default ".+" .namespace}}",
+                              dst_namespace=~"{{default ".+" .toNamespace}}",
                               {{lower .kind}}=~"{{default ".+" .fromName}}",
                               dst_{{lower .kind}}=~"{{default ".+" .toName}}"
                             }[{{.window}}]
@@ -126,7 +128,8 @@ linkerd:
                         sum(
                           irate(
                             response_latency_ms_bucket{
-                              namespace=~"{{.namespace}}",
+                              namespace=~"{{default ".+" .namespace}}",
+                              dst_namespace=~"{{default ".+" .toNamespace}}",
                               {{lower .kind}}=~"{{default ".+" .fromName}}",
                               dst_{{lower .kind}}=~"{{default ".+" .toName}}"
                             }[{{.window}}]
@@ -144,7 +147,8 @@ linkerd:
                 increase(
                   response_total{
                     classification="success",
-                    namespace=~"{{.namespace}}",
+                    namespace=~"{{default ".+" .namespace}}",
+                    dst_namespace=~"{{default ".+" .toNamespace}}",
                     {{lower .kind}}=~"{{default ".+" .fromName}}",
                     dst_{{lower .kind}}=~"{{default ".+" .toName}}"
                   }[{{.window}}]
@@ -160,7 +164,8 @@ linkerd:
                 increase(
                   response_total{
                     classification="failure",
-                    namespace=~"{{.namespace}}",
+                    namespace=~"{{default ".+" .namespace}}",
+                    dst_namespace=~"{{default ".+" .toNamespace}}",
                     {{lower .kind}}=~"{{default ".+" .fromName}}",
                     dst_{{lower .kind}}=~"{{default ".+" .toName}}"
                   }[{{.window}}]

diff --git a/pkg/prometheus/edge.go b/pkg/prometheus/edge.go
@@ -54,9 +54,9 @@ func (e *EdgeLookup) Queries() []*Query {
 			Name:     name,
 			Template: tmpl,
 			Values: map[string]interface{}{
-				"kind":      e.Item.Resource.Kind,
-				"namespace": e.Item.Resource.Namespace,
-				"toName":    e.Item.Resource.Name,
+				"kind":        e.Item.Resource.Kind,
+				"toNamespace": e.Item.Resource.Namespace,
+				"toName":      e.Item.Resource.Name,
 			},
 		})
 	}