Merge pull request #69 from scality/prometheus_storage

Add storage for prometheus (10Gi as default)
scality · Jun 14, 2018 · d56922a · d56922a
2 parents 8e1903f + 97f433c
commit d56922a
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 12 deletions.
diff --git a/roles/kube_prometheus/defaults/main.yml b/roles/kube_prometheus/defaults/main.yml
@@ -13,3 +13,5 @@ kube_prometheus_repo: 'https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/'
 kube_prometheus_release_name: 'kube-prometheus'
 
 prometheus_addon_dir: '{{ kube_config_dir }}/addons/prometheus'
+
+prometheus_storage_size: '10Gi'
diff --git a/roles/kube_prometheus/tasks/main.yml b/roles/kube_prometheus/tasks/main.yml
@@ -12,12 +12,9 @@
   tempfile:
     state: file
     suffix: yml
-  register: kube_prometheus_value_files
+  register: kube_prometheus_value_file
   run_once: True
   delegate_to: "{{ groups['kube-master'][0] }}"
-  with_items:
-    - additionnal_dashboard.yml
-    - prometheus_values.yml
 
 - debug:
     var: kube_prometheus_value_file
@@ -26,10 +23,30 @@
   delegate_to: "{{ groups['kube-master'][0] }}"
 
 - name: 'copy kube-prometheus values into temporary file'
+  template:
+    src: prometheus_values.yml
+    dest: '{{ kube_prometheus_value_file.path }}'
+  run_once: True
+  delegate_to: "{{ groups['kube-master'][0] }}"
+
+- name: 'create tempfile for kube-prometheus values'
+  tempfile:
+    state: file
+    suffix: yml
+  register: kube_prometheus_dashboard_file
+  run_once: True
+  delegate_to: "{{ groups['kube-master'][0] }}"
+
+- debug:
+    var: kube_prometheus_dashboard_file
+  when: debug|bool
+  run_once: True
+  delegate_to: "{{ groups['kube-master'][0] }}"
+
+- name: 'copy kube-prometheus dashboard into temporary file'
   copy:
-    src: '{{ item.item }}'
-    dest: '{{ item.path }}'
-  with_items: '{{ kube_prometheus_value_files.results|default([]) }}'
+    src: additionnal_dashboard.yml
+    dest: '{{ kube_prometheus_dashboard_file.path }}'
   run_once: True
   delegate_to: "{{ groups['kube-master'][0] }}"
 
@@ -40,17 +57,18 @@
     --repo {{ kube_prometheus_repo }}
     --version {{ kube_prometheus_version }}
     --namespace {{ kube_prometheus_namespace }}
-    {% for value_files in kube_prometheus_value_files.results|default([]) %}
-    -f {{ value_files.path }}
-    {% endfor %}
+    -f {{ kube_prometheus_value_file.path }}
+    -f {{ kube_prometheus_dashboard_file.path }}
   run_once: True
   delegate_to: "{{ groups['kube-master'][0] }}"
 
 - name: 'remove unneeded kube-prometheus values file'
   file:
-    dest: '{{ item.path }}'
+    dest: '{{ item }}'
     state: absent
-  with_items: '{{ kube_prometheus_value_files.results|default([]) }}'
+  with_items: >-
+    {{ [kube_prometheus_value_file.path,
+        kube_prometheus_dashboard_file.path]|select|list }}
   when: remove_metal_k8s_temporary_file|bool
   run_once: True
   delegate_to: "{{ groups['kube-master'][0] }}"
diff --git a/...be_prometheus/files/prometheus_values.yml → ...rometheus/templates/prometheus_values.yml b/...be_prometheus/files/prometheus_values.yml → ...rometheus/templates/prometheus_values.yml
@@ -14,6 +14,13 @@ prometheus:
       kubernetes.io/cluster-service: "true"
       kubernetes.io/name: "Prometheus"
   replicaCount: 2
+  storageSpec:
+    volumeClaimTemplate:
+      spec:
+        accessModes: ["ReadWriteOnce"]
+        resources:
+          requests:
+            storage: {{ prometheus_storage_size }}
 
 alertmanager:
   externalUrl: '/api/v1/namespaces/kube-ops/services/kube-prometheus-alertmanager:http/proxy/'