Skip to content

Updates to Cloud Grafana #234

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Sep 2, 2025
Merged

Updates to Cloud Grafana #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9ee804
ENH: Enable grafana-service on boot
khalford Sep 2, 2025
246b713
MAINT: Change URL for prod chatops prometheus
khalford Sep 2, 2025
5bc1e1e
ENH: Update Grafana user roles based on group
khalford Sep 2, 2025
f64662e
MAINT: Add forwardfor headers to haproxy
khalford Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions grafana_monitoring/roles/grafana/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,4 @@
ansible.builtin.systemd_service:
state: restarted
name: grafana-server.service
enabled: true
2 changes: 1 addition & 1 deletion grafana_monitoring/roles/grafana/templates/cloud_datasource.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ datasources:
type: prometheus
uid: "prod-chatops"
access: proxy
url: https://prometheus.cloud-chatops.nubes.rl.ac.uk
url: https://prometheus.chatops.nubes.rl.ac.uk
isDefault: false
basicAuth: true
basicAuthUser: {{ prod_chatops_prometheus_username }}
Expand Down
13 changes: 8 additions & 5 deletions grafana_monitoring/roles/grafana/templates/grafana.ini.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,17 @@ api_url = https://iris-iam.stfc.ac.uk/userinfo
groups_attribute_path = groups[*]
allowed_groups = "stfc-cloud/team,stfc-cloud/admins"

# Only apply role changes on dev so we can edit datasources and dashboards before pushing changes to prod.
{% if inventory_hostname.startswith("dev") %}
role_attribute_path=contains(groups[*], 'stfc-cloud/admins') && 'Admin' || contains(groups[*], 'stfc-cloud/team') && 'Editor' || 'Viewer'
{% else %}
# Keep role for all users as Viewer on production.
role_attribute_path='Viewer'
{% endif %}

[log]
# Raise the log level as the default is "info"
log_level = critical

[security]
admin_password="{{ grafana_admin_password }}"

{% if inventory_hostname.startswith("dev") %}
[users]
auto_assign_org_role=Admin
{% endif %}
1 change: 1 addition & 0 deletions grafana_monitoring/roles/haproxy/templates/haproxy.cfg.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ frontend {{ inventory_hostname }}
default_backend localhost

backend localhost
option forwardfor
server grafana 127.0.0.1:3000 check