225 Commits

Author SHA1 Message Date
Edward Fagin
fbaa120653 Add better string escaping to upstart template just in case somebody has an exclamation point in a Django key or something. 2015-04-03 11:47:58 -04:00
David Buxton
76ab3fb66f Merge pull request #206 from xinity/patch-1
adding alert type selection and hackpad support
2015-03-30 10:18:29 +01:00
xinity
c1c78e08fc adding alert type selection to instances 2015-03-30 10:46:55 +02:00
David Buxton
2829eed8e5 Merge pull request #191 from bonniejools/master
Remove 'No URL file' error message and set default versions for plugins.
2015-03-24 15:24:26 +00:00
Jonathan Balls
14a6bcc357 Merge branch 'master' of github.com:arachnys/cabot 2015-02-25 18:25:08 +00:00
Jonathan Balls
6e5762975d removed URL file missing errors and explicitly defined plugin version numbers. 2015-02-25 18:24:20 +00:00
David Buxton
8362690722 Merge branch 'packetcollision-ubuntu1404' 2015-02-20 09:34:09 +00:00
David Buxton
cc0c4bcb92 Merge branch 'ubuntu1404' of https://github.com/packetcollision/cabot into packetcollision-ubuntu1404
Conflicts:
	.gitignore
2015-02-20 09:33:27 +00:00
David Buxton
db554a5192 Whitespace 2015-02-09 19:47:34 +00:00
David Buxton
5cceaa926a Merge pull request #182 from bonniejools/cabot-alert-plugins
Cabot alert plugins landed in dev
2015-02-09 15:48:47 +00:00
Jonathan Balls
b2625c2004 merged upstream 2015-02-09 12:49:54 +00:00
Jonathan Balls
43ae71a986 Added support for alert plugins 2015-02-09 12:34:36 +00:00
David Buxton
f794461ea7 Merge pull request #174 from 0rc/cabot-API--instances-field-is-not-exposed-to-/api/services
fixed cabot API: instances field is not exposed to /api/services/
2015-01-31 11:07:42 +00:00
Dmitry Batiyevsky
56ccb00f4d fixed cabot API: instances field is not exposed to /api/services/ 2015-01-26 10:23:18 +02:00
David Buxton
c6f604b09f Merge pull request #173 from bpaquet/master
Allow to specify email backend
2015-01-25 14:49:54 +00:00
Bertrand Paquet
2c34868266 Merge pull request #1 from bpaquet/email_backend_config
Allow to specify email backend
2015-01-23 22:02:30 +01:00
Bertrand Paquet
bcf5058a5c Allow to specify email backend 2015-01-23 22:01:30 +01:00
Daniel Nelson
ef09cb4f84 Merge branch 'master' into ubuntu1404 2015-01-22 01:38:03 -08:00
David Buxton
b3ca47808c Merge pull request #162 from lebedevdsl/#161-fix
#161 updated pytz
2015-01-22 08:58:27 +00:00
David Buxton
42b185b8b7 Merge pull request #170 from packetcollision/fix-tests
Fix tests failing because of http vs https
2015-01-22 08:57:57 +00:00
Daniel Nelson
6cef0793a4 Fix tests failing because of http vs https 2015-01-21 23:41:16 -08:00
Daniel Nelson
569c71d0b1 Make Cabot work on 14.04 as well as 12.04
Closes upstream #122
2015-01-21 19:35:55 -08:00
David Buxton
b84c524753 Update test expectations 2015-01-07 15:30:24 +00:00
David Buxton
302a5ed69d Merge pull request #165 from Labgoo/master
Alert sequence fails when one of the alerts fails
2014-12-31 15:27:58 +00:00
romankor
dee44198fc removing @property from last_result 2014-12-30 15:29:44 -08:00
romankor
430f466473 Merge remote-tracking branch 'upstream/master' 2014-12-29 11:10:11 -08:00
Roman Kournjaev
06a849be09 fixing sending alert when one fails all fail 2014-12-26 17:35:46 -08:00
Dmitry Lebedev
51f1ecb23e updated pytz 2014-12-24 01:37:06 +03:00
David Buxton
2957bec84b Merge pull request #158 from bonniejools/master
Added badge to readme which links to docs
2014-12-07 17:06:42 -06:00
Jonathan Balls
aca9ddad43 Added badge to readme which links to docs 2014-12-05 13:29:12 +00:00
David Buxton
b0056c644d Merge pull request #152 from bonniejools/jenkins_job_number
Updated models to show jenkins job number in StatusCheckResult
2014-12-01 11:32:59 -06:00
Matthew Brown
3040cffde5 Updated models to show jenkins job number in StatusCheckResult. Job number and link is also reported in hipchat template.
Tests were not merged because alert testing has already been implemented.
Conflicts:
	cabot/cabotapp/tests/tests_basic.py
2014-12-01 17:23:10 +00:00
David Buxton
d33c57af01 Merge pull request #150 from bonniejools/travis_integration
Travis integration
2014-11-30 13:56:14 -05:00
Jonathan Balls
096e569f09 Added a badge to the README to show whether the build is passing or not 2014-11-28 22:58:11 +00:00
Jonathan Balls
290b6d1bd7 Created a .travis.yml file which will allow Cabot to be built and tested on travis-ci 2014-11-28 22:53:23 +00:00
David Buxton
e689938df1 Merge pull request #148 from bonniejools/master
Update tests and stop inactive users being alerted
2014-11-28 06:49:14 -05:00
Jonathan Balls
ee1952c812 Updated and fixed unit tests 2014-11-28 11:00:17 +00:00
Barak Cohen
1029ebf5c5 Merge pull request #1 from Labgoo/feature/Add_last_result_content_to_email_alert
add last result content to the email body
2014-11-27 14:31:07 +02:00
Sagie Shamay
ddc461c3af define check.last_result as property
add last result content to the email body
2014-11-26 11:37:06 +02:00
Jonathan Balls
9d88e5d846 Inactive users are no longer notified 2014-11-18 19:40:03 +00:00
David Buxton
3ed5f36bca Merge pull request #128 from andrewbaxter/serviceapi_url
Add URL to service API
2014-10-06 16:27:43 +01:00
Rendaw
a446e3d857 Add url to service api. 2014-09-28 20:34:34 +09:00
David Buxton
52fa92636c Markdown dependency syntax 2014-09-19 15:11:49 +01:00
David Buxton
940b83303b Merge branch 'rest_api' of github.com:andrewbaxter/cabot into andrewbaxter-rest_api 2014-09-19 14:20:18 +01:00
Rendaw
b59b453f0b API documentation clarification, fixes. 2014-09-19 22:10:50 +09:00
Rendaw
bb70ff59f8 Simple API documentation, filtering tests. 2014-09-19 21:59:22 +09:00
Rendaw
4b7452def6 Add rest api based on django-rest-framework
Supports standard rest operations on instance, service, and all
status check models.  Creation is disabled for the StatusCheck
parent class - status checks must be created through a derived
class.

State (non-configuration) fields are omitted since they are
difficult to serialize and would be redundant (Cabot itself
is a monitoring framework).
2014-09-17 13:39:10 +09:00
David Buxton
0f4b35f771 Use id not time_complete 2014-08-13 16:48:49 +01:00
David Buxton
c9ad3ba874 Make redis work out of the box 2014-08-07 11:49:39 +01:00
Mario de Frutos
690c8fd916 Better explanation for setting 2014-08-07 09:56:22 +02:00