flapjack 1.1.0 → 1.2.0rc1

data/lib/flapjack/gateways/jsonapi/entity_methods.rb

@@ -66,10 +66,16 @@ module Flapjack
               raise Flapjack::Gateways::JSONAPI::EntitiesNotFound.new(requested_entities)
             end
 
-            linked_contact_ids = entities.empty? ? [] : Flapjack::Data::Entity.contact_ids_for(entities.map(&:id), :redis => redis)
+            entity_ids = entities.map(&:id)
+            linked_contact_ids = entities.empty? ? [] :
+              Flapjack::Data::Entity.contact_ids_for(entity_ids, :redis => redis)
+            linked_check_ids   = entities.empty? ? [] :
+              Flapjack::Data::Entity.check_ids_for(entity_ids, :redis => redis)
 
             entities_json = entities.collect {|entity|
-              entity.to_jsonapi(:contact_ids => linked_contact_ids[entity.id])
+              entity_id = entity.id
+              entity.to_jsonapi(:contact_ids => linked_contact_ids[entity_id],
+                                :check_ids   => linked_check_ids[entity_id] )
             }.join(",")
 
             '{"entities":[' + entities_json + ']}'
@@ -86,7 +92,7 @@ module Flapjack
 
             response.headers['Location'] = "#{request.base_url}/entities/#{entity_ids.join(',')}"
             status 201
-            entity_ids.to_json
+            Flapjack.dump_json(entity_ids)
           end
 
           app.patch '/entities/:id' do
@@ -96,19 +102,31 @@ module Flapjack
               apply_json_patch('entities') do |op, property, linked, value|
                 case op
                 when 'replace'
-                  if ['name'].include?(property)
-                    # # Name change not supported in Flapjack v1.x, too many changes required
-                    # entity.update(property => value)
+                  if 'name'.eql?(property)
+                    name = entity.name
+                    if name != value
+                      existing = Flapjack::Data::Entity.find_by_name(value, :redis => redis)
+                      Flapjack::Data::Entity.send(existing.nil? ? :rename : :merge,
+                        name, value, :redis => redis)
+                    end
                   end
                 when 'add'
-                  if 'contacts'.eql?(linked)
+                  case linked
+                  when 'contacts'
                     contact = Flapjack::Data::Contact.find_by_id(value, :redis => redis)
                     contact.add_entity(entity) unless contact.nil?
+                  when 'tags'
+                    value.respond_to?(:each) ? entity.add_tags(*value) :
+                                               entity.add_tags(value)
                   end
                 when 'remove'
-                  if 'contacts'.eql?(linked)
+                  case linked
+                  when 'contacts'
                     contact = Flapjack::Data::Contact.find_by_id(value, :redis => redis)
                     contact.remove_entity(entity) unless contact.nil?
+                  when 'tags'
+                    value.respond_to?(:each) ? entity.delete_tags(*value) :
+                                               entity.delete_tags(value)
                   end
                 end
               end

data/lib/flapjack/gateways/jsonapi/medium_methods.rb

@@ -42,8 +42,8 @@ module Flapjack
 
               contact_id = $1
               media_type = $2
-              halt err(422, "Could not get contact_id from media_id") if contact_id.nil?
-              halt err(422, "Could not get media type from media_id") if media_type.nil?
+              halt err(422, "Could not get contact_id from media_id '#{m_id}'") if contact_id.nil?
+              halt err(422, "Could not get media type from media_id '#{m_id}'") if media_type.nil?
 
               contact_cache[contact_id] ||= find_contact(contact_id)
 
@@ -65,15 +65,17 @@ module Flapjack
               halt err(422, "No valid media were submitted")
             end
 
