Skip to content
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

Feat/Unify grafana-operator based setup on k8s/openshift overlays #11

Merged
merged 12 commits into from
Mar 3, 2025

Conversation

slopezz
Copy link
Collaborator

@slopezz slopezz commented Feb 19, 2025

Until now, grafana (part of observability-hub) had a different setup on k8s and openshift:

  • Openshift: it was used the grafana-operator (simple to maintain)
  • K8s: it was used a "manual" deployment, which make difficult to manage the app lifecycle, as there are dozens of related k8s resources with lots of "manual" volume mounts, rbac running... too complex

This PR:

  • Unifies the grafana setup by using the same community grafana-operator
    • Grafana main setup is done on the kustomized base, while the small differences are managed on each overlay:
      • small differences on Subscription
      • very similar Grafana CR (with some proxy tuning in the case of openshift)
      • complete different GrafanaDatasource
  • Kuadrant grafana dashboards are obtained directly through an URL (so no need to create an intermediate configmap mounted on the GrafanaDashboard CR)
    • Also, I updated to newer release v1.0.2
  • Istio dashboard was only present in k8s overlay (not openshift). What I did is to add it to the base (so it is always present on any overlay).
  • k8s grafana overlay exposes grafana service with a LoadBalancer, so using the same MetalLB already used for ArgoCD, making easier the usage of Grafana UI with no need of port-forwarding...
    • A new make target called grafana-url provide the Grafana MetalLB URL with user/password
  • Enable openshift user-workload-monitoring on openshift overlay (grafana-operator already has thanos as the datasource, consolidating cluster and uwm prometheus instances), so we have gateway metrics available in the dashboard

Signed-off-by: Sergio López <slopezma@redhat.com>
Signed-off-by: Sergio López <slopezma@redhat.com>
Signed-off-by: Sergio López <slopezma@redhat.com>
…verlay

Signed-off-by: Sergio López <slopezma@redhat.com>
…vability-hub k8s overlay

Signed-off-by: Sergio López <slopezma@redhat.com>
…ty-hub base

Signed-off-by: Sergio López <slopezma@redhat.com>
…sword of local-setup grafana UI

Signed-off-by: Sergio López <slopezma@redhat.com>
@slopezz slopezz added the enhancement New feature or request label Feb 19, 2025
@slopezz slopezz self-assigned this Feb 19, 2025
…openshift overlay (not used in k8s)

Signed-off-by: Sergio López <slopezma@redhat.com>
…lity-hub base

Signed-off-by: Sergio López <slopezma@redhat.com>
@slopezz slopezz force-pushed the feat/k8s-grafana-operator branch from eaba628 to 354bede Compare February 24, 2025 15:29
…ability-hub openshift overlay

Signed-off-by: Sergio López <slopezma@redhat.com>
@slopezz slopezz force-pushed the feat/k8s-grafana-operator branch from 0622913 to 8565dd3 Compare February 25, 2025 11:29
slopezz added 2 commits March 3, 2025 17:01
Signed-off-by: Sergio López <slopezma@redhat.com>
…-worker that enables openshift user-workload-monitoring

Signed-off-by: Sergio López <slopezma@redhat.com>
@roivaz
Copy link
Contributor

roivaz commented Mar 3, 2025

Tested both in k8s and OCP4 and both work as expected.

@roivaz roivaz merged commit 0525587 into Kuadrant:main Mar 3, 2025
2 checks passed
@david-martin
Copy link
Member

Thanks for taking the time to make this change @slopezz

@slopezz slopezz deleted the feat/k8s-grafana-operator branch March 4, 2025 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants