From e8bb8a01b2b58cc4112fc8739ae43e5a2e420460 Mon Sep 17 00:00:00 2001
From: Nemo <me@captnemo.in>
Date: Thu, 28 Dec 2017 18:50:38 +0530
Subject: [PATCH] command line flag fixes

---
 monitoring/data.tf   |  8 ++++----
 monitoring/images.tf |  9 +++++----
 monitoring/main.tf   | 10 ++++------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/monitoring/data.tf b/monitoring/data.tf
index 91f1c7c..b3010c6 100644
--- a/monitoring/data.tf
+++ b/monitoring/data.tf
@@ -6,11 +6,11 @@ data "docker_registry_image" "prometheus" {
   name = "prom/prometheus"
 }
 
-data "docker_registry_image" "alertmanager" {
-  name = "prom/alertmanager"
-}
+# data "docker_registry_image" "alertmanager" {
+#   name = "prom/alertmanager"
+# }
 
 data "docker_registry_image" "nodeexporter" {
-  name = "prom/nodeexporter"
+  name = "prom/node-exporter"
 }
 
diff --git a/monitoring/images.tf b/monitoring/images.tf
index a5ad812..2a7d60d 100644
--- a/monitoring/images.tf
+++ b/monitoring/images.tf
@@ -8,10 +8,11 @@ resource "docker_image" "prometheus" {
   pull_triggers = ["${data.docker_registry_image.prometheus.sha256_digest}"]
 }
 
-resource "docker_image" "alertmanager" {
-  name          = "${data.docker_registry_image.alertmanager.name}"
-  pull_triggers = ["${data.docker_registry_image.alertmanager.sha256_digest}"]
-}
+# resource "docker_image" "alertmanager" {
+#   name          = "${data.docker_registry_image.alertmanager.name}"
+#   pull_triggers = ["${data.docker_registry_image.alertmanager.sha256_digest}"]
+# }
+
 resource "docker_image" "nodeexporter" {
   name          = "${data.docker_registry_image.nodeexporter.name}"
   pull_triggers = ["${data.docker_registry_image.nodeexporter.sha256_digest}"]
diff --git a/monitoring/main.tf b/monitoring/main.tf
index 8cbf0b4..0d8e5b4 100644
--- a/monitoring/main.tf
+++ b/monitoring/main.tf
@@ -31,7 +31,7 @@ resource docker_container "prometheus" {
   name  = "prometheus"
   image = "${docker_image.prometheus.latest}"
 
-  command = ["-config.file=/etc/prometheus/prometheus.yml"]
+  command = ["--config.file=/etc/prometheus/prometheus.yml"]
 
   volumes {
     host_path      = "/mnt/xwing/data/prometheus"
@@ -54,8 +54,6 @@ resource docker_container "nodeexporter" {
   name  = "nodeexporter"
   image = "${docker_image.nodeexporter.latest}"
 
-  command = ["-config.file=/etc/prometheus/prometheus.yml"]
-
   volumes {
     host_path      = "/proc"
     container_path = "/host/proc"
@@ -73,9 +71,9 @@ resource docker_container "nodeexporter" {
   }
 
   command = [
-    "-collector.procfs=/host/proc",
-    "-collector.sysfs=/host/sys",
-    "-collector.filesystem.ignored-mount-points=\"^/(sys|proc|dev|host|etc)($$|/)\""
+    "--collector.procfs=/host/proc",
+    "--collector.sysfs=/host/sys",
+    "--collector.filesystem.ignored-mount-points=\"^/(sys|proc|dev|host|etc)($$|/)\""
   ]
 
   restart               = "unless-stopped"