roles: grafana: Add grafana configuration

Reviewed-on: #1

ansible/inventory

@@ -2,24 +2,26 @@ all:
   children:
     debian:
       hosts:
-        reverse-proxy.labolyon.dn42:
-        git.labolyon.dn42:
-        labolyon-fr.labolyon.dn42:
-        matrix.labolyon.dn42:
-        wiki.labolyon.dn42:
-        blogs.labolyon.dn42:
-        mail.labolyon.dn42:
-        radius.labolyon.dn42:
         ansible.labolyon.dn42:
+        blogs.labolyon.dn42:
         dn42-router.labolyon.dn42:
-        lolix-rs1.labolyon.dn42:
-        lolix-ixpman.labolyon.dn42:
         dns.labolyon.dn42:
-        mosquitto.labolyon.dn42:
-        monitoring.labolyon.dn42:
+        git.labolyon.dn42:
+        i2p.labolyon.dn42:
+        labolyon-fr.labolyon.dn42:
+        lolix-ixpman.labolyon.dn42:
+        lolix-rs1.labolyon.dn42:
         lolmox.labolyon.dn42:
         lolmox2.labolyon.dn42:
-        i2p.labolyon.dn42:
+        mail.labolyon.dn42:
+        matrix.labolyon.dn42:
+        monitoring.labolyon.dn42:
+        mosquitto.labolyon.dn42:
+        octoprint.labolyon.dn42:
+        radius.labolyon.dn42:
+        reverse-proxy.labolyon.dn42:
+        wiki.labolyon.dn42:
+        zigbee2mqtt.labolyon.dn42:
 #    blackbox:
 #      hosts:
 #        monitoring:

ansible/roles/grafana/handlers/main.yml

@@ -0,0 +1,5 @@
+## Restart grafana on changes
+- name: restart grafana
+  ansible.builtin.service:
+    name: 'grafana-server'
+    state: restarted

ansible/roles/grafana/tasks/main.yml

@@ -1,14 +1,21 @@
----
-
-- name: Install Grafana
-  tags: grafana-install
-  ansible.builtin.package:
-    name: 'grafana'
-    state: latest
-
-- name: Enable Grafana service
-  tags: grafana-enable
-  ansible.builtin.service:
-    name: 'grafana-server'
-    state: started
-    enabled: yes
+---
+
+- name: Install Grafana
+  tags: grafana-install
+  ansible.builtin.package:
+    name: 'grafana'
+    state: latest
+
+- name: Add grafana configuration
+  tags: grafana-configure
+  ansible.builtin.template:
+    src: grafana.ini.j2
+    dest: '/etc/grafana/grafana.ini'
+  notify: restart grafana
+
+- name: Enable Grafana service
+  tags: grafana-enable
+  ansible.builtin.service:
+    name: 'grafana-server'
+    state: started
+    enabled: yes

ansible/roles/node-exporter/vars/alpine.yml

@@ -1,6 +0,0 @@
----
-# vars file for node-exporter role
-node_service: node-exporter
-
-node_package:
-  - prometheus-node-exporter

ansible/roles/node-exporter/vars/redhat.yml

@@ -1,6 +0,0 @@
----
-# vars file for node-exporter role
-node_service: prometheus-node-exporter
-
-node_package:
-  - golang-github-prometheus-node-exporter

ansible/roles/node-exporter/vars/suse.yml

@@ -1,6 +0,0 @@
----
-# vars file for node-exporter role
-node_service: prometheus-node_exporter
-
-node_package:
-  - golang-github-prometheus-node_exporter

ansible/roles/prometheus/templates/prometheus.config.j2

@@ -54,13 +54,16 @@ scrape_configs:
   - job_name: "linux-nodes"
     static_configs:
       - targets:
