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

docs: Update external prom and grafana readme (#5142) 

* docs: Update external prom and grafana readme

Update `Values.yaml` to make it more clear about reverse proxy
configuration with external grafana instances.

Also, adds `global.prometheusUrl` and `global.grafanaUrl` into charts
`README`

Signed-off-by: Tarun Pothulapati <tarunpothulapati@outlook.com>
This commit is contained in:
Tarun Pothulapati 2020-10-28 07:30:40 +05:30 committed by GitHub
parent 80794876e0
commit dd42da343f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/linkerd2/README.md
View File

@ -104,6 +104,7 @@ their default values.
| `global.controllerImageVersion` | Tag for the controller container docker image | latest version | | `global.controllerImageVersion` | Tag for the controller container docker image | latest version |
| `global.controllerLogLevel` | Log level for the control plane components | `info` | | `global.controllerLogLevel` | Log level for the control plane components | `info` |
| `global.controllerNamespaceLabel` | Control plane label. Do not edit | `linkerd.io/control-plane-ns` | | `global.controllerNamespaceLabel` | Control plane label. Do not edit | `linkerd.io/control-plane-ns` |
| `global.grafanaUrl` | URL of external grafana instance configured with reverse proxy, used by the dashboard | |
| `global.podLabels` | Additional labels to add to all pods | `{}` | | `global.podLabels` | Additional labels to add to all pods | `{}` |
| `global.podAnnotations` | Additional annotations to add to all pods | `{}` | | `global.podAnnotations` | Additional annotations to add to all pods | `{}` |
| `global.createdByAnnotation` | Annotation label for the proxy create. Do not edit. | `linkerd.io/created-by` | | `global.createdByAnnotation` | Annotation label for the proxy create. Do not edit. | `linkerd.io/created-by` |
@ -113,6 +114,7 @@ their default values.
| `global.linkerdNamespaceLabel` | Control plane label. Do not edit | `linkerd.io/is-control-plane` | | `global.linkerdNamespaceLabel` | Control plane label. Do not edit | `linkerd.io/is-control-plane` |
| `global.linkerdVersion` | Control plane version | latest version | | `global.linkerdVersion` | Control plane version | latest version |
| `global.namespace` | Control plane namespace | `linkerd` | | `global.namespace` | Control plane namespace | `linkerd` |
| `global.prometheusUrl` | URL of external prometheus instance to perform queries, used by the `public-api` | |
| `global.proxy.enableExternalProfiles` | Enable service profiles for non-Kubernetes services | `false` | | `global.proxy.enableExternalProfiles` | Enable service profiles for non-Kubernetes services | `false` |
| `global.proxy.image.name` | Docker image for the proxy | `ghcr.io/linkerd/proxy` | | `global.proxy.image.name` | Docker image for the proxy | `ghcr.io/linkerd/proxy` |
| `global.proxy.image.pullPolicy` | Pull policy for the proxy container Docker image | `IfNotPresent` | | `global.proxy.image.pullPolicy` | Pull policy for the proxy container Docker image | `IfNotPresent` |

2
charts/linkerd2/values.yaml
View File

@ -41,7 +41,7 @@ global:
# url of existing prometheus # url of existing prometheus
prometheusUrl: "" prometheusUrl: ""
# url of external grafana instance. # url of external grafana instance with reverse proxy configured
grafanaUrl: "" grafanaUrl: ""
# Additional annotations to add to all pods # Additional annotations to add to all pods