viz: make prom checks dynamic by using annotations

charts/linkerd2/README.md

@@ -145,7 +145,6 @@ Kubernetes: `>=1.13.0-0`
 | disableHeartBeat | bool | `false` | Set to true to not start the heartbeat cronjob |
 | enableEndpointSlices | bool | `false` | enables the use of EndpointSlice informers for the destination service; enableEndpointSlices should be set to true only if EndpointSlice K8s feature gate is on; the feature is still experimental. |
 | enableH2Upgrade | bool | `true` | Allow proxies to perform transparent HTTP/2 upgrading |
-| grafanaUrl | string | `""` | url of external grafana instance with reverse proxy configured. |
 | heartbeatSchedule | string | `"0 0 * * *"` | Config for the heartbeat cronjob |
 | identity.issuer.clockSkewAllowance | string | `"20s"` | Amount of time to allow for clock skew within a Linkerd cluster |
 | identity.issuer.crtExpiry | string | `nil` | Expiration timestamp for the issuer certificate. It must be provided during install. Must match the expiry date in crtPEM |

charts/linkerd2/values.yaml

@@ -37,8 +37,6 @@ cniEnabled: false
 identityTrustAnchorsPEM: |
 # -- Trust domain used for identity
 identityTrustDomain: *cluster_domain
-# -- url of external grafana instance with reverse proxy configured.
-grafanaUrl: ""
 # -- Additional annotations to add to all pods
 podAnnotations: {}
 # -- Additional labels to add to all pods

test/integration/testdata/check.viz.golden

@@ -9,7 +9,6 @@ linkerd-viz
 √ linkerd-viz pods are injected
 √ viz extension pods are running
 √ prometheus is installed and configured correctly
-√ grafana is installed and configured correctly
 √ can initialize the client
 √ viz extension self-check
 

test/integration/testdata/check.viz.proxy.golden

@@ -9,7 +9,6 @@ linkerd-viz
 √ linkerd-viz pods are injected
 √ viz extension pods are running
 √ prometheus is installed and configured correctly
-√ grafana is installed and configured correctly
 √ can initialize the client
 √ viz extension self-check
 

viz/charts/linkerd-viz/README.md

@@ -100,6 +100,7 @@ Kubernetes: `>=1.13.0-0`
 | grafana.resources.cpu.request | string | `nil` | Amount of CPU units that the grafana container requests |
 | grafana.resources.memory.limit | string | `nil` | Maximum amount of memory that grafana container can use |
 | grafana.resources.memory.request | string | `nil` | Amount of memory that the grafana container requests |
+| grafanaUrl | string | `""` | url of external grafana instance with reverse proxy configured. |
 | identityTrustDomain | string | `"cluster.local"` | Trust domain used for identity |
 | imagePullSecrets | list | `[]` | For Private docker registries, authentication is needed.  Registry secrets are applied to the respective service accounts |
 | installNamespace | bool | `true` | Set to false when installing in a custom namespace. |

viz/charts/linkerd-viz/templates/namespace.yaml

@@ -10,5 +10,8 @@ metadata:
   labels:
     {{.Values.extensionAnnotation}}: linkerd-viz
   annotations:
+    {{- if .Values.prometheusUrl }}
+    viz.linkerd.io/external-prometheus: {{.Values.prometheusUrl}}
+    {{- end }}
     {{.Values.proxyInjectAnnotation}}: enabled
 {{ end -}}

viz/charts/linkerd-viz/values.yaml

@@ -52,6 +52,9 @@ enablePodAntiAffinity: false
 # -- url of external prometheus instance
 prometheusUrl: ""
 
+# -- url of external grafana instance with reverse proxy configured.
+grafanaUrl: ""
+
 # -- url of external jaeger instance
 # Set this to `jaeger.linkerd-jaeger.svc.<clusterDomain>` if you plan to use jaeger extension
 jaegerUrl: ""

viz/cmd/install_test.go

@@ -63,6 +63,13 @@ func TestRender(t *testing.T) {
 			},
 			"install_proxy_resources.golden",
 		},
+		{
+			map[string]interface{}{
+				"grafana":    map[string]interface{}{"enabled": false},
+				"grafanaUrl": "external-grafana.com",
+			},
+			"install_grafana_disabled.golden",
+		},
 	}
 
 	for i, tc := range testCases {