Filippo Giunchedi has submitted this change and it was merged.
Change subject: prometheus: upgrade to new config syntax
......................................................................
prometheus: upgrade to new config syntax
The configuration keys changed in 0.20.
Bug: T147207
Change-Id: I63ae7d23f061b421e825bffc77e67c17487bde05
---
M modules/prometheus/manifests/server.pp
M modules/role/manifests/prometheus/beta.pp
M modules/role/manifests/prometheus/ops.pp
M modules/role/manifests/prometheus/tools.pp
4 files changed, 15 insertions(+), 15 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/prometheus/manifests/server.pp
b/modules/prometheus/manifests/server.pp
index 05e0616..61fb13f 100644
--- a/modules/prometheus/manifests/server.pp
+++ b/modules/prometheus/manifests/server.pp
@@ -74,14 +74,14 @@
{
'job_name' => 'prometheus',
'metrics_path' => "/${title}/metrics",
- 'target_groups' => [
+ 'static_configs' => [
{ 'targets' => [ $listen_address ] },
]
},
{
'job_name' => 'node',
'file_sd_configs' => [
- { 'names' => [ "${targets_path}/node_*.yml",
+ { 'files' => [ "${targets_path}/node_*.yml",
"${targets_path}/node_*.yaml" ] },
]
},
diff --git a/modules/role/manifests/prometheus/beta.pp
b/modules/role/manifests/prometheus/beta.pp
index bb44478..0297764 100644
--- a/modules/role/manifests/prometheus/beta.pp
+++ b/modules/role/manifests/prometheus/beta.pp
@@ -12,13 +12,13 @@
{
'job_name' => 'varnish-text',
'file_sd_configs' => [
- { 'names' => [ "${targets_path}/varnish-text_*.yaml"] },
+ { 'files' => [ "${targets_path}/varnish-text_*.yaml"] },
]
},
{
'job_name' => 'varnish-upload',
'file_sd_configs' => [
- { 'names' => [ "${targets_path}/varnish-upload_*.yaml"] },
+ { 'files' => [ "${targets_path}/varnish-upload_*.yaml"] },
]
},
]
@@ -27,7 +27,7 @@
{
'job_name' => 'mysql-core',
'file_sd_configs' => [
- { 'names' => [ "${targets_path}/mysql-core_*.yaml"] },
+ { 'files' => [ "${targets_path}/mysql-core_*.yaml"] },
]
},
]
@@ -36,19 +36,19 @@
{
'job_name' => 'apache',
'file_sd_configs' => [
- { 'names' => [ "${targets_path}/apache_*.yaml"] },
+ { 'files' => [ "${targets_path}/apache_*.yaml"] },
]
},
{
'job_name' => 'hhvm',
'file_sd_configs' => [
- { 'names' => [ "${targets_path}/hhvm_*.yaml"] },
+ { 'files' => [ "${targets_path}/hhvm_*.yaml"] },
]
},
{
'job_name' => 'memcache',
'file_sd_configs' => [
- { 'names' => [ "${targets_path}/memcache_*.yaml"] },
+ { 'files' => [ "${targets_path}/memcache_*.yaml"] },
]
},
]
diff --git a/modules/role/manifests/prometheus/ops.pp
b/modules/role/manifests/prometheus/ops.pp
index 0d39db9..eabc97e 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -13,31 +13,31 @@
{
'job_name' => 'mysql-core',
'file_sd_configs' => [
- { 'names' => [ "${targets_path}/mysql-core_*.yaml"] },
+ { 'files' => [ "${targets_path}/mysql-core_*.yaml"] },
]
},
{
'job_name' => 'mysql-dbstore',
'file_sd_configs' => [
- { 'names' => [ "${targets_path}/mysql-dbstore_*.yaml"] },
+ { 'files' => [ "${targets_path}/mysql-dbstore_*.yaml"] },
]
},
{
'job_name' => 'mysql-labs',
'file_sd_configs' => [
- { 'names' => [ "${targets_path}/mysql-labs_*.yaml"] },
+ { 'files' => [ "${targets_path}/mysql-labs_*.yaml"] },
]
},
{
'job_name' => 'mysql-misc',
'file_sd_configs' => [
- { 'names' => [ "${targets_path}/mysql-misc_*.yaml"] },
+ { 'files' => [ "${targets_path}/mysql-misc_*.yaml"] },
]
},
{
'job_name' => 'mysql-parsercache',
'file_sd_configs' => [
- { 'names' => [ "${targets_path}/mysql-parsercache_*.yaml"] },
+ { 'files' => [ "${targets_path}/mysql-parsercache_*.yaml"] },
]
},
]
diff --git a/modules/role/manifests/prometheus/tools.pp
b/modules/role/manifests/prometheus/tools.pp
index 32b1c52..e0f60a9 100644
--- a/modules/role/manifests/prometheus/tools.pp
+++ b/modules/role/manifests/prometheus/tools.pp
@@ -50,7 +50,7 @@
},
'file_sd_configs' => [
{
- 'names' => ["${targets_path}/ssh_banner.yml"]
+ 'files' => ["${targets_path}/ssh_banner.yml"]
}
],
'relabel_configs' => [
@@ -81,7 +81,7 @@
'job_name' => 'etcd',
'file_sd_configs' => [
{
- 'names' => [ "${targets_path}/etcd_*.yml" ]
+ 'files' => [ "${targets_path}/etcd_*.yml" ]
}
]
},
--
To view, visit https://gerrit.wikimedia.org/r/317880
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I63ae7d23f061b421e825bffc77e67c17487bde05
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
