flapjack 0.9.6 → 1.0.0rc1

data/lib/flapjack/gateways/jabber.rb

@@ -50,17 +50,9 @@ module Flapjack
         @redis = Flapjack::RedisPool.new(:config => @redis_config, :size => 2)
 
         @logger = opts[:logger]
-        @logger.debug("Jabber Initializing")
 
         @buffer = []
         @hostname = Socket.gethostname
-
-        # FIXME: i suspect the following should be in #setup so a config reload updates @identifiers
-        # I moved it here so the rspec passes :-/
-        @alias = @config['alias'] || 'flapjack'
-        @identifiers = ((@config['identifiers'] || []) + [@alias]).uniq
-        @logger.debug("I will respond to the following identifiers: #{@identifiers.join(', ')}")
-
         super()
       end
 
@@ -73,9 +65,7 @@ module Flapjack
       end
 
       def setup
-        jid = @config['jabberid'] || 'flapjack'
-        jid += '/' + @hostname unless jid.include?('/')
-        @flapjack_jid = Blather::JID.new(jid)
+        @flapjack_jid = Blather::JID.new((@config['jabberid'] || 'flapjack') + '/' + @hostname)
 
         super(@flapjack_jid, @config['password'], @config['server'], @config['port'].to_i)
 
@@ -90,19 +80,13 @@ module Flapjack
           end
         end
 
-        body_matchers = @identifiers.inject([]) do |memo, identifier|
-          @logger.debug("identifier: #{identifier}, memo: #{memo}")
-          memo << {:body => /^#{identifier}[:\s]/}
-          memo
-        end
-        @logger.debug("body_matchers: #{body_matchers}")
-        register_handler :message, :groupchat?, body_matchers do |stanza|
+        register_handler :message, :groupchat?, :body => /^#{@config['alias']}:\s+/ do |stanza|
           EventMachine::Synchrony.next_tick do
             on_groupchat(stanza)
           end
         end
 
-        register_handler :message, :chat?, :body do |stanza|
+        register_handler :message, :chat? do |stanza|
           EventMachine::Synchrony.next_tick do
             on_chat(stanza)
           end
@@ -127,11 +111,11 @@ module Flapjack
             @logger.info("Joining room #{room}")
             presence = Blather::Stanza::Presence.new
             presence.from = @flapjack_jid
-            presence.to = Blather::JID.new("#{room}/#{@alias}")
+            presence.to = Blather::JID.new("#{room}/#{@config['alias']}")
             presence << "<x xmlns='http://jabber.org/protocol/muc'><history maxstanzas='0'></x>"
             EventMachine::Synchrony.next_tick do
               write presence
-              say(room, "flapjack jabber gateway started at #{Time.now}, hello! Try typing 'help'.", :groupchat)
+              say(room, "flapjack jabber gateway started at #{Time.now}, hello!", :groupchat)
             end
           end
         end
@@ -176,7 +160,7 @@ module Flapjack
         out
       end
 
-      def interpreter(command_raw, from)
+      def interpreter(command_raw,from)
         msg          = nil
         action       = nil
         entity_check = nil
@@ -255,8 +239,7 @@ module Flapjack
           t    = Process.times
           fqdn = `/bin/hostname -f`.chomp
           pid  = Process.pid
-          msg  = "Flapjack #{Flapjack::VERSION} process #{pid} on #{fqdn}\n" +
-                 "Identifiers: #{@identifiers.join(', ')}\n" +
+          msg  = "Flapjack #{Flapjack::VERSION} process #{pid} on #{fqdn} \n" +
                  "Boot time: #{@boot_time}\n" +
                  "User CPU Time: #{t.utime}\n" +
                  "System CPU Time: #{t.stime}\n" +
@@ -554,23 +537,18 @@ module Flapjack
         return if @should_quit
         @logger.debug("groupchat message received: #{stanza.inspect}")
 
-        the_command = nil
-        @identifiers.each do |identifier|
-          if stanza.body =~ /^#{identifier}:?\s*(.*)/m
-            the_command  = $1
-            @logger.debug("matched identifier: #{identifier}, command: #{the_command.inspect}")
-            break
-          end
+        if stanza.body =~ /^#{@config['alias']}:\s+(.*)/m
+          command  = $1
         end
 
         from = stanza.from
 
         begin
-          results = interpreter(the_command, from.to_s)
+          results = interpreter(command, from.resource.to_s)
           msg     = results[:msg]
           action  = results[:action]
         rescue => e
-          @logger.debug("Exception when interpreting command '#{the_command}' - #{e.class}, #{e.message}")
+          @logger.error("Exception when interpreting command '#{command}' - #{e.class}, #{e.message}")
           msg = "Oops, something went wrong processing that command (#{e.class}, #{e.message})"
         end
 
@@ -593,10 +571,8 @@ module Flapjack
           command = stanza.body
         end
 
-        from = stanza.from
-
         begin
-          results = interpreter(command, from.resource.to_s)
+          results = interpreter(command)
           msg     = results[:msg]
           action  = results[:action]
         rescue => e

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

@@ -81,7 +81,7 @@ module Flapjack
                       }
           end
 
