Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/365239 )
Change subject: prometheus: use blackbox-exporter package from Debian
......................................................................
prometheus: use blackbox-exporter package from Debian
Drop our custom systemd unit in favour of the standard one shipped by Debian
package. In the past we used to have a custom package for blackbox-exporter.
Also adjust the configuration path.
Bug: T169860
Change-Id: Id5238f79af0ca8b1010e28d54082fa07f543581f
---
M modules/prometheus/manifests/blackbox_exporter.pp
D
modules/prometheus/templates/initscripts/prometheus-blackbox-exporter.systemd.erb
2 files changed, 1 insertion(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/365239/1
diff --git a/modules/prometheus/manifests/blackbox_exporter.pp
b/modules/prometheus/manifests/blackbox_exporter.pp
index fa7446f..de34c60 100644
--- a/modules/prometheus/manifests/blackbox_exporter.pp
+++ b/modules/prometheus/manifests/blackbox_exporter.pp
@@ -9,19 +9,12 @@
require_package('prometheus-blackbox-exporter')
- file { '/etc/prometheus-blackbox_exporter.yml':
+ file { '/etc/prometheus/blackbox.yml':
ensure => present,
mode => '0444',
owner => 'root',
group => 'root',
content => template('prometheus/blackbox_exporter.yml.erb'),
notify => Service['prometheus-blackbox-exporter'],
- }
-
- base::service_unit { 'prometheus-blackbox-exporter':
- ensure => present,
- refresh => true,
- systemd => true,
- require => Package['prometheus-blackbox-exporter'],
}
}
diff --git
a/modules/prometheus/templates/initscripts/prometheus-blackbox-exporter.systemd.erb
b/modules/prometheus/templates/initscripts/prometheus-blackbox-exporter.systemd.erb
deleted file mode 100644
index 2f35925..0000000
---
a/modules/prometheus/templates/initscripts/prometheus-blackbox-exporter.systemd.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=prometheus-blackbox-exporter
-
-[Service]
-User=prometheus
-ExecStart=/usr/bin/blackbox_exporter -config.file
/etc/prometheus-blackbox_exporter.yml
-Restart=on-failure
--
To view, visit https://gerrit.wikimedia.org/r/365239
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5238f79af0ca8b1010e28d54082fa07f543581f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
