RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-17 20:05:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
136 Commits 67 Branches 77 Tags 215 MiB
b9afdd5b98
Commit Graph

136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Björn Rabenstein
b9afdd5b98 Merge pull request #59 from prometheus/fabxc/authors 
Update AUTHORS
 2015-05-11 11:34:07 +02:00
Fabian Reinartz
c8fa9a1073 Update AUTHORS 2015-05-11 09:41:26 +02:00
Fabian Reinartz
70cc051e8e Merge pull request #57 from sdurrheimer/master 
Add simple support for Slack notifications
 2015-05-10 22:38:25 +02:00
Steve Durrheimer
df0ce42d42 Add simple support for Slack notifications 2015-05-10 22:21:18 +02:00
Julius Volz
6bfb2c3e18 Merge pull request #58 from prometheus/experimental-notice 
Use stronger wording for "experimental" notice.
 2015-05-10 21:11:20 +02:00
Julius Volz
0fe36a0033 Use stronger wording for "experimental" notice. 2015-05-10 20:47:11 +02:00
Julius Volz
1ef8e9ca57 Merge pull request #56 from prometheus/readd-config-target 
Re-add config Makefile target.
 2015-05-08 16:18:46 +02:00
Julius Volz
aceb489817 Correct paths in "web" Makefile target. 2015-05-06 11:50:39 +02:00
Julius Volz
ea231ad7b2 Move including of Makefile.COMMON to top of Makefile. 
This fixes the Makefile's default target.
 2015-05-06 11:44:01 +02:00
Julius Volz
91cd73b00a Re-add config Makefile target. 
This was accidentally removed in
https://github.com/prometheus/alertmanager/pull/55
 2015-05-06 11:16:20 +02:00
Johannes 'fish' Ziemke
2b6c5caf89 Merge pull request #55 from prometheus/update-makefile 
Use Makefile.COMMON
 2015-05-05 18:20:13 +02:00
Johannes 'fish' Ziemke
e38bb7c1c3 Use Makefile.COMMON and add generated files.go 2015-05-05 17:11:03 +02:00
Julius Volz
fd2a1e6099 Update hosting location of protobuf package. 2015-04-29 22:05:32 +02:00
Julius Volz
cf2f1191e0 Merge pull request #53 from a86c6f7964/remove-deps-dockerbuild 
we do not need the deps around after the executable is created
 2015-04-28 01:14:31 +02:00
Julius Volz
b8260fc390 Merge pull request #54 from a86c6f7964/continue-inside-notifier 
fix notifier, return means no other notifications will work.
 2015-04-28 01:12:13 +02:00
Cameron Davison
fc6a513f7f fix notifier, return means no other notifications will work. instead continue in case other notifications should alert 2015-04-27 16:17:55 -05:00
Julius Volz
0a3a0a811c Merge pull request #51 from prometheus/add-resolved-notifications 
Add support to notify for resolved alerts
 2015-04-27 13:23:48 +02:00
Johannes 'fish' Ziemke
735e8075d2 Add support to notify for resolved alerts 
Change-Id: I31fc51d2a47d92e9d7ac2ba224c7fce02b28444e
 2015-04-24 19:29:52 +02:00
Julius Volz
ffff50027a Merge pull request #50 from quinox/hipchat 
Visually distinguish alertname and summary
 2015-04-21 19:50:53 +02:00
Ceesjan Luiten
c12fa13a06 Visually distinguish alertname and summary 2015-04-21 19:28:05 +02:00
Julius Volz
99636c0e55 Merge pull request #48 from quinox/mailfix 
Add date header to please strict mail servers
 2015-04-19 23:37:40 +02:00
Tobias Schmidt
507de53eb7 Add travis CI support 2015-04-17 18:28:07 -04:00
Ceesjan Luiten
d36de99079 Add date header to please strict mail servers 2015-04-17 21:56:53 +02:00
Julius Volz
624c9b636c Merge pull request #47 from prometheus/flag-cleanpus 
Make notification flag names consistent with Prometheus style.
 2015-04-14 14:28:34 +02:00