-          {:outages => result}
+          result
         end
 
         def unscheduled_maintenance(start_time, end_time)
@@ -96,7 +96,7 @@ module Flapjack
               pu[:end_time] >= start_time
             }
 
-          {:unscheduled_maintenances => (start_in_unsched + unsched_maintenance)}
+          start_in_unsched + unsched_maintenance
         end
 
         def scheduled_maintenance(start_time, end_time)
@@ -111,7 +111,7 @@ module Flapjack
               ps[:end_time] >= start_time
             }
 
-          {:scheduled_maintenances => (start_in_sched + sched_maintenance)}
+          start_in_sched + sched_maintenance
         end
 
         # TODO test whether the below overlapping logic is prone to off-by-one
@@ -120,7 +120,9 @@ module Flapjack
         #
         # TODO test performance with larger data sets
         def downtime(start_time, end_time)
-          outs = outage(start_time, end_time)[:outages]
+          sched_maintenances = scheduled_maintenance(start_time, end_time)
+
+          outs = outage(start_time, end_time)
 
           total_secs  = {}
           percentages = {}
@@ -137,8 +139,6 @@ module Flapjack
             # We then create two new outage periods to cover the time around
             # the scheduled maintenance period, and remove the original.
 
-            sched_maintenances = scheduled_maintenance(start_time, end_time)[:scheduled_maintenances]
-
             sched_maintenances.each do |sm|
 
               split_outs = []

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

@@ -27,9 +27,11 @@ module Flapjack
             end
 
             checks = if event_ids.nil?
-              Flapjack::Data::EntityCheck.find_all(:redis => redis).collect {|check_name|
-                find_entity_check_by_name(*check_name.split(':', 2))
-              }
+              Flapjack::Data::Entity.all(:redis => redis).collect {|entity|
+                entity.check_list.collect {|check_name|
+                  find_entity_check(entity, check_name)
+                }
+              }.flatten(2)
             elsif !event_ids.empty?
               event_ids.collect {|event_id| find_entity_check_by_name(*event_id.split(':', 2)) }
             else

data/lib/flapjack/gateways/pagerduty.rb

@@ -178,7 +178,7 @@ module Flapjack
       def find_pagerduty_acknowledgements
         @logger.debug("looking for acks in pagerduty for unack'd problems")
 
-        unacknowledged_failing_checks = Flapjack::Data::EntityCheck.unacknowledged_failing(:redis => @redis, :logger => @logger)
+        unacknowledged_failing_checks = Flapjack::Data::EntityCheck.unacknowledged_failing(:redis => @redis)
 
         @logger.debug "found unacknowledged failing checks as follows: " + unacknowledged_failing_checks.join(', ')
 

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

