Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304164
Change subject: prometheus: Restore node exporter prefix requirements
......................................................................
prometheus: Restore node exporter prefix requirements
I removed this earlier, and now see why it is required -
so that we can have other target files described as other
jobs! I've restored it and added explicit lines for the
jobs I needed
Change-Id: Iee2c49c5e4ad668f2e7cc3f1ac679dc0c8e973e1
---
M modules/prometheus/manifests/server.pp
M modules/role/manifests/prometheus/tools.pp
2 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/304164/1
diff --git a/modules/prometheus/manifests/server.pp
b/modules/prometheus/manifests/server.pp
index 2421278..05e0616 100644
--- a/modules/prometheus/manifests/server.pp
+++ b/modules/prometheus/manifests/server.pp
@@ -81,8 +81,8 @@
{
'job_name' => 'node',
'file_sd_configs' => [
- { 'names' => [ "${targets_path}/*.yml",
- "${targets_path}/*.yaml" ] },
+ { 'names' => [ "${targets_path}/node_*.yml",
+ "${targets_path}/node_*.yaml" ] },
]
},
]
diff --git a/modules/role/manifests/prometheus/tools.pp
b/modules/role/manifests/prometheus/tools.pp
index d59ebab..ace93da 100644
--- a/modules/role/manifests/prometheus/tools.pp
+++ b/modules/role/manifests/prometheus/tools.pp
@@ -74,7 +74,15 @@
}
# lint:endignore
]
- }
+ },
+ {
+ 'job_name' => 'etcd',
+ 'file_sd_configs' => [
+ {
+ 'names' => [ "${targets_path}/etcd_*.yml" ]
+ }
+ ]
+ },
]
}
--
To view, visit https://gerrit.wikimedia.org/r/304164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee2c49c5e4ad668f2e7cc3f1ac679dc0c8e973e1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
