Fixes #23: Allow configuration of default Grafana admin password.

README.md

@@ -34,11 +34,17 @@ Other features:
  - `example.config.yml` to `config.yml`
  4. Run the playbook: `ansible-playbook main.yml`
 
-## Logging in
+## Usage
 
-Grafana has an admin username and password by default; currently this is not easily configurable, but follow [this issue](https://github.com/geerlingguy/internet-pi/issues/23) for progress making it more configurable.
+### Pi-hole
 
-The default is `admin`/`wonka`.
+Visit the Pi's IP address (e.g. https://192.168.1.10/) and use the `pihole_password` you configured in your `config.yml` file.
+
+### Grafana
+
+Visit the Pi's IP address with port 3030 (e.g. https://192.168.1.10:3030/), and log in with username `admin` and the password `monitoring_grafana_admin_password` you configured in your `config.yml`.
+
+> Note: The `monitoring_grafana_admin_password` is only used the first time Grafana starts up; if you need to change it later, do it via Grafana's admin UI.
 
 ## Updating and Backup
 

example.config.yml

@@ -7,6 +7,7 @@ pihole_password: change-this-password
 
 # Internet monitoring configuration.
 monitoring_enable: true
+monitoring_grafana_admin_password: admin
 
 # Shelly Plug configuration. (Also requires `monitoring_enable`)
 shelly_plug_enable: false

main.yml

@@ -11,6 +11,10 @@
  update_cache: true
  cache_valid_time: 3600
 
+ handlers:
+ - name: Include handlers.
+ ansible.builtin.import_tasks: tasks/handlers.yml
+
  tasks:
  - name: Setup Docker.
  ansible.builtin.import_tasks: tasks/docker.yml

tasks/handlers.yml

@@ -0,0 +1,7 @@
+---
+- name: Restart internet-monitoring
+ community.docker.docker_compose:
+ project_src: ~/internet-monitoring/
+ build: false
+ restarted: true
+ become: false

tasks/internet-monitoring.yml

@@ -33,6 +33,7 @@
  loop:
  - src: grafana-config.monitoring.j2
  dest: grafana/config.monitoring
+ notify: Restart internet-monitoring
  become: false
 
 - name: Ensure internet-monitoring environment is running.

templates/grafana-config.monitoring.j2

@@ -1,3 +1,3 @@
-GF_SECURITY_ADMIN_PASSWORD=wonka
+GF_SECURITY_ADMIN_PASSWORD={{ monitoring_grafana_admin_password }}
 GF_USERS_ALLOW_SIGN_UP=false
 GF_INSTALL_PLUGINS=flant-statusmap-panel,ae3e-plotly-panel