RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-28 17:12:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,711 Commits 66 Branches 77 Tags 218 MiB
7ff1a618c6
Commit Graph

1711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Johannes 'fish' Ziemke
991cb23d64 Run make in Dockerfile without explicit target 
This fixes the docker build which broke since we removed the 'build'
target from the Makefile.

Change-Id: I36ca5b3c1ad49fe4748322fcd063fbca402bda38
 2015-02-10 17:17:04 +01:00
juliusv
09ca3ef824 Merge pull request #29 from prometheus/update-readme 
Expand alertmanager README.md
 2015-02-10 13:25:57 +01:00
juliusv
6af075e71b Merge pull request #30 from prometheus/discordianfish-patch-1 
Fix port in Dockerfile
 2015-02-10 13:21:39 +01:00
Johannes 'fish' Ziemke
52dc8a1968 Fix port in Dockerfile 2015-02-10 12:41:19 +01:00
Julius Volz
bb8cae4c36 Expand alertmanager README.md 2015-02-09 22:04:16 +01:00
juliusv
3191b2a8d0 Merge pull request #27 from prometheus/flag-cleanup 
Make flag names consistent across projects.
 2015-02-09 12:25:24 +01:00
Julius Volz
0db99c2c5e Make flag names consistent across projects. 2015-02-09 12:22:44 +01:00
juliusv
9677e2fea7 Merge pull request #26 from prometheus/arch-os-build-fixes 
Fix Go download link for several archs and OSes.
 2015-02-05 18:08:47 +01:00
Julius Volz
a00d9201cd Fix Go download link for several archs and OSes. 2015-02-05 17:01:22 +01:00
Julius Volz
fb7bebc591 Use minified Bootstrap JS (non-minified gone now). 2015-02-02 22:02:45 +01:00
juliusv
ae70ec3ac5 Merge pull request #25 from prometheus/makefile-cleanup 
Makefile cleanup
 2015-02-02 13:48:06 +01:00
Julius Volz
cbf5faaf8c Bring Makefiles into shape. 
This borrows a lot of the latest changes to the node_exporter Makefile,
as well as some tricks from the Prometheus one.
 2015-02-01 02:30:41 +01:00
Julius Volz
2a5dee15b0 Remove unused bootstrap CSS/JS files. 2015-02-01 02:29:33 +01:00
juliusv
98cfb53cb4 Add link to sample config to README.md. 2015-01-29 17:38:05 +01:00
juliusv
fa901287a0 Merge pull request #23 from prometheus/beorn7/license-cleanup 
License cleanup.
 2015-01-22 17:10:47 +01:00
Bjoern Rabenstein
c2cfb51171 License cleanup. 2015-01-22 15:45:23 +01:00
juliusv
9b7e59c0ce Merge pull request #22 from prometheus/optional-generator-url 
Treat `GeneratorURL` as optional in Alerts page.
 2015-01-11 17:58:46 +01:00
Julius Volz
41963417df Treat GeneratorURL as optional in Alerts page. 
This fixes https://github.com/prometheus/alertmanager/issues/21

Otherwise, sending an alert with a missing `GeneratorURL` payload
property would cause the template rendering to crash:

    Error executing template: template: alerts.html:51:76: executing "content" at <.Alert.Payload.Gener...>: invalid value; expected string
 2015-01-10 21:58:42 +01:00
Johannes 'fish' Ziemke
d2ce4fa3e7 Add Dockerfile 
Change-Id: Ib544dc1dd0b29ecaf7a777a3bd55982961cbb1ae
 2014-10-28 21:38:28 +01:00
Julius Volz
0642137a11 Fix alert expiry crashbug. 
No, the array representation of a binary heap is of course *not* sorted.

Change-Id: Ib18c9b7e1bee24391f98d73135ac19c77026b168
 2014-10-27 23:50:31 +01:00
Julius Volz
20b146657b Update HTTP/clientlib dependencies + cleanups. 
Change-Id: I175ac4874b25358dd569866e3d575ba49e4357f2
 2014-10-27 23:50:22 +01:00
Julius Volz
6d789102f9 Fix wrong repeat rate setting in config.go. 
Change-Id: I362f4d2ad85eb21a64ac85814fdc2fa85da6a7f4
 2013-09-11 17:55:47 +02:00
Julius Volz
be0e958d8f Major rewrite of alertmanager, adding inhibit support. 
Change-Id: If11f3aec70ba2ac816b9b824a387ffdd2e51790f
 2013-09-11 15:34:02 +02:00
Julius Volz
7c21fb1f5a Shorten links to Prometheus console in alertmanager UI. 
Change-Id: Id22736ba573b031bc88b95442fa04e71893a52ae
 2013-08-20 16:23:33 +02:00
Julius Volz
db87129fa8 Add .gitignore file. 
Change-Id: I041bbc311bc817ab6ea1a54afafa46ab268513a1
 2013-08-16 15:25:35 +02:00