From: Hannes Eichblatt <hannes.eichblatt@publicispixelpark.de>
Date: Fri, 16 Dec 2016 13:28:19 +0000 (+0100)
Subject: prometheus - no xymon
X-Git-Tag: v0.1.0~3725^2~5
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=9c298b7db0169814b47929e6bce503cdadc7c724;p=pixelpark%2Fhiera.git

prometheus - no xymon
---

diff --git a/customer/prometheus/slave001.prometheus.pixelpark.net.yaml b/customer/prometheus/slave001.prometheus.pixelpark.net.yaml
index 3c2635f2..d31f653f 100644
--- a/customer/prometheus/slave001.prometheus.pixelpark.net.yaml
+++ b/customer/prometheus/slave001.prometheus.pixelpark.net.yaml
@@ -1,5 +1,7 @@
 ---
-site::role: base
+site::role: base_for_old_systems # because we don't need xymon
+site::additional_classes:
+  - accounts
 
 site::additional_classes:
   - logstash
@@ -14,7 +16,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u mesos-slave'
       type: mesos-slave
-      tags: 
+      tags:
         - 'talos'
   docker:
     resource: pipe
@@ -22,7 +24,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u docker'
       type: docker
-      tags: 
+      tags:
         - 'talos'
 
 accounts::users:
diff --git a/customer/prometheus/slave002.prometheus.pixelpark.net.yaml b/customer/prometheus/slave002.prometheus.pixelpark.net.yaml
index 3c2635f2..d31f653f 100644
--- a/customer/prometheus/slave002.prometheus.pixelpark.net.yaml
+++ b/customer/prometheus/slave002.prometheus.pixelpark.net.yaml
@@ -1,5 +1,7 @@
 ---
-site::role: base
+site::role: base_for_old_systems # because we don't need xymon
+site::additional_classes:
+  - accounts
 
 site::additional_classes:
   - logstash
@@ -14,7 +16,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u mesos-slave'
       type: mesos-slave
-      tags: 
+      tags:
         - 'talos'
   docker:
     resource: pipe
@@ -22,7 +24,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u docker'
       type: docker
-      tags: 
+      tags:
         - 'talos'
 
 accounts::users:
diff --git a/customer/prometheus/slave003.prometheus.pixelpark.net.yaml b/customer/prometheus/slave003.prometheus.pixelpark.net.yaml
index 3c2635f2..d31f653f 100644
--- a/customer/prometheus/slave003.prometheus.pixelpark.net.yaml
+++ b/customer/prometheus/slave003.prometheus.pixelpark.net.yaml
@@ -1,5 +1,7 @@
 ---
-site::role: base
+site::role: base_for_old_systems # because we don't need xymon
+site::additional_classes:
+  - accounts
 
 site::additional_classes:
   - logstash
@@ -14,7 +16,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u mesos-slave'
       type: mesos-slave
-      tags: 
+      tags:
         - 'talos'
   docker:
     resource: pipe
@@ -22,7 +24,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u docker'
       type: docker
-      tags: 
+      tags:
         - 'talos'
 
 accounts::users:
diff --git a/customer/prometheus/slave004.prometheus.pixelpark.net.yaml b/customer/prometheus/slave004.prometheus.pixelpark.net.yaml
index 3c2635f2..d31f653f 100644
--- a/customer/prometheus/slave004.prometheus.pixelpark.net.yaml
+++ b/customer/prometheus/slave004.prometheus.pixelpark.net.yaml
@@ -1,5 +1,7 @@
 ---
-site::role: base
+site::role: base_for_old_systems # because we don't need xymon
+site::additional_classes:
+  - accounts
 
 site::additional_classes:
   - logstash
@@ -14,7 +16,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u mesos-slave'
       type: mesos-slave
-      tags: 
+      tags:
         - 'talos'
   docker:
     resource: pipe
@@ -22,7 +24,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u docker'
       type: docker
-      tags: 
+      tags:
         - 'talos'
 
 accounts::users:
diff --git a/customer/prometheus/slave005.prometheus.pixelpark.net.yaml b/customer/prometheus/slave005.prometheus.pixelpark.net.yaml
index fdfe06f5..ced43bc8 100644
--- a/customer/prometheus/slave005.prometheus.pixelpark.net.yaml
+++ b/customer/prometheus/slave005.prometheus.pixelpark.net.yaml
@@ -1,5 +1,7 @@
 ---
-site::role: base
+site::role: base_for_old_systems # because we don't need xymon
+site::additional_classes:
+  - accounts
 
 site::additional_classes:
   - logstash
@@ -14,7 +16,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u mesos-slave'
       type: mesos-slave
-      tags: 
+      tags:
         - 'talos'
   docker:
     resource: pipe
