adding vim tags everywhere and all ARMS are rsyslog clients

This commit is contained in:
do
2020-03-27 22:32:40 +01:00
parent 8b9163c3f6
commit 7ce12df5a1
8 changed files with 22 additions and 11 deletions

View File

@@ -1,3 +1,7 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
ceph: ceph:
release: luminous release: luminous
use_upstream_repo: false use_upstream_repo: false

View File

@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=yaml # vim: ft=yaml
--- ---
grafana: grafana:
pkg: pkg:
name: grafana name: grafana

View File

@@ -1,6 +1,6 @@
# # -*- coding: utf-8 -*-
# Example pillar configuration # vim: ft=yaml
# ---
haproxy: haproxy:
enabled: True enabled: True

View File

@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=yaml # vim: ft=yaml
--- ---
chaos-role: chaos-role:
- prometheus-node_exporter - prometheus-node_exporter

View File

@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=yaml # vim: ft=yaml
--- ---
chaos-role: chaos-role:
- prometheus-master - prometheus-master
- prometheus-node_exporter - prometheus-node_exporter

View File

@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=yaml # vim: ft=yaml
--- ---
chaos: chaos:
role: role:
- salt-master - salt-master

View File

@@ -9,7 +9,7 @@ mine_functions:
disk.usage: [] disk.usage: []
grains.items: [] grains.items: []
network.ip_addrs: [eth0] network.ip_addrs: [eth0]
networkplus.internal_ip_addrs: [] #networkplus.internal_ip_addrs: []
internal_ip_addrs: internal_ip_addrs:
mine_function: network.ip_addrs mine_function: network.ip_addrs
cidr: 192.168.0.0/16 cidr: 192.168.0.0/16

17
top.sls
View File

@@ -10,15 +10,18 @@ base:
- haproxy - haproxy
- grafana - grafana
- prometheus.prometheus - prometheus.prometheus
- rsyslog - base.log.rsyslog.client
# Verflixt und zugenaeht!
#'cpuarch:aarch64':
# - match: grain
# - base
'pine*': 'pine*':
- rsyslog - base.log.rsyslog.client
'ebin*': '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*': #'pine03*':
# - prometheus.prometheus # - prometheus.prometheus