Commit Graph

30 Commits

Author SHA1 Message Date
Max Inden 37bbc4c439 Merge pull request #736 from prometheus/ui-rewrite-merge-master
Update ui-rewrite with master branch
2017-04-25 17:36:55 +02:00
Max Leonard Inden 0d2b0b6bd6
Merge branch 'master' into ui-rewrite 2017-04-25 15:47:57 +02:00
Max Leonard Inden e2898f8f4d
Exclude /ui folder from go tests 2017-04-25 15:01:07 +02:00
Max Leonard Inden a8d7f92c66 test: Ensure bindata.go is always up to date
This adds three more steps to the Travis tests.
1. Compile Elm -> script.js
2. Bundle html.index & script.js -> bindata.go
3. Check if bindata.go hasn't changed
2017-04-25 11:33:57 +02:00
Fabian Reinartz 309c6af4b2
nflog: use alert set instead of hash for deduplication
Building a hash over an entire set of alerts causes problems, because
the hash differs, on any change, whereas we only want to send
notifications if the alert and it's state have changed. Therefore this
introduces a list of alerts that are active and a list of alerts that
are resolved. If the currently active alerts of a group are a subset of
the ones that have been notified about before then they are
deduplicated. The resolved notifications work the same way, with a
separate list of resolved notifications that have already been sent.
2017-04-13 15:13:47 +02:00
Max Leonard Inden c3850708c1 Make assets generation deterministic
By passing "-modtime 1" flag into go-bindata command it uses the same
unix timestamp (1) for every file in the fake filesystem. Thereby every
execution of "make assets" results in the same asset outputs if the
inputs were the same. This forces us to set the "Cache-Control"
attribute to "no-cache".
2017-04-10 13:47:13 +02:00
Max Leonard Inden 0faf0f531f
Add Elm UI rewrite from github.com/stuartnelson3/am-ui with history
* Including glue between Alertmanager server and Elm UI.
* Rebuilding assets (ui/bindata.go).
* Exact commit: 'bd78de6b16bcefaacf4229304d439b33aa09cc72'
* Subdirectory: ui/app
2017-03-24 17:48:50 +01:00
stuart nelson 7987e9d5df Update format to find all .elm files 2017-01-04 18:02:49 -05:00
stuart nelson e4d7663cb8 Add format make target 2016-11-06 21:07:17 +01:00
Steve Durrheimer 9d4dccae7c
New release process using docker, circleci and a centralized
building tool
2016-04-22 21:46:53 +02:00
Fabian Reinartz 1629e9d166 Statically compile default templates 2015-12-01 18:39:57 +01:00
Fabian Reinartz f974dfa91f Remove 'assets' from default target
There are issues with changing timestamps for unmodified files
in go-bindata+git.
2015-11-23 16:16:07 +01:00
Fabian Reinartz c5d77252e6 Improve button visibility in UI 2015-11-16 14:47:03 +01:00
Fabian Reinartz d80fd26902 Add Dockerfile and target, change flag 2015-11-12 15:03:09 +01:00
Fabian Reinartz 78c6784672 Change Makefile target order 2015-11-11 15:50:19 +01:00
Fabian Reinartz 034ab0da0c Statically compile assets into binary 2015-11-11 15:34:36 +01:00
Fabian Reinartz 97c3f1f58e Add Makefile and build script 2015-09-25 14:42:14 +02:00
Fabian Reinartz f129a30515 Remove old makefiles 2015-09-24 16:52:47 +02:00
Fabian Reinartz 4c58dc90e6 wipe everything 2015-06-30 12:34:45 +02:00
Fabian Reinartz 2e1a01b2fa switch to YAML config. 2015-06-29 18:53:47 +02:00
Julius Volz 53c131c535 Cut bugfix release 0.0.3. 2015-06-10 17:05:02 +02:00
Julius Volz d5aa4039cb Cut Alertmanager version 0.0.2. 2015-06-09 18:53:24 +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 e38bb7c1c3 Use Makefile.COMMON and add generated files.go 2015-05-05 17:11:03 +02: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
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 02b970b149 Show status and build information under /status.
Also add Makefile infrastructure for gathering status information.

Change-Id: Id7dcb9655d0b6024bf47d5dd41a7655df3635922
2013-08-14 18:56:41 +02:00