+         - ansible.labolyon.dn42:9100
+         - dn42-router.labolyon.dn42:9100
+         - dns.labolyon.dn42:9100
+         - git.labolyon.dn42:9100
+         - i2p.labolyon.dn42:9100
+         - labolyon-fr.labolyon.dn42:9100
+         - lolix-ixpman.labolyon.dn42:9100
+         - lolix-rs1.labolyon.dn42:9100
          - lolmox.labolyon.dn42:9100
          - lolmox2.labolyon.dn42:9100
-         - blogs.labolyon.dn42:9100
-         - dn42-router.labolyon.dn42:9100
-         - git.labolyon.dn42:9100
-         - labolyon-fr.labolyon.dn42:9100
-         - lolix-rs1.labolyon.dn42:9100
          - mail.labolyon.dn42:9100
          - matrix.labolyon.dn42:9100
          - monitoring.labolyon.dn42:9100
@@ -68,4 +71,5 @@ scrape_configs:
          - radius.labolyon.dn42:9100
          - reverse-proxy.labolyon.dn42:9100
          - wiki.labolyon.dn42:9100
+         - zigbee2mqtt.labolyon.dn42:9100
 {% endif %}

ansible/roles/prometheus/templates/scrape-main.yml

@@ -1,13 +1,16 @@
   - job_name: "linux-nodes"
     static_configs:
       - targets:
+         - ansible.labolyon.dn42:9100
+         - dn42-router.labolyon.dn42:9100
+         - dns.labolyon.dn42:9100
+         - git.labolyon.dn42:9100
+         - i2p.labolyon.dn42:9100
+         - labolyon-fr.labolyon.dn42:9100
+         - lolix-ixpman.labolyon.dn42:9100
+         - lolix-rs1.labolyon.dn42:9100
          - lolmox.labolyon.dn42:9100
          - lolmox2.labolyon.dn42:9100
-         - blogs.labolyon.dn42:9100
-         - dn42-router.labolyon.dn42:9100
-         - git.labolyon.dn42:9100
-         - labolyon-fr.labolyon.dn42:9100
-         - lolix-rs1.labolyon.dn42:9100
          - mail.labolyon.dn42:9100
          - matrix.labolyon.dn42:9100
          - monitoring.labolyon.dn42:9100
@@ -15,3 +18,4 @@
          - radius.labolyon.dn42:9100
          - reverse-proxy.labolyon.dn42:9100
          - wiki.labolyon.dn42:9100
+         - zigbee2mqtt.labolyon.dn42:9100

ansible/roles/tools/vars/debian.yml

@@ -2,7 +2,6 @@
 # vars file for tools role
 common_packages:
   - htop
-  - neofetch
   - curl
   - bash
   - figlet
@@ -10,6 +9,5 @@ common_packages:
   - rsync
   - needrestart
   - lynis
-  - apt-listbugs
   - dnsutils
   - libpam-radius-auth

ansible/roles/users/tasks/main.yml

@@ -1,5 +1,4 @@
 ---
-
 - name: Load variables
   include_vars: "{{ ansible_os_family|lower }}.yml"
 
@@ -50,6 +49,16 @@
     group: root
     mode: 0640
 
+- name: Linux | Install sudoers file for sudo group
+  ansible.builtin.template:
+    src: sudo_sudoers
+    dest: "/etc/sudoers.d/sudo"
+    backup: yes
+    owner: root
+    group: root
+    mode: 0640
+    validate: /usr/sbin/visudo -cf %s
+
 - name: Linux | Define MOTD file
   ansible.builtin.shell:
     cmd: figlet -t {{ inventory_hostname_short | quote }} > /etc/motd

ansible/roles/users/templates/sudo_sudoers

@@ -0,0 +1,2 @@
+# Enable passwordless sudo for sudo members
+%sudo ALL=(ALL) NOPASSWD: ALL

ansible/roles/users/vars/debian.yml

@@ -1,5 +1,5 @@
 ---
-
+## Define custom UIDs to avoid conflicts
 user_details:
      - { name: vinishor, uid: 2000 }
      - { name: mirsal, uid: 2001 }