-            unless media_data.all? {|m| m['id'].nil? }
-              halt err(422, "Media creation cannot include IDs")
+            media_id_re = /^#{params[:contact_id]}_(?:#{Flapjack::Data::Contact::ALL_MEDIA.join('|')}$)/
+
+            unless media_data.all? {|m| m['id'].nil? || media_id_re === m['id'] }
+              halt err(422, "Media creation cannot include non-conformant IDs")
             end
 
             semaphore = obtain_semaphore(SEMAPHORE_CONTACT_MASS_UPDATE)
             contact = Flapjack::Data::Contact.find_by_id(params[:contact_id], :redis => redis)
             if contact.nil?
               semaphore.release
-              halt err(422, "Contact id:'#{params[:contact_id]}' could not be loaded")
+              halt err(422, "Contact id: '#{params[:contact_id]}' could not be loaded")
             end
 
             media_data.each do |medium_data|
@@ -90,7 +92,7 @@ module Flapjack
 
             status 201
             response.headers['Location'] = "#{base_url}/media/#{media_ids.join(',')}"
-            media_ids.to_json
+            Flapjack.dump_json(media_ids)
           end
 
           # get one or more media records; media ids are, for Flapjack
@@ -115,19 +117,21 @@ module Flapjack
               media_list_cache[contact.id] ||= contact.media_list
               if media_list_cache[contact.id].include?(media_type)
                 medium_id = "#{contact.id}_#{media_type}"
+                int = contact.media_intervals[media_type]
+                rut = contact.media_rollup_thresholds[media_type]
                 memo <<
                   {:id               => medium_id,
                    :type             => media_type,
                    :address          => contact.media[media_type],
-                   :interval         => contact.media_intervals[media_type],
-                   :rollup_threshold => contact.media_rollup_thresholds[media_type],
+                   :interval         => int.nil? ? nil : int.to_i,
+                   :rollup_threshold => rut.nil? ? nil : rut.to_i,
                    :links            => {:contacts => [contact.id]}}
               end
 
               memo
             end
 
-            '{"media":' + media_data.to_json + '}'
+            '{"media":' + Flapjack.dump_json(media_data) + '}'
           end
 
           # update one or more media records; media ids are, for Flapjack

data/lib/flapjack/gateways/jsonapi/metrics_methods.rb

@@ -50,7 +50,7 @@ module Flapjack
             {
               'all'     => Flapjack::Data::Entity.all(:redis => redis).length,
               'enabled' => Flapjack::Data::Entity.all(:enabled => true, :redis => redis).length,
-              'failing' => Flapjack::Data::Entity.find_all_with_failing_checks(:redis => redis).length,
+              'failing' => Flapjack::Data::Entity.find_all_names_with_failing_checks(:redis => redis).length,
             }
           end
 
@@ -88,7 +88,7 @@ module Flapjack
               metrics[key] = self.send(key.to_sym)
             end
 
-            return metrics.to_json
+            Flapjack.dump_json(metrics)
           end
         end
 

data/lib/flapjack/gateways/jsonapi/notification_rule_methods.rb

@@ -67,7 +67,7 @@ module Flapjack
 
             unless rule_ids.empty?
               response.headers['Location'] = "#{base_url}/notification_rules/#{rule_ids.join(',')}"
-              rule_ids.to_json
+              Flapjack.dump_json(rule_ids)
             end
           end
 

data/lib/flapjack/gateways/jsonapi/pagerduty_credential_methods.rb

@@ -46,7 +46,7 @@ module Flapjack
             contact = Flapjack::Data::Contact.find_by_id(params[:contact_id], :redis => redis)
             if contact.nil?
               semaphore.release
-              halt err(422, "Contact id '#{params[:contact_id]}' could not be loaded")
+              halt err(422, "Contact id: '#{params[:contact_id]}' could not be loaded")
             end
 
             pagerduty_credential_data = fields.inject({}) do |memo, field|
@@ -61,7 +61,7 @@ module Flapjack
 
             status 201
             response.headers['Location'] = "#{base_url}/pagerduty_credentials/#{contact.id}"
