Commit Graph

336 Commits

Author SHA1 Message Date
Jean-Frédéric 16828aed7d Merge pull request #385 from m-brown/fix_api_test_fragility
fixed API test fragility
2016-10-06 15:28:47 +01:00
Matthew Brown fc194fc356 fixed API test fragility
The base test class `LocalTestCase` will setup base objects for all tests to use but because this is called for each test the IDs of the objects will change between tests. One of the child test classes `TestAPI` has a some static data used to check the response of API calls, however these IDs were hard coded meaning that if the order of the tests changed for any reason the test would fail. To fix this the IDs of the static data have been replaced with the object ID meaning they will always be correct.
2016-10-06 15:19:37 +01:00
Matthew Brown a6caf63431 Merge pull request #333 from imnotjames/configurable-base-url
Configurable URL prefix
2016-10-05 16:34:31 +01:00
Charles McLaughlin 02f52bc284 Automatically create UserProfiles
Copying changes from pull-request #329

Fixes issues mentionned in #326
2016-10-05 12:17:43 +01:00
Charles McLaughlin 6caecfac2b Adding form validation for runbook_link 2016-10-05 12:14:03 +01:00
Charles McLaughlin 93bfc86654 Allow non-embed links for recovery instructions
Adding a new field for linkable recovery instructions, i.e. a link to a
runbook on the company's wiki.

A few notes/things to point out in this change:

* I expanded form field widths on the service and instance pages...
  I had to add a new field and it was really small by default, so I made
  all the widths match because I think it looks better.

* The InstanceForm class had hackpad_id defined as a field, but not as a
  widget, so it wasn't visiable.  I think that was a mistake, so I
  cleaned it up. For most users I don't think it make sense to have
  documentation for particular instances, so removing it seems like the
  right thing to do.