@@ -187,7 +187,7 @@ Backbone.JSONAPIModel = Backbone.Model.extend({
     this.linked[type].remove(obj);
   },
 
-  urlRoot: function() { return(flapjack.api_url + this.name); },
+  urlRoot: function() { return(flapjack.api_url + "/" + this.name); },
 
   // can only be called from inside a 'change' event
   setDirty: function() {

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

@@ -48,7 +48,7 @@
 
   Contact.List = Backbone.JSONAPICollection.extend({
     model: Contact.Model,
-    url: function() { return flapjack.api_url + "contacts"; }
+    url: function() { return flapjack.api_url + "/contacts"; }
   });
 
   Contact.Views.List = Backbone.View.extend({
@@ -518,4 +518,4 @@
     }
   });
 
-})(flapjack, flapjack.module("contact"));
+})(flapjack, flapjack.module("contact"));

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

@@ -22,7 +22,7 @@
   Entity.List = Backbone.JSONAPICollection.extend({
     model:      Entity.Model,
     comparator: 'name',
-    url: function() { return flapjack.api_url + "entities"; }
+    url: function() { return flapjack.api_url + "/entities"; }
   });
 
-})(flapjack, flapjack.module("entity"));
+})(flapjack, flapjack.module("entity"));

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

@@ -21,9 +21,9 @@
     },
     sync: function(method, model, options) {
       if ( method == 'create') {
-        options.url = flapjack.api_url + 'contacts/' + model.contact.get('id') + '/' + this.name;
+        options.url = flapjack.api_url + '/contacts/' + model.contact.get('id') + '/' + this.name;
       } else {
-        options.url = flapjack.api_url + this.name + '/' + model.contact.get('id') + '_' + model.get('type');
+        options.url = flapjack.api_url + '/' + this.name + '/' + model.contact.get('id') + '_' + model.get('type');
       }
       Backbone.JSONAPIModel.prototype.sync(method, model, options);
     }
@@ -33,7 +33,7 @@
   Medium.List = Backbone.JSONAPICollection.extend({
     model:      Medium.Model,
     comparator: 'type',
-    url: function() { return flapjack.api_url + "media"; }
+    url: function() { return flapjack.api_url + "/media"; }
   });
 
-})(flapjack, flapjack.module("medium"));
+})(flapjack, flapjack.module("medium"));

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

