Added naruto

Signed-off-by: TuDatTr <tuan-dat.tran@tudattr.dev>

roles/docker/tasks/aya01_compose.yml

@@ -75,7 +75,3 @@
 - include_tasks: grafana.yml
   tags:
     - grafana
-
-- include_tasks: gitlab.yml
-  tags:
-    - gitlab

roles/docker/templates/aya01/compose.yaml

@@ -51,57 +51,57 @@ services:
       - "traefik.http.routers.{{ pihole_host }}.rule=Host(`{{ pihole_host }}.{{ aya01_host }}.{{ local_domain }}`)"
       - "traefik.http.services.{{ pihole_host }}.loadbalancer.server.port=80"
 
-  db:
-    image: mariadb
-    container_name: zoneminder_db
-    restart: unless-stopped
-    networks:
-      - zoneminder
-    volumes:
-      - "/etc/localtime:/etc/localtime:ro"
-      - "{{ zoneminder_db }}:/var/lib/mysql"
-    environment:
-      - "MYSQL_DATABASE={{ zoneminder_host }}"
-      - "MYSQL_ROOT_PASSWORD={{ vault_mysql_root_password }}"
-      - "MYSQL_USER={{ mysql_user }}"
-      - "MYSQL_PASSWORD={{ vault_mysql_user_password }}"
-      - "MAX_LOG_SIZE_BYTES=1000000"
-      - "MAX_LOG_NUMBER=20"
-      - "TZ=Europe/Berlin"
-  zoneminder:
-    image: ghcr.io/zoneminder-containers/zoneminder-base:latest
-    container_name: zoneminder
-    restart: unless-stopped
-    stop_grace_period: 45s
-    depends_on:
-      - db
-      - traefik
-    networks:
-      - zoneminder
-      - net
-    ports:
-      - "{{ zoneminder_port }}:80"
-    volumes:
-      - "/etc/localtime:/etc/localtime:ro"
-      - "{{ zoneminder_data }}:/data"
-      - "{{ zoneminder_config }}:/config"
-      - "{{ zoneminder_log}}:/log"
-      - type: tmpfs
-        target: /dev/shm
-        tmpfs:
-          size: 1000000000
-    environment:
-      - "MYSQL_DATABASE={{ zoneminder_host }}"
-      - "MYSQL_ROOT_PASSWORD={{ vault_mysql_root_password }}"
-      - "MYSQL_USER={{ mysql_user }}"
-      - "MYSQL_PASSWORD={{ vault_mysql_user_password }}"
-      - "MAX_LOG_SIZE_BYTES=1000000"
-      - "MAX_LOG_NUMBER=20"
-      - "TZ=Europe/Berlin"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.{{ zoneminder_host }}.rule=Host(`{{ zoneminder_host}}.{{ aya01_host }}.{{ local_domain }}`)"
-      - "traefik.http.services.{{ zoneminder_host }}.loadbalancer.server.port=80"
+#  db:
+#    image: mariadb
+#    container_name: zoneminder_db
+#    restart: unless-stopped
+#    networks:
+#      - zoneminder
+#    volumes:
+#      - "/etc/localtime:/etc/localtime:ro"
+#      - "{{ zoneminder_db }}:/var/lib/mysql"
+#    environment:
+#      - "MYSQL_DATABASE={{ zoneminder_host }}"
+#      - "MYSQL_ROOT_PASSWORD={{ vault_mysql_root_password }}"
+#      - "MYSQL_USER={{ mysql_user }}"
+#      - "MYSQL_PASSWORD={{ vault_mysql_user_password }}"
+#      - "MAX_LOG_SIZE_BYTES=1000000"
+#      - "MAX_LOG_NUMBER=20"
+#      - "TZ=Europe/Berlin"
+#  zoneminder:
+#    image: ghcr.io/zoneminder-containers/zoneminder-base:latest
+#    container_name: zoneminder
+#    restart: unless-stopped
+#    stop_grace_period: 45s
+#    depends_on:
+#      - db
+#      - traefik
+#    networks:
+#      - zoneminder
+#      - net
+#    ports:
+#      - "{{ zoneminder_port }}:80"
+#    volumes:
+#      - "/etc/localtime:/etc/localtime:ro"
+#      - "{{ zoneminder_data }}:/data"
+#      - "{{ zoneminder_config }}:/config"
+#      - "{{ zoneminder_log}}:/log"
+#      - type: tmpfs
+#        target: /dev/shm
+#        tmpfs:
+#          size: 1000000000
+#    environment:
+#      - "MYSQL_DATABASE={{ zoneminder_host }}"
+#      - "MYSQL_ROOT_PASSWORD={{ vault_mysql_root_password }}"
+#      - "MYSQL_USER={{ mysql_user }}"
+#      - "MYSQL_PASSWORD={{ vault_mysql_user_password }}"
+#      - "MAX_LOG_SIZE_BYTES=1000000"
+#      - "MAX_LOG_NUMBER=20"
+#      - "TZ=Europe/Berlin"
+#    labels:
+#      - "traefik.enable=true"
+#      - "traefik.http.routers.{{ zoneminder_host }}.rule=Host(`{{ zoneminder_host}}.{{ aya01_host }}.{{ local_domain }}`)"
+#      - "traefik.http.services.{{ zoneminder_host }}.loadbalancer.server.port=80"
 
   syncthing:
     image: syncthing/syncthing
