Commit 36998f35 authored by Sven-Hendrik Haase's avatar Sven-Hendrik Haase
Browse files

Merge branch 'remove_zabbix' into 'master'

Remove zabbix

See merge request !143
parents 0408c643 ce6774c4
Pipeline #3131 passed with stage
in 32 seconds
# Grafana
Our Grafana is hosted on https://monitoring.archlinux.org and is accessible for
all Arch Linux Staff, editing rights are restricted to users with the Devops
Role.
Dashboards and datasources are automatically provisioned by Grafana with Grafana's built-in [provisioning configuration](https://grafana.com/docs/grafana/latest/administration/provisioning/).
## Adding a new Dashboard
A new dashboard can be configured in our Grafana instance to try it out and if satisfactory checked in to Git as following:
* Export the dashboard to json (top left, share dashboard => exporter => save to file).
* Save the json file in `roles/grafana/files/dashboards'
* Git add the file and run the grafana playbook
......@@ -4,9 +4,6 @@ configure_firewall: true
# module when deploying firewalld tasks
ansible_python_interpreter: /usr/bin/python3
zabbix_agent_templates:
- Template OS Linux
# this is used by the maintenance role to get the ip address
# of the machine running the playbook
maintenance_remote_machine: "{{ hostvars[inventory_hostname]['ansible_env'].SSH_CLIENT.split(' ')[0] }}"
......
......@@ -4,8 +4,3 @@ archweb_db_host: 'apollo.archlinux.org'
# raise tcp window limits to 32MiB
tcp_rmem: "10240 87380 33554432"
tcp_wmem: "10240 87380 33554432"
zabbix_agent_templates:
- Template OS Linux
- Template App Syncrepo
- Template App Syncrepo Arch32
---
zabbix_agent_templates:
- Template OS Linux
repro_users:
holger:
name: "Holger Levsen"
ssh_key: holger.pub
groups:
- wheel
maprepi:
name: "Mattia Rizzolo"
ssh_key: maprepi.pub
groups:
- wheel
---
filesystem: btrfs
zabbix_agent_templates:
- Template OS Linux
- Template App Borg Backup
- Template App HTTP Service
- Template App HTTPS Service
- Template App Nginx
- Template App SSH Service
- Template App PostgreSQL
......@@ -14,24 +14,6 @@ system_disks:
kanboard_version: "v1.2.14"
# TODO use a list of enabled roles or groups to enable each template and also use the same to enable each role for a machine? duplicating and manually tracking this stuff sucks, but maybe we want to deploy roles without monitoring? maybe not?
zabbix_agent_templates:
- Template OS Linux
- Template App Borg Backup
- Template App HTTP Service
- Template App HTTPS Service
- Template App MySQL
- Template App Nginx
- Template App SMTP Service
- Template App SSH Service
- Template App Zabbix Server
- Template App PostgreSQL
- Template App Memcached
zabbix_agent_host_groups:
- Linux servers
- Zabbix servers
fail2ban_jails:
sshd: true
postfix: true
......
---
filesystem: btrfs
memcached_socket: "/var/run/aurweb.sock"
zabbix_agent_templates:
- Template OS Linux
- Template App Borg Backup
- Template App HTTP Service
- Template App HTTPS Service
- Template App MySQL
- Template App Nginx
---
filesystem: btrfs
memcached_socket: "/var/run/aurweb.sock"
zabbix_agent_templates:
- Template OS Linux
- Template App Borg Backup
- Template App HTTP Service
- Template App HTTPS Service
- Template App MySQL
- Template App Nginx
---
filesystem: btrfs
zabbix_agent_templates:
- Template OS Linux
- Template App Borg Backup
- Template App HTTP Service
- Template App HTTPS Service
- Template App MySQL
- Template App Nginx
---
filesystem: btrfs
zabbix_agent_templates:
- Template OS Linux
- Template App Borg Backup
- Template App HTTP Service
- Template App HTTPS Service
- Template App MySQL
- Template App Nginx
......@@ -14,7 +14,3 @@ system_disks:
- /dev/nvme1n1
archbuild_fs: 'btrfs'
zabbix_agent_templates:
- Template OS Linux
- Template Btrfs
......@@ -17,8 +17,3 @@ system_disks:
raid_level: "raid6"
archive_domain: archive.archlinux.org
zabbix_agent_templates:
- Template OS Linux
- Template App Borg Backup
- Template App Nginx
---
filesystem: btrfs
zabbix_agent_templates:
- Template OS Linux
- Template App Borg Backup
- Template App HTTP Service
- Template App HTTPS Service
- Template App Nginx
- Template App SSH Service
gitlab_backupdir: /srv/gitlab/data/backups
---
filesystem: btrfs
zabbix_agent_templates:
- Template OS Linux
- Template App Borg Backup
- Template App HTTP Service
- Template App HTTPS Service
- Template App Nginx
......@@ -7,10 +7,3 @@ system_disks:
vault_mariadb_users:
root: "{{encrypted_mariadb_users_root_password}}"
zabbix_agent: "{{encrypted_mariadb_users_zabbix_password}}"
zabbix_agent_templates:
- Template OS Linux
- Template App Mailman
- Template App MySQL
- Template App Nginx
---
filesystem: btrfs
zabbix_agent_templates:
- Template OS Linux
- Template App Borg Backup
- Template App HTTP Service
- Template App HTTPS Service
- Template App Nginx
- Template App SSH Service
- Template App PostgreSQL
......@@ -2,5 +2,3 @@
mirror_domain: mirror.pkgbuild.com
archweb_mirrorcheck_locations: [12, 13]
filesystem: btrfs
zabbix_agent_templates:
- Template OS Linux
---
filesystem: btrfs
zabbix_agent_templates:
- Template OS Linux
- Template App Borg Backup
arch_users:
demize:
name: "Johannes Löthberg"
......
---
filesystem: btrfs
zabbix_agent_templates:
- Template OS Linux
- Template App Borg Backup
- Template App PostgreSQL
---
filesystem: btrfs
zabbix_agent_templates:
- Template OS Linux
- Template App Borg Backup
- Template App HTTP Service
- Template App HTTPS Service
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment