rearview 1.2.0-jruby → 1.2.1-jruby

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9930818c3cb39841ee9774dbdee3ad09c4e72c4
-  data.tar.gz: 0190f0a54cdebf77f29d161adeea0a9ea195a7d4
+  metadata.gz: caebe0965f0b933bfeab70bc95f3137fff502768
+  data.tar.gz: f776171448d8107b7ecc2288fba419047ed869fe
 SHA512:
-  metadata.gz: a285f335cf44cb0d9fbfc174e419d9051544ab03a045a60cfa8529edb90752cf493625b957d9f983b50081ea063fcda6646454c7bd13ed40ef579a6b0b4c3503
-  data.tar.gz: 17e8d45a1f71f0bac7028cb1204978f968f4bc63d30a178e409cba18d2471b8cf48ce19d50ebea818d3ac463ca4fa628692e29b9976db9a3e9c280b89dc57730
+  metadata.gz: cc87e87abf2be33a444f873648d2b7fb5006905ea776d194a0a5bd5382e06545a2c8ad0c8662867cc99c2c3f9604297f9b7abeab81eae7c2be480f1bf9314151
+  data.tar.gz: 1f287be94f0063f6b1fdcb78aecadd5567a3ee9597b4fb24131001f1920c1c2ffa1c84cad0a7a0787ad67d772a8461b2136934a6d976d243b11c60aff92ea815

data/app/controllers/rearview/jobs_controller.rb

@@ -36,6 +36,7 @@ module Rearview
       if dashboard_id.present? && dashboard_id.to_i!=@job.app_id
         @job.dashboard = Rearview::Dashboard.find(dashboard_id.to_i)
       end
+      params["alert_keys"] = [] if params["alert_keys"].blank?
       if @job.update_attributes(job_update_params)
         @job.sync_monitor_service
         render :show

data/app/controllers/rearview/monitor_controller.rb

@@ -11,8 +11,12 @@ module Rearview
     # monitor job model instead of custom params
     #
     def create
-      metrics_validator = Rearview::MetricsValidator.new({attributes: [:metrics]})
-      @errors = params[:metrics].inject([]) { |a,v| a << "Metrics contains an invalid metric: #{v}" unless(metrics_validator.metric_valid?(v)); a }
+      @errors = if params[:metrics].empty?
+                  [ "No metrics were provided" ]
+                else
+                  metrics_validator = Rearview::MetricsValidator.new({attributes: [:metrics]})
+                  params[:metrics].inject([]) { |a,v| a << "Metrics contains an invalid metric: #{v}" unless(metrics_validator.metric_valid?(v)); a }
+                end
       results = if @errors.empty?
                   Rearview::MonitorRunner.run(params[:metrics],params[:monitorExpr],params[:minutes],{},false,params[:toDate],true)
                 else

data/lib/generators/templates/README.md

@@ -6,7 +6,8 @@ Edit the following file:
 
     config/initializers/rearview.rb
 
-You must set **config.graphite_url** and **config.sandbox_exec** for rearview
-to run properly. Most of the other settings you should be able to leave as is.
+You must set **config.graphite_connection** and **config.sandbox_exec** 
+for rearview to run properly. Most of the other settings you should be able to 
+leave as is.
 
 ===============================================================================

data/lib/generators/templates/rearview.rb

@@ -69,7 +69,7 @@ Rearview.configure do |config|
   # Set schedule for checking for invalid metrics (cron expression). Recommended only once per day.
   # see http://quartz-scheduler.org/api/2.0.0/org/quartz/CronExpression.html. Only necessary if
   # enable_metrics_validator is true.
-  config.metrics_validator_schedule = '* * 23 * *'
+  config.metrics_validator_schedule = '0 0 23 * *'
 
   case Rails.env
     when "test"

data/lib/graphite/client.rb

@@ -25,7 +25,7 @@ module Graphite
       exists = false
       response = find_metric(metric)
       # Does this need to handle redirects?
-      if response.status == 200 && response.headers['content-type']=='application/json'
+      if response.status == 200 && response.headers['content-type'].include?('application/json')
         json = JSON.parse(response.body)
         exists = true unless json.empty?
       end
@@ -35,7 +35,7 @@ module Graphite
       reachable = false
       begin
         response = connection.get('/render')
-        reachable = response.status==200 && response.headers['content-type']=='image/png' && response.headers['content-length'].to_i > 0
+        reachable = response.status==200 && response.headers['content-type'].include?('image/png') && response.headers['content-length'].to_i > 0
       rescue Exception => e
       end
       reachable

data/lib/rearview/version.rb

