Commit Graph

639 Commits

Author SHA1 Message Date
Brian Brazil
aafb163275 Merge pull request #217 from RichiH/patch-2
README.md: sudo ALL the yums
2016-01-08 14:05:30 +00:00
Richard Hartmann
27bbdf333d README.md: sudo ALL the yums 2016-01-08 14:59:32 +01:00
Fabian Reinartz
0318f264e6 Merge pull request #216 from prometheus/fabxc-patch-1
Remove template section from example config
2016-01-07 16:39:40 +01:00
Fabian Reinartz
4540c75887 Remove template section from example config
Since our default templates are now compiled into the binary, this is only
relevant to advanced users and will cause trouble when running a derivative
of the example config within the repository directory.
2016-01-07 16:19:51 +01:00
Fabian Reinartz
3c15d0fc96 Merge pull request #215 from RichiH/patch-1
README.md: List dependencies
2016-01-07 15:30:43 +01:00
Richard Hartmann
fcf17c2ee4 README.md: List dependencies 2016-01-07 15:15:21 +01:00
Fabian Reinartz
3de6b062a2 Merge pull request #213 from 0x46616c6b/fix-hipchat-token
remove checking auth token in config/notifiers.go
2016-01-06 16:32:59 +01:00
louis
960acdba65 remove checking auth token in config/notifiers.go 2016-01-06 16:25:34 +01:00
Fabian Reinartz
d7791329e7 Merge pull request #208 from 0x46616c6b/hipchat-integration
Readd Hipchat Integration
2016-01-06 11:29:41 +01:00
louis
5a16e373a7 update simple config example for hipchat integration 2016-01-05 20:52:25 +01:00
louis
23db37dc98 add hipchat room notifier 2016-01-05 20:52:08 +01:00
Fabian Reinartz
b472659c6d Merge pull request #209 from prometheus/brian-brazil-patch-1
Don't send resolved to Slack by default
2016-01-05 19:44:08 +01:00
Brian Brazil
9a175d7b4f Don't send resolved to Slack by default
Slack is a general chat system, it has no notion
of resolved messages. Default it to false to avoid
spamming people as we do with all other such systems.
2016-01-05 18:01:21 +00:00
Fabian Reinartz
0c668ea4e5 Bump version to 0.1.0-beta0 2015-12-23 10:06:52 +01:00
Fabian Reinartz
9c33650920 Merge pull request #199 from prometheus/sendres
Correctly parse send_resolved config field
2015-12-23 10:02:53 +01:00
Fabian Reinartz
d21d29ee58 Correctly parse send_resolved config field
Fixes #198
2015-12-23 08:31:50 +01:00
Fabian Reinartz
e0f67dbca5 Invert navigation active/inactive color 2015-12-18 12:05:31 +01:00
Fabian Reinartz
9ab38477dd Merge branch 'dev' into master 2015-12-17 14:47:10 +01:00
Fabian Reinartz
a6b5d0552d Fix fanout initialization conflict 2015-12-17 14:25:03 +01:00
Fabian Reinartz
68aa792c0c Merge pull request #196 from prometheus/resolvconf
Move send_resolved parameter to notifier configuration
2015-12-17 13:50:11 +01:00
Fabian Reinartz
9b4479cb6b Move send_resolved parameter to notifier configuration 2015-12-17 13:43:56 +01:00
Fabian Reinartz
fbd81f325b Use double quotes for label values in UI 2015-12-17 11:35:33 +01:00
Fabian Reinartz
5997b89ea2 Improve silence form validation 2015-12-16 16:40:10 +01:00
Fabian Reinartz
001a2788da Fix non-JSON API error 2015-12-16 16:39:37 +01:00
Fabian Reinartz
e29c7ab2b4 Increase highlighted silence visibility 2015-12-16 14:52:12 +01:00
Fabian Reinartz
625fc42658 Preserve activity interval on silence edit 2015-12-16 14:42:38 +01:00
Fabian Reinartz
2f6437c89a Merge pull request #186 from prometheus/validate
Validate
2015-12-09 21:47:42 +01:00
Fabian Reinartz
f10e5cb703 Vendor new version of common/model 2015-12-09 21:45:07 +01:00
Fabian Reinartz
a2b8d35733 Validate API input 2015-12-09 18:21:06 +01:00
Fabian Reinartz
33506d7257 Disable static compilation for OSX 2015-12-09 18:20:44 +01:00
Fabian Reinartz
07300bad52 Statically compile C libraries 2015-12-09 15:05:35 +01:00
Brian Brazil
d059dca7c2 Merge pull request #185 from prometheus/tmpl1
Allow zero matching template files
2015-12-09 13:59:32 +00:00
Fabian Reinartz
76f884b328 Allow zero matching template files 2015-12-09 14:51:18 +01:00
Fabian Reinartz
f8fdb24fb2 Fix typo 2015-12-09 14:31:26 +01:00
Fabian Reinartz
de41ccfddd Switch Dockerfile to golang:1.5.2 2015-12-09 14:31:01 +01:00
Fabian Reinartz
1cde611be2 Add build dependencies for CGO 2015-12-09 12:17:53 +01:00
Fabian Reinartz
bd8a548501 Fix CGO_ENABLED flag 2015-12-09 12:01:58 +01:00
Fabian Reinartz
7e7c97dc0d Merge pull request #184 from prometheus/sqlite
Add better mail template
2015-12-09 11:59:12 +01:00
Fabian Reinartz
002c9ca793 Add better mail template 2015-12-09 11:49:22 +01:00
Fabian Reinartz
2f37761658 Merge pull request #183 from prometheus/sqlite
Switch to SQLite persistence
2015-12-08 15:28:21 +01:00
Fabian Reinartz
219fd1a293 Vendor go-sqlite3 library 2015-12-08 12:16:48 +01:00
Fabian Reinartz
a50171cf39 Remove old providers and dependencies 2015-12-08 12:16:48 +01:00
Fabian Reinartz
2e5b9e5194 Improve acceptance test logging 2015-12-08 11:55:29 +01:00
Fabian Reinartz
2a879f649f Fix email From configuration 2015-12-08 11:55:28 +01:00
Fabian Reinartz
cadae2a9e5 Implement SQLite persistence provider 2015-12-08 11:55:28 +01:00
Brian Brazil
dd43885ea6 Merge pull request #181 from prometheus/hook2
Update webhook for new alertmanager.
2015-12-07 18:13:40 +00:00
Brian Brazil
29fd91784b Update webhook for new alertmanager.
As we've a new data format the version number needs a bump.
Also make alerts with no annotations easier to handle for
users on the receiving end.
2015-12-07 16:55:37 +00:00
Fabian Reinartz
f286930c69 Fix API response codes 2015-12-07 13:41:18 +01:00
Fabian Reinartz
7ddcc42efa Fix lock 2015-12-04 14:55:42 +01:00
Fabian Reinartz
78ac6859a1 Merge pull request #176 from prometheus/silinh
Set previous inhibition/silence state
2015-12-04 10:59:11 +01:00