diff --git a/NOTICE b/NOTICE index f5d0bbb..e0dd624 100644 --- a/NOTICE +++ b/NOTICE @@ -11,8 +11,3 @@ Bootstrap http://getbootstrap.com Copyright 2011-2014 Twitter, Inc. Licensed under the MIT License - -bootstrap-datetimepicker.js -http://www.eyecon.ro/bootstrap-datepicker -Copyright 2012 Stefan Petre -Licensed under the Apache License, Version 2.0 diff --git a/alertmanager b/alertmanager index 1abe36b..e536233 100755 Binary files a/alertmanager and b/alertmanager differ diff --git a/alertmanager.yml b/alertmanager.yml index e1f079d..7bd5e0c 100644 --- a/alertmanager.yml +++ b/alertmanager.yml @@ -1,16 +1,13 @@ -global: - resolve_timeout: 5m - route: group_by: ['alertname'] - group_wait: 10s - group_interval: 10s + group_wait: 30s + group_interval: 5m repeat_interval: 1h receiver: 'web.hook' receivers: -- name: 'web.hook' - webhook_configs: - - url: 'http://127.0.0.1:5001/' + - name: 'web.hook' + webhook_configs: + - url: 'http://127.0.0.1:5001/' inhibit_rules: - source_match: severity: 'critical' diff --git a/amtool b/amtool index 38832de..157787f 100755 Binary files a/amtool and b/amtool differ