-            [contact.id].to_json
+            Flapjack.dump_json([contact.id])
           end
 
           app.get %r{^/pagerduty_credentials(?:/)?([^/]+)?$} do
@@ -72,14 +72,18 @@ module Flapjack
             end
 
             pagerduty_credentials_data = contacts.inject([]) do |memo, contact|
-              pdc = contact.pagerduty_credentials.clone
+              pdc = contact.pagerduty_credentials
+
+              unless pdc.nil?
+                pd_data = pdc.clone
+                pd_data['links'] = {'contacts' => [contact.id]}
+                memo << pd_data
+              end
 
-              pdc['links'] = {'contacts' => [contact.id]}
-              memo << pdc
               memo
             end
 
-            '{"pagerduty_credentials":' + pagerduty_credentials_data.to_json + '}'
+            '{"pagerduty_credentials":' + Flapjack.dump_json(pagerduty_credentials_data) + '}'
           end
 
           # update one or more sets of pagerduty credentials
@@ -88,21 +92,22 @@ module Flapjack
               apply_json_patch('pagerduty_credentials') do |op, property, linked, value|
                 if 'replace'.eql?(op)
 
-                  pdc = contact.pagerduty_credentials.clone
+                  pdc = contact.pagerduty_credentials
+                  pd_data = pdc.nil? ? {} : pdc.clone
 
                   case property
                   when 'service_key'
-                    pdc['service_key'] = value
-                    contact.set_pagerduty_credentials(pdc)
+                    pd_data['service_key'] = value
+                    contact.set_pagerduty_credentials(pd_data)
                   when 'subdomain'
-                    pdc['subdomain'] = value
-                    contact.set_pagerduty_credentials(pdc)
+                    pd_data['subdomain'] = value
+                    contact.set_pagerduty_credentials(pd_data)
                   when 'username'
-                    pdc['username'] = value
-                    contact.set_pagerduty_credentials(pdc)
+                    pd_data['username'] = value
+                    contact.set_pagerduty_credentials(pd_data)
                   when 'password'
-                    pdc['password'] = value
-                    contact.set_pagerduty_credentials(pdc)
+                    pd_data['password'] = value
+                    contact.set_pagerduty_credentials(pd_data)
                   end
                 end
               end
@@ -112,9 +117,11 @@ module Flapjack
           end
 
           app.delete '/pagerduty_credentials/:contact_id' do
-            params[:contact_id].split(',').uniq.collect {|c_id| find_contact(c_id) }.each do |contact|
+            params[:contact_id].split(',').uniq.collect {|c_id|
+              find_contact(c_id)
+            }.each {|contact|
               contact.delete_pagerduty_credentials
-            end
+            }
             status 204
           end
 

data/lib/flapjack/gateways/jsonapi/rack/json_params_parser.rb

@@ -13,7 +13,7 @@ module Flapjack
               env['rack.request.form_input'] = env['rack.input']
               json_data = env['rack.input'].read
               env['rack.input'].rewind
-              data = json_data.empty? ? {} : Oj.load(json_data)
+              data = json_data.empty? ? {} : Flapjack.load_json(json_data)
               env['rack.request.form_hash'] = data.empty? ? {} :
                 (('application/json-patch+json'.eql?(t)) ? {'ops' => data} : data)
             end

data/lib/flapjack/gateways/jsonapi/report_methods.rb

@@ -27,7 +27,7 @@ module Flapjack
             end
 
             checks = if event_ids.nil?
-              Flapjack::Data::EntityCheck.find_current(:redis => redis).collect {|check_name|
+              Flapjack::Data::EntityCheck.find_current_names(:redis => redis).collect {|check_name|
                 find_entity_check_by_name(*check_name.split(':', 2))
               }
             elsif !event_ids.empty?
@@ -121,9 +121,9 @@ module Flapjack
               }
             end
 