@@ -1,3 +1,3 @@
 module Rearview
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/public/rearview-src/help/cron.html

@@ -0,0 +1,34 @@
+<table>
+    <tr>
+        <th>field</th>
+        <td>description</td>
+    </tr>
+    <tr>
+        <th>minutes</th>
+        <td>0-59 [, - * /]</td>
+    </tr>
+    <tr>
+        <th>hours</th>
+        <td>0-23 [, - * /]</td>
+    </tr>
+    <tr>
+        <th>days</th>
+        <td>1-31 [, - * ? / L W]</td>
+    </tr>
+    <tr>
+        <th>weekday</th>
+        <td>select which days to run (otherwise it will run everyday)</td>
+    </tr>
+    <tr>
+        <th>month</th>
+        <td>select which month to run (otherwise it will run everymonth)</td>
+    </tr>
+</table>
+<div class="cron-help-details">
+  <p>The '*' character is used to specify all values. For example, "*" in the minute field means "every minute".</p>
+  <p>The '?' character is allowed for the days field. It is used to specify 'no specific value'. This is useful when you need to specify something in one of the weekday field.</p>
+  <p>The '-' character is used to specify ranges For example "10-12" in the hour field means "the hours 10, 11 and 12".</p>
+  <p>The ',' character is used to specify additional values. For example "MON,WED,FRI" in the day-of-week field means "the days Monday, Wednesday, and Friday".</p>
+  <p>The '/' character is used to specify increments. For example "0/15" in the seconds field means "the seconds 0, 15, 30, and 45".</p>
+<a href="http://quartz-scheduler.org/api/2.1.0/org/quartz/CronExpression.html" target="_new">more about cron schedules</a>
+</div>

data/public/rearview-src/js/app.js

