terrafying-components 1.12.5 → 1.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f3ddc8fc721c504ef88f9f63e64df62b6466acc699b706bb9b2ffcc38cab200
-  data.tar.gz: 896634fe8548201f34038ba49df8957933573a5d01bdd8ebaa01058b22f5587d
+  metadata.gz: 207909717ddd31f5740ef36393a7e9350c69d8815682279a1024672de1b60775
+  data.tar.gz: a741a9a535b43229db3381b3bd08ce4bead27fb4c8fd5eb691082ebcd76b23ea
 SHA512:
-  metadata.gz: 7898765a4482959af59d741c8ad509ae2eb04b952925c3227dd0fa704f25c8f86f4e091ba7318e17dfcee0ade69fc931c649a0fe5f649b9ec9e3dc2c43f542eb
-  data.tar.gz: b0fc7c7db4d441f75bfa9fd4f8bad36b3317d175f5a8ba915af82a1f397b406d0210667407143af7fe10729c0ea7c1d444de87a636ce6eca3747bec25597fc40
+  metadata.gz: 1b7cb8553f9ee931d603c0aeea91b9e8832a5337a399bf87e6729ef050501609b3889c50ba57355f415e7523558dc9c838f8dd59c83efcb5d7c6f5a8b4d76601
+  data.tar.gz: d89ae30401610cc32b2386c4066fa26a502d05916d09664a53a05921f1d628164b19acecb52ff82948450d6c6a9f7b1dd5a97f4f8a126283c8f50cedcf91d1f1

data/lib/terrafying/components/prometheus.rb

@@ -24,7 +24,9 @@ module Terrafying
         prom_name: 'prometheus',
         prom_version: 'v2.10.0',
         instances: 2,
-        instance_type: 't3a.small'
+        instance_type: 't3a.small',
+        thanos_instance_type: 't3a.small',
+        prometheus_tsdb_retention: '1d'
       )
         super()
         @vpc = vpc
@@ -33,7 +35,9 @@ module Terrafying
         @prom_name = prom_name
         @prom_version = prom_version
         @instances = instances
-        @instance_type = instance_type
+        @prometheus_instance_type = instance_type
+        @thanos_instance_type = thanos_instance_type
+        @prometheus_tsdb_retention = prometheus_tsdb_retention
       end
 
       def find
@@ -46,7 +50,8 @@ module Terrafying
       def create
         prometheus_thanos_sidecar_hostname = tf_safe(@prom_name)
         prometheus_thanos_sidecar_srv_fqdn = "_grpc._tcp.#{@vpc.zone.qualify prometheus_thanos_sidecar_hostname}"
-        @instance_vcpu_count = aws.instance_type_vcpu_count(@instance_type)
+        @prometheus_instance_vcpu_count = aws.instance_type_vcpu_count(@prometheus_instance_type)
+        @thanos_instance_vcpu_count = aws.instance_type_vcpu_count(@thanos_instance_type)
         @thanos = create_thanos(prometheus_thanos_sidecar_srv_fqdn)
         create_thanos_cloudwatch_alert(@thanos)
 
@@ -82,7 +87,7 @@ module Terrafying
               number: 10_901
             }
           ],
-          instance_type: @instance_type,
+          instance_type: @prometheus_instance_type,
           iam_policy_statements: thanos_store_access,
           instances: [{}] * @instances,
           units: [prometheus_unit, thanos_sidecar_unit],
@@ -116,7 +121,7 @@ module Terrafying
               }
             }
           ],
-          instance_type: @instance_type,
+          instance_type: @thanos_instance_type,
           units: [thanos_unit(prometheus_thanos_sidecar_srv_fqdn)],
           instances: [{}] * @instances,
           loadbalancer: true,
@@ -150,12 +155,12 @@ module Terrafying
               -v /opt/prometheus:/opt/prometheus \
               quay.io/prometheus/prometheus:#{@prom_version} \
               --storage.tsdb.path=/opt/prometheus/data \
-              --storage.tsdb.retention.time=1d \
+              --storage.tsdb.retention.time=#{@prometheus_tsdb_retention} \
               --storage.tsdb.min-block-duration=2h \
               --storage.tsdb.max-block-duration=2h \
               --storage.tsdb.no-lockfile \
-              --storage.remote.read-concurrent-limit=#{@instance_vcpu_count} \
-              --query.max-concurrency=#{@instance_vcpu_count} \
+              --storage.remote.read-concurrent-limit=#{@prometheus_instance_vcpu_count} \
+              --query.max-concurrency=#{@prometheus_instance_vcpu_count} \
               --config.file=/opt/prometheus/prometheus.yml \
               --web.console.templates=/etc/prometheus/consoles \
               --web.console.libraries=/etc/prometheus/console_libraries \
@@ -271,7 +276,7 @@ module Terrafying
               improbable/thanos:#{@thanos_version} \
               query \
               --query.replica-label=replica \
-              --query.max-concurrent=#{@instance_vcpu_count} \
+              --query.max-concurrent=#{@thanos_instance_vcpu_count} \
               --store=dnssrv+#{prometheus_thanos_sidecar_srv_fqdn} \
               --log.level=warn
             Restart=always

data/lib/terrafying/components/version.rb

@@ -2,6 +2,6 @@
 
 module Terrafying
   module Components
-    VERSION = '1.12.5'
+    VERSION = '1.12.6'
   end
 end

metadata

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