From 43ed9c0c883f2532c30b309dd9a6a8316199909b Mon Sep 17 00:00:00 2001 From: Niklas Yann Wettengel Date: Sat, 13 Apr 2019 01:29:23 +0200 Subject: nat64 --- roles/install_monitoring/files/vnstat | 37 ------------ roles/install_monitoring/files/vnstat.sh | 45 -------------- roles/install_monitoring/tasks/install_vnstat.yml | 73 ----------------------- roles/install_monitoring/tasks/main.yml | 3 - 4 files changed, 158 deletions(-) delete mode 100644 roles/install_monitoring/files/vnstat delete mode 100755 roles/install_monitoring/files/vnstat.sh delete mode 100644 roles/install_monitoring/tasks/install_vnstat.yml (limited to 'roles/install_monitoring') diff --git a/roles/install_monitoring/files/vnstat b/roles/install_monitoring/files/vnstat deleted file mode 100644 index cbd2f7c..0000000 --- a/roles/install_monitoring/files/vnstat +++ /dev/null @@ -1,37 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server ipv6only=on; - server_name localhost; - - charset UTF-8; - - index index.html index.htm; - root /srv/http/vnstat; - - location / { - try_files $uri $uri/ =404; - autoindex on; - } - - # redirect server error pages to the static page /50x.html - # - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } - - location /nginx_status { - stub_status on; - access_log off; - allow 127.0.0.1; - allow ::1; - deny all; - } - - - location ~* \.(?:jpg|jpeg|gif|bmp|ico|png|css|js|swf|svg)$ { - expires 30d; - # Optional: Don't log access to assets - access_log off; - } -} diff --git a/roles/install_monitoring/files/vnstat.sh b/roles/install_monitoring/files/vnstat.sh deleted file mode 100755 index 7ff875c..0000000 --- a/roles/install_monitoring/files/vnstat.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -set -e - -IFACES=$(ls /var/lib/vnstat/) - -TARGET=/srv/http/vnstat/ - -for iface in $IFACES; do - /usr/bin/vnstati -i ${iface} -h -o ${TARGET}${iface}_hourly.png - /usr/bin/vnstati -i ${iface} -d -o ${TARGET}${iface}_daily.png - /usr/bin/vnstati -i ${iface} -m -o ${TARGET}${iface}_monthly.png - /usr/bin/vnstati -i ${iface} -t -o ${TARGET}${iface}_top10.png - /usr/bin/vnstati -i ${iface} -s -o ${TARGET}${iface}_summary.png -done - -cat > ${TARGET}index.html < - - - - - - - - - -EOT - - -for iface in $IFACES; do - sed s/IFACE/${iface}/g >> ${TARGET}index.html < - traffic summary
- traffic per month
- traffic per hour
- traffic top10
- traffic per day - -EOT - -done - -echo "" >> ${TARGET}index.html - diff --git a/roles/install_monitoring/tasks/install_vnstat.yml b/roles/install_monitoring/tasks/install_vnstat.yml deleted file mode 100644 index 4027aa6..0000000 --- a/roles/install_monitoring/tasks/install_vnstat.yml +++ /dev/null @@ -1,73 +0,0 @@ ---- -- name: install vnstat - pacman: - name: vnstat - state: present - -- name: start and enable vnstat service - systemd: - name: vnstat.service - enabled: yes - state: started - -- name: add interfaces to vnstat for batman interfaces - command: /usr/bin/vnstat -u -i bat{{ item.name }} - args: - creates: '/var/lib/vnstat/bat{{ item.name }}' - with_items: "{{ sites }}" - when: "'fastd' in group_names" - -- name: add interfaces to vnstat for uplink interfaces - command: /usr/bin/vnstat -u -i bb{{ hostvars[item]['wireguard_bb_name'] }} - args: - creates: "/var/lib/vnstat/bb{{ hostvars[item]['wireguard_bb_name'] }}" - with_items: - - "{{ groups['uplink'] }}" - when: "'fastd' in group_names" - -- name: add interfaces to vnstat for outgoing v4 interface - command: /usr/bin/vnstat -u -i {{ ansible_default_ipv4.interface }} - args: - creates: '/var/lib/vnstat/{{ ansible_default_ipv4.interface }}' - -- name: add interfaces to vnstat for outgoing v6 interface - command: /usr/bin/vnstat -u -i {{ ansible_default_ipv6.interface }} - args: - creates: '/var/lib/vnstat/{{ ansible_default_ipv6.interface }}' - -- name: add output folder for vnstat graphs - file: - path: /srv/http/vnstat - state: directory - -- name: install gd which is needed for graph generation - pacman: - name: gd - state: present - -- name: add bash script to generate vnstat graphs - copy: - src: vnstat.sh - dest: /usr/local/bin/vnstat.sh - mode: 0744 - -- name: add cronjob to generate vnstat graphs - cron: - name: vnstat - minute: '*/5' - user: root - cron_file: vnstat - job: '/usr/local/bin/vnstat.sh' - -- name: add vnstat nginx config - copy: - src: vnstat - dest: /etc/nginx/sites-available/vnstat - notify: reload nginx - -- name: enable vnstat nginx config - file: - src: /etc/nginx/sites-available/vnstat - dest: /etc/nginx/sites-enabled/vnstat - state: link - notify: reload nginx diff --git a/roles/install_monitoring/tasks/main.yml b/roles/install_monitoring/tasks/main.yml index afb4db9..6600e0c 100644 --- a/roles/install_monitoring/tasks/main.yml +++ b/roles/install_monitoring/tasks/main.yml @@ -1,7 +1,4 @@ --- -- name: install vnstat - import_tasks: install_vnstat.yml - - name: install ffmyk-influx include: install_ffmyk-influx.yml when: "'fastd' in group_names" -- cgit v1.2.3-54-g00ecf