Commit bf5ac31
authored
fix(viz): update admin port names (#15090)
**Problem**
After #14111, prometheus does not correctly scrape the control plane
pods due to a misconfigured regex. This is true for both the regular
control plane components as well as the multicluster addon.
**Solution**
Update the regex for the `linkerd-controller` and
`linkerd-multicluster-controller` jobs to keep any port that matches the
pattern `*.admin$` instead of matching the entire string `admin`. This
way, any port name that ends with or is just `admin` is matched.
Additionally, any port that matches `linkerd-admin` is dropped to not
scrape the control plane proxies twice. This change is in line with the
handling in the `PodMonitors` for the control plane and multicluster
addon.
**Validation**
Set up two clusters with multicluster link enabled. Roll out the new
prometheus config and check that control plane metrics (not just the
control plane proxies) are present.
Fixes #14642 and #15089.
Signed-off-by: Benedikt Kittinger <benedikt.kittinger@post.at>1 parent 348d2b2 commit bf5ac31
5 files changed
Lines changed: 50 additions & 10 deletions
File tree
- viz
- charts/linkerd-viz/templates
- cmd/testdata
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
71 | | - | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
72 | 76 | | |
73 | 77 | | |
74 | 78 | | |
| |||
81 | 85 | | |
82 | 86 | | |
83 | 87 | | |
84 | | - | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
85 | 93 | | |
86 | 94 | | |
87 | 95 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments