terrafying-components 1.12.7 → 1.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5acb423052587aa0f912b103c54a7fa279b0c879811290cc1d84d5f9306af187
-  data.tar.gz: e40ba1c34f00923bfb696ae3c7c783f37203b3c2dfacd549d123a0940e8f0fbc
+  metadata.gz: 54520cd03f620415fec047fba8561400088b58aeec4d1941590362b7d6d1b066
+  data.tar.gz: 0607b8d938affc570cf680437ec2de165854071c7d07691ad23d3fcb1f773ceb
 SHA512:
-  metadata.gz: e434ec5f3ff0a5869739d57ee1d242c0639324dcf9e3d97cccdfa6a7617770643bccbd9edc4ada515082380b410356c6654e43bdb985e9b8e5f16fb27443225f
-  data.tar.gz: bbc439049928cd659664a3ada6475bf394fafbf193d272c58d66e639f64c6b1294566d5ad7a4992ab243f48befa0d3c4163da4375971f45864873766acabccc2
+  metadata.gz: '084e2781ba5cc42c461e5115d9e01abd45f41a015d2e21898c69454081a9cde755f55485f9d50aa533040ba474b1aed692abf11953771175731c402749097e6d'
+  data.tar.gz: 5ee69ea538baf10b3713ff6feb2e9a39c1579a19a6183c336ca2d36aa2f9e3625dd7e0d11da06e671205788be4a86aac49c6d9723669d85207d8b6f4ac42cb5c

data/lib/terrafying/components/prometheus.rb

@@ -26,7 +26,9 @@ module Terrafying
         instances: 2,
         instance_type: 't3a.small',
         thanos_instance_type: 't3a.small',
-        prometheus_tsdb_retention: '1d'
+        prometheus_tsdb_retention: '1d',
+        prometheus_data_dir: '/var/lib/prometheus',
+        prometheus_data_size: 20
       )
         super()
         @vpc = vpc
@@ -38,6 +40,8 @@ module Terrafying
         @prometheus_instance_type = instance_type
         @thanos_instance_type = thanos_instance_type
         @prometheus_tsdb_retention = prometheus_tsdb_retention
+        @prometheus_data_dir = prometheus_data_dir
+        @prometheus_data_size = prometheus_data_size
       end
 
       def find
@@ -92,6 +96,7 @@ module Terrafying
           instances: [{}] * @instances,
           units: [prometheus_unit, thanos_sidecar_unit],
           files: [prometheus_conf, thanos_bucket],
+          volumes: [prometheus_data_volume],
           tags: {
             prometheus_port: 9090,
             prometheus_path: '/metrics',
@@ -132,29 +137,42 @@ module Terrafying
         )
       end
 
+      def prometheus_data_volume
+
+        {
+          name: 'prometheus_data',
+          mount: @prometheus_data_dir,
+          device: '/dev/xvdl',
+          size: @prometheus_data_size,
+        }
+      end
+
       def prometheus_unit
         {
           name: 'prometheus.service',
           contents: <<~PROM_UNIT
             [Install]
             WantedBy=multi-user.target
-             [Unit]
+
+            [Unit]
             Description=Prometheus Service
             After=docker.service
             Requires=docker.service
-             [Service]
+
+            [Service]
             ExecStartPre=-/usr/bin/docker network create --driver bridge prom
             ExecStartPre=-/usr/bin/docker kill prometheus
             ExecStartPre=-/usr/bin/docker rm prometheus
             ExecStartPre=/usr/bin/docker pull quay.io/prometheus/prometheus:#{@prom_version}
             ExecStartPre=-/usr/bin/sed -i "s/{{HOST}}/%H/" /opt/prometheus/prometheus.yml
-            ExecStartPre=/usr/bin/install -d -o nobody -g nobody -m 0755 /opt/prometheus/data
+            ExecStartPre=/usr/bin/install -d -o nobody -g nobody -m 0755 #{@prometheus_data_dir}
             ExecStart=/usr/bin/docker run --name prometheus \
               -p 9090:9090 \
               --network=prom \
               -v /opt/prometheus:/opt/prometheus \
+              -v #{@prometheus_data_dir}:/var/lib/prometheus \
               quay.io/prometheus/prometheus:#{@prom_version} \
-              --storage.tsdb.path=/opt/prometheus/data \
+              --storage.tsdb.path=/var/lib/prometheus/tsdb \
               --storage.tsdb.retention.time=#{@prometheus_tsdb_retention} \
               --storage.tsdb.min-block-duration=2h \
               --storage.tsdb.max-block-duration=2h \
@@ -178,23 +196,25 @@ module Terrafying
           contents: <<~THANOS_SIDE
             [Install]
             WantedBy=multi-user.target
-             [Unit]
+
+            [Unit]
             Description=Thanos Service
             After=docker.service prometheus.service
             Requires=docker.service prometheus.service
-             [Service]
+
+            [Service]
             ExecStartPre=-/usr/bin/docker kill thanos
             ExecStartPre=-/usr/bin/docker rm thanos
             ExecStartPre=/usr/bin/docker pull improbable/thanos:#{@thanos_version}
             ExecStart=/usr/bin/docker run --name thanos \
               -p 10901-10902:10901-10902 \
-              -v /opt/prometheus:/opt/prometheus \
+              -v #{@prometheus_data_dir}:/var/lib/prometheus \
               -v /opt/thanos:/opt/thanos \
               --network=prom \
               improbable/thanos:#{@thanos_version} \
               sidecar \
               --prometheus.url=http://prometheus:9090 \
-              --tsdb.path=/opt/prometheus/data \
+              --tsdb.path=/var/lib/prometheus/tsdb \
               --objstore.config-file=/opt/thanos/bucket.yml \
               --log.level=warn
             Restart=always

data/lib/terrafying/components/version.rb

@@ -2,6 +2,6 @@
 
 module Terrafying
   module Components
-    VERSION = '1.12.7'
+    VERSION = '1.12.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying-components
 version: !ruby/object:Gem::Version
-  version: 1.12.7
+  version: 1.12.8
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler