diff --git a/base/init.sls b/base/init.sls index aa4c2bf..614919a 100644 --- a/base/init.sls +++ b/base/init.sls @@ -5,3 +5,4 @@ include: - log.rsyslog.client - sys.sysctl + - kubernetes diff --git a/base/sys/sysctl.sls b/base/sys/sysctl.sls index c414070..2bd23ca 100644 --- a/base/sys/sysctl.sls +++ b/base/sys/sysctl.sls @@ -8,6 +8,7 @@ sysctl: location: '/etc/sysctl.d' params: vm.swappiness: 60 + net.ipv4.ip_forward: 1 net.core.rmem_max: value: 16777216 net.core.wmem_max: diff --git a/kubernetes.sls b/kubernetes.sls deleted file mode 100644 index 2743e80..0000000 --- a/kubernetes.sls +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=yaml ---- - -kubernetes: - minikube: - version: '1.9.0' - pkg: - binary: - source_hash: c161e8ffdbc8d7cc92c2f57809bf846ff73996f06bc6a757bef518b3acce5b47 diff --git a/prometheus/prometheus.sls b/prometheus/prometheus.sls index 25a4a5e..9dfbc25 100644 --- a/prometheus/prometheus.sls +++ b/prometheus/prometheus.sls @@ -61,6 +61,7 @@ prometheus: static_configs: - targets: - dumont.chaos:9100 + - dumont2.chaos:9100 {% set roles = salt.saltutil.runner('mine.get', tgt='*', fun='chaos_roles', diff --git a/top.sls b/top.sls index 4451d36..3749387 100644 --- a/top.sls +++ b/top.sls @@ -13,8 +13,7 @@ base: - grafana - prometheus.prometheus - base.log.rsyslog.client - #- kubernetes - 'osarch:arm64': + 'osarch:arm64 or osarch:armel': - match: grain - base.log.rsyslog.client 'osarch:armhf and not fqdn:tumor.chaos':