Add cloudwatch check plugin to default plugins

The cloudwatch check plugin needs django autocomplete light - eventually we can use this for other plugins too (e.g. getting the available jenkins jobs for jenkins check)
saruberoz · Sep 14, 2017 · 30451d6 · 30451d6
1 parent ae00284
commit 30451d6
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+master
+------
+
+* Add cloudwatch check plugin to dockerfile by default
+  - Can be enabled by adding "cabot_check_cloudwatch" to CABOT_PLUGINS_ENABLED
+
 Version 0.11.5
 --------------
 

diff --git a/cabot/settings.py b/cabot/settings.py
@@ -135,8 +135,6 @@
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    # Uncomment the next line to enable the admin:
-    'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'django_filters',
@@ -145,6 +143,9 @@
     'jsonify',
     'cabot.cabotapp',
     'rest_framework',
+    'dal',
+    'dal_select2',
+    'django.contrib.admin',
 )
 
 AUTH_USER_MODEL = 'auth.User'

diff --git a/cabot/templates/base_public.html b/cabot/templates/base_public.html
@@ -17,6 +17,8 @@
   <link href="{% static 'arachnys/css/base.less' %}" type="text/less" rel="stylesheet">
   <link rel="stylesheet" href="{% static 'arachnys/css/morris.css' %}" type="text/css">
   <link rel="stylesheet" href="{% static 'arachnys/css/graph.css' %}" type="text/css">
+  <link rel="stylesheet" href="{% static 'autocomplete_light/vendor/select2/dist/css/select2.css' %}" type="text/css">
+  <link rel="stylesheet" href="{% static 'autocomplete_light/select2.css' %}" type="text/css">
   {% endcompress %}
   <link href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-social/5.1.1/bootstrap-social.css" rel="stylesheet">
   <link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.css" rel="stylesheet">

diff --git a/cabot/templates/cabotapp/_base_form.html b/cabot/templates/cabotapp/_base_form.html
@@ -30,4 +30,4 @@
   </div>
   {% endif %}
 </div>
-{% endfor %}
+{% endfor %}
diff --git a/cabot/templates/cabotapp/statuscheck_form.html b/cabot/templates/cabotapp/statuscheck_form.html
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load static from staticfiles %}
 
 {% block content %}
 <div class="row">
@@ -115,5 +116,6 @@ <h2>{% if form.instance.id %}Edit check{% else %}New check{% endif %}</h2>
   $('#graph').hide()
 
 </script>
+{{ form.media }}
 {% endcompress %}
 {% endblock %}
diff --git a/requirements-plugins.txt b/requirements-plugins.txt
@@ -2,3 +2,4 @@ cabot_alert_email==1.4.3
 cabot_alert_hipchat==2.0.2
 cabot_alert_twilio==1.3.1
 cabot_alert_slack==0.8.1
+cabot_check_cloudwatch==0.1.1
diff --git a/requirements.txt b/requirements.txt
@@ -9,6 +9,7 @@ dj-database-url==0.4.2
 Django==1.11
 django-appconf==1.0.2
 django-auth-ldap==1.2.11
+django-autocomplete-light==3.2.10
 django-compressor==2.1.1
 django-filter==1.0.2
 django-jsonify==0.3.0