Add support for running in socket mode (#161)

* Added support for running the server in socket mode

Check for the presence of the socket when the server is in socket mode

* Manage the socket directory permissions

Ensure that grafana can write to the directory the socket is in

* Ensure newline at end of file

* Fixed typo

Author: RichardHeelin

tasks/configure.yml

@@ -47,6 +47,26 @@
     - "{{ grafana_data_dir }}/dashboards"
     - "{{ grafana_data_dir }}/plugins"
 
+- block:
+    - name: Create grafana socket directory
+      file:
+        path: "{{ grafana_server.socket | dirname }}"
+        state: directory
+        mode: 0775
+        owner: "grafana"
+        group: "grafana"
+
+    - name: Ensure grafana socket directory created on startup
+      template:
+        src: tmpfiles.j2
+        dest: /etc/tmpfiles.d/grafana.conf
+        owner: root
+        group: root
+        mode: 0644
+  when:
+    - grafana_server.protocol is defined and grafana_server.protocol == 'socket'
+    - grafana_server.socket | dirname != '/var/run'
+
 - name: Enable grafana to ports lower than port 1024
   capabilities:
     path: /usr/sbin/grafana-server

tasks/main.yml

@@ -47,10 +47,23 @@
     - grafana_dashboards
     - grafana_run
 
-- name: Wait for grafana to start
+- name: Wait for grafana to start (http/s)
   wait_for:
     host: "{{ grafana_address }}"
     port: "{{ grafana_port }}"
+  when: grafana_server.protocol is undefined or grafana_server.protocol in ['http', 'https']
+  tags:
+    - grafana_install
+    - grafana_configure
+    - grafana_datasources
+    - grafana_notifications
+    - grafana_dashboards
+    - grafana_run
+
+- name: Wait for grafana to start (socket)
+  wait_for:
+    path: "{{ grafana_server.socket }}"
+  when: grafana_server.protocol is defined and grafana_server.protocol == 'socket'
   tags:
     - grafana_install
     - grafana_configure

tasks/preflight.yml

@@ -83,3 +83,10 @@
   when:
     - grafana_port <= 1024
     - not grafana_cap_net_bind_service
+
+- name: Fail if grafana_server.socket not defined when in socket mode
+  fail:
+    msg: "You need to configure grafana_server.socket when grafana_server.protocol is set to 'socket'"
+  when:
+    - grafana_server.protocol is defined and grafana_server.protocol == 'socket'
+    - grafana_server.socket is undefined or grafana_server.socket == ''

templates/grafana.ini.j2

@@ -15,8 +15,10 @@ plugins = {{ grafana_data_dir }}/plugins
 
 # HTTP options
 [server]
+{% if grafana_server.protocol is undefined or grafana_server.protocol in ['http', 'https'] %}
 http_addr = {{ grafana_address }}
 http_port = {{ grafana_port }}
+{% endif %}
 domain = {{ grafana_domain }}
 root_url = {{ grafana_url }}
 {% for k,v in grafana_server.items() %}

templates/tmpfiles.j2

@@ -0,0 +1,2 @@
+{{ ansible_managed | comment }}
+d {{ grafana_server.socket | dirname }} 0775 grafana grafana