-
Notifications
You must be signed in to change notification settings - Fork 7
feat: allow deploying dashboard and alerts on existing instances #62
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
8acd058 to
4cd9c53
Compare
47bb49f to
dd9620a
Compare
|
@aslafy-z thanks very much for your contribution. I'll be on PTO until Mon 13th, and my colleague who is co-maintaining this with me is away as well. Would it be ok with you if I got to this when I return? |
dd9620a to
651a327
Compare
|
@dannykopping sure, enjoy your pto! |
dannykopping
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Overall LGTM! Thanks for a great contribution @aslafy-z
Left a few notes
coder-observability/templates/dashboards/_dashboards_prebuilds.json.tpl
Outdated
Show resolved
Hide resolved
coder-observability/templates/dashboards/_dashboards_coderd.json.tpl
Outdated
Show resolved
Hide resolved
coder-observability/templates/dashboards/_dashboards_provisionerd.json.tpl
Outdated
Show resolved
Hide resolved
coder-observability/templates/dashboards/_dashboards_workspace_detail.json.tpl
Outdated
Show resolved
Hide resolved
coder-observability/templates/dashboards/_dashboards_workspaces.json.tpl
Outdated
Show resolved
Hide resolved
coder-observability/templates/dashboards/configmap-dashboards-prebuilds.yaml
Outdated
Show resolved
Hide resolved
coder-observability/templates/dashboards/configmap-dashboards-provisionerd.yaml
Outdated
Show resolved
Hide resolved
coder-observability/templates/dashboards/configmap-dashboards-status.yaml
Outdated
Show resolved
Hide resolved
coder-observability/templates/dashboards/configmap-dashboards-workspace_detail.yaml
Outdated
Show resolved
Hide resolved
coder-observability/templates/dashboards/configmap-dashboards-workspaces.yaml
Outdated
Show resolved
Hide resolved
coder-observability/templates/dashboards/configmap-dashboards-coderd.yaml
Outdated
Show resolved
Hide resolved
Signed-off-by: Zadkiel AHARONIAN <[email protected]>
Tracked with coder#63
Co-authored-by: Danny Kopping <[email protected]>
…ds.labels' Co-authored-by: Danny Kopping <[email protected]>
f456c7c to
6a7ced0
Compare
|
@dannykopping I rebased and re-built the compiled manifests. Do you see any blocking things left? Thanks |
|
@aslafy-z the main sticking point for me is #62 (comment) |
|
Sure! I missed that comment. I will test it in my dev environment in a few hours and will get back to you. |
I'm running it right now with these values and it works almost perfectly. Without the grafana agent, logs are not correctly matched ( demo v0.6.0 is available in the |
|
Almost there, thank you for your patience @aslafy-z - it's greatly appreciated! |
dannykopping
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for all the hard work on this @aslafy-z! Much appreciated.
Signed-off-by: Danny Kopping <[email protected]>
|
@dannykopping would you mind labelling this PR with |
|
@aslafy-z done! |
This PR includes several changes to allow the use of this Helm chart with existing infrastructure components such as Prometheus Operator and Grafana.
global.alerts.enabled(new value): enable/disable deployment of alertsglobal.alerts.kind(new value): alerts container resource (configmaporprometheusrule) (Prometheus Operator compatibility)global.dashboards.enabled(new value): enable/disable deployment of dashboardsglobal.dashboards.labels(new value): allow to set dashboard configmaps a label (Grafana Sidecar compatibility)runbookViewer.enabled(new value): enable/disable deployment of the runbook viewergrafana-agentis enabledCoderand Grafana uid(posponed Make Grafana dashboards' UIDs consistent #63) bycoder-It does not fix #31 but helps people that only want to deploy dashboards and alerts for example.
I'm running it right now with these values and it works almost perfectly. Without the grafana agent, logs are not correctly matched (
loggerfield not detected) - I've seen json support was tracked with #8, it may resolve this issue. I had to add service monitors by myself, I opened issue #67 for this matter.demo v0.6.0 is available in the
https://zadkiel.fr/coder-observabilityhelm repository