Merge branch 'master' of arch-git:/srv/git/infrastructure

README.md

@@ -162,17 +162,6 @@ The following steps should be used to update our managed servers:
      the hosts vars and re-used the archusers role. Users
      in the phrik group are allowed to restar the irc bot.
 
-### soyuz
-
-#### Services
-  - build server (pkgbuild.com)
-  - releng
-  - sogrep
-  - /~user/ webhost
-  - matrix
-  - docker images
-  - arch boxes (packer)
-
 ### dragon
 
 #### Services

host_vars/dragon.archlinux.org

@@ -17,3 +17,4 @@ archbuild_fs: 'btrfs'
 
 zabbix_agent_templates:
   - Template OS Linux
+  - Template Btrfs

misc/vault_hetzner.yml

 $ANSIBLE_VAULT;1.1;AES256
-35623837346431643363356131323862303663343434333565613164336139303438393139356664
-3038656230613533313363636161616237306363306264370a353435313162303164323830313139
-62323236353533363264333930626631323038393864313334316131663732366130323363333364
-6236306266316631390a386563383931306635623334383833623135383932303436363931373034
-66366631663138356635666236323632346166363236343333366463373531303230306534326338
-37653135346231373534366234626439323937353037356130643531653435393839306536626537
-30343030386432363962633666346639383236646361386564356533373862363336616366626433
-30653761626436666431663937326533646236383136393035643034333834363532636464356563
-33613830623430306664356238323032626230616333663233616364326165376435666636616432
-61353337626666356366353862646564643439373239363036333936656161393736633335386636
-63323563316639653239616137386233333539353562343466623463303937383939633833376634
-65353663616635613765343766636463353332636661623337333566323435303330366263616264
-66633237646366633834346231633330396538356338366530396466656631616339393631323936
-33623935626161373338313936303565633538613735613361343763343665666464353638666362
-31323732343061336336653163346537383163386532646635333135356433393364303664323033
-35356337343632333064383230333532336166633131653537333534303863633664656536396463
-64613233353664343034646234303165633039666339383933373339353561646530383238303065
-3930386365326437343333333264353030373064383766653134
+34356164636366663266306235353431363762343164633938353533613437333536306533336461
+3466343038303832376136623532333633353739393035640a373036363866313438666263393630
+62373039313738393633356565343861663461626437343762323231613230663838656465356166
+3933383065376263390a663363363866393264386436313437633237316634386165343838396665
+34366361623866336664326233363834386439373632313837306239653665653063373838313139
+33376139633434346664363933613963656233623937646465656535646333343166313038363364
+36383934633330656364626261356466353561363834306163356236616562376363326239343637
+30663161363135373765383064643331393065303763623762333735343463343361663036323066
+65316534373536323966333663626662633861646264323731383636396539363738613632323164
+63663030643036333763336430643031333762656164393530326636343463633137383637393030
+64306331616237613830363836646337323165363462613237376266653436663063393239383362
+39623535663961646462326432373730306137393665306132663762313635366664663030356364
+30353262376532663031653039643034323236643366313163353838653138616637353431333639
+65333538396438386239633238643633383466333139636438383164396564666137313131366466
+36316364653237353138303437366330623566306330343161333864313164303336396436353236
+34636137623134313335326635666661666439303932303836356139313930383861613031316562
+33363763613664363133666334663564363966323739643634303466373636323233633833633764
+3537333433306535623737633932333465616132376631623831

roles/zabbix-agent/files/zabbix-btrfs-subvolume.sh

+#!/bin/bash
+btrfs subvol list -d / | wc -l

roles/zabbix-agent/tasks/main.yml

@@ -95,6 +95,7 @@
     - postgresql-dbsize-stats.pl
     - postgresql-user-stats.pl
     - memcached-stats.py
+    - zabbix-btrfs-subvolume.sh
 
 - name: Install helper scripts
   copy: src=nginx-zabbix.pl dest=/usr/local/bin/nginx-zabbix.pl mode=0755 owner=root group=root

roles/zabbix-agent/templates/zabbix-agent-sudoers.conf.j2

-zabbix-agent ALL=(root) NOPASSWD: /usr/local/bin/borg list --json --format {start}{end} --sort-by timestamp --last 1, /usr/local/bin/mysql-dbsize-stats.pl, /usr/local/bin/memcached-stats.py
+zabbix-agent ALL=(root) NOPASSWD: /usr/local/bin/borg list --json --format {start}{end} --sort-by timestamp --last 1, /usr/local/bin/mysql-dbsize-stats.pl, /usr/local/bin/memcached-stats.py, /usr/local/bin/zabbix-btrfs-subvolume.sh
 zabbix-agent ALL=(postgres) NOPASSWD: /usr/local/bin/postgresql-dbsize-stats.pl, /usr/local/bin/postgresql-user-stats.pl

roles/zabbix-agent/templates/zabbix_agentd.conf

@@ -71,3 +71,5 @@ UserParameter=arch_archive.db_count,echo 'select count(*) from files;' | sqlite3
 UserParameter=memcached.stats[*],sudo /usr/local/bin/memcached-stats.py --socket '$1'
 UserParameter=memcached.stats_discover,/usr/local/bin/memcached-stats.py --discover
 #UserParameter=postgresql.dbsize_discover,sudo -u postgres /usr/local/bin/postgresql-dbsize-stats.pl discover
+
+UserParameter=btrfs.subvolume_count,sudo /usr/local/bin/zabbix-btrfs-subvolume.sh

roles/zabbix-server/templates/irccat.json.j2

+{
+  "tcp": {
+    "listen": "localhost:12345"
+  },
+  "irc": {
+    "server": "chat.freenode.net:6697",
+    "tls": true,
+    "tls_skip_verify": false,
+    "nick": "archzabbix",
+    "realname": "Arch Zabbix Notifier",
+    "server_pass": "",
+    "identify_pass": "{{ vault_zabbix_irc_password }}",
+    "sasl_login": "archzabbix",
+    "sasl_pass": "{{ vault_zabbix_irc_password }}",
+    "channels": ["#archlinux-devops"]
+  },
+  "commands": {
+  }
+}
+

roles/zabbix-server/templates/zabbix-irc-msg.j2

+#!/bin/sh
+
+sender=$1
+subject=$2
+body=$3
+
+echo $subject | nc -c localhost 12345