Closes #273
2016-10-05 12:11:59 +01:00
Jérôme Renard 4d7f9b07ef Miscaellenous fixes with dependencies (#383)
* Force amqp lib under 2.0. Fixes #378
* Fix SSL InsecurePlatform errors with Requests
2016-09-29 19:01:46 +01:00
David Buxton c0ad65f095 Merge pull request #379 from m-brown/fix_last_result_lookup_slowness
added index to allow quicker lookup of `last_result`
2016-09-27 06:43:46 -07:00
Matthew Brown 2ec38c9c1c added index to allow quicker lookup of `last_result`
We experienced problems on certain StatusChecks that had a moderate number of StatusCheckResults that had problems looking up the latest check when updating. This lead to high load on the database and the app not being able to update checks correctly. Having an index on the exact lookup of `last_result` removes this problem.
2016-09-27 12:49:49 +01:00
Jean-Fred Berthelot ebb3d22eba Merge pull-request #314 from branch 'docker-compose'
Squash-merged.
2016-09-20 10:38:14 +01:00
Jean-Fred Berthelot 2acbf0291c Add build script running the necessary Django commands
Also useful to be run inside Docker.
2016-09-20 10:36:00 +01:00
David Buxton 27f65a2eba Docker-compose setup
- Externalise requirements to pip format
- Add entry-point script
- Update Travis-CI configuration
- Fix test data
2016-09-20 10:33:22 +01:00
David Buxton b72864ea82 Pad check time 2016-09-02 09:49:11 +01:00
David Buxton f034205fb7 Update PR to take into account potential issues with check scheduling 2016-08-24 17:25:19 +02:00
David Buxton 317e1e3300 Remove inaccurate documentation 2016-08-24 17:12:53 +02:00
David Buxton 27a353aa0f Actually request last x minutes from graphite
Plagiarises #127
2016-07-20 12:52:51 +01:00
David Buxton 57bbcd32b2 Use graphite timestamps to select datapoints used in checking
* Potentially addresses #352
* Potentially addresses #129
2016-07-20 12:40:27 +01:00
David Buxton 2580e71973 Merge pull request #365 from arachnys/test-duty-rota
Add test for ical parsing
2016-07-20 11:55:04 +01:00
David Buxton e69ad96712 Add test for ical parsing
Addresses #364
2016-07-20 11:48:16 +01:00
David Buxton 5819473c31 Merge branch 'mattvonrocketstein-master' 2016-07-17 17:09:30 +01:00
David Buxton 474f29295e Merge branch 'master' of https://github.com/mattvonrocketstein/cabot into mattvonrocketstein-master 2016-07-17 17:09:15 +01:00
David Buxton 5f5155d5db Merge pull request #361 from knowsis/default_from_email
Set DEFAULT_FROM_EMAIL
2016-07-15 16:57:25 +01:00
Mark Unsworth 1c28b15921 keep settings default if we don't set the CABOT_FROM_EMAIL address 2016-07-15 14:57:29 +01:00
Mark Unsworth b7d9c854e0 set default_from_email address - for non error emails sent by Django such as password reset. Fixes #360. 2016-07-15 13:48:23 +01:00
Mark Unsworth 144db27a99 set default_from_email address - for non error emails sent by Django such as password reset. Fixes #360. 2016-07-15 13:40:43 +01:00
Prashant Khanduri 718120c056 Add a delay in updateGraphiteData before making the backend call (#354) 2016-06-15 11:59:42 +01:00
Prashant Khanduri dbe45f9b20 No backend call in case there is no change (#355) 2016-06-15 11:59:24 +01:00
mvr ad9f7394a2 a few improvements for deployment code in fabfile 2016-06-10 23:07:20 +00:00
cmclaughlin caa4bb5c3c Expose the User API if enabled in the settings file
Enable the 'users' and 'user-profiles' API endpoints
if settings.EXPOSE_USER_API is set in the config
2016-05-18 14:36:54 +01:00
Mohit Sethi d41d748bd8 Require YAML in Vagrantfile (#344)
On some configurations, `vagrant up` was failing with
  NameError: uninitialized constant YAML
2016-05-16 14:36:51 +01:00
Mark Unsworth 3270540427 General cleanup (#346)
* updated to latest distribute
* removed django-mptt dependency as it's not used anywhere
* PEP8 cleanup. Removed unused imports, reformatted files
2016-05-14 00:06:40 +01:00
Martin Sander 1d29d7134f Bump celery version (#335)
Bump celery version from 3.1.7 to 3.1.23 to fix memory leak issue
(see https://github.com/celery/celery/issues/2927)

Also bump kombu (as celery depends on it), amqp and billiard
without which cabot/celery would not start.
2016-04-18 12:27:38 +01:00
James Ward 13c6718dec add tests for urlprefix
also adds a helper to override the URL_PREFIX setting
and clear caches to test it
2016-04-18 03:13:34 -04:00
James Ward 526c7f97e9 add a URL_PREFIX environment variable
this adds the ability to add a prefix to all generated URLs
so placing cabot under a subdirectory of a web server is possible,
such as with a reverse proxy.

resolves #321
2016-04-18 02:30:55 -04:00
David Buxton d8a54fd6f2 Merge pull request #332 from imnotjames/safe-raw-data
safely handle assigning "json" raw_data from results
2016-03-31 18:14:05 +01:00
James Ward 39f0cfe1c1 correctly set the login URL using reverse_lazy
this way the redirect to LOGIN_URL doesn't go to a page that isn't
defined in the urls
2016-03-31 02:39:55 -04:00
James Ward 368c32ab2e remove static cabot URLs from templates
any of the URLs linking internally have been updated to use the url helper
2016-03-31 02:39:53 -04:00
James Ward e52edca5c0 move urls for password reset to top so we override
this way the password resets don't replace our custom login, logout, or password-reset
named routes.
2016-03-31 02:39:38 -04:00
James Ward 7b8c1dfee8 safely handle assigning "json" raw_data from results
the way that raw data was handled before meant that injection could be possible
for XSS or just general page breakage when assigning the raw data from the result
onto the window DATA variable.

this change makes it so we parse the value as an escapes JS string value, and on
failure assigns an empty object

this does mean that instead of the original behavior of failing with a JS error
on non-valid JSON data we instead create an empty object into window.DATA

fixes #231
2016-03-31 02:38:19 -04:00
David Buxton fa61497480 Merge pull request #328 from arachnys/revert-323-master
Revert "Automatically create UserProfiles"
2016-03-29 13:10:59 +01:00
David Buxton 92b161c33e Revert "Automatically create UserProfiles" 2016-03-29 13:06:47 +01:00
David Buxton 61dc6790bf Merge pull request #327 from cmclaughlin/master
Sort users_to_notify
2016-03-29 13:05:45 +01:00
Charles McLaughlin 1e9c75b987 Sort users_to_notify
Sorting "Users to notify" on the service/instance forms is very useful
to me... I think everyone will find it easier on the eyes.
2016-03-28 14:25:09 -07:00
David Buxton 7344efa981 Merge pull request #323 from cmclaughlin/master
Automatically create UserProfiles
2016-03-24 14:04:14 +00:00
Charles McLaughlin 1825d0a260 Automatically create UserProfiles
I'm trying to use the cabot-alert-pagerduty plugin and found that it
expects all users to have profiles. I think that's a pretty reasonable
assumption, so here's a change that automatically creates profiles
when new users are created using the post_save signal.
2016-03-23 22:12:20 -07:00
David Buxton 8a4b3710d5 Merge pull request #318 from arachnys/update-requests
Bump requests (fixes #317)
2016-02-10 08:27:50 -05:00
David Buxton 28a92e0a10 Bump requests (fixes #317) 2016-02-10 08:21:36 -05:00
Jean-Frédéric 3a74f1cf1f Merge pull request #279 from movermeyer/issue227
Adds the 'EMAIL_USE_TLS' option to the settings file.
2016-02-04 14:08:45 +01:00
David Buxton 8e2d3bf6f4 Merge pull request #292 from xinity/develop
hacky way to have pagination in services dashboard
2016-01-29 09:51:52 +00:00
David Buxton 2a6752e72e Merge pull request #306 from trdarr/hide-http-password
Hide basic auth password for HTTP status checks
2016-01-29 09:48:59 +00:00