nemo
/
nebula
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

command line flag fixes

This commit is contained in:
Nemo 2017-12-28 18:50:38 +05:30
parent 5712a339ce
commit e8bb8a01b2
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
monitoring/data.tf
View File

@ -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"
}

9
monitoring/images.tf
View File

@ -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}"]

10
monitoring/main.tf
View File

@ -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"