Skip to content

Commit

Permalink
use templates
Browse files Browse the repository at this point in the history
add configuration templates for loki, grafana and grafana auth
  • Loading branch information
kayiwa committed Dec 16, 2024
1 parent 692a57e commit 8887c5d
Show file tree
Hide file tree
Showing 6 changed files with 1,100 additions and 9 deletions.
2 changes: 2 additions & 0 deletions roles/logs/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
logs_ldap_host: "{{ omit }}"
logs_bind_dn: "{{ omit }}"
logs_bind_password: "{{ omit }}"
logs_loadbalancer_dns_name: "kennyloggin-example.edu"
logs_bucket_name: "kennyloggin-gcs-bucket"
9 changes: 9 additions & 0 deletions roles/logs/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
---
# handlers file for roles/logs
- name: Restart grafana
ansible.builtin.systemd:
name: grafana-server
state: restarted

- name: Restart loki
ansible.builtin.service:
name: loki
state: restarted
14 changes: 12 additions & 2 deletions roles/logs/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,23 @@ lint: |
platforms:
- name: instance
image: "ghcr.io/pulibrary/pul_containers:jammy_multi"
command: "sleep infinity"
command: "/lib/systemd/systemd"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- /sys/fs/cgroup:/sys/fs/cgroup:rw
tmpfs:
- /tmp
- /run
- /run/lock
- /tmp/ansible
cgroupns_mode: host
privileged: true
pre_build_image: true
provisioner:
name: ansible
config_options:
defaults:
remote_tmp: /tmp/ansible
log: true
verifier:
name: ansible

29 changes: 23 additions & 6 deletions roles/logs/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,28 @@
- loki
- promtail

- name: Logs | Replace domain entry with our inventory name
ansible.builtin.lineinfile:
path: /etc/grafana/grafana.ini
regexp: ''
line: domain="{{ inventory_hostname }}"
- name: Logs | add loki config
ansible.builtin.template:
src: config.yml.j2
dest: /etc/loki/config.yml
owner: root
group: root
mode: '0644'
mode: '0640'
notify: Restart loki

- name: Logs | add grafana ldap config
ansible.builtin.template:
src: ldap.toml.j2
dest: /etc/grafana/ldap.toml
owner: root
group: root
mode: '0640'

- name: Logs | add grafana config
ansible.builtin.template:
src: grafana.ini.j2
dest: /etc/grafana/grafana.ini
owner: root
group: root
mode: '0640'
notify: Restart grafana
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ storage_config:
active_index_directory: /var/lib/loki/index
cache_location: /var/lib/loki/index_cache
gcs:
bucket_name: replace_by_your_bucked_name
bucket_name: "{{ logs_bucket_name }}"
Loading

0 comments on commit 8887c5d

Please sign in to comment.