Julius Volz
91b8b8847f Make notification flag names consistent with Prometheus style. 2015-04-14 13:42:29 +02:00
Julius Volz
92fd497c3e Merge pull request #45 from a86c6f7964/hipchat-support 
adding simple support for hipchat
 2015-04-14 13:38:11 +02:00
Cameron Davison
f4f6ceccc4 Add simple support for HipChat notifications 2015-04-13 17:49:46 -05:00
Cameron Davison
975b1c42ef we do not need the deps around after the executable is created 2015-04-10 14:47:36 -05:00
Julius Volz
438e8b98b8 Merge pull request #42 from prometheus/handle-index-only-from-root 
Only serve alerts page from /alerts or /.
 2015-03-31 15:29:04 +02:00
Julius Volz
3380692f71 Only serve alerts page from /alerts or /. 
This fixes https://github.com/prometheus/prometheus/issues/607
 2015-03-23 19:39:31 +01:00
Julius Volz
e3427a89cf Merge pull request #41 from stapelberg/patch-1 
docker: run alertmanager as nobody
 2015-03-23 13:15:04 +01:00
Michael Stapelberg
2937c7e765 docker: run alertmanager as nobody 
fixes #39
 2015-03-22 20:14:20 +01:00
Julius Volz
2f0da53569 Merge pull request #38 from euphoria-io/smtp-auth-tests 
Separate out SMTP auth logic and test it.
 2015-03-13 17:24:05 +01:00
Logan Hanks
c43957beb2 Separate out SMTP auth logic and test it. 2015-03-13 08:14:39 -07:00
Julius Volz
01e6a472ac Merge pull request #37 from euphoria-io/smtp-auth 
Add -smtpAuth for mail servers that require authentication
 2015-03-13 13:16:42 +01:00
Logan Hanks
183ee95a3e Check error on SplitHostPort. 2015-03-12 20:57:29 -07:00
Logan Hanks
e746596de0 Fix logic error in auth mechanism loop. 2015-03-12 20:55:31 -07:00
Logan Hanks
6d140d7571 Add more general PLAIN/CRAM-MD5 auth support. 2015-03-12 16:54:40 -07:00
Logan Hanks
f6ba424325 Replace -smtpAuth flag with SMTP_AUTH env var. 2015-03-12 13:01:16 -07:00
Logan Hanks
4883eaae5e Add -smtpAuth flag. 2015-03-12 11:19:48 -07:00
Julius Volz
adbefc4da3 Merge pull request #35 from prometheus/fix-makefile-parallelism 
Fix makefile parallelism
 2015-02-23 17:38:27 +01:00
Julius Volz
66df34348f Merge pull request #36 from atombender/master 
Makefile: Use $(CURDIR) instead of $(PWD), which is more dependable
 2015-02-23 12:42:07 +01:00
Alexander Staubo
6d8e79c198 Makefile: Calculate $(GOROOT), etc. relative to Makefile instead of using $(PWD), which is not always available (eg., in debuild). 2015-02-22 23:09:59 -05:00
Julius Volz
8655ec18b2 Use "-q" curl option to ignore any settings in ~/.curlrc. 2015-02-23 01:18:31 +01:00
Julius Volz
666a19830d Fix Makefile dependencies to work with parallelism. 
This fixes https://github.com/prometheus/alertmanager/issues/34
 2015-02-23 01:17:32 +01:00
juliusv
942cd35dea Merge pull request #33 from antonlindstrom/feature/notification-pushover 
add pushover as notification method
 2015-02-17 14:12:35 +01:00
Anton Lindström
a0c156e3e6 add pushover as notification method 
This adds https://pushover.net/ as a way of notification.
 2015-02-17 05:44:45 +00:00
juliusv
38b86ce41c Merge pull request #32 from prometheus/add-fromto-headers 
Add From/To (non-envelope) headers to email notifications.
 2015-02-16 21:50:15 +01:00
Julius Volz
5a1771be63 Add From/To (non-envelope) headers to email notifications. 2015-02-16 20:35:45 +01:00
juliusv
25b925c686 Merge pull request #31 from prometheus/fix-dockerfile 
Run make in Dockerfile without explicit target
 2015-02-10 17:25:11 +01:00