Merge pull request #36 from valiantlynx/working

Working

.gitignore

@@ -0,0 +1 @@
+alertmanager

ansible/roles/docker_deploy/files/prometheus/alert.rules

@@ -1,7 +1,6 @@
 groups:
-- name: example
+- name: devops
   rules:
-
   # Alert for any instance that is unreachable for >2 minutes.
   - alert: service_down
     expr: up == 0

ansible/roles/docker_deploy/files/prometheus/prometheus.yml

@@ -7,7 +7,7 @@ global:
   # Attach these labels to any time series or alerts when communicating with
   # external systems (federation, remote storage, Alertmanager).
   external_labels:
-      monitor: 'my-project'
+      monitor: 'devops'
 
 # Load and evaluate rules in this file every 'evaluation_interval' seconds.
 rule_files:
@@ -89,4 +89,13 @@ scrape_configs:
   - job_name: 'svelte-manga-api'
     scrape_interval: 5s
     static_configs:
-      - targets: ['svelte-manga-api.valiantlynx.com']
+      - targets: ['svelte-manga-api.valiantlynx.com']
+
+
+  - job_name: 'node_exporter_kasm'
+    static_configs:
+      - targets: ['kasm.valiantlynx.com:9100']
+
+  - job_name: 'cadvisor_kasm'
+    static_configs:
+      - targets: ['kasm.valiantlynx.com:8080']

ansible/roles/docker_deploy/tasks/main.yml

@@ -76,13 +76,13 @@
   ansible.builtin.copy:
     src: grafana/
     dest: "{{ ansible_env.HOME }}/grafana/"
-    force: yes # Do not overwrite the file if it already exists
+    force: yes 
 
 - name: Copy uptime-kuma configuration folder
   ansible.builtin.copy:
     src: uptime-kuma/
     dest: "{{ ansible_env.HOME }}/uptime-kuma/"
-    force: no
+    force: no # Do not overwrite the file if it already exists
 
 - name: Generate Alertmanager configuration
   ansible.builtin.template:
@@ -173,7 +173,7 @@
     chdir: "{{ ansible_env.HOME }}/"
 
 - name: Delete all hanging stuff
-  command: docker system prune -a -f
+  command: docker system prune -a -f --volumes
   become: true
   args:
     chdir: "{{ ansible_env.HOME }}/"

docker-compose.yml

@@ -88,7 +88,7 @@ services:
     ports:
       - 9093:9093
     volumes:
-      - ./ansible/roles/docker_deploy/files/alertmanager/:/etc/alertmanager/
+      - ./alertmanager/:/etc/alertmanager/
     networks:
       - monitoring
     restart: always