APItools Monitor Release 201408041328

Dockerfile

@@ -0,0 +1,19 @@
+FROM quay.io/3scale/openresty:1.5.12.1
+
+MAINTAINER Michal Cichra <[email protected]> # 2014-02-24
+
+RUN luarocks install luajson \
+ && luarocks install luaexpat
+
+RUN ln -sf /var/www/brainslug/config/supervisor.conf /etc/supervisor/conf.d/openresty.conf \
+ && ln -sf /var/www/brainslug/config/logrotate.conf /etc/logrotate.d/nginx \
+ && echo '* * * * * curl http://localhost:7071/api/mails/send' | crontab
+
+ENV SLUG_LOGFILE /var/log/supervisor/supervisord.log
+ENV SLUG_CSRF_PROTECTION 1;
+
+CMD ["supervisord", "-n"]
+EXPOSE 7071 10002
+
+ADD . /var/www/brainslug
+

app/analytics/index.html

@@ -12,10 +12,10 @@ <h4>Analyze flows to detect peaks and problems</h4>
     </p>
   </div>
 
-  <ul ng-if="current_dashboard" class="charts" ng-controller="CurrentDashboardCtrl">
+  <ul ng-if="current_dashboard" class="charts current-dashboard" ng-controller="CurrentDashboardCtrl">
 
     <li class="{{ blueprint.type }}" ng-repeat="window in windows" ng-controller="ChartController">
-      <a ng-hide="chart" class="chart new" ng-click="addChart($index, config)"><i class="icon-plus"></i> Add Chart</a>
+      <a ng-hide="chart" href class="chart new" ng-click="addChart($index, config)"><i class="icon-plus"></i> Add Chart</a>
 
       <div ng-if="chart" class="chart">
         <div class="caption">
@@ -25,6 +25,7 @@ <h4>{{ chart.name }}</h4>
 
         <div class="plot">
           <div rickshaw="stats"></div>
+          <a rickshaw-maximizer />
         </div>
       </div>
     </li>

app/dashboard/show.html

@@ -47,14 +47,18 @@
 
         <div ng-switch-default
              class="selected-dashboard"
-             id="dashboard-{{ selected_dashboard }}"
-             rickshaw="dashboard"
-             rickshaw-renderer="area"
-             rickshaw-color="{{ color }}"
-             rickshaw-stroke-width="3"
-        ></div>
-      </div>
+             id="dashboard-{{ selected_dashboard }}">
+          <div class="plot">
+            <div rickshaw="dashboard"
+                 rickshaw-renderer="area"
+                 rickshaw-color="{{ color }}"
+                 rickshaw-stroke-width="3">
+            </div>
+            <a rickshaw-maximizer />
+          </div>
+        </div>
 
+      </div>
     </div>
   </div>
 </div>
@@ -95,7 +99,7 @@ <h4 class="dashboard-box-title">Latest traces <small><a href="traces">(View all)
 
     <ol>
       <li ng-repeat="trace in last_traces">
-        <a class='trace-link' ng-href="traces?select={{trace._id }}">
+        <a class='trace-link' ng-href="traces/{{ trace._id }}">
           <span class="cell label-{{ trace.res.status | status }}">{{ trace.res.status }}</span>
           <b class="cell http-method method-{{ trace.req.method | lowercase }}">{{
             trace.req.method }}</b>

app/dashboards/chart.html

@@ -8,7 +8,12 @@ <h3 ng-show="!editTitle" >{{ chart.name }}</h3>
 
   <div class="modal-body">
 
-    <div class="preview" rickshaw="analytics"></div>
+    <div class="preview">
+      <div class="plot">
+        <div rickshaw="analytics"></div>
+        <a rickshaw-maximizer />
+      </div>
+    </div>
 
     <fieldset class="row-fluid">
       <div class="span3">