upgpkg: prometheus-ipmi-exporter 1.4.0-1

* New upstream release.
* Removed environment config file in favour of systemd drop-ins.
* Renamed systemd files to be more descriptive.
* Renamed main binary to reflect upstream's name.
* Added dependency: glibc.

5 files changed, 26 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 711ab2c36723..57e9391749dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,18 @@
 pkgbase = prometheus-ipmi-exporter
 	pkgdesc = Prometheus exporter for IPMI metrics
-	pkgver = 1.3.2
-	pkgrel = 2
+	pkgver = 1.4.0
+	pkgrel = 1
 	url = https://github.com/soundcloud/ipmi_exporter
 	arch = x86_64
 	license = MIT
 	makedepends = go
+	depends = glibc
 	depends = freeipmi
-	backup = etc/conf.d/prometheus-ipmi-exporter
-	source = prometheus-ipmi-exporter-1.3.2.tar.gz::https://github.com/soundcloud/ipmi_exporter/archive/v1.3.2.tar.gz
-	source = prometheus-ipmi-exporter.conf
-	source = prometheus-ipmi-exporter.service
-	source = prometheus-ipmi-exporter.sysusers
-	b2sums = 36aec4e98bf6285f1f25e776a46c5e897a983d0c462aaed88495390cc9dbac79fb8b69ed213ce2003ce118779be8c2026a63db5309b430f76be03a7111e9e5ae
-	b2sums = 39663e6da79867687a85662a49c3d70f97ca1f528562b67928265f512718d975feb9b3a2ab5f169f72f947eb334b02bbcd307c4f0641e6a18d05e9d2824b934e
-	b2sums = 428d9b1afbe59888966ac900c1e3b8bbef2ae1cee229e690a39d29883663503dd650d0a537126f10bb6e1b5241c8ee297c121537f8980ca1e1d0e8dab9c86fb4
+	source = prometheus-ipmi-exporter-1.4.0.tar.gz::https://github.com/soundcloud/ipmi_exporter/archive/v1.4.0.tar.gz
+	source = systemd.service
+	source = sysusers.conf
+	b2sums = 1511324e2fe6a6f6301cdfc41da1fc34f5c63f6cf871702104b679ebc247694cebe786a009b9e6a3eea1683aff074d16a37ab7480812e36dcd9d047021c68136
+	b2sums = adae5f80306c13ef619c47a732eab9067c9f11ec025e7e46abb200f1c122d4cccd1c55cec99120e373022e1f798f4623bb93c9e8ff6801e6915a9d385a4ed8bd
 	b2sums = 93e62d3bacccb26e808271fa4f576dc5e67cb5111f7d0c744a4f029aa3974de29742b4301f4058db38884de1cb049969c533291daf0fa6a9f3175a77c72b0001
 
 pkgname = prometheus-ipmi-exporter
-
diff --git a/PKGBUILD b/PKGBUILD
index 68015c7e27c8..7f1881fe23c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,19 @@
 
 pkgname=prometheus-ipmi-exporter
 _pkgname=ipmi_exporter
-pkgver=1.3.2
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Prometheus exporter for IPMI metrics"
 arch=(x86_64)
 url="https://github.com/soundcloud/ipmi_exporter"
-license=(MIT)
-makedepends=(go)
-depends=(freeipmi)
-backup=("etc/conf.d/prometheus-ipmi-exporter")
+license=('MIT')
+makedepends=('go')
+depends=('glibc' 'freeipmi')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
-        "$pkgname.conf"
-        "$pkgname.service"
-        "$pkgname.sysusers")
-b2sums=('36aec4e98bf6285f1f25e776a46c5e897a983d0c462aaed88495390cc9dbac79fb8b69ed213ce2003ce118779be8c2026a63db5309b430f76be03a7111e9e5ae'
-        '39663e6da79867687a85662a49c3d70f97ca1f528562b67928265f512718d975feb9b3a2ab5f169f72f947eb334b02bbcd307c4f0641e6a18d05e9d2824b934e'
-        '428d9b1afbe59888966ac900c1e3b8bbef2ae1cee229e690a39d29883663503dd650d0a537126f10bb6e1b5241c8ee297c121537f8980ca1e1d0e8dab9c86fb4'
+        'systemd.service'
+        'sysusers.conf')
+b2sums=('1511324e2fe6a6f6301cdfc41da1fc34f5c63f6cf871702104b679ebc247694cebe786a009b9e6a3eea1683aff074d16a37ab7480812e36dcd9d047021c68136'
+        'adae5f80306c13ef619c47a732eab9067c9f11ec025e7e46abb200f1c122d4cccd1c55cec99120e373022e1f798f4623bb93c9e8ff6801e6915a9d385a4ed8bd'
         '93e62d3bacccb26e808271fa4f576dc5e67cb5111f7d0c744a4f029aa3974de29742b4301f4058db38884de1cb049969c533291daf0fa6a9f3175a77c72b0001')
 
 build() {
@@ -37,15 +34,14 @@ build() {
 }
 
 package() {
-  # systemd files
-  install -Dm644 "$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-  install -Dm644 "$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-  install -Dm640 "$pkgname.conf" "$pkgdir/etc/conf.d/$pkgname"
+  # systemd integration
+  install -Dm644 systemd.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
 
   cd "$_pkgname-$pkgver"
 
   # binary
-  install -Dm755 "$_pkgname" "$pkgdir/usr/bin/$pkgname"
+  install -Dm755 -t "$pkgdir/usr/bin" "$_pkgname"
 
   # license
   install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE
@@ -54,5 +50,7 @@ package() {
   install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname" \
     ipmi_local.yml \
     ipmi_remote.yml \
+    docs/configuration.md \
+    docs/metrics.md \
     README.md
 }
diff --git a/prometheus-ipmi-exporter.conf b/prometheus-ipmi-exporter.conf
deleted file mode 100644
index 648b8bd31268..000000000000
--- a/prometheus-ipmi-exporter.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Specify additional arguments to pass to prometheus-ipmi-exporter on startup
-IPMI_EXPORTER_ARGS=""
-
-# Available arguments:
-#   --config.file=CONFIG.FILE     Path to configuration file
-#   --freeipmi.path=FREEIPMI.PATH Path to FreeIPMI executables (default: rely on $PATH)
-#   --web.listen-address=":9290"  Address to listen on for web interface and telemetry
-#   --log.level="info"            Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal]
-#   --log.format="logger:stderr"  Set the log target and format. Example: "logger:syslog?appname=bob&local=7" or "logger:stdout?json=true"
diff --git a/prometheus-ipmi-exporter.service b/systemd.service
index 632877fc8428..eccba12a674a 100644
--- a/prometheus-ipmi-exporter.service
+++ b/systemd.service
@@ -4,8 +4,9 @@ Requires=network-online.target
 After=network-online.target
 
 [Service]
-EnvironmentFile=-/etc/conf.d/prometheus-ipmi-exporter
-ExecStart=/usr/bin/prometheus-ipmi-exporter $IPMI_EXPORTER_ARGS
+# If IPMI_EXPORTER_ARGS is required, it should be applied using a
+# drop-in systemd file. See `man 5 systemd.unit` for details.
+ExecStart=/usr/bin/ipmi_exporter $IPMI_EXPORTER_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 User=ipmi-exporter
 Group=ipmi-exporter
diff --git a/prometheus-ipmi-exporter.sysusers b/sysusers.conf
index 8782d5e563e4..8782d5e563e4 100644
--- a/prometheus-ipmi-exporter.sysusers
+++ b/sysusers.conf