@@ -62,7 +62,7 @@ $(document).ready(function() {
 
   function updateData() {
     var api_url = $('div#data-api-url').data('api-url');
-    $.get(api_url + 'metrics?filter=event_queue_length', function(json) {
+    $.get(api_url + '/metrics?filter=event_queue_length', function(json) {
       var d = new Date().getTime();
       var value = {x: d, y: json.event_queue_length}
       data[0].values.push(value);

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

@@ -4,7 +4,7 @@
   current_time = Time.now
 %>
 <div class="page-header">
-  <% entity_link = "/entity/" + u(@entity) %>
+  <% entity_link = u(@base_url) + "entity/" << u(@entity) %>
   <h2><%= h @check %> on <a href="<%= entity_link %>" title="entity summary"><%= h @entity %></a></h2>
 </div>
 
@@ -62,7 +62,7 @@
   <% if @current_unscheduled_maintenance %>
     <div class="alert alert-warning">
 
-      <form action="/end_unscheduled_maintenance/<%= check_path_escaped %>" method="post" class="form-horizontal" role="form">
+      <form action="<%= @base_url %>end_unscheduled_maintenance/<%= check_path_escaped %>" method="post" class="form-horizontal" role="form">
 
         <div class="form-group">
           <label class="col-md-3 control-label">State</label>
@@ -132,7 +132,7 @@
     <div class="alert alert-warning">
       <% action = @current_unscheduled_maintenance ? "Re-acknowledge" : "Acknowledge" %>
       <h4><%= action %> alert</h4>
-      <form action="/acknowledgements/<%= check_path_escaped %>" method="post" class="form-horizontal">
+      <form action="<%= @base_url %>acknowledgements/<%= check_path_escaped %>" method="post" class="form-horizontal">
         <div class="form-group">
           <div class="col-sm-12 text-left">
             <label class="col-sm-3 control-label" for="summary">Summary</label>
@@ -307,7 +307,7 @@
         <td>
         <% if end_time > current_time.to_i %>
           <% label = (start_time > current_time.to_i) ? 'Delete' : 'End Now' %>
-            <form action="/scheduled_maintenances/<%= check_path_escaped %>" method="post">
+            <form action="<%= @base_url %>scheduled_maintenances/<%= check_path_escaped %>" method="post">
               <input type="hidden" name="_method" value="delete">
               <input type="hidden" name="start_time" value="<%= start_time %>">
               <button type="submit" class="btn btn-danger"><%= label %></button>
@@ -333,7 +333,7 @@
         <h3 class="panel-title">Add Scheduled Maintenance</h4>
       </div>
       <div class="panel-body">
-        <form action="/scheduled_maintenances/<%= check_path_escaped %>" method="post" role="form" class="form-horizontal">
+        <form action="<%= @base_url %>scheduled_maintenances/<%= check_path_escaped %>" method="post" role="form" class="form-horizontal">
 
           <div class="form-group">
             <label class="col-sm-2 control-label" for="start_time">Start time:</label>
@@ -394,7 +394,7 @@
         </tr>
         <% @contacts.sort_by {|c| [c.first_name, c.last_name] }.each do |contact| %>
           <tr>
-            <td><a href="/contacts/<%= contact.id %>" title="contact details"><%= h contact.name %></a></td>
+            <td><a href="<%= @base_url %>contacts/<%= contact.id %>" title="contact details"><%= h contact.name %></a></td>
             <td>
               <% if contact.media && !contact.media.empty? %>
                 <p><%= h contact.media.keys.collect(&:capitalize).join(", ") %></p>
@@ -423,7 +423,7 @@
       <div class="panel-body">
       <% if @check_enabled %>
         <h4>Decommission check</h4>
-        <form action="/checks/<%= check_path_escaped %>" method="post" style="display:inline-block" class="pull-right">
+        <form action="<%= @base_url %>checks/<%= check_path_escaped %>" method="post" style="display:inline-block" class="pull-right">
           <input type='hidden' name='_method' value='delete'>
           <button type='submit' class="btn btn-danger decommission-check">Decommission Check</button>
         </form>

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

@@ -21,7 +21,7 @@
   <tbody>
     <% @entities_sorted.each do |entity| %>
       <% row_entity = nil %>
-      <% entity_link = "/entity/" << u(entity) %>
+      <% entity_link = u(@base_url) + "entity/" << u(entity) %>
       <% @states[entity].each do |check, status, summary, changed, updated, in_unscheduled_outage, in_scheduled_outage, notified| %>
         <%
           row_colour = case status
@@ -33,8 +33,7 @@
             status
           end
 
-          check_link = "/check?entity=" << u(entity) << "&amp;check=" << u(check)
-
+          check_link = u(@base_url) + "check?entity=" << u(entity) << "&amp;check=" << u(check)
         %>
         <tr class="<%= row_colour %>">
         <% unless row_entity && entity == row_entity %>

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

@@ -81,9 +81,9 @@
           <td>
             <% checks.each do |entity_check| %>
               <% entity, check = entity_check.split(':', 2) %>
-              <% check_link = "<a href=\"/check?entity=#{u(entity)}&amp;check=#{u(check)}\" title=\"check status\">" +
+              <% check_link = "<a href=\"#{u(@base_url)}check?entity=#{u(entity)}&amp;check=#{u(check)}\" title=\"check status\">" +
                  h(check) + "</a>"%>
-              <a href="/entity/<%= u(entity) %>" title="entity status"><%= h entity %></a> ::
+              <a href="<%= @base_url %>entity/<%= u(entity) %>" title="entity status"><%= h entity %></a> ::
               <%= check_link %> <br />
             <% end %>
           </td>
@@ -144,10 +144,10 @@
         checks = ec[:checks]
        %>
       <tr>
-        <td><a href="/entity/<%= u(entity.name) %>" title="entity status"><%= h entity.name %></a></td>
+        <td><a href="<%= @base_url %>entity/<%= u(entity.name) %>" title="entity status"><%= h entity.name %></a></td>
         <td>
           <% checks.each do |check| %>
-          <%= "<a href=\"/check?entity=#{u(entity.name)}&amp;check=#{u(check)}\" title=\"check status\">#{ h check }</a>" %>
+          <%= "<a href=\"#{u(@base_url)}check?entity=#{u(entity.name)}&amp;check=#{u(check)}\" title=\"check status\">#{ h check }</a>" %>
           <% end %>
         </td>
       </tr>

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

@@ -14,14 +14,14 @@
     </tr>
     <% @contacts.sort_by {|c| [c.last_name, c.first_name] }.each do |contact| %>
     <tr>
-      <td><a href="/contacts/<%= contact.id %>" title="contact details"><%= h contact.name %></a></td>
+      <td><a href="<%= @base_url %>contacts/<%= contact.id %>" title="contact details"><%= h contact.name %></a></td>
       <td><%= h contact.email %></td>
     </tr>
     <% end %>
   </table>
 <% end %>
 
-<a href="/edit_contacts"/>
+<a href="<%= @base_url %>edit_contacts"/>
   Edit contacts
   <span class="label label-danger">beta</span>
 </a>

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

@@ -36,7 +36,7 @@
     <h4 class="modal-title" id="contactModalLabel"><@- is_new ? 'New' : 'Edit' @> Contact</h4>
   </div>
   <div class="modal-body">
-    <form action="/contacts" method="post" role="form" class="form-horizontal">
+    <form action="<%= @base_url %>contacts" method="post" role="form" class="form-horizontal">
 
       <div id="contactDetails">
         <div class="form-group">

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

@@ -16,7 +16,7 @@
   <tbody>
     <% @entities.sort.each do |entity| %>
       <tr>
-        <td><a href="/entity/<%= CGI.escape(entity) %>"><%= h entity %></a>
+        <td><a href="<%= @base_url %>entity/<%= CGI.escape(entity) %>"><%= h entity %></a>
         </td>
       </tr>
     <% end %>

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

@@ -28,7 +28,7 @@
           status
         end
 
-        check_link = "/check?entity=" << u(@entity) << "&amp;check=" << u(check)
+        check_link = u(@base_url) + "check?entity=" << u(@entity) << "&amp;check=" << u(check)
 
       %>
       <tr class="<%= row_colour %>">

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

@@ -4,5 +4,5 @@
   <h2>Summary</h2>
 </div> <!-- page header -->
 
-<h4><a href="/entities_failing" title="failing entities"><%= h @count_failing_entities %></a> out of <a href="/entities_all" title="all entities"><%= h @count_all_entities %></a> entities have failing checks</h4>
-<h4><a href="/checks_failing" title="failing checks"><%= h @count_failing_checks %></a> out of <a href="/checks_all" title="all checks"><%= h @count_all_checks %></a> checks are failing</h4>
+<h4><a href="<% @base_url %>entities_failing" title="failing entities"><%= h @count_failing_entities %></a> out of <a href="<% @base_url %>entities_all" title="all entities"><%= h @count_all_entities %></a> entities have failing checks</h4>
+<h4><a href="<% @base_url %>checks_failing" title="failing checks"><%= h @count_failing_checks %></a> out of <a href="<% @base_url %>checks_all" title="all checks"><%= h @count_all_checks %></a> checks are failing</h4>

data/lib/flapjack/gateways/web/views/layout.erb

@@ -16,7 +16,7 @@
   <head>
     <title><%= h include_page_title %></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="shortcut icon" href="/img/flapjack-favicon-64-32-24-16.ico"> <!-- thank you http://xiconeditor.com/ -->
+    <link rel="shortcut icon" href="<%= @base_url %>img/flapjack-favicon-64-32-24-16.ico"> <!-- thank you http://xiconeditor.com/ -->
     <%= include_required_css %>
     <%= include_required_js %>
   </head>
@@ -24,8 +24,8 @@
     <nav class="navbar navbar-default navbar-inverse" role="navigation">
 
       <div class="navbar-header">
-        <a class="navbar-brand" title="Summary" href="/">
-          <img alt="Flapjack" class="logo" src="/img/flapjack-2013-notext-transparent-300-300.png">
+        <a class="navbar-brand" title="Summary" href="<%= @base_url %>">
+          <img alt="Flapjack" class="logo" src="<%= @base_url %><%= @logo_image_file ? "img/branding#{@logo_image_ext}" : @default_logo_url %>">
         </a>
       </div>
 
@@ -33,37 +33,37 @@
 
         <ul class="nav navbar-nav">
           <li<%= include_active?('') %>>
-            <a title="Summary" href="/">
+            <a title="Summary" href="<%= @base_url %>">
               <i class="fa fa-trophy fa-lg"></i>
               Summary
             </a>
           </li>
           <li<%= include_active?('entities_all') %>>
-            <a title="All Entities" href="/entities_all">
+            <a title="All Entities" href="<%= @base_url %>entities_all">
               <i class="fa fa-bullseye fa-lg"></i>
               All Entities
             </a>
           </li>
           <li<%= include_active?('entities_failing') %>>
-            <a title="Failing Entities" href="/entities_failing">
+            <a title="Failing Entities" href="<%= @base_url %>entities_failing">
               <i class="fa fa-bullhorn fa-lg"></i>
               Failing Entities
             </a>
           </li>
           <li<%= include_active?('checks_all') %>>
-            <a title="All Checks" href="/checks_all">
+            <a title="All Checks" href="<%= @base_url %>checks_all">
               <i class="fa fa-check-circle-o fa-lg"></i>
               All Checks
             </a>
           </li>
           <li<%= include_active?('checks_failing') %>>
-            <a title="Failing Checks" href="/checks_failing">
+            <a title="Failing Checks" href="<%= @base_url %>checks_failing">
               <i class="fa fa-times-circle-o fa-lg"></i>
               Failing Checks
             </a>
           </li>
           <li<%= include_active?('contacts') %>>
-            <a title="Contacts" href="/contacts">
+            <a title="Contacts" href="<%= @base_url %>contacts">
               <i class="fa fa-users fa-lg"></i>
               Contacts
             </a>
@@ -72,7 +72,7 @@
 
         <ul class="nav navbar-nav navbar-right">
           <li<%= include_active?('self_stats') %>>
-            <a title="Internal Statistics" href="/self_stats">
+            <a title="Internal Statistics" href="<%= @base_url %>self_stats">
               <i class="fa fa-tachometer fa-lg"></i>
               Internal Statistics
             </a>

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

@@ -125,7 +125,7 @@
 </div>
 
 <p>
-  <a class="btn btn-success" href="/self_stats.json">View as JSON</a>
+  <a class="btn btn-success" href="<% @base_url %>self_stats.json">View as JSON</a>
   Learn how to
   <a href="https://github.com/flapjack/flapjack/wiki/Gathering-internal-statistics-with-collectd">
     use these metrics</a>.

data/lib/flapjack/gateways/web.rb

@@ -67,6 +67,28 @@ module Flapjack
             @logger.error "api_url is not configured, parts of the web interface will be broken"
           end
 
+          @base_url = @config['base_url']
+          if @base_url
+            @base_url = $1 if @base_url.match(/^(.+\/)$/)
+          else
+	          dummy_url = "/"
+            @logger.error "base_url must contain trailing '/', setting it to safe default (#{dummy_url})"
+            @base_url = dummy_url
+          end
+
+          # constants won't be exposed to eRb scope
+          @default_logo_url = "img/flapjack-2013-notext-transparent-300-300.png"
+          @logo_image_file  = nil
+          @logo_image_ext   = nil
+
+          if logo_image_path = @config['logo_image_path']
+            if File.file?(logo_image_path)
+              @logo_image_file = logo_image_path
+              @logo_image_ext  = File.extname(logo_image_path)
+            else
+              @logger.error "logo_image_path '#{logo_image_path}'' does not point to a valid file."
+            end
+          end
         end
       end
 
@@ -99,8 +121,17 @@ module Flapjack
         self.class.instance_variable_get('@logger')
       end
 
-      def api_url
-        self.class.instance_variable_get('@api_url')
+      before do
+        @api_url          = self.class.instance_variable_get('@api_url')
+        @base_url         = self.class.instance_variable_get('@base_url')
+        @default_logo_url = self.class.instance_variable_get('@default_logo_url')
+        @logo_image_file  = self.class.instance_variable_get('@logo_image_file')
+        @logo_image_ext   = self.class.instance_variable_get('@logo_image_ext')
+      end
+
+      get '/img/branding.*' do
+        halt(404) unless @logo_image_file && params[:splat].first.eql?(@logo_image_ext[1..-1])
+        send_file(@logo_image_file)
       end
 
       get '/' do
@@ -313,7 +344,6 @@ module Flapjack
       end
 
       get '/edit_contacts' do
-        @api_url = api_url
         erb 'edit_contacts.html'.to_sym
       end
 
@@ -389,7 +419,6 @@ module Flapjack
       def self_stats
         @fqdn    = `/bin/hostname -f`.chomp
         @pid     = Process.pid
-        @api_url = api_url
 
         @dbsize              = redis.dbsize
         @executive_instances = redis.keys("executive_instance:*").inject({}) do |memo, i|
@@ -454,7 +483,7 @@ module Flapjack
       def include_required_js
         if @required_js
           @required_js.map { |filename|
-            "<script type='text/javascript' src='#{link_to("/js/#{filename}.js")}'></script>"
+            "<script type='text/javascript' src='#{link_to("js/#{filename}.js")}'></script>"
           }.join("\n    ")
         else
           ""
@@ -464,7 +493,7 @@ module Flapjack
       def include_required_css
         if @required_css
           @required_css.map { |filename|
-            %(<link rel="stylesheet" href="#{link_to("/css/#{filename}.css")}" media="screen">)
+            %(<link rel="stylesheet" href="#{link_to("css/#{filename}.css")}" media="screen">)
           }.join("\n    ")
         else
           ""
@@ -475,7 +504,7 @@ module Flapjack
       def link_to(url_fragment, mode=:path_only)
         case mode
         when :path_only
-          base = request.script_name
+          base = @base_url
         when :full_url
           if (request.scheme == 'http' && request.port == 80 ||
               request.scheme == 'https' && request.port == 443)

data/lib/flapjack/pikelet.rb

@@ -19,7 +19,6 @@ require 'thin'
 
 require 'flapjack/notifier'
 require 'flapjack/processor'
-require 'flapjack/gateways/api'
 require 'flapjack/gateways/jsonapi'
 require 'flapjack/gateways/jabber'
 require 'flapjack/gateways/oobetet'
@@ -218,7 +217,6 @@ module Flapjack
     class Thin < Flapjack::Pikelet::Base
 
       PIKELET_TYPES = {'web'     => Flapjack::Gateways::Web,
-                       'api'     => Flapjack::Gateways::API,
                        'jsonapi' => Flapjack::Gateways::JSONAPI}
 
       def self.create(type, opts = {})

data/lib/flapjack/processor.rb

@@ -38,6 +38,8 @@ module Flapjack
       ncsm_duration_conf = @config['new_check_scheduled_maintenance_duration'] || '100 years'
       @ncsm_duration = ChronicDuration.parse(ncsm_duration_conf, :keep_zero => true)
 
+      @ncsm_ignore_tags = @config['new_check_scheduled_maintenance_ignore_tags'] || []
+
       @exit_on_queue_empty = !! @config['exit_on_queue_empty']
 
       options = { :logger => opts[:logger], :redis => @redis }
@@ -208,7 +210,7 @@ module Flapjack
         if previous_state.nil?
           @logger.info("No previous state for event #{event.id}")
 
-          if @ncsm_duration > 0
+          if @ncsm_duration > 0 && (event.tags & @ncsm_ignore_tags).empty?
             @logger.info("Setting scheduled maintenance for #{time_period_in_words(@ncsm_duration)}")
             entity_check.create_scheduled_maintenance(timestamp,
               @ncsm_duration, :summary => 'Automatically created for new check')