add: oauth grafana support

group_vars/all.yaml

@@ -156,3 +156,15 @@ keycloak_clients:
         groups: "monitoring"
         master_address: "https://icinga.atlantishq.de"
         skips:
+
+    grafana:
+        party_secret : "HISTORY_PURGED_SECRET"
+        client_id: z_grafana
+        client_secret: "HISTORY_PURGED_SECRET"
+        redirect_uris:
+            - "https://stats.atlantishq.de/*"
+        description: "Grafana"
+        keycloak_id: "00000000-0000-0000-0000-000000000010"
+        groups: "monitoring"
+        master_address: "https://stats.atlantishq.de"
+        skips:

roles/docker-deployments/tasks/main.yaml

@@ -39,6 +39,7 @@
   with_items:
     - tmnf-replay-server
     - atlantis-hub
+    - grafana
 
 - name: Copy AtlantisHub config
   copy:
@@ -59,6 +60,11 @@
     src: "atlantis-hub-content/static-icons/"
     dest: "/data/atlantis-hub/static-icons/"
 
+- name: Copy AtlantisHub static icons
+  template:
+    src: "grafana.ini"
+    dest: "/data/grafana/grafana.ini"
+
 - name: Create compose directories
   file:
     name: "/opt/{{ item }}"
@@ -71,6 +77,7 @@
     - async-icinga
     - tmnf-replay-server
     - atlantis-hub
+    - grafana
 
 - name: Copy compose templates
   template:
@@ -84,6 +91,7 @@
     - async-icinga
     - tmnf-replay-server
     - atlantis-hub
+    - grafana
 
 - name: Log into private registry
   docker_login:
@@ -105,6 +113,7 @@
     - async-icinga
     - tmnf-replay-server
     - atlantis-hub
+    - grafana
 
 - name: OAuth2Proxy directories
   file:
@@ -114,6 +123,7 @@
   with_items:
     - tmnf-replay-server
     - atlantis-hub
+    - grafana
 
 - name: include services ports
   include_vars: services.yaml
@@ -125,6 +135,7 @@
   with_items:
     - tmnf-replay-server
     - atlantis-hub
+    - grafana
 
 - name: Deploy OAuth2Proxy
   community.docker.docker_compose:
@@ -133,3 +144,4 @@
   with_items:
     - tmnf-replay-server
     - atlantis-hub
+    - grafana

roles/docker-deployments/templates/grafana.yaml

@@ -1,9 +1,10 @@
 grafana:
     ports:
-        - 3000:3000
+        - 4000:3000
     image: grafana/grafana-oss
     restart: always
     volumes:
-        - "/var/grafana:/var/lib/grafana"
+        - "/data/grafana/grafana-var/:/var/lib/grafana"
+        - "/data/grafana/grafana.ini:/etc/grafana/grafana.ini"
     environment:
         GF_INSTALL_PLUGINS : "grafana-clock-panel,grafana-simple-json-datasource"

roles/monitoring-master/tasks/grafana.yaml

@@ -1,16 +0,0 @@
-- name: Create Compose Directory
-  file:
-    path: /opt/
-    state: directory
-
-- name: Create Data Volume Directory
-  file:
-    path: /var/grafana/
-    state: directory
-    owner: 472 # grafana docker uid
-    group: root
-
-- name: Copy Grafana Compose file
-  template:
-    src: grafana.yaml.j2
-    dest: /opt/

roles/monitoring-master/tasks/main.yaml

@@ -12,13 +12,6 @@
     - icinga
     - monitoring-master
 
-- name: Grafana.yaml
-  include: icinga.yaml
-  when: monitoring_master
-  tags:
-    - grafana
-    - monitoring-master
-
 - name: logs.yaml
   include: logs.yaml
   when: monitoring_master

vars/services.yaml

@@ -17,3 +17,5 @@ services:
         port: 8000
     icinga:
         port: 8080
+    grafana:
+        port: 3000