Merge branch 'master' of git.autistici.org:ai3/float

roles/mariadb/templates/exporter.service.j2

@@ -4,7 +4,7 @@ Description=Prometheus exporter for MySQL server (%I)
 [Service]
 Restart=always
 User=prometheus
-ExecStart=/usr/bin/prometheus-mysqld-exporter -web.listen-address {{ mariadb_metrics_address }}:{{ mariadb_metrics_port }} -config.my-cnf {{ mariadb_metrics_config }}
+ExecStart=/usr/bin/prometheus-mysqld-exporter -web.listen-address {{ mariadb_metrics_address }}:{{ mariadb_metrics_port }} -config.my-cnf {{ mariadb_metrics_config }} -collect.info_schema.tables=false -collect.info_schema.tablestats=false
 
 [Install]
 WantedBy=multi-user.target

roles/prometheus/files/rules/rules_net.conf.yml

@@ -16,9 +16,9 @@ groups:
   - record: instance:network_receive_bytes:rate5m
     expr: sum(rate(node_network_receive_bytes{device!="lo"}[5m])) without (device)
   - record: instance:public_network_transmit_bytes:rate5m
-    expr: sum(rate(node_network_transmit_bytes{device=~"(eth|eno|elp).*"}[5m])) without (device)
+    expr: sum(rate(node_network_transmit_bytes{device=~"(eth|e[nl][op]).*"}[5m])) without (device)
   - record: instance:public_network_receive_bytes:rate5m
-    expr: sum(rate(node_network_receive_bytes{device=~"(eth|eno|elp).*"}[5m])) without (device)
+    expr: sum(rate(node_network_receive_bytes{device=~"(eth|e[nl][op]).*"}[5m])) without (device)
   - record: global:public_network_transmit_bytes:rate5m
     expr: sum(instance:public_network_transmit_bytes:rate5m) without (instance, host)
   - record: global:public_network_receive_bytes:rate5m