From: samuel.bufe <samuel.bufe@publicispixelpark.de>
Date: Wed, 3 Aug 2016 14:03:26 +0000 (+0200)
Subject: elk hinzugefügt
X-Git-Tag: v0.1.0~4386^2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=f9c1d7279bc27a6ee2ba2abd58ae8afb1e6bcc8f;p=pixelpark%2Fhiera.git

elk hinzugefügt
---

diff --git a/customer/elk/common.yaml b/customer/elk/common.yaml
new file mode 100644
index 00000000..4c3c2b5e
--- /dev/null
+++ b/customer/elk/common.yaml
@@ -0,0 +1,2 @@
+---
+site::role: base
diff --git a/customer/prometheus/test-master01.prometheus.pixelpark.net.yaml b/customer/prometheus/test-master01.prometheus.pixelpark.net.yaml
deleted file mode 100644
index 2e0d157e..00000000
--- a/customer/prometheus/test-master01.prometheus.pixelpark.net.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-site::role: base
-site::additional_classes:
-  - nfs::server
-  - munin::master
-  - site::profile::apache
-
-munin::master::graph_strategy: cron
-munin::master::html_strategy: cron
-munin::master::extra_config:
-  - 'cgiurl_graph /munin-cgi/munin-cgi-graph'
-
-nfs::server::exports:
-  /srv/mesos/shared:
-    ensure: mounted
-    clients: '192.168.55.245/32(rw,no_root_squash)'
diff --git a/customer/prometheus/test-slave.yaml b/customer/prometheus/test-slave.yaml
deleted file mode 100644
index 8a8c2eb9..00000000
--- a/customer/prometheus/test-slave.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-site::role: base
-site::additional_classes:
-  - site::profile::nfs
-  - docker
-  - munin::node
-
-site::profile::nfs::mount:
-  /srv/mesos/shared:
-    server: test-master01.prometheus.pixelpark.net
-    share: '/srv/mesos/shared'
-    options: 'rw,vers=3'
-    perm: '0777'
-
-
-munin::mastername: test-master01.prometheus.pixelpark.net
-munin::node::masterconfig:
-  - ''
-  - 'use_node_name yes'
-
-
-munin::node::allow:
-  - 192.168.55.240/32
-
-
-docker::version: present
-docker::socketbind: 'fd://'
-docker::storage_driver: devicemapper
-docker::dm_thinpooldev: '/dev/mapper/vgdocker'
-docker::dm_fs: 'xfs'
-docker::dm_blocksize: '64k'
-docker::logdriver: 'journald'
-docker::selinux_enabled: 'true' 
-docker::extra_parameters: '--exec-opt native.cgroupdriver=cgroupfs'
-
-docker::registry_auth::registries:
-  'registry.prometheus.pixelpark.net:5000'
-  
-docker::run_instance::instance:
-  helloworld:
-    image: 'oraclelinux:7.2'
-    command: '/bin/sh -c "while true; do echo hello world; sleep 1; done"'