@@ -22,7 +24,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u docker'
       type: docker
-      tags: 
+      tags:
         - 'talos'
 
 accounts::users:
diff --git a/customer/prometheus/slave006.prometheus.pixelpark.net.yaml b/customer/prometheus/slave006.prometheus.pixelpark.net.yaml
index fdfe06f5..ced43bc8 100644
--- a/customer/prometheus/slave006.prometheus.pixelpark.net.yaml
+++ b/customer/prometheus/slave006.prometheus.pixelpark.net.yaml
@@ -1,5 +1,7 @@
 ---
-site::role: base
+site::role: base_for_old_systems # because we don't need xymon
+site::additional_classes:
+  - accounts
 
 site::additional_classes:
   - logstash
@@ -14,7 +16,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u mesos-slave'
       type: mesos-slave
-      tags: 
+      tags:
         - 'talos'
   docker:
     resource: pipe
@@ -22,7 +24,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u docker'
       type: docker
-      tags: 
+      tags:
         - 'talos'
 
 accounts::users:
diff --git a/customer/prometheus/slave007.prometheus.pixelpark.net.yaml b/customer/prometheus/slave007.prometheus.pixelpark.net.yaml
index fdfe06f5..ced43bc8 100644
--- a/customer/prometheus/slave007.prometheus.pixelpark.net.yaml
+++ b/customer/prometheus/slave007.prometheus.pixelpark.net.yaml
@@ -1,5 +1,7 @@
 ---
-site::role: base
+site::role: base_for_old_systems # because we don't need xymon
+site::additional_classes:
+  - accounts
 
 site::additional_classes:
   - logstash
@@ -14,7 +16,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u mesos-slave'
       type: mesos-slave
-      tags: 
+      tags:
         - 'talos'
   docker:
     resource: pipe
@@ -22,7 +24,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u docker'
       type: docker
-      tags: 
+      tags:
         - 'talos'
 
 accounts::users:
diff --git a/customer/prometheus/slave008.prometheus.pixelpark.net.yaml b/customer/prometheus/slave008.prometheus.pixelpark.net.yaml
index fdfe06f5..ced43bc8 100644
--- a/customer/prometheus/slave008.prometheus.pixelpark.net.yaml
+++ b/customer/prometheus/slave008.prometheus.pixelpark.net.yaml
@@ -1,5 +1,7 @@
 ---
-site::role: base
+site::role: base_for_old_systems # because we don't need xymon
+site::additional_classes:
+  - accounts
 
 site::additional_classes:
   - logstash
@@ -14,7 +16,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u mesos-slave'
       type: mesos-slave
-      tags: 
+      tags:
         - 'talos'
   docker:
     resource: pipe
@@ -22,7 +24,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u docker'
       type: docker
-      tags: 
+      tags:
         - 'talos'
 
 accounts::users:
diff --git a/customer/prometheus/slave011.prometheus.pixelpark.net.yaml b/customer/prometheus/slave011.prometheus.pixelpark.net.yaml
index fdfe06f5..ced43bc8 100644
--- a/customer/prometheus/slave011.prometheus.pixelpark.net.yaml
+++ b/customer/prometheus/slave011.prometheus.pixelpark.net.yaml
@@ -1,5 +1,7 @@
 ---
-site::role: base
+site::role: base_for_old_systems # because we don't need xymon
+site::additional_classes:
+  - accounts
 
 site::additional_classes:
   - logstash
@@ -14,7 +16,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u mesos-slave'
       type: mesos-slave
-      tags: 
+      tags:
         - 'talos'
   docker:
     resource: pipe
@@ -22,7 +24,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u docker'
       type: docker
-      tags: 
+      tags:
         - 'talos'
 
 accounts::users:
diff --git a/customer/prometheus/slave012.prometheus.pixelpark.net.yaml b/customer/prometheus/slave012.prometheus.pixelpark.net.yaml
index fdfe06f5..ced43bc8 100644
--- a/customer/prometheus/slave012.prometheus.pixelpark.net.yaml
+++ b/customer/prometheus/slave012.prometheus.pixelpark.net.yaml
@@ -1,5 +1,7 @@
 ---
-site::role: base
+site::role: base_for_old_systems # because we don't need xymon
+site::additional_classes:
+  - accounts
 
 site::additional_classes:
   - logstash
@@ -14,7 +16,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u mesos-slave'
       type: mesos-slave
-      tags: 
+      tags:
         - 'talos'
   docker:
     resource: pipe
@@ -22,7 +24,7 @@ logstash::generic_resource:
     parameters:
       command: 'journalctl -fl -u docker'
       type: docker
-      tags: 
+      tags:
         - 'talos'
 
 accounts::users: