Scheduled daily dependency update on monday

bin/alias

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -eo pipefail
+
+[ ! -z $DOCKERHUB_REPO ] && [ $# -eq 2 ]
+
+VERSION="$1"
+ALIAS="$2"
+
+docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+docker tag $DOCKERHUB_REPO:$VERSION $DOCKERHUB_REPO:$ALIAS
+docker push $DOCKERHUB_REPO:$ALIAS

bin/docker-entrypoint

@@ -5,9 +5,13 @@ worker() {
   /app/manage.py db upgrade
   WORKERS_COUNT=${WORKERS_COUNT:-2}
   QUEUES=${QUEUES:-queries,scheduled_queries,celery}
+  MAX_MEMORY=$(($(/usr/bin/awk '/MemTotal/ {print $2}' /proc/meminfo)/4))
 
   echo "Starting $WORKERS_COUNT workers for queues: $QUEUES..."
-  exec /usr/local/bin/celery worker --app=redash.worker -c$WORKERS_COUNT -Q$QUEUES -linfo --maxtasksperchild=10 -Ofair
+  exec /usr/local/bin/celery worker --app=redash.worker -c$WORKERS_COUNT -Q$QUEUES -linfo \
+      --max-tasks-per-child=10 \
+      --max-memory-per-child=$MAX_MEMORY \
+      -Ofair
 }
 
 scheduler() {
@@ -17,7 +21,9 @@ scheduler() {
 
   echo "Starting scheduler and $WORKERS_COUNT workers for queues: $QUEUES..."
 
-  exec /usr/local/bin/celery worker --app=redash.worker --beat -c$WORKERS_COUNT -Q$QUEUES -linfo --maxtasksperchild=10 -Ofair
+  exec /usr/local/bin/celery worker --app=redash.worker --beat -c$WORKERS_COUNT -Q$QUEUES -linfo \
+      --max-tasks-per-child=10 \
+      -Ofair
 }
 
 server() {

circle.yml

@@ -18,16 +18,22 @@ test:
   override:
     - pytest --junitxml=$CIRCLE_TEST_REPORTS/junit.xml tests/
 deployment:
-  latest:
+  master:
     branch: master
     owner: mozilla
     commands:
-      - ./bin/deploy "latest"
-  hub_releases:
+      - ./bin/deploy "master"
+  release:
+    branch: release
+    owner: mozilla
+    commands:
+      - ./bin/deploy "rc"
+  milestone:
     tag: /^m[0-9]+(\.[0-9]+)?$/
     owner: mozilla
     commands:
       - ./bin/deploy "$CIRCLE_TAG"
+      - ./bin/alias "$CIRCLE_TAG" "latest"
 general:
   branches:
     ignore:

client/app/components/dashboards/widget.js

@@ -66,8 +66,6 @@ function DashboardWidgetCtrl($location, $uibModal, $window, Events, currentUser)
       return;
     }
 
-    Events.record('delete', 'widget', this.widget.id);
-
     this.widget.delete().then(() => {
       if (this.deleted) {
         this.deleted({});

client/app/components/parameters.js

@@ -123,7 +123,7 @@ function ParametersDirective($location, $uibModal) {
           }
           scope.parameters.forEach((param) => {
             if (param.value !== null || param.value !== '') {
-              $location.search(`p_${param.name}`, param.value);
+              $location.search(`p_${param.name}_${param.queryId}`, param.value);
             }
           });
         }, true);

client/app/components/queries/query-editor.js

@@ -80,57 +80,77 @@ function queryEditor(QuerySnippet, $timeout) {
               editor.getSession().setMode(newMode);
             });
 
-            $scope.$watch('schema', (newSchema, oldSchema) => {
+            $scope.$watch('autoCompleteSchema', (newSchema, oldSchema) => {
               if (newSchema !== oldSchema) {
                 if (newSchema === undefined) {
                   return;
                 }
-                const tokensCount = newSchema.reduce((totalLength, table) => totalLength + table.columns.length, 0);
-                // If there are too many tokens we disable live autocomplete,
-                // as it makes typing slower.
-                if (tokensCount > 5000) {
+                const tokensCount =
+                  newSchema.reduce((totalLength, table) => totalLength + table.columns.length, 0);
+                // If there are too many tokens or if it's requested via the UI
+                // we disable live autocomplete, as it makes typing slower.
+                if (tokensCount > 5000 || !$scope.$parent.autocompleteQuery) {
                   editor.setOption('enableLiveAutocompletion', false);
+                  editor.setOption('enableBasicAutocompletion', false);
                 } else {
                   editor.setOption('enableLiveAutocompletion', true);
+                  editor.setOption('enableBasicAutocompletion', true);
                 }
               }
             });
 
             $scope.$parent.$on('angular-resizable.resizing', () => {
               editor.resize();
             });
+            $scope.$parent.$watch('autocompleteQuery', () => {
+              editor.setOption('enableLiveAutocompletion', $scope.$parent.autocompleteQuery);
+              editor.setOption('enableBasicAutocompletion', $scope.$parent.autocompleteQuery);
+            });
 
             editor.focus();
           },
         };
 
         const schemaCompleter = {
           getCompletions(state, session, pos, prefix, callback) {
-            if (prefix.length === 0 || !$scope.schema) {
+            // make a variable for the auto completion in the query editor
+            $scope.autoCompleteSchema = $scope.schema; // removeExtraSchemaInfo(
+
+            if (prefix.length === 0 || !$scope.autoCompleteSchema) {
               callback(null, []);
               return;
             }
 
-            if (!$scope.schema.keywords) {
+            if (!$scope.autoCompleteSchema.keywords) {
               const keywords = {};
 
-              $scope.schema.forEach((table) => {
+              $scope.autoCompleteSchema.forEach((table) => {
                 keywords[table.name] = 'Table';
 
-                table.columns.forEach((c) => {
-                  keywords[c] = 'Column';
+                table.columns.forEach((c) => { // autoCompleteColumns
+                  if (c.charAt(c.length - 1) === ')') {
+                    let parensStartAt = c.indexOf('(') - 1;
+                    c = c.substring(0, parensStartAt);
+                    parensStartAt = 1; // linter complains without this line
+                  }
+                  // remove '[P] ' for partition keys
+                  if (c.charAt(0) === '[') {
+                    c = c.substring(4, c.length);
+                  }
+                  // keywords[c] = 'Column'; // dups columns
                   keywords[`${table.name}.${c}`] = 'Column';
                 });
               });
 
-              $scope.schema.keywords = map(keywords, (v, k) => ({
-                name: k,
-                value: k,
-                score: 0,
-                meta: v,
-              }));
+              $scope.autoCompleteSchema.keywords = map(keywords, (v, k) =>
+                ({
+                  name: k,
+                  value: k,
+                  score: 0,
+                  meta: v,
+                }));
             }
-            callback(null, $scope.schema.keywords);
+            callback(null, $scope.autoCompleteSchema.keywords);
           },
         };
 

client/app/components/queries/schedule-dialog.html

@@ -19,4 +19,7 @@ <h4 class="modal-title">Refresh Schedule</h4>
       Stop scheduling at date/time (format yyyy-MM-ddTHH:mm:ss, like 2016-12-28T14:57:00):
       <schedule-until query="$ctrl.query" save-query="$ctrl.saveQuery"></schedule-until>
     </label>
+    <label>
+      Number of query results to keep <schedule-keep-results query="$ctrl.query" save-query="$ctrl.saveQuery"></schedule-keep-results>
+    </label>
 </div>

client/app/components/queries/schedule-dialog.js

@@ -114,11 +114,21 @@ function scheduleUntil() {
   };
 }
 
+function scheduleKeepResults() {
+  return {
+    restrict: 'E',
+    scope: {
+      query: '=',
+      saveQuery: '=',
+    },
+    template: '<input type="number" class="form-control" ng-model="query.schedule_resultset_size" ng-change="saveQuery()" ng-disabled="!query.schedule">',
+  };
+}
+
 const ScheduleForm = {
   controller() {
     this.query = this.resolve.query;
     this.saveQuery = this.resolve.saveQuery;
-
     if (this.query.hasDailySchedule()) {
       this.refreshType = 'daily';
     } else {
@@ -137,5 +147,6 @@ export default function init(ngModule) {
   ngModule.directive('queryTimePicker', queryTimePicker);
   ngModule.directive('queryRefreshSelect', queryRefreshSelect);
   ngModule.directive('scheduleUntil', scheduleUntil);
+  ngModule.directive('scheduleKeepResults', scheduleKeepResults);
   ngModule.component('scheduleDialog', ScheduleForm);
 }

client/app/pages/admin/outdated-queries/index.js

@@ -3,8 +3,7 @@ import moment from 'moment';
 import { Paginator } from '@/lib/pagination';
 import template from './outdated-queries.html';
 
-function OutdatedQueriesCtrl($scope, Events, $http, $timeout) {
-  Events.record('view', 'page', 'admin/outdated_queries');
+function OutdatedQueriesCtrl($scope, $http, $timeout) {
   $scope.autoUpdate = true;
 
   this.queries = new Paginator([], { itemsPerPage: 50 });

client/app/pages/admin/tasks/index.js

@@ -3,8 +3,7 @@ import moment from 'moment';
 import { Paginator } from '@/lib/pagination';
 import template from './tasks.html';
 
-function TasksCtrl($scope, $location, $http, $timeout, Events) {
-  Events.record('view', 'page', 'admin/tasks');
+function TasksCtrl($scope, $location, $http, $timeout) {
   $scope.autoUpdate = true;
 
   $scope.selectedTab = 'in_progress';

client/app/pages/alert/index.js

@@ -6,8 +6,6 @@ function AlertCtrl($routeParams, $location, $sce, toastr, currentUser, Query, Ev
 
   if (this.alertId === 'new') {
     Events.record('view', 'page', 'alerts/new');
-  } else {
-    Events.record('view', 'alert', this.alertId);
   }
 
   this.trustAsHtml = html => $sce.trustAsHtml(html);

client/app/pages/alerts-list/index.js

@@ -8,9 +8,7 @@ const stateClass = {
 };
 
 class AlertsListCtrl {
-  constructor(Events, Alert) {
-    Events.record('view', 'page', 'alerts');
-
+  constructor(Alert) {
     this.showEmptyState = false;
     this.showList = false;
 

client/app/pages/dashboards/dashboard.js

@@ -179,7 +179,6 @@ function DashboardCtrl(
       (dashboard) => {
         this.dashboard = dashboard;
         this.isDashboardOwner = currentUser.id === dashboard.user.id || currentUser.hasPermission('admin');
-        Events.record('view', 'dashboard', dashboard.id);
         renderDashboard(dashboard, force);
 
         if ($location.search().edit === true) {
@@ -229,7 +228,6 @@ function DashboardCtrl(
 
   this.archiveDashboard = () => {
     const archive = () => {
-      Events.record('archive', 'dashboard', this.dashboard.id);
       this.dashboard.$delete();
     };
 

client/app/pages/data-sources/list.js

@@ -1,9 +1,7 @@
 import settingsMenu from '@/lib/settings-menu';
 import template from './list.html';
 
-function DataSourcesCtrl(Policy, Events, DataSource) {
-  Events.record('view', 'page', 'admin/data_sources');
-
+function DataSourcesCtrl(Policy, DataSource) {
   this.policy = Policy;
   this.dataSources = DataSource.query();
 }

client/app/pages/data-sources/show.js

@@ -6,9 +6,8 @@ const logger = debug('redash:http');
 
 function DataSourceCtrl(
   $scope, $route, $routeParams, $http, $location, toastr,
-  currentUser, AlertDialog, Events, DataSource,
+  currentUser, AlertDialog, DataSource,
 ) {
-  Events.record('view', 'page', 'admin/data_source');
 
   $scope.dataSource = $route.current.locals.dataSource;
   $scope.dataSourceId = $routeParams.dataSourceId;
@@ -45,8 +44,6 @@ function DataSourceCtrl(
 
   function deleteDataSource(callback) {
     const doDelete = () => {
-      Events.record('delete', 'datasource', $scope.dataSource.id);
-
       $scope.dataSource.$delete(() => {
         toastr.success('Data source deleted successfully.');
         $location.path('/data_sources/');
@@ -64,8 +61,6 @@ function DataSourceCtrl(
   }
 
   function testConnection(callback) {
-    Events.record('test', 'datasource', $scope.dataSource.id);
-
     DataSource.test({ id: $scope.dataSource.id }, (httpResponse) => {
       if (httpResponse.ok) {
         toastr.success('Success');
@@ -81,8 +76,6 @@ function DataSourceCtrl(
   }
 
   function getDataSourceVersion(callback) {
-    Events.record('test', 'data_source_version', $scope.dataSource.id);
-
     DataSource.version({ id: $scope.dataSource.id }, (httpResponse) => {
       if (httpResponse.ok) {
         const versionNumber = httpResponse.message;

client/app/pages/destinations/list.js

@@ -1,9 +1,7 @@
 import settingsMenu from '@/lib/settings-menu';
 import template from './list.html';
 
-function DestinationsCtrl($scope, $location, toastr, currentUser, Events, Destination) {
-  Events.record('view', 'page', 'admin/destinations');
-
+function DestinationsCtrl($scope, $location, toastr, currentUser, Destination) {
   $scope.destinations = Destination.query();
 }
 

client/app/pages/destinations/show.js

@@ -6,9 +6,8 @@ const logger = debug('redash:http');
 
 function DestinationCtrl(
   $scope, $route, $routeParams, $http, $location, toastr,
-  currentUser, AlertDialog, Events, Destination,
+  currentUser, AlertDialog, Destination,
 ) {
-  Events.record('view', 'page', 'admin/destination');
 
   $scope.destination = $route.current.locals.destination;
   $scope.destinationId = $routeParams.destinationId;
@@ -34,8 +33,6 @@ function DestinationCtrl(
 
   $scope.delete = () => {
     const doDelete = () => {
-      Events.record('delete', 'destination', $scope.destination.id);
-
       $scope.destination.$delete(() => {
         toastr.success('Destination deleted successfully.');
         $location.path('/destinations/');

client/app/pages/groups/data-sources.js

@@ -1,8 +1,7 @@
 import { includes } from 'lodash';
 import template from './data-sources.html';
 
-function GroupDataSourcesCtrl($scope, $routeParams, $http, Events, Group, DataSource) {
-  Events.record('view', 'group_data_sources', $scope.groupId);
+function GroupDataSourcesCtrl($scope, $routeParams, $http, Group, DataSource) {
   $scope.group = Group.get({ id: $routeParams.groupId });
   $scope.dataSources = Group.dataSources({ id: $routeParams.groupId });
   $scope.newDataSource = {};

client/app/pages/groups/list.js

@@ -2,8 +2,7 @@ import settingsMenu from '@/lib/settings-menu';
 import { Paginator } from '@/lib/pagination';
 import template from './list.html';
 
-function GroupsCtrl($scope, $uibModal, currentUser, Events, Group) {
-  Events.record('view', 'page', 'groups');
+function GroupsCtrl($scope, $uibModal, currentUser, Group) {
   $scope.currentUser = currentUser;
   $scope.groups = new Paginator([], { itemsPerPage: 20 });
   Group.query((groups) => {

client/app/pages/groups/show.js

@@ -1,9 +1,7 @@
 import { includes } from 'lodash';
 import template from './show.html';
 
-function GroupCtrl($scope, $routeParams, $http, currentUser, Events, Group, User) {
-  Events.record('view', 'group', $scope.groupId);
-
+function GroupCtrl($scope, $routeParams, $http, currentUser, Group, User) {
   $scope.currentUser = currentUser;
   $scope.group = Group.get({ id: $routeParams.groupId });
   $scope.members = Group.members({ id: $routeParams.groupId });

client/app/pages/queries-list/index.js

@@ -9,9 +9,6 @@ class QueriesListCtrl {
     const page = parseInt($location.search().page || 1, 10);
 
     this.term = $location.search().q;
-    if (isString(this.term) && this.term !== '') {
-      Events.record('search', 'query', '', { term: this.term });
-    }
 
     this.defaultOptions = {};