diff --git a/ceph.sls b/ceph.sls index 67d5b11..2c817c3 100644 --- a/ceph.sls +++ b/ceph.sls @@ -1,3 +1,7 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- + ceph: release: luminous use_upstream_repo: false diff --git a/grafana.sls b/grafana.sls index 4bc60e4..42b5753 100644 --- a/grafana.sls +++ b/grafana.sls @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # vim: ft=yaml --- + grafana: pkg: name: grafana diff --git a/haproxy.sls b/haproxy.sls index 82a3727..15fb518 100644 --- a/haproxy.sls +++ b/haproxy.sls @@ -1,6 +1,6 @@ -# -# Example pillar configuration -# +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- haproxy: enabled: True diff --git a/prometheus/node_exporter.sls b/prometheus/node_exporter.sls index 5a67769..0cf8b8a 100644 --- a/prometheus/node_exporter.sls +++ b/prometheus/node_exporter.sls @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # vim: ft=yaml --- + chaos-role: - prometheus-node_exporter diff --git a/prometheus/prometheus.sls b/prometheus/prometheus.sls index e375abb..25a4a5e 100644 --- a/prometheus/prometheus.sls +++ b/prometheus/prometheus.sls @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # vim: ft=yaml --- + chaos-role: - prometheus-master - prometheus-node_exporter diff --git a/salt/master.sls b/salt/master.sls index f99412e..548fdc6 100644 --- a/salt/master.sls +++ b/salt/master.sls @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # vim: ft=yaml --- + chaos: role: - salt-master diff --git a/saltmine.sls b/saltmine.sls index df26247..a49827e 100644 --- a/saltmine.sls +++ b/saltmine.sls @@ -9,7 +9,7 @@ mine_functions: disk.usage: [] grains.items: [] network.ip_addrs: [eth0] - networkplus.internal_ip_addrs: [] + #networkplus.internal_ip_addrs: [] internal_ip_addrs: mine_function: network.ip_addrs cidr: 192.168.0.0/16 diff --git a/top.sls b/top.sls index b610605..4d71965 100644 --- a/top.sls +++ b/top.sls @@ -10,15 +10,18 @@ base: - haproxy - grafana - prometheus.prometheus - - rsyslog - # Verflixt und zugenaeht! - #'cpuarch:aarch64': - # - match: grain - # - base + - base.log.rsyslog.client 'pine*': - - rsyslog + - base.log.rsyslog.client 'ebin*': - - rsyslog + - base.log.rsyslog.client + # Verflixt und zugenaeht! + 'cpuarch:aarch64': + - match: grain + - base.log.rsyslog.client + 'cpuarch:armv7l': + - match: grain + - base.log.rsyslog.client #'pine03*': # - prometheus.prometheus