Merge pull request #47 from cabify/upgrade-prometheus

Upgrade prometheus to 2.5.0 and add parameter to set log-level
cabify · Dec 13, 2018 · e908c33 · e908c33
2 parents 6dd8e99 + 66dfd55
commit e908c33
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/apps/prometheus/inputs.tf b/apps/prometheus/inputs.tf
@@ -50,6 +50,12 @@ variable "external_url" {
   type        = "string"
 }
 
+variable "log_level" {
+  description = "Log level for the instance. Defaults to info."
+  type        = "string"
+  default     = "info"
+}
+
 variable "prometheus_io_scrape" {
   description = "Set it to your desired value to get prometheus scraped. By default it will be true"
   type        = "string"

diff --git a/apps/prometheus/replication-controller.tf b/apps/prometheus/replication-controller.tf
@@ -95,7 +95,7 @@ resource "kubernetes_replication_controller" "prometheus" {
       }
 
       container {
-        image = "prom/prometheus:v2.3.2"
+        image = "prom/prometheus:v2.5.0"
         name  = "prometheus"
 
         port {
@@ -132,6 +132,7 @@ resource "kubernetes_replication_controller" "prometheus" {
           "--storage.tsdb.path=/prometheus/",
           "--web.enable-lifecycle",
           "--web.external-url=${var.external_url}",
+          "--log.level=${var.log_level}",
         ]
 
         liveness_probe {