@@ -475,29 +475,6 @@ services:
       - "traefik.http.routers.{{ grafana_host }}.rule=Host(`{{ grafana_host }}.{{ aya01_host }}.{{ local_domain }}`)"
       - "traefik.http.services.{{ grafana_host }}.loadbalancer.server.port={{ grafana_port }}"
 
-  {{ gitlab.host }}:
-    image: gitlab/gitlab-ce:latest
-    container_name: {{ gitlab.host }}
-    restart: {{ gitlab.restart }}
-    depends_on:
-      - {{ pihole_host }}
-    networks:
-      - net
-    environment:
-      - TZ={{ timezone }}
-    volumes:
-      - {{ gitlab.paths.config }}:/etc/gitlab/
-      - {{ gitlab.paths.logs}}:/var/log/gitlab/
-      - {{ gitlab.paths.data}}:/var/opt/gitlab/
-    ports:
-      - {{ gitlab.ports.ssh.remote }}:{{ gitlab.ports.ssh.local }}
-      - {{ gitlab.ports.http.remote }}:{{ gitlab.ports.http.local }}
-    shm_size: '256m'
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.{{ gitlab.host }}.rule=Host(`{{ gitlab.host }}.{{ aya01_host }}.{{ local_domain }}`)"
-      - "traefik.http.services.{{ gitlab.host }}.loadbalancer.server.port={{ gitlab.ports.http.local }}"
-
 networks:
   zoneminder:
     driver: bridge

roles/docker/templates/aya01/prometheus/prometheus.yml.j2

@@ -16,16 +16,17 @@ rule_files:
   # - "second_rules.yml"
 
 scrape_configs:
-  - job_name: 'aya01'
+  - job_name: 'node'
     scrape_interval: 10s
     scrape_timeout: 10s
     tls_config:
       insecure_skip_verify: true
     static_configs:
-    - targets: ['{{ aya01_ip }}:{{node_exporter_port}}']
-    - targets: ['{{ mii_ip }}:{{node_exporter_port}}']
-    - targets: ['{{ pi_ip }}:{{node_exporter_port}}']
-  - job_name: Mikrotik
+    - targets: ['{{ aya01_ip }}:{{node_exporter.port}}']
+    - targets: ['{{ mii_ip }}:{{node_exporter.port}}']
+    - targets: ['{{ pi_ip }}:{{node_exporter.port}}']
+    - targets: ['{{ naruto_ip }}:{{node_exporter.port}}']
+  - job_name: 'mikrotik'
     static_configs:
       - targets:
         - {{ snmp_exporter_target }}
@@ -39,6 +40,7 @@ scrape_configs:
         target_label: instance
       - target_label: __address__
         replacement: {{ aya01_ip }}:{{ snmp_exporter_port }} # The SNMP exporter's real hostname:port.
-  - job_name: 'smart'
+  - job_name: 'SMART'
     static_configs:
     - targets: ['{{ aya01_ip }}:{{smart_exporter.port}}']
+    - targets: ['{{ naruto_ip }}:{{smart_exporter.port}}']