-            "{\"#{action}_reports\":" + report_data.to_json + "," +
-             "\"linked\":{\"entities\":" + entity_data.to_json + "," +
-                         "\"checks\":" + check_data.to_json + "}}"
+            "{\"#{action}_reports\":" + Flapjack.dump_json(report_data) + "," +
+             "\"linked\":{\"entities\":" + Flapjack.dump_json(entity_data) + "," +
+                         "\"checks\":" + Flapjack.dump_json(check_data) + "}}"
           end
 
         end

data/lib/flapjack/gateways/jsonapi.rb

@@ -89,6 +89,13 @@ module Flapjack
         end
       end
 
+      class EntityChecksNotFound < RuntimeError
+        attr_reader :entity_checks
+        def initialize(entity_checks)
+          @entity_checks = entity_checks
+        end
+      end
+
       class ResourceLocked < RuntimeError
         attr_reader :resource
         def initialize(resource)
@@ -100,37 +107,45 @@ module Flapjack
 
       set :protection, :except => :path_traversal
 
-      rescue_error = Proc.new {|status, exception, request_info, *msg|
-        if !msg || msg.empty?
-          trace = exception.backtrace.join("\n")
-          msg = "#{exception.class} - #{exception.message}"
-          msg_str = "#{msg}\n#{trace}"
-        else
-          msg_str = msg.join(", ")
-        end
-        case
-        when status < 500
-          @logger.warn "Error: #{msg_str}"
-        else
-          @logger.error "Error: #{msg_str}"
-        end
+      @rescue_exception = Proc.new {|env, e|
 
-        response_body = {:errors => msg}.to_json
+        rescue_error = Proc.new {|status, exception, request_info, *msg|
+          if !msg || msg.empty?
+            trace = exception.backtrace.join("\n")
+            msg = "#{exception.class} - #{exception.message}"
+            msg_str = "#{msg}\n#{trace}"
+          else
+            msg_str = msg.join(", ")
+          end
+          case
+          when status < 500
+            @logger.warn "Error: #{msg_str}"
+          else
+            @logger.error "Error: #{msg_str}"
+          end
 
-        query_string = (request_info[:query_string].respond_to?(:length) &&
-                        request_info[:query_string].length > 0) ? "?#{request_info[:query_string]}" : ""
-        if @logger.debug?
-          @logger.debug("Returning #{status} for #{request_info[:request_method]} " +
-            "#{request_info[:path_info]}#{query_string}, body: #{response_body}")
-        elsif @logger.info?
-          @logger.info("Returning #{status} for #{request_info[:request_method]} " +
-            "#{request_info[:path_info]}#{query_string}")
-        end
+          response_body = Flapjack.dump_json(:errors => msg)
 
-        [status, {}, response_body]
-      }
+          query_string = (request_info[:query_string].respond_to?(:length) &&
+                          request_info[:query_string].length > 0) ? "?#{request_info[:query_string]}" : ""
+          if @logger.debug?
+            @logger.debug("Returning #{status} for #{request_info[:request_method]} " +
+              "#{request_info[:path_info]}#{query_string}, body: #{response_body}")
+          elsif @logger.info?
+            @logger.info("Returning #{status} for #{request_info[:request_method]} " +
+              "#{request_info[:path_info]}#{query_string}")
+          end
+
+          headers = if 'DELETE'.eql?(request_info[:request_method])
+            # not set by default for delete, but the error structure is JSON
+            {'Content-Type' => JSONAPI_MEDIA_TYPE}
+          else
+            {}
+          end
+
+          [status, headers, response_body]
+        }
 
-      rescue_exception = Proc.new {|env, e|
         request_info = {
           :path_info      => env['REQUEST_PATH'],
           :request_method => env['REQUEST_METHOD'],
@@ -147,15 +162,21 @@ module Flapjack
           rescue_error.call(404, e, request_info, "could not find notification rules '" + e.notification_rule_ids.join(', ') + "'")
         when Flapjack::Gateways::JSONAPI::EntityNotFound
           rescue_error.call(404, e, request_info, "could not find entity '#{e.entity}'")
+        when Flapjack::Gateways::JSONAPI::EntitiesNotFound
+          entity_ids = "'" + e.entity_ids.join("', '") + "'"
+          rescue_error.call(404, e, request_info, "could not find entities: #{entity_ids}")
         when Flapjack::Gateways::JSONAPI::EntityCheckNotFound
           rescue_error.call(404, e, request_info, "could not find entity check '#{e.check}'")
+        when Flapjack::Gateways::JSONAPI::EntityChecksNotFound
+          checks = "'" + e.entity_checks.join("', '") + "'"
+          rescue_error.call(404, e, request_info, "could not find entity checks: #{checks}")
         when Flapjack::Gateways::JSONAPI::ResourceLocked
           rescue_error.call(423, e, request_info, "unable to obtain lock for resource '#{e.resource}'")
         else
           rescue_error.call(500, e, request_info)
         end
       }
-      use ::Rack::FiberPool, :size => 25, :rescue_exception => rescue_exception
+      use ::Rack::FiberPool, :size => 25, :rescue_exception => @rescue_exception
 
       use ::Rack::MethodOverride
       use Flapjack::Gateways::JSONAPI::Rack::JsonParamsParser
@@ -205,7 +226,7 @@ module Flapjack
       before do
         input = nil
         query_string = (request.query_string.respond_to?(:length) &&
-                        request.query_string.length > 0) ? "?#{request.query_string}" : ""
+                         (request.query_string.length > 0)) ? "?#{request.query_string}" : ""
         if logger.debug?
           input = env['rack.input'].read
           logger.debug("#{request.request_method} #{request.path_info}#{query_string} #{input}")
@@ -256,7 +277,7 @@ module Flapjack
         def err(status, *msg)
           msg_str = msg.join(", ")
           logger.info "Error: #{msg_str}"
-          [status, {}, {:errors => msg}.to_json]
+          [status, {}, Flapjack.dump_json(:errors => msg)]
         end
 
         def is_json_request?
@@ -390,7 +411,7 @@ module Flapjack
       # bare 'params' may have splat/captures for regex route, see
       # https://github.com/sinatra/sinatra/issues/453
       post '*' do
-        halt(405) unless request.params.empty? || is_json_request? || is_jsonapi_request
+        halt(405) unless request.params.empty? || is_json_request? || is_jsonapi_request?
         content_type JSONAPI_MEDIA_TYPE
         cors_headers
         pass

data/lib/flapjack/gateways/oobetet.rb

@@ -4,7 +4,6 @@ require 'socket'
 require 'eventmachine'
 require 'em-synchrony'
 require 'blather/client/client'
-require 'oj'
 
 require 'flapjack/utility'
 
@@ -210,9 +209,9 @@ module Flapjack
       end
 
       def send_pagerduty_event(event)
-        options  = { :body => Oj.dump(event) }
+        options  = { :body => Flapjack.dump_json(event) }
         http     = EM::HttpRequest.new(@pagerduty_events_api_url).post(options)
-        response = Oj.load(http.response)
+        response = Flapjack.load_json(http.response)
         status   = http.response_header.status
         @logger.debug "send_pagerduty_event got a return code of #{status.to_s} - #{response.inspect}"
         [status, response]

data/lib/flapjack/gateways/pagerduty.rb

@@ -4,8 +4,6 @@ require 'em-hiredis'
 require 'em-synchrony'
 require 'em-synchrony/em-http'
 
-require 'oj'
-
 require 'flapjack/data/entity_check'
 require 'flapjack/data/alert'
 require 'flapjack/redis_pool'
@@ -40,7 +38,7 @@ module Flapjack
         redis_uri = @redis_config[:path] ||
           "redis://#{@redis_config[:host] || '127.0.0.1'}:#{@redis_config[:port] || '6379'}/#{@redis_config[:db] || '0'}"
         shutdown_redis = EM::Hiredis.connect(redis_uri)
-        shutdown_redis.rpush(@config['queue'], Oj.dump('notification_type' => 'shutdown'))
+        shutdown_redis.rpush(@config['queue'], Flapjack.dump_json('notification_type' => 'shutdown'))
       end
 
       def start
@@ -67,7 +65,7 @@ module Flapjack
           event_json    = events[queue][1]
 
           begin
-            event = Oj.load(event_json)
+            event = Flapjack.load_json(event_json)
             @logger.debug("pagerduty notification event received: " + event.inspect)
 
             if 'shutdown'.eql?(event['notification_type'])
@@ -110,10 +108,13 @@ module Flapjack
               'trigger'
             end
 
+            # Setting the HOSTNAME and the SERVICE makes them visible in the Pagerduty UI
             pagerduty_event = { 'service_key'  => alert.address,
                                 'incident_key' => alert.event_id,
                                 'event_type'   => pagerduty_type,
-                                'description'  => message }
+                                'description'  => message,
+                                'details'      => {'HOSTNAME' => alert.entity,
+                                                   'SERVICE' => alert.check}}
 
             send_pagerduty_event(pagerduty_event)
             alert.record_send_success!
