374 Commits

Author SHA1 Message Date
dbuxton
f8604ddaa6 Fix task path for cleanup 2014-08-05 14:56:33 +01:00
David Buxton
474acbe298 Default args 2014-08-05 09:31:41 +01:00
David Buxton
235a094214 Fix some template refs 2014-08-05 09:19:41 +01:00
David Buxton
2e53658469 Update tests 2014-08-05 08:40:32 +01:00
David Buxton
a318477d28 Some tweaks 2014-08-05 01:10:40 +01:00
David Buxton
81c107c5ec Use related manager properly 2014-08-05 00:51:16 +01:00
David Buxton
c505d2e8d1 Remove manual transaction management 2014-08-05 00:32:34 +01:00
David Buxton
427f97bbce Remove transaction middleware 2014-08-05 00:09:06 +01:00
David Buxton
78c758d017 Merge branch 'django-1.6' of github.com:lincolnloop/cabot into lincolnloop-django-1.6 2014-08-04 23:52:36 +01:00
Peter Baumgartner
b6d29b76f9 Fixes test discovery 2014-08-04 08:36:10 -06:00
Peter Baumgartner
462bd184f9 Fixes another template for 1.6 2014-08-04 08:32:15 -06:00
Peter Baumgartner
41e9e0e110 Make ALLOWED_HOSTS more permissive 2014-08-04 08:21:21 -06:00
Peter Baumgartner
9282ffeb8e Merge branch 'master' into django-1.6
Conflicts:
	cabot/cabotapp/models.py
	cabot/templates/base.html
	cabot/templates/cabotapp/_statuscheck_list.html
	cabot/templates/cabotapp/service_list.html
	cabot/templates/cabotapp/statuscheck_detail.html
	setup.py
2014-08-04 08:20:36 -06:00
David Buxton
4e821b4274 Correct icon for log out 2014-08-03 12:06:23 +01:00
David Buxton
8c941ca31d Some path fixes 2014-08-03 11:40:48 +01:00
David Buxton
d9ff9b867a Move new files 2014-08-03 11:34:01 +01:00
David Buxton
3872565144 Merge branch 'python-package' of github.com:lincolnloop/cabot into lincolnloop-python-package
Conflicts:
	cabot/cabotapp/tests/basic.py
	cabot/cabotapp/views.py
	cabot/urls.py
	requirements.txt
2014-08-03 11:27:30 +01:00
David Buxton
cab908b24f Merge branch 'jmontineri-instances' 2014-08-02 01:14:13 +01:00
David Buxton
4227d7865f Don't use gevent anymore 2014-08-02 01:13:55 +01:00
David Buxton
49d6c81865 Remove status checks when Instance deleted 2014-08-02 00:59:11 +01:00
David Buxton
8a404c9755 Fix subscriptions order 2014-08-02 00:54:00 +01:00
David Buxton
fb761f5603 Bugfixes 2014-08-02 00:51:39 +01:00
Peter Baumgartner
ad859ac21b Upgrades for 1.6 compatibility 2014-08-01 12:51:07 -06:00
Peter Baumgartner
c6394524d8 Revert "Puts manage.py on $PATH and reads .env by default"
This reverts commit 6d2d369d2d732e146318cdd2510b55d949e69541.

Conflicts:
	setup.py
2014-08-01 12:44:10 -06:00
Peter Baumgartner
473435c34e Merge branch 'python-package' into django-1.6 2014-08-01 12:41:19 -06:00
Jonathan Montineri
4e3968fd96 Added Instance duplication, small template cleanups 2014-08-01 18:03:06 +01:00
Jonathan Montineri
06adb3bc3f Fixed overall status not displaying on instance lists 2014-08-01 18:03:06 +01:00
Jonathan Montineri
e604cf673f Removed instance "Alerts Disabled" icon, cleaned up templates 2014-08-01 18:03:06 +01:00
Jonathan Montineri
b1d730103e Removed Instance alerts (caused errors) 2014-08-01 18:03:05 +01:00
Jonathan Montineri
09effe2aab Added StatusCheck duplication, minor bugfixes 2014-08-01 18:03:05 +01:00
Jonathan Montineri
f37e980248 Removed Hackpad from instances, fixed alerts for instances (needs testing) 2014-08-01 18:03:05 +01:00
vagrant
6f7a9aaa5c Minor bugfix 2014-08-01 18:03:05 +01:00
Jonathan Montineri
558f18c04e Instances now get their Status updated correctly, ICMPChecks can't have more than one Instance attached anymore (used to error instead). Minor cleanups. 2014-08-01 18:03:05 +01:00
Jonathan Montineri
6cb4bd4e97 Fixed "Edit check" not working for ping checks 2014-08-01 18:03:05 +01:00
Peter Baumgartner
8cf51d5bf6 Fixes static paths 2014-08-01 09:36:46 -06:00
Peter Baumgartner
9cbb4a02a6 Install via setup.py 2014-08-01 09:36:20 -06:00
Peter Baumgartner
68741a7775 Merge branch 'master' into python-package
Conflicts:
	requirements.txt
2014-07-31 21:33:31 -06:00
David Buxton
47c60cf407 Create pingcheck in the view 2014-07-31 14:41:25 +01:00
David Buxton
2c690e9373 Merge branch 'wip' of github.com:jmontineri/cabot into jmontineri-instances
Conflicts:
	app/cabotapp/migrations/0004_auto.py
	app/cabotapp/views.py
2014-07-31 14:00:42 +01:00
David Buxton
949bf37e31 Redo migration 2014-07-31 13:24:13 +01:00
David Buxton
45c2e13653 Merge branch 'instances' of github.com:jmontineri/cabot into jmontineri-instances
Conflicts:
	app/cabotapp/views.py
2014-07-31 13:16:08 +01:00
Jonathan Montineri
1785d02a6c WIP 2014-07-31 12:30:46 +01:00
Jonathan Montineri
f5928ba4d5 Cleaning up 2014-07-31 12:04:42 +01:00
Jonathan Montineri
b0ab9268c5 Creating an instance now adds a Ping Check to it. 2014-07-30 14:05:57 +01:00
David Buxton
1ce3325ee2 Don't use recent results 2014-07-30 14:02:28 +01:00
David Buxton
b6aee8b7a2 Add index to time 2014-07-30 14:02:28 +01:00
David Buxton
1f33d0ebc9 Limit size of raw data 2014-07-30 14:02:28 +01:00
vagrant
639c5e2fc2 Fixed a stupid indentation mistake 2014-07-30 14:02:28 +01:00
vagrant
97c7a53ba9 Replaced tabs with spaces 2014-07-30 14:02:28 +01:00
vagrant
9487d73b51 Fixed adding a check without linking it to a service displayying an error 2014-07-30 14:02:28 +01:00