mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-11-10 12:47:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #981 from aaronraimist/grafana

Browse Source 
Allow special characters in Grafana password and upgrade Grafana
This commit is contained in:
Slavi Pantaleev 2021-04-04 10:04:07 +03:00 committed by GitHub
commit 560777cc16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/configuring-playbook-prometheus-grafana.md
View File

@ -17,11 +17,10 @@ matrix_grafana_anonymous_access: false
# This has no relation to your Matrix user id. It can be any username you'd like. # This has no relation to your Matrix user id. It can be any username you'd like.
# Changing the username subsequently won't work. # Changing the username subsequently won't work.
matrix_grafana_default_admin_user: some_username_chosen_by_you matrix_grafana_default_admin_user: "some_username_chosen_by_you"
# Passwords containing special characters may be troublesome.
# Changing the password subsequently won't work. # Changing the password subsequently won't work.
matrix_grafana_default_admin_password: some_strong_password_chosen_by_you matrix_grafana_default_admin_password: "some_strong_password_chosen_by_you"
``` ```
By default, a [Grafana](https://grafana.com/) web user-interface will be available at `https://stats.<your-domain>`. By default, a [Grafana](https://grafana.com/) web user-interface will be available at `https://stats.<your-domain>`.

2
roles/matrix-grafana/defaults/main.yml
View File

@ -3,7 +3,7 @@
matrix_grafana_enabled: false matrix_grafana_enabled: false
matrix_grafana_version: 7.4.0 matrix_grafana_version: 7.5.2
matrix_grafana_docker_image: "docker.io/grafana/grafana:{{ matrix_grafana_version }}" matrix_grafana_docker_image: "docker.io/grafana/grafana:{{ matrix_grafana_version }}"
matrix_grafana_docker_image_force_pull: "{{ matrix_grafana_docker_image.endswith(':latest') }}" matrix_grafana_docker_image_force_pull: "{{ matrix_grafana_docker_image.endswith(':latest') }}"

8
roles/matrix-grafana/templates/grafana.ini.j2
View File

@ -1,16 +1,16 @@
[security] [security]
# default admin user, created on startup # default admin user, created on startup
admin_user = {{ matrix_grafana_default_admin_user }} admin_user = "{{ matrix_grafana_default_admin_user }}"
# default admin password, can be changed before first start of grafana, or in profile settings # default admin password, can be changed before first start of grafana, or in profile settings
admin_password = {{ matrix_grafana_default_admin_password }} admin_password = """{{ matrix_grafana_default_admin_password }}"""
[auth.anonymous] [auth.anonymous]
# enable anonymous access # enable anonymous access
enabled = {{ matrix_grafana_anonymous_access }} enabled = {{ matrix_grafana_anonymous_access }}
# specify organization name that should be used for unauthenticated users # specify organization name that should be used for unauthenticated users
org_name = {{ matrix_grafana_anonymous_access_org_name }} org_name = "{{ matrix_grafana_anonymous_access_org_name }}"
[dashboards] [dashboards]
{% if matrix_synapse_metrics_enabled %} {% if matrix_synapse_metrics_enabled %}