Re-implement the grafana server

Author: vmcj

icpc-wf/ansible/Makefile

@@ -10,6 +10,8 @@ LIBVENDORTGZ=roles/domjudge_checkout/files/lib-vendor.tgz
 SSHKEY=roles/ssh/files/id_rsa
 SSL_LOCALHOST=roles/ssl/files/localhost
 SSL_LOCALHOST_FILES=$(addprefix $(SSL_LOCALHOST),.key .crt)
+SSL_GRAFANA=roles/grafana/files/ssl
+SSL_GRAFANA_FILES=$(addprefix $(SSL_GRAFANA),.key .crt)
 
 ifeq ($(wildcard $(LIBVENDORTGZ)),)
 LIBVENDOR=
@@ -23,19 +25,24 @@ domserver judgehost admin grafana: %: %.yml hosts group_vars/all/secret.yml $(LI
 	ansible-playbook -i hosts $<
 
 admin: $(SSL_LOCALHOST_FILES)
+grafana: $(SSL_GRAFANA_FILES)
 
 $(SSHKEY) $(SSHKEY).pub:
 	ssh-keygen -t rsa -f $(SSHKEY) -P ''
 
 $(SSL_LOCALHOST_FILES):
 	openssl req -x509 -nodes -newkey rsa:4096 -subj "/O=DOMjudge/CN=localhost" \
 		-sha256 -days 365 -keyout $(SSL_LOCALHOST).key -out $(SSL_LOCALHOST).crt
+$(SSL_GRAFANA_FILES):
+	openssl req -x509 -nodes -newkey rsa:4096 -subj "/O=DOMjudge/CN=grafana" \
+		-sha256 -days 365 -keyout $(SSL_GRAFANA).key -out $(SSL_GRAFANA).crt
 
 clean:
 	rm -rf $(LIBVENDOR)
 
 distclean: clean
 	rm -f $(SSHKEY) $(SSHKEY).pub
 	rm -f $(SSL_LOCALHOST_FILES)
+	rm -f $(SSL_GRAFANA_FILES)
 
 .PHONY: default clean distclean domserver judgehost admin grafana

icpc-wf/ansible/grafana.yml

@@ -4,76 +4,18 @@
   vars:
     host_type: grafana
   become: yes
-  tasks:
+  roles:
+    - role: base_packages
+      tags: base_packages
+    - role: icpc_fixes
+      tags: icpc_fixes
+      when: ICPC_IMAGE
+    - role: system_fixes
+      tags: system_fixes
+    - role: hosts
+      tags: hosts
     - role: prometheus_target_all
       tags: prometheus_target_all
       when: GRAFANA_MONITORING
-    - name: include global variables
-      include_vars: variables.yml
-    - name: include global (secret) variables
-      include_vars: variables-secret.yml
-    
-    - name: install local DEB packages
-      include: install-local-package.yml
-      with_fileglob:
-        - files/install-grafana/*.deb
-    
-    - name: install dependencies
-      apt:
-        state: present
-        install_recommends: no
-        pkg:
-          - nginx
-          # We need these for our extra monitoring things
-          - prometheus
-
-    - name: copy ssl cert
-      copy: src=files/grafana/grafana.crt dest=/etc/ssl/certs/grafana.crt
-    - name: copy ssl key
-      copy: src=files/grafana/grafana.key dest=/etc/ssl/private/grafana.key
-
-    - name: copy default nginx config
-      copy: src=files/grafana/nginx.conf dest=/etc/nginx/sites-enabled/grafana.conf
-
-    - name: restart nginx
-      service: name=nginx state=restarted
-
-    - name: configure grafana
-      copy:
-        src: files/grafana/environment
-        dest: /etc/default/grafana-server
-    
-    - name: set up grafana dashboards
-      copy:
-        src: files/grafana/dashboards.yml
-        dest: /etc/grafana/provisioning/dashboards/default.yml
-    
-    - name: set up grafana datasources
-      copy:
-        src: files/grafana/datasources.yml
-        dest: /etc/grafana/provisioning/datasources/default.yml
-    
-    - name: set up prometheus scrapes
-      template:
-        src: files/grafana/prometheus.yml.j2
-        dest: /etc/prometheus/prometheus.yml
-
-    - name: create dashboard directory
-      file: path=/etc/grafana/dashboards state=directory
-
-    - name: restart prometheus
-      service: name=prometheus state=restarted
-
-    - name: restart grafana
-      service: name=grafana-server state=restarted
-
-    - name: copy grafana dashboards
-      copy:
-        src: files/grafana/dashboards/
-        dest: /etc/grafana/dashboards/
-    
-    - name: Start/enable our services
-      service: name={{ item }} state=started enabled=yes
-      with_items:
-        - grafana-server.service
-        - prometheus.service
+    - role: grafana
+      tags: grafana

icpc-wf/ansible/roles/base_packages/files/install-grafana/README.md

@@ -1 +1,3 @@
 Any `*.deb` package files placed here will be installed on the grafana host.
+
+The grafana server package should be downloaded from grafana.com (https://grafana.com/grafana/download?pg=get&plcmt=selfmanaged-box1-cta1)

icpc-wf/ansible/roles/grafana/files/.gitignore

@@ -0,0 +1 @@
+/ssl.*

icpc-wf/ansible/roles/grafana/files/dashboards.yml

@@ -0,0 +1,6 @@
+- name: 'default'       # name of this dashboard configuration (not dashboard itself)
+  org_id: 1             # id of the org to hold the dashboard
+  folder: ''            # name of the folder to put the dashboard (http://docs.grafana.org/v5.0/reference/dashboard_folders/)
+  type: 'file'          # type of dashboard description (json files)
+  options:
+    folder: '/etc/grafana/dashboards'       # where dashboards are