From 992f210e3527033de3a72cb806a8d3c97cdf9bc7 Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <elberfeld@web.de>
Date: Tue, 3 Jul 2018 22:38:31 +0200
Subject: [PATCH] =?UTF-8?q?influx=20instanz=20f=C3=BCr=20systemmonitoring?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 group_vars/all                                | 12 +++++-
 warpsrvint/docker_influx/tasks/main.yml       | 37 +++++++++++++++++++
 .../templates/docker-compose.yml              | 22 +++++++++++
 .../docker_influx/templates/influx_sysmon.sh  |  5 +++
 warpsrvint/docker_influxdb/tasks/main.yml     | 18 ---------
 .../templates/docker-compose.yml              | 16 --------
 warpsrvint/main.yml                           |  2 +-
 7 files changed, 75 insertions(+), 37 deletions(-)
 create mode 100644 warpsrvint/docker_influx/tasks/main.yml
 create mode 100644 warpsrvint/docker_influx/templates/docker-compose.yml
 create mode 100644 warpsrvint/docker_influx/templates/influx_sysmon.sh
 delete mode 100644 warpsrvint/docker_influxdb/tasks/main.yml
 delete mode 100644 warpsrvint/docker_influxdb/templates/docker-compose.yml

diff --git a/group_vars/all b/group_vars/all
index 6321239b..49b92940 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -6,5 +6,13 @@ ldap_ip_ext: 10.0.20.2
 # int ist noch ungenutzt / später replikation in der Zone
 ldap_ip_int: 10.0.20.2
 
-ldap_base_dn: DC=warpzone,DC=ms
-ldap_readonly_bind_dn: CN=readonly,DC=warpzone,DC=ms
\ No newline at end of file
+ldap_base_dn: dc=warpzone,dc=ms
+ldap_readonly_bind_dn: cn=readonly,dc=warpzone,dc=ms
+
+# Zentrale InfluxDb für Systemmonitoring  
+influxdb_sysmon:
+  url: "http:// 192.168.0.201:18086"
+  db: "influx"
+  user: "influx" 
+  password: "influx" 
+
diff --git a/warpsrvint/docker_influx/tasks/main.yml b/warpsrvint/docker_influx/tasks/main.yml
new file mode 100644
index 00000000..204f09e9
--- /dev/null
+++ b/warpsrvint/docker_influx/tasks/main.yml
@@ -0,0 +1,37 @@
+---
+
+- include: ../functions/get_secret.yml
+  with_items:
+   - { path: /srv/influx/influx_admin_pw,  length: 24 }
+ 
+
+- name: create folder struct for influx
+  file: 
+    path: "{{ item }}"
+    state: "directory"
+  with_items:
+    - /srv/influx/
+    - /srv/influx/sysmon/
+
+
+- name: Konfig-Dateien erstellen
+  template:
+    src: "{{ item }}"
+    dest: "/srv/influx/{{ item }}"
+  with_items:
+    - docker-compose.yml
+
+
+- name: Script-Dateien erstellen
+  template:
+    src: "{{ item }}"
+    dest: "/srv/influx/{{ item }}"
+    mode: "o+rwx"
+  with_items:
+    - influx_sysmon.sh
+
+
+- name: start influx docker
+  docker_service:
+    project_src: /srv/influx/
+    state: present
diff --git a/warpsrvint/docker_influx/templates/docker-compose.yml b/warpsrvint/docker_influx/templates/docker-compose.yml
new file mode 100644
index 00000000..ae6ed6f5
--- /dev/null
+++ b/warpsrvint/docker_influx/templates/docker-compose.yml
@@ -0,0 +1,22 @@
+version: "3"
+
+services:
+
+  sysmon:
+
+    image: influxdb:1.5.3
+    restart: always
+    ports:
+      - 0.0.0.0:18086:8086
+    volumes:
+      - /srv/influx/sysmon/:/var/lib/influxdb
+    environment:
+      INFLUXDB_DB: "{{influxdb_sysmon.db}}"
+      INFLUXDB_ADMIN_USER: "admin"
+      INFLUXDB_ADMIN_PASSWORD: "{{ influx_admin_pw }}"
+      INFLUXDB_USER: "{{influxdb_sysmon.user}}"
+      INFLUXDB_USER_PASSWORD: "{{influxdb_sysmon.password}}"
+      INFLUXDB_HTTP_AUTH_ENABLED: "true"
+
+ 
+
diff --git a/warpsrvint/docker_influx/templates/influx_sysmon.sh b/warpsrvint/docker_influx/templates/influx_sysmon.sh
new file mode 100644
index 00000000..767ceb2e
--- /dev/null
+++ b/warpsrvint/docker_influx/templates/influx_sysmon.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+# Influx Admin Konsole 
+# Usage: ./influx_sysmon.sh 
+
+docker-compose exec sysmon influx -database "{{influxdb_sysmon.db}}" -password "{{ influx_admin_pw }}" -username "admin"
diff --git a/warpsrvint/docker_influxdb/tasks/main.yml b/warpsrvint/docker_influxdb/tasks/main.yml
deleted file mode 100644
index 6c3054a8..00000000
--- a/warpsrvint/docker_influxdb/tasks/main.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: create folder struct for influxdb
-  file: 
-    path: "{{ item }}"
-    state: "directory"
-  with_items:
-    - "/srv/influxdb/"
-    - "/srv/influxdb/data/"   
-
-- name: Docker Compose Konfig-Datei erstellen
-  template:
-    src: "docker-compose.yml"
-    dest: "/srv/influxdb/docker-compose.yml"
-
-- name: start influxdb docker
-  docker_service:
-    project_src: /srv/influxdb/
-    state: present
diff --git a/warpsrvint/docker_influxdb/templates/docker-compose.yml b/warpsrvint/docker_influxdb/templates/docker-compose.yml
deleted file mode 100644
index 2a6d208a..00000000
--- a/warpsrvint/docker_influxdb/templates/docker-compose.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: "3"
-
-services:
-
-  db:
-
-    image: influxdb:1.5.1
-    restart: always
-    ports:
-      - 8086:8086
-      - 2003:2003
-    volumes:
-      - /srv/influxdb/data/:/var/lib/influxdb
-    environment:
-      INFLUXDB_GRAPHITE_ENABLED: "true"
-
diff --git a/warpsrvint/main.yml b/warpsrvint/main.yml
index c9c79a23..33efe13a 100644
--- a/warpsrvint/main.yml
+++ b/warpsrvint/main.yml
@@ -9,7 +9,7 @@
     - { role: ../common/docker, tags: docker }
     - { role: nginx, tags: nginx }
     - { role: docker_grafana, tags: grafana }
-    - { role: docker_influxdb, tags: influxdb }
+    - { role: docker_influx, tags: influx }
     - { role: docker_iobroker, tags: iobroker }
     - { role: docker_librenms, tags: librenms }
     - { role: docker_l4z0r, tags: l4z0r }
-- 
GitLab