Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions services/nomad/apps/popcorn.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,15 @@ EOF
}

service {
name = "popcorn-statrepo"
port = "statrepo"
provider = "nomad"
name = "popcorn-statrepo"
port = "statrepo"
}

service {
name = "popcorn-pqueryd"
port = "pqueryd"
provider = "nomad"
name = "popcorn-pqueryd"
port = "pqueryd"
}

volume "popcorn_data" {
Expand Down
2 changes: 2 additions & 0 deletions services/nomad/build/buildbot.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ job "buildbot" {
provider = "nomad"
name = "buildbot-metrics"
port = "metrics"

tags = ["prometheus_enable", "prometheus_job=buildbot"]
}

task "buildbot" {
Expand Down
20 changes: 13 additions & 7 deletions services/nomad/monitoring/alertmanager.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ job "alertmanager" {
}

service {
name = "alertmanager"
port = "http"
meta {
nginx_enable = "true"
nginx_names = "alertmanager.s.voidlinux.org alertmanager.voidlinux.org"
}
provider = "nomad"
name = "alertmanager"
port = "http"

tags = [
"nginx_enable",
"nginx_names=alertmanager.s.voidlinux.org alertmanager.voidlinux.org",
"prometheus_enable",
]

check {
type = "http"
Expand Down Expand Up @@ -46,6 +49,7 @@ job "alertmanager" {

template {
data = <<EOT
{{- $allocID := env "NOMAD_ALLOC_ID" -}}
global:
route:
receiver: 'infra-team'
Expand All @@ -56,7 +60,9 @@ route:
receivers:
- name: infra-team
webhook_configs:
- url: http://alertrelay-irc.service.consul:21225/xbps
{{ range nomadService 1 $allocID "alertrelay-irc" }}
- url: http://{{ .Address }}:{{ .Port }}/xbps
{{ end }}
EOT
destination = "local/alertmanager.yml"
}
Expand Down
5 changes: 3 additions & 2 deletions services/nomad/monitoring/alertrelay.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ job "alertrelay" {
}

service {
name = "alertrelay-irc"
port = "http"
provider = "nomad"
name = "alertrelay-irc"
port = "http"
}

task "app" {
Expand Down
7 changes: 5 additions & 2 deletions services/nomad/monitoring/ccache.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ job "ccache_exporter" {
}

service {
name = "ccache-exporter"
port = "http"
provider = "nomad"
name = "ccache-exporter"
port = "http"

tags = ["prometheus_enable"]
}

task "exporter" {
Expand Down
14 changes: 8 additions & 6 deletions services/nomad/monitoring/grafana.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@ job "grafana" {
}

service {
name = "grafana"
port = "http"
meta {
nginx_enable = "true"
nginx_names = "grafana.s.voidlinux.org grafana.voidlinux.org"
}
provider = "nomad"
name = "grafana"
port = "http"

tags = [
"nginx_enable",
"nginx_names=grafana.s.voidlinux.org grafana.voidlinux.org",
]

check {
type = "http"
Expand Down
14 changes: 8 additions & 6 deletions services/nomad/monitoring/prometheus.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ job "prometheus" {
}

service {
name = "prometheus"
port = "http"
meta {
nginx_enable = "true"
nginx_names = "prometheus.s.voidlinux.org prometheus.voidlinux.org"
}
provider = "nomad"
name = "prometheus"
port = "http"

tags = [
"nginx_enable",
"nginx_names=prometheus.s.voidlinux.org prometheus.voidlinux.org",
]

check {
type = "http"
Expand Down
Loading
Loading