prometheus - no xymon

diff --git a/customer/prometheus/slave001.prometheus.pixelpark.net.yaml b/customer/prometheus/slave001.prometheus.pixelpark.net.yaml
index 3c2635f265e15e296d2c67865b753b6b02ec60cc..d31f653f1be7c15cb738771c442f6cacbba75be2 100644 (file)
--- 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 3c2635f265e15e296d2c67865b753b6b02ec60cc..d31f653f1be7c15cb738771c442f6cacbba75be2 100644 (file)
--- 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 3c2635f265e15e296d2c67865b753b6b02ec60cc..d31f653f1be7c15cb738771c442f6cacbba75be2 100644 (file)
--- 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 3c2635f265e15e296d2c67865b753b6b02ec60cc..d31f653f1be7c15cb738771c442f6cacbba75be2 100644 (file)
--- 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 fdfe06f591e7d29762cb69a473e393e36f5cd95c..ced43bc8695fa7a0cf5168e3db3c26c9342cac8e 100644 (file)
--- 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 fdfe06f591e7d29762cb69a473e393e36f5cd95c..ced43bc8695fa7a0cf5168e3db3c26c9342cac8e 100644 (file)
--- 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 fdfe06f591e7d29762cb69a473e393e36f5cd95c..ced43bc8695fa7a0cf5168e3db3c26c9342cac8e 100644 (file)
--- 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 fdfe06f591e7d29762cb69a473e393e36f5cd95c..ced43bc8695fa7a0cf5168e3db3c26c9342cac8e 100644 (file)
--- 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 fdfe06f591e7d29762cb69a473e393e36f5cd95c..ced43bc8695fa7a0cf5168e3db3c26c9342cac8e 100644 (file)
--- 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 fdfe06f591e7d29762cb69a473e393e36f5cd95c..ced43bc8695fa7a0cf5168e3db3c26c9342cac8e 100644 (file)
--- 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: