Hello community,
here is the log from the commit of package
golang-github-prometheus-alertmanager for openSUSE:Factory checked in at
2020-09-08 22:51:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/golang-github-prometheus-alertmanager (Old)
and
/work/SRC/openSUSE:Factory/.golang-github-prometheus-alertmanager.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "golang-github-prometheus-alertmanager"
Tue Sep 8 22:51:23 2020 rev:6 rq:832969 version:0.21.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/golang-github-prometheus-alertmanager/golang-github-prometheus-alertmanager.changes
2019-08-07 14:01:17.976852946 +0200
+++
/work/SRC/openSUSE:Factory/.golang-github-prometheus-alertmanager.new.3399/golang-github-prometheus-alertmanager.changes
2020-09-08 22:51:41.555644453 +0200
@@ -1,0 +2,33 @@
+Fri Aug 28 12:43:59 UTC 2020 - Matthias Eliasson <[email protected]>
+
+- Fix permissions for /var/lib/prometheus to match
+ golang-github-prometheus-prometheus package. Otherwise the install check will
+ fail.
+
+-------------------------------------------------------------------
+Sat Jul 18 20:24:34 UTC 2020 - Matthias Eliasson <[email protected]>
+
+- Update to 0.21.0
+ + Changes:
+ * [HipChat] Remove HipChat integration as it is end-of-life. #2282
+ * [amtool] Remove default assignment of environment variables. #2161
+ * [PagerDuty] Enforce 512KB event size limit. #2225
+ + Enhancements:
+ * [amtool] Add cluster command to show cluster and peer statuses. #2256
+ * Add redirection from / to the routes prefix when it isn't empty. #2235
+ * [Webhook] Add max_alerts option to limit the number of alerts included
in the payload. #2274
+ * Improve logs for API v2, notifications and clustering. #2177 #2188 #2260
#2261 #2273
+ + Bugfixes:
+ * Fix child routes not inheriting their parent route's grouping when
group_by: [...]. #2154
+ * [UI] Fix the receiver selector in the Alerts page when the receiver name
contains regular expression metacharacters such as +. #2090
+ * Fix error message about start and end time validation. #2173
+ * Fix a potential race condition in dispatcher. #2208
+ * [API v2] Return an empty array of peers when the clustering is disabled.
#2203
+ * Fix the registration of alertmanager_dispatcher_aggregation_groups and
alertmanager_dispatcher_alert_processing_duration_seconds metrics. #2200
+ * Always retry notifications with back-off. #2290
+- Run spec-cleaner
+- Remove rpm group
+- Update to build with go1.14 for Factory (Tumbleweed)
+- Refresh example config from upstream
+
+-------------------------------------------------------------------
Old:
----
alertmanager-0.16.2.tar.xz
New:
----
alertmanager-0.21.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ golang-github-prometheus-alertmanager.spec ++++++
--- /var/tmp/diff_new_pack.UyWrts/_old 2020-09-08 22:51:42.971645161 +0200
+++ /var/tmp/diff_new_pack.UyWrts/_new 2020-09-08 22:51:42.975645163 +0200
@@ -1,7 +1,7 @@
#
# spec file for package golang-github-prometheus-alertmanager
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,29 +16,30 @@
#
-%{go_nostrip}
-
Name: golang-github-prometheus-alertmanager
-Version: 0.16.2
+Version: 0.21.0
Release: 0
Summary: Prometheus Alertmanager
License: Apache-2.0
-Group: System/Management
-Url: https://prometheus.io/
+URL: https://prometheus.io/
Source: alertmanager-%{version}.tar.xz
Source1: prometheus-alertmanager.service
Source2: alertmanager.yml
# Lifted from Debian's alertmanager package
Patch1: 0001-Default-settings.patch
BuildRequires: fdupes
-BuildRequires: go1.11
BuildRequires: golang-github-prometheus-promu
BuildRequires: golang-packaging
BuildRequires: xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%{?systemd_requires}
Requires(pre): shadow
+%{go_nostrip}
+%{?systemd_requires}
%{go_provides}
+%if 0%{?suse_version} > 1500
+BuildRequires: go1.14
+%else
+BuildRequires: go1.11
+%endif
%description
The Alertmanager handles alerts sent by client applications such as the
@@ -62,7 +63,7 @@
mv %{buildroot}%{_bindir}/alertmanager
%{buildroot}%{_bindir}/prometheus-alertmanager
install -D -m 0644 %{SOURCE1}
%{buildroot}%{_unitdir}/prometheus-alertmanager.service
install -Dd -m 0755 %{buildroot}%{_sbindir}
-ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcprometheus-alertmanager
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcprometheus-alertmanager
install -D -m 0644 %{SOURCE2}
%{buildroot}%{_sysconfdir}/prometheus/alertmanager.yml
install -Dd -m 0755
%{buildroot}%{_sysconfdir}/prometheus/alertmanager_templates
install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus
@@ -85,15 +86,14 @@
%service_del_postun prometheus-alertmanager.service
%files -f file.lst
-%defattr(-,root,root,-)
%doc README.md
%license LICENSE
%{_bindir}/prometheus-alertmanager
%{_bindir}/amtool
%{_unitdir}/prometheus-alertmanager.service
%{_sbindir}/rcprometheus-alertmanager
-%dir %attr(0750, prometheus, prometheus) %{_localstatedir}/lib/prometheus
-%dir %attr(0750, prometheus, prometheus)
%{_localstatedir}/lib/prometheus/alertmanager
+%dir %attr(0700, prometheus, prometheus) %{_localstatedir}/lib/prometheus
+%dir %attr(0700, prometheus, prometheus)
%{_localstatedir}/lib/prometheus/alertmanager
%dir %{_sysconfdir}/prometheus
%dir %{_sysconfdir}/prometheus/alertmanager_templates
%config(noreplace) %{_sysconfdir}/prometheus/alertmanager.yml
++++++ _service ++++++
--- /var/tmp/diff_new_pack.UyWrts/_old 2020-09-08 22:51:43.015645183 +0200
+++ /var/tmp/diff_new_pack.UyWrts/_new 2020-09-08 22:51:43.015645183 +0200
@@ -4,8 +4,8 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="exclude">.github</param>
- <param name="versionformat">0.16.2</param>
- <param name="revision">v0.16.2</param>
+ <param name="versionformat">0.21.0</param>
+ <param name="revision">v0.21.0</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">alertmanager-*.tar</param>
++++++ alertmanager-0.16.2.tar.xz -> alertmanager-0.21.0.tar.xz ++++++
++++ 496520 lines of diff (skipped)
++++++ alertmanager.yml ++++++
--- /var/tmp/diff_new_pack.UyWrts/_old 2020-09-08 22:51:44.335645843 +0200
+++ /var/tmp/diff_new_pack.UyWrts/_new 2020-09-08 22:51:44.335645843 +0200
@@ -3,30 +3,31 @@
global:
# The smarthost and SMTP sender used for mail notifications.
- smtp_smarthost: 'localhost:25'
- smtp_from: '[email protected]'
- smtp_auth_username: 'alertmanager'
- smtp_auth_password: 'password'
- # The auth token for Hipchat.
- hipchat_auth_token: '1234556789'
- # Alternative host for Hipchat.
- hipchat_api_url: 'https://hipchat.foobar.org/'
-
-# The directory from which notification templates are read.
-templates:
-- '/etc/prometheus/alertmanager_templates/*.tmpl'
+ smtp_smarthost: "localhost:25"
+ smtp_from: "[email protected]"
# The root route on which each incoming alert enters.
route:
+ # The root route must not have any matchers as it is the entry point for
+ # all alerts. It needs to have a receiver configured so alerts that do not
+ # match any of the sub-routes are sent to someone.
+ receiver: "team-X-mails"
+
# The labels by which incoming alerts are grouped together. For example,
# multiple alerts coming in for cluster=A and alertname=LatencyHigh would
# be batched into a single group.
- group_by: ['alertname', 'cluster', 'service']
+ #
+ # To aggregate by all possible labels use '...' as the sole label name.
+ # This effectively disables aggregation entirely, passing through all
+ # alerts as-is. This is unlikely to be what you want, unless you have
+ # a very low alert volume or your upstream notification system performs
+ # its own grouping. Example: group_by: [...]
+ group_by: ["alertname", "cluster"]
# When a new group of alerts is created by an incoming alert, wait at
# least 'group_wait' to send the initial notification.
# This way ensures that you get multiple alerts for the same group that start
- # firing shortly after another are batched together on the first
+ # firing shortly after another are batched together on the first
# notification.
group_wait: 30s
@@ -36,91 +37,89 @@
# If an alert has successfully been sent, wait 'repeat_interval' to
# resend them.
- repeat_interval: 3h
-
- # A default receiver
- receiver: team-X-mails
+ repeat_interval: 3h
- # All the above attributes are inherited by all child routes and can
+ # All the above attributes are inherited by all child routes and can
# overwritten on each.
# The child route trees.
routes:
- # This routes performs a regular expression match on alert labels to
- # catch alerts that are related to a list of services.
- - match_re:
- service: ^(foo1|foo2|baz)$
- receiver: team-X-mails
- # The service has a sub-route for critical alerts, any alerts
- # that do not match, i.e. severity != critical, fall-back to the
- # parent node and are sent to 'team-X-mails'
- routes:
- - match:
- severity: critical
- receiver: team-X-pager
- - match:
- service: files
- receiver: team-Y-mails
+ # This routes performs a regular expression match on alert labels to
+ # catch alerts that are related to a list of services.
+ - match_re:
+ service: ^(foo1|foo2|baz)$
+ receiver: team-X-mails
+
+ # The service has a sub-route for critical alerts, any alerts
+ # that do not match, i.e. severity != critical, fall-back to the
+ # parent node and are sent to 'team-X-mails'
+ routes:
+ - match:
+ severity: critical
+ receiver: team-X-pager
- routes:
- match:
- severity: critical
- receiver: team-Y-pager
+ service: files
+ receiver: team-Y-mails
- # This route handles all alerts coming from a database service. If there's
- # no team to handle it, it defaults to the DB team.
- - match:
- service: database
- receiver: team-DB-pager
- # Also group alerts by affected database.
- group_by: [alertname, cluster, database]
- routes:
- - match:
- owner: team-X
- receiver: team-X-pager
+ routes:
+ - match:
+ severity: critical
+ receiver: team-Y-pager
+
+ # This route handles all alerts coming from a database service. If there's
+ # no team to handle it, it defaults to the DB team.
- match:
- owner: team-Y
- receiver: team-Y-pager
+ service: database
+ receiver: team-DB-pager
+ # Also group alerts by affected database.
+ group_by: [alertname, cluster, database]
+
+ routes:
+ - match:
+ owner: team-X
+ receiver: team-X-pager
+
+ - match:
+ owner: team-Y
+ receiver: team-Y-pager
# Inhibition rules allow to mute a set of alerts given that another alert is
# firing.
-# We use this to mute any warning-level notifications if the same alert is
+# We use this to mute any warning-level notifications if the same alert is
# already critical.
inhibit_rules:
-- source_match:
- severity: 'critical'
- target_match:
- severity: 'warning'
- # Apply inhibition if the alertname is the same.
- equal: ['alertname', 'cluster', 'service']
-
+ - source_match:
+ severity: "critical"
+ target_match:
+ severity: "warning"
+ # Apply inhibition if the alertname is the same.
+ # CAUTION:
+ # If all label names listed in `equal` are missing
+ # from both the source and target alerts,
+ # the inhibition rule will apply!
+ equal: ["alertname"]
receivers:
-- name: 'team-X-mails'
- email_configs:
- - to: '[email protected]'
-
-- name: 'team-X-pager'
- email_configs:
- - to: '[email protected]'
- pagerduty_configs:
- - service_key: <team-X-key>
-
-- name: 'team-Y-mails'
- email_configs:
- - to: '[email protected]'
-
-- name: 'team-Y-pager'
- pagerduty_configs:
- - service_key: <team-Y-key>
-
-- name: 'team-DB-pager'
- pagerduty_configs:
- - service_key: <team-DB-key>
-- name: 'team-X-hipchat'
- hipchat_configs:
- - auth_token: <auth_token>
- room_id: 85
- message_format: html
- notify: true
+ - name: "team-X-mails"
+ email_configs:
+ - to: "[email protected], [email protected]"
+
+ - name: "team-X-pager"
+ email_configs:
+ - to: "[email protected]"
+ pagerduty_configs:
+ - routing_key: <team-X-key>
+
+ - name: "team-Y-mails"
+ email_configs:
+ - to: "[email protected]"
+
+ - name: "team-Y-pager"
+ pagerduty_configs:
+ - routing_key: <team-Y-key>
+
+ - name: "team-DB-pager"
+ pagerduty_configs:
+ - routing_key: <team-DB-key>