@@ -163,9 +164,9 @@ module Flapjack
       end
 
       def send_pagerduty_event(event)
-        options  = { :body => Oj.dump(event) }
+        options  = { :body => Flapjack.dump_json(event) }
         http = EM::HttpRequest.new(PAGERDUTY_EVENTS_API_URL).post(options)
-        response = Oj.load(http.response)
+        response = Flapjack.load_json(http.response)
         status   = http.response_header.status
         @logger.debug "send_pagerduty_event got a return code of #{status.to_s} - #{response.inspect}"
         unless status == 200
@@ -260,7 +261,7 @@ module Flapjack
 
         http = EM::HttpRequest.new(url).get(options)
         begin
-          response = Oj.load(http.response)
+          response = Flapjack.load_json(http.response)
         rescue Oj::Error
           @logger.error("failed to parse json from a post to #{url} ... response headers and body follows...")
           return nil

data/lib/flapjack/gateways/web/public/js/backbone.jsonapi.js

@@ -46,6 +46,25 @@ toolbox.batchRequest = function(klass, ids, amount, success) {
 
 Backbone.JSONAPIModel = Backbone.Model.extend({
 
+  initialize: function() {
+    var _persisted;
+
+    this.isPersisted = function () {
+      if ( !_.isUndefined(_persisted) && !_.isNull(_persisted) ) {
+        return(_persisted);
+      } else {
+        return(!_.isNull(this.id));
+      }
+    };
+    this.setPersisted = function(pers) {
+      _persisted = pers;
+    };
+  },
+
+  isNew: function() {
+    return(!this.isPersisted());
+  },
+
   // the following two methods, and batchRequest, should be folded into
   // Collection.fetch (and Model.fetch?)
   resolveLink: function(name, klass, superset) {

data/lib/flapjack/gateways/web/public/js/flapjack.js

@@ -44,7 +44,11 @@ $(document).ready(function() {
       // skip if modal showing
       if ( $('#contactModal').hasClass('in') ) { return; }
 
-      var contactDetailsView = new (Contact.Views.ContactDetails)({model: new (Contact.Model)()});
+      var contact = new (Contact.Model)();
+      contact.setPersisted(false);
+      contact.set('id', toolbox.generateUUID());
+
+      var contactDetailsView = new (Contact.Views.ContactDetails)({model: contact});
       contactDetailsView.render();
 
       $('div.modal-dialog').append(contactDetailsView.$el);
@@ -75,4 +79,4 @@ $(document).ready(function() {
     }
   });
 
-});
+});

data/lib/flapjack/gateways/web/public/js/modules/contact.js

@@ -17,6 +17,7 @@
       links: {},
     },
     initialize: function(){
+      Backbone.JSONAPIModel.prototype.initialize.apply(this, arguments);
       this.on('change', this.setDirty, this);
     },
     toJSON: function() {
@@ -65,17 +66,7 @@
 
       this.collection.each(function(contact) {
         var item = new (Contact.Views.ListItem)({ model: contact });
-        var itemEl = item.render().$el;
-
-        itemEl.on('mouseenter', function(e) {
-          e.stopPropagation();
-          $(this).find('td.actions button').css('visibility', 'visible');
-        }).on('mouseleave', function(e) {
-          e.stopPropagation();
-          $(this).find('td.actions button').css('visibility', 'hidden');
-        });
-
-        jqel.append(itemEl);
+        jqel.append(item.render().$el);
       });
 
       return this;
@@ -122,7 +113,7 @@
 
       var context = this;
 
-      var deferreds = this.model.resolveLinks({media:    Medium.List});
+      var deferreds = this.model.resolveLinks({media: Medium.List});
 
       $.when.apply($, deferreds).done(
         function() {
@@ -214,6 +205,7 @@
 
       if ( this.model.isNew() ) {
         var save_success = function(model, response, options) {
+          model.setPersisted(true);
           flapjack.contactList.add(model);
           $('#contactModal').modal('hide');
         };
@@ -297,8 +289,10 @@
             type: type,
             address: '',
             interval: 15,
-            rollup_threshold: 3,
+            rollup_threshold: 3
           });
+          medium.setPersisted(false);
+          medium.set('id', options.contact.get('id') + '_' + type);
           context.collection.add(medium);
         }
         medium.contact = options.contact;
@@ -365,7 +359,8 @@
       var attrs = _.pick(model.attributes, changedAttrKeys);
       if ( model.isNew() ) {
         model.save(attrs);
-        model.set('id', model.contact.get('id') + '_' + model.get('type'));
+        model.setPersisted(true);
+        model.contact.addLinked('contacts', 'media', model);
       } else {
         model.patch('media', attrs);
       }

data/lib/flapjack/gateways/web/public/js/modules/medium.js

@@ -6,6 +6,7 @@
   Medium.Model = Backbone.JSONAPIModel.extend({
     name: 'media',
     initialize: function(){
+      Backbone.JSONAPIModel.prototype.initialize.apply(this, arguments);
       this.on('change', this.setDirty, this);
     },
     defaults: {

data/lib/flapjack/gateways/web/public/js/self_stats.js

@@ -66,7 +66,7 @@ $(document).ready(function() {
       var d = new Date().getTime();
       var value = {x: d, y: json.event_queue_length}
       data[0].values.push(value);
-      console.log(data[0].values.length);
+      // console.log(data[0].values.length);
 
       // Remove old data, to keep the graph performant
       if (data[0].values.length > 100) {

data/lib/flapjack/gateways/web/views/edit_contacts.html.erb

@@ -20,13 +20,13 @@
   <td><@- first_name @></td>
   <td><@- last_name @></td>
   <td class="actions">
-    <button type="button" class="btn btn-default contact-media" style="visibility: hidden" aria-hidden="true">Media</button>
+    <button type="button" class="btn btn-default contact-media" aria-hidden="true">Media</button>
   </td>
   <td class="actions">
-    <button type="button" class="btn btn-default contact-entities" style="visibility: hidden" aria-hidden="true">Entities</button>
+    <button type="button" class="btn btn-default contact-entities" aria-hidden="true">Entities</button>
   </td>
   <td class="actions">
-    <button type="button" class="btn btn-danger delete-contact" style="visibility: hidden" aria-hidden="true">&minus;</button>
+    <button type="button" class="btn btn-danger delete-contact">Delete</button>
   </td>
 </script>