Merge branch 'prometheus-setup'

Former-commit-id: a459909

deploy/aws/provision/main.yml

@@ -91,6 +91,12 @@
     - vars.yml
   tasks:
     - include: tasks/prometheus/main.yml
+  handlers:
+    - name: Restart Prometheus
+      systemd:
+        name: prometheus
+        daemon_reload: yes
+        state: restarted
   tags:
     - prometheus
 
@@ -184,7 +190,6 @@
       shell: > 
         {{ item }}
       with_items:
-        - /var/prometheus/prometheus-start.sh
         - /var/qed/exporter-start.sh
   tags:
     - start-prometheus

deploy/aws/provision/tasks/common/main.yml

@@ -105,7 +105,7 @@
 
 - name: Create Node Exporter start script
   template:
-    dest: /var/qed/exporter-{{ item }} 
+    dest: /var/qed/exporter-{{ item }}
     src: ../../templates/exporter-{{ item }}.j2
     force: true
     mode: 0775

deploy/aws/provision/tasks/prometheus/main.yml

@@ -17,19 +17,70 @@
 - name: Download Prometheus
   unarchive:
     src: https://github.com/prometheus/prometheus/releases/download/v2.8.0/prometheus-2.8.0.linux-amd64.tar.gz
-    dest: /var
+    dest: /tmp
     keep_newer: true
     remote_src: true
 
-- name: Create Node Exporter link 
+- name: Install Prometheus binary
+  copy:
+    src: /tmp/prometheus-2.8.0.linux-amd64/prometheus
+    dest: /usr/bin/prometheus
+    remote_src: yes
+    mode: preserve
+
+- name: Create Prometheus system group
+  group:
+    name: prometheus
+    system: yes
+    gid: 210
+
+- name: Create Prometheus system user
+  user:
+    name: prometheus
+    system: yes
+    uid: 210
+    group: 210
+
+- name: Create Prometheus work dir
   file:
-    src: /var/prometheus-2.8.0.linux-amd64
-    dest: /var/prometheus
-    state: link
+    path: /var/lib/prometheus
+    owner: prometheus
+    group: prometheus
+    mode: 0755
+    state: directory
+
+- name: Create Prometheus config dir
+  file:
+    path: /etc/prometheus
+    state: directory
+
+- name: Create Prometheus config
+  template:
+    dest: /etc/prometheus/prometheus.yml
+    src: ../../templates/prometheus-config.yml.j2
+    force: yes
+  notify:
+    - Restart Prometheus
+
+- name: Install Prometheus systemd service unit file
+  template:
+    dest: /etc/systemd/system/{{ item }}
+    src: ../../templates/{{ item }}.j2
+  with_items:
+    - prometheus.service
+  notify:
+    - Restart Prometheus
+
+- name: Enable and run Prometheus service
+  systemd:
+    name: prometheus
+    state: started
+    enabled: yes
+    daemon_reload: yes
 
 - name: Install Grafana
   yum:
-      update_cache: yes 
+      update_cache: yes
       name: https://dl.grafana.com/oss/release/grafana-6.0.1-1.x86_64.rpm
 
 - name: Copy Grafana config and dashboards to remote
@@ -51,18 +102,3 @@
     name: grafana-server
     state: restarted
   when: grafana_config.changed
-
-- name: Create Prometheus config
-  template:
-    dest: /var/prometheus/prometheus.yml 
-    src: ../../templates/prometheus-config.yml.j2
-    force: yes
-
-- name: Create Prometheus start script
-  template:
-    dest: /var/prometheus/{{ item }} 
-    src: ../../templates/{{ item }}.j2
-    force: yes
-    mode: 0775
-  with_items:
-    - prometheus-start.sh

deploy/aws/provision/templates/prometheus-start.sh.j2 → deploy/aws/provision/templates/prometheus.service.j2

@@ -13,8 +13,20 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 #}
-#!/bin/bash
+[Unit]
+Description=Prometheus service
+Requires=network-online.target
+After=network-online.target
 
-export PROMETHEUS_HOME=/var/prometheus
-nohup $PROMETHEUS_HOME/prometheus --config.file=$PROMETHEUS_HOME/prometheus.yml >> prometheus.log 2>&1 &
+[Service]
+User=prometheus
+Group=prometheus
+Restart=on-failure
+ExecStart=/usr/bin/prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/data
+ExecReload=/bin/kill -HUP $MAINPID
+NoNewPrivileges=true
+ProtectHome=true
+ProtectSystem=full
 
+[Install]
+WantedBy=multi-user.target