@@ -3,6 +3,7 @@ define([
     'underscore',
     'backbone',
     'util/templar',
+    'util/cron',
     'route/index',
     'view/alert',
     'view/primarynav',
@@ -26,6 +27,7 @@ define([
     _,
     Backbone,
     Templar,
+    CronUtil,
     IndexRouter,
     AlertView,
     PrimaryNavView,
@@ -55,7 +57,6 @@ define([
 
         initialize : function() {
             _.bindAll(this);
-
             // check authorization
             this.auth();
 

data/public/rearview-src/js/main.js

@@ -14,7 +14,7 @@ require.config({
         'jquery-validate'       : '../vendor/jquery/plugins/jquery.validate',
         'jquery-ui'             : '../vendor/jquery/plugins/jquery-ui/js/jquery-ui-1.10.3.custom.min',
         'jquery-timepicker'     : '../vendor/jquery/plugins/timepicker-ui/js/jquery.timepicker',
-        'parsley'               : '../vendor/parsley/js/parsley.min',
+        'parsley'               : '../vendor/parsley/js/parsley',
         'underscore'            : '../vendor/underscore/js/underscore',
         'underscore-string'     : '../vendor/underscore/plugins/underscore-string/js/underscore.string',
         'xdate'                 : '../vendor/xdate/js/xdate',
@@ -86,4 +86,4 @@ define([
     App
 ){
     App.initialize();
-});
+});

data/public/rearview-src/js/util/cron.js

@@ -0,0 +1,50 @@
+define([
+    'underscore'
+],
+function(_){
+    var CronUtil = function() {};
+
+    _.extend(CronUtil, {
+
+      //TODO this just checks that the characters are in the valid
+      //set but does not assert the syntax of cron
+      minuteRegex : RegExp(/^[0-9\*\-,\/]+$/),
+      hourRegex : RegExp(/^[0-9\*\-,\/]+$/),
+      dayRegex : RegExp(/^[\?0-9\*\-,\/,LW]+$/i),
+
+      parsleyValidator : function(cb) {
+        var validator = function() {};
+        _.extend(validator, {
+          validationMinlength: 1,
+          validators : {
+            cronfield : function (val,param) {
+              var valid = null;
+              switch(param) {
+                case 'day':
+                  valid = val.match(this.dayRegex);
+                break;
+                case 'hour':
+                  valid = val.match(this.hourRegex);
+                break;
+                case 'minute':
+                  valid = val.match(this.minuteRegex);
+                break;
+              }
+              if(_.isFunction(cb)) {
+                valid = cb(val,param,valid);
+              }
+              return valid!=null;
+            }.bind(this)
+          },
+          messages : {
+            cronfield : "Not a valid value for cron field '%s'" 
+          }
+        });
+        return validator;
+      }
+
+    }); 
+    
+    return CronUtil;
+});
+

data/public/rearview-src/js/view/addmonitor.js

@@ -2,19 +2,25 @@ define([
     'view/base',
     'model/monitor',
     'codemirror',
+    'util/cron',
     'codemirror-ruby',
     'jquery-validate',
     'parsley'
 ], function(
     BaseView,
     MonitorModel,
-    CodeMirror
+    CodeMirror,
+    CronUtil
 ){
 
     var AddMonitorView = BaseView.extend({
-        scheduleViewInitialized : false,
-        metricsViewInitialized  : false,
-        scheduleView            : true,
+        scheduleViewInitialized       : false,
+        metricsViewInitialized        : false,
+        scheduleView                  : true,
+        cronScheduleFormValid         : false,
+        cronScheduleWeekdaysSelected  : false,
+        cronScheduleDaysDisabled      : false,
+        namePagerFormValid            : false,
 
         el : '.add-monitor-wrap',
 
@@ -29,6 +35,7 @@ define([
             'click .nameSchedule' : 'backToSchedule',
             'click .saveFinish'   : 'saveFinish',
             'click .back'         : 'exitFullScreen',
+            'click #cronScheduleForm .day-month-picker .day-picker button' : 'cronWeekdayButtonClicked',
             'hide #addMonitor'    : 'modalClose',
             'show #addMonitor'    : 'modalShow',
             'shown #addMonitor'   : 'focusFirst'
@@ -68,8 +75,9 @@ define([
 
             this.scheduleViewInitialized = true;
 
-            // scheduling is the first step in add monitor workflow
-            this.setScheduleValidation();
+            this.setNamePagerValidation();
+            this.setCronScheduleValidation();
+            this.setNameScheduleHelp();
 
             // store reference to modal
             this.$modal = this.$el.find('.add-monitor');
@@ -135,8 +143,12 @@ define([
          * view.
          **/
         advanceToMetrics : function() {
-            // validate form
-            this.scheduleForm.parsley('validate');
+            this.namePagerForm.parsley('validate');
+            this.cronScheduleForm.parsley('validate');
+            if(this.namePagerFormValid && this.cronScheduleFormValid) {
+              this._setSchedule();
+              this._setupMetricsView();
+            }
         },
         /**
          * AddMonitorView#backToSchedule()
@@ -176,27 +188,107 @@ define([
             }
             this.expressionsMirror.refresh();
         },
+
+        setCronScheduleWeekdaysSelected : function() {
+          this.cronScheduleWeekdaysSelected = $('#cronScheduleForm .day-month-picker .day-picker button.active').size() > 0
+        },
+
+        setCronScheduleDaysDisabled : function(disabled) {
+          if(disabled) {
+            if(!this.cronScheduleDaysDisabled) {
+              $('#inputDays').parsley('ParsleyField').reset();
+              $('#inputDays').val('?');
+              $('#inputDays').attr('disabled',"");
+              this.cronScheduleDaysDisabled = true;
+            }
+          }
+          else {
+            if(this.cronScheduleDaysDisabled) {
+              $('#inputDays').val('*');
+              $('#inputDays').removeAttr('disabled');
+              this.cronScheduleDaysDisabled = false;
+            } 
+          }
+        },
+
+        cronWeekdayButtonClicked : function(event) {
+          $(event.target).button('toggle');
+          this.setCronScheduleWeekdaysSelected();
+          this.setCronScheduleDaysDisabled(this.cronScheduleWeekdaysSelected);
+        },
+
+        setNameScheduleHelp : function() {
+            $cronHelpContent = '';
+            $alertHelpContent = '';
+            $.ajax({
+                url     : rearview.path + '/help/cron.html',
+                async   : false,
+                success : function( response ) {
+                    $cronHelpContent = response;
+                }
+            });
+
+            $.ajax({
+                url     : rearview.path + '/help/alert.html',
+                async   : false,
+                success : function( response ) {
+                    $alertHelpContent = response;
+                }
+            });
+
+            this.$el.find('#cronScheduleForm .set-schedule .help.label').tooltip({
+                trigger   : 'click',
+                html      : true,
+                placement : 'left',
+                delay     : { show : 100, hide : 200 },
+                title     : $cronHelpContent
+            });
+
+            this.$el.find('#namePagerForm .pager-duty .help.label').tooltip({
+                trigger   : 'click',
+                html      : true,
+                placement : 'left',
+                delay     : { show : 100, hide : 200 },
+                title     : $alertHelpContent
+            });
+        },
         /**
-         * AddMonitorView#setScheduleValidation()
+         * AddMonitorView#setNamePagerValidation()
          *
          * Sets up the front end form validation for the name field which is required.
          * If name is present, save the sceduling data to the monitor model and setup the
          * next view in the add monitor workflow to set up the metrics data.
          **/
-        setScheduleValidation : function() {
-            this.scheduleForm = $('#namePagerForm');
-
-            var validator = this.scheduleForm.parsley({
+        setNamePagerValidation : function() {
+            this.namePagerForm = $('#namePagerForm');
+            var validator = this.namePagerForm.parsley({
                 listeners: {
                     onFormSubmit : function ( isFormValid, event, ParsleyForm ) {
-                        if (isFormValid) {
-                            this._setSchedule();
-                            this._setupMetricsView();
-                        }
+                      this.namePagerFormValid = isFormValid;
                     }.bind(this)
                 }
             });
         },
+        setCronScheduleValidation : function() {
+            this.cronScheduleForm = $('#cronScheduleForm');
+            var validator = CronUtil.parsleyValidator();
+            _.extend(validator,{
+                errors: {
+                  container: function (parsleyElement, parsleyTemplate, isRadioOrCheckbox) {
+                    var container = $('#cronScheduleFormErrors');
+                    container.append(parsleyTemplate);
+                    return container;
+                  }
+                },
+                listeners: {
+                    onFormSubmit : function ( isFormValid, event, ParsleyForm ) {
+                      this.cronScheduleFormValid = isFormValid;
+                    }.bind(this)
+                }
+            });
+            this.cronScheduleForm.parsley(validator);
+
+        },
         setMetricsValidation : function() {
             $.validator.addMethod('code', function(value, element) {
                 var mirror  = $(element).data('CodeMirror'),
@@ -374,7 +466,7 @@ define([
 
             this.metricsForm.submit();
         },
-        setHelp : function() {
+        setMetricsHelp : function() {
             var $content = '';
 
             $.ajax({
@@ -624,7 +716,7 @@ define([
                     this._initCodeMirror();
                     this._initDatePicker();
                     this.initGraph( modalContainerEl.find('.graph')[0] );
-                    this.setHelp();
+                    this.setMetricsHelp();
                     this.setMetricsValidation();
 
                     // set that metrics view has been initialized to

data/public/rearview-src/js/view/expandedmonitor.js

@@ -1,17 +1,25 @@
 define([
     'view/base',
     'view/deletemonitor',
-    'model/monitor'
+    'model/monitor',
+    'util/cron',
+    'parsley'
 ], function(
     BaseView,
     DeleteMonitorView,
-    JobModel
+    JobModel,
+    CronUtil
 ){
     var ExpandedMonitorView = BaseView.extend({
 
+        cronScheduleFormValid         : true,
+        cronScheduleWeekdaysSelected  : false,
+        cronScheduleDaysDisabled      : false,
+
         events : {
             'click .name-save'            : 'updateMonitorName',
             'click .schedule-tab'         : '_setExpandedViewHeight',
+            'click #cronScheduleFormEdit .day-month-picker .day-picker button' : 'cronWeekdayButtonClicked',
             'change #selectPreviousError' : '_setErrorDropDown'
         },
 
@@ -47,7 +55,6 @@ define([
             this.categories  = categories;
             this.categoryId  = categoryId;
             this.dashboardId = dashboardId;
-
             this.initMonitor();
         },
         /**
@@ -120,6 +127,7 @@ define([
 
                         // inline help
                         self.setHelp();
+                        self.setCronScheduleValidation(); 
 
                         // dynamically set the heights to maximum screen utilization
                         self._setExpandedViewHeight();
@@ -128,6 +136,55 @@ define([
                 });
             });
 
+
+        },
+
+        setCronScheduleWeekdaysSelected : function() {
+          this.cronScheduleWeekdaysSelected = $('#cronScheduleFormEdit .day-month-picker .day-picker button.active').size() > 0
+        },
+
+        setCronScheduleDaysDisabled : function(disabled) {
+          if(disabled) {
+            if(!this.cronScheduleDaysDisabled) {
+              $('#inputDays').parsley('ParsleyField').reset();
+              $('#inputDays').val('?');
+              $('#inputDays').attr('disabled',"");
+              this.cronScheduleDaysDisabled = true;
+            }
+          }
+          else {
+            if(this.cronScheduleDaysDisabled) {
+              $('#inputDays').val('*');
+              $('#inputDays').removeAttr('disabled');
+              this.cronScheduleDaysDisabled = false;
+            } 
+          }
+        },
+
+        cronWeekdayButtonClicked : function(event) {
+            $(event.target).button('toggle');
+            this.setCronScheduleWeekdaysSelected();
+            this.setCronScheduleDaysDisabled(this.cronScheduleWeekdaysSelected);
+        },
+        
+        setCronScheduleValidation : function() {
+            this.cronScheduleForm = $('#cronScheduleFormEdit');
+            var validator = CronUtil.parsleyValidator();
+            _.extend(validator,{
+                errors: {
+                  container: function (parsleyElement, parsleyTemplate, isRadioOrCheckbox) {
+                    var container = $('#cronScheduleFormEditErrors');
+                    container.append(parsleyTemplate);
+                    return container;
+                  }
+                },
+                listeners: {
+                    onFormSubmit : function ( isFormValid, event, ParsleyForm ) {
+                      this.cronScheduleFormValid = isFormValid;
+                    }.bind(this)
+                }
+            });
+            this.cronScheduleForm.parsley(validator);
         },
 
         getGraphData : function(monitorId, cb) {
@@ -192,18 +249,26 @@ define([
         },
         setHelp : function() {
             var self     = this,
-            $content = '';
+            $quickContent = '';
             $alertContent = '';
-            //TODO fix this path
+            $cronHelpContent = '';
+
+            $.ajax({
+                url     : rearview.path + '/help/cron.html',
+                async   : false,
+                success : function( response ) {
+                    $cronHelpContent = response;
+                }
+            });
+
             $.ajax({
                 url     : rearview.path + '/help/quick.html',
                 async   : false,
                 success : function( response ) {
-                    $content = response;
+                    $quickContent = response;
                 }
             });
 
-            //TODO fix this path
             $.ajax({
                 url     : rearview.path + '/help/alert.html',
                 async   : false,
@@ -212,15 +277,23 @@ define([
                 }
             });
 
+            self.$el.find('#viewSchedule .help.label').tooltip({
+                trigger   : 'click',
+                html      : true,
+                placement : 'left',
+                delay     : { show : 100, hide : 200 },
+                title     : $cronHelpContent
+            });
+
             self.$el.find('.help:nth-child(2)').tooltip({
                 trigger   : 'click',
                 html      : true,
                 placement : 'right',
                 delay     : { show : 100, hide : 200 },
-                title     : $content
+                title     : $quickContent
             });
 
-            self.$el.find('.help:nth-child(1)').tooltip({
+            self.$el.find('#viewSettings .monitor-meta .pager-duty .help.label').tooltip({
                 trigger   : 'click',
                 html      : true,
                 placement : 'left',
@@ -372,32 +445,37 @@ define([
                 toDate      = e.data.toDate,
                 output      = e.data.output;
 
-            monitor = self._setMetrics(monitor);
-            monitor = self._setSchedule(monitor);
-            monitor = self._setSettings(monitor);
+            this.cronScheduleForm.parsley('validate');
+            if(this.cronScheduleFormValid) {
+            
+              monitor = self._setMetrics(monitor);
+              monitor = self._setSchedule(monitor);
+              monitor = self._setSettings(monitor);
+
+              monitor.save(null, {
+                  success : function(model, response, options) {
+                      Backbone.Mediator.pub('view:expandedmonitor:save', {
+                          'model'     : self.model,
+                          'message'   : "The monitor '" + model.get('name') + "' was saved.",
+                          'attention' : 'Monitor Saved!',
+                          'status'    : 'success'
+                      });
+
+                      // quit out of the edit monitor view
+                      self.exit(monitor);
+                      self.updateGraph(monitor);
+                  },
+                  error : function(model, xhr, options) {
+                      Backbone.Mediator.pub('view:expandedmonitor:save', {
+                          'model'     : self.model,
+                          'tryJSON'   : xhr.responseText,
+                          'attention' : 'Monitor Saved Error!',
+                          'status'    : 'error'
+                      });
+                  }
+              });
 
-            monitor.save(null, {
-                success : function(model, response, options) {
-                    Backbone.Mediator.pub('view:expandedmonitor:save', {
-                        'model'     : self.model,
-                        'message'   : "The monitor '" + model.get('name') + "' was saved.",
-                        'attention' : 'Monitor Saved!',
-                        'status'    : 'success'
-                    });
-
-                    // quit out of the edit monitor view
-                    self.exit(monitor);
-                    self.updateGraph(monitor);
-                },
-                error : function(model, xhr, options) {
-                    Backbone.Mediator.pub('view:expandedmonitor:save', {
-                        'model'     : self.model,
-                        'tryJSON'   : xhr.responseText,
-                        'attention' : 'Monitor Saved Error!',
-                        'status'    : 'error'
-                    });
-                }
-            });
+            }
         },
         /**
          * ExpandedMonitorView#deleteMonitor(e)