Merge pull request #560 from arachnys/add-autocomplete

Add cloudwatch check plugin to default plugins

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
 --------------
 

cabot/settings.py

@@ -135,8 +135,6 @@ INSTALLED_APPS = (
     '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 @@ INSTALLED_APPS = (
     'jsonify',
     'cabot.cabotapp',
     'rest_framework',
+    'dal',
+    'dal_select2',
+    'django.contrib.admin',
 )
 
 AUTH_USER_MODEL = 'auth.User'

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">

cabot/templates/cabotapp/_statuscheck_list.html

@@ -18,9 +18,10 @@
       {% if checks_type == "All" or checks_type == "ICMP" %}
       &nbsp;<a href="{% url "create-icmp-check" %}?instance={{ instance.id }}&service={{ service.id }}" class="" title="Add new ICMP check"><i class="glyphicon glyphicon-plus"></i><i class="glyphicon glyphicon-transfer"></i></a>
       {% endif %}
-      <!-- Custom check plugins buttons-->
       {% for checktype in custom_check_types %}
+        {% if checks_type == "All" or checks_type == checktype.check_name %}
         &nbsp;<a href="{% url checktype.creation_url %}?instance={{ instance.id }}&service={{ service.id }}" class="" title="Add new {{checktype.check_name|capfirst}} check"><i class="glyphicon glyphicon-plus"></i><i class="glyphicon {{checktype.icon_class|default:"glyphicon-ok"}}"></i></a>
+        {% endif %}
       {% endfor %}
       </h3>
     </div>

cabot/templates/cabotapp/service_detail.html

@@ -105,6 +105,12 @@
 
 <hr>
 
+{% for check_class in custom_check_types %}
+<hr>
+{% include 'cabotapp/_statuscheck_list.html' with checks=check_class.objects.all service=service checks_type=check_class.check_name %}
+{% endfor %}
+<hr>
+
 <div class="row">
   <div class="col-xs-12">
     <div class="col-xs-1"><h3><i class="fa fa-table"></i></h3></div>

cabot/templates/cabotapp/statuscheck_form.html

@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load static from staticfiles %}
 
 {% block content %}
 <div class="row">
@@ -116,4 +117,5 @@ removeMorris = () ->
 
 </script>
 {% endcompress %}
+{{ form.media }}
 {% endblock %}

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.2

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