diff options
| author |   pmikus <pmikus@cisco.com> | 2021-08-27 07:24:38 +0000 |
|---|---|---|
| committer | pmikus <pmikus@cisco.com> | 2021-08-27 07:24:38 +0000 |
| commit | bcc8b334d1961894b54c080f3d58032aacb1a048 (patch) | |
| tree | 8b499a765d9a4db71500bb7eab06df89bc099ecb /fdio.infra.terraform/1n_nmd/grafana | |
| parent | f325af2076e3b9b158227f275df595a626dd4a8e (diff) | |
Infra: Minor terraform cleanup
Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I1f6c9b2f9e3ac607fac76b12100992d901820e38
Diffstat (limited to 'fdio.infra.terraform/1n_nmd/grafana')
| -rw-r--r-- | fdio.infra.terraform/1n_nmd/grafana/conf/nomad/grafana.hcl | 12 | ||||
| -rw-r--r-- | fdio.infra.terraform/1n_nmd/grafana/providers.tf (renamed from fdio.infra.terraform/1n_nmd/grafana/versions.tf) | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/fdio.infra.terraform/1n_nmd/grafana/conf/nomad/grafana.hcl b/fdio.infra.terraform/1n_nmd/grafana/conf/nomad/grafana.hcl index a759abc4f7..0faace1b62 100644 --- a/fdio.infra.terraform/1n_nmd/grafana/conf/nomad/grafana.hcl +++ b/fdio.infra.terraform/1n_nmd/grafana/conf/nomad/grafana.hcl @@ -123,6 +123,11 @@ job "${job_name}" { value = "arm64" } + constraint { + attribute = "$${node.class}" + value = "builder" + } + # The "task" stanza creates an individual unit of work, such as a Docker # container, web application, or batch processing. # @@ -148,7 +153,6 @@ job "${job_name}" { "secrets/dashboards.yml:/etc/grafana/provisioning/dashboards/dashboards.yml", "secrets/grafana.ini:/etc/grafana/grafana.ini", "secrets/node_exporter.json:/etc/grafana/provisioning/dashboards/node_exporter.json", - "secrets/docker_cadvisor.json:/etc/grafana/provisioning/dashboards/docker_cadvisor.json", "secrets/nomad.json:/etc/grafana/provisioning/dashboards/nomad.json", "secrets/consul.json:/etc/grafana/provisioning/dashboards/consul.json", "secrets/prometheus.json:/etc/grafana/provisioning/dashboards/prometheus.json", @@ -164,12 +168,6 @@ job "${job_name}" { } artifact { - # Docker cAdvisor - source = "https://raw.githubusercontent.com/pmikus/grafana-dashboards/main/docker_cadvisor.json" - destination = "secrets/" - } - - artifact { # Nomad source = "https://raw.githubusercontent.com/pmikus/grafana-dashboards/main/nomad.json" destination = "secrets/" diff --git a/fdio.infra.terraform/1n_nmd/grafana/versions.tf b/fdio.infra.terraform/1n_nmd/grafana/providers.tf index 960bd4bba6..1399201d21 100644 --- a/fdio.infra.terraform/1n_nmd/grafana/versions.tf +++ b/fdio.infra.terraform/1n_nmd/grafana/providers.tf @@ -9,5 +9,5 @@ terraform { version = "~> 2.1.2" } } - required_version = ">= 0.13" + required_version = ">= 1.0.3" } |