From 3ac7f02aea43c3aedb3ba9b6d2c3cdb59784b54f Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Thu, 18 Feb 2016 20:44:49 +0000 Subject: [PATCH 01/38] Add NotificationDestination model and handlers; Add BaseNotification class --- .../0023_add_notification_destination.py | 13 +++ redash/__init__.py | 2 + redash/destinations/__init__.py | 91 +++++++++++++++ redash/destinations/slack.py | 21 ++++ redash/handlers/api.py | 5 +- redash/handlers/destinations.py | 83 ++++++++++++++ redash/models.py | 105 +++++++++++++++++- redash/settings.py | 10 ++ 8 files changed, 328 insertions(+), 2 deletions(-) create mode 100644 migrations/0023_add_notification_destination.py create mode 100644 redash/destinations/__init__.py create mode 100644 redash/destinations/slack.py create mode 100644 redash/handlers/destinations.py diff --git a/migrations/0023_add_notification_destination.py b/migrations/0023_add_notification_destination.py new file mode 100644 index 000000000..685d32abc --- /dev/null +++ b/migrations/0023_add_notification_destination.py @@ -0,0 +1,13 @@ +from redash.models import db, NotificationDestination, NotificationDestinationGroup + +if __name__ == '__main__': + with db.database.transaction(): + + if not NotificationDestination.table_exists(): + NotificationDestination.create_table() + + if not NotificationDestinationGroup.table_exists(): + NotificationDestinationGroup.create_table() + + db.close_db(None) + diff --git a/redash/__init__.py b/redash/__init__.py index a4012fde3..92ace5bf1 100644 --- a/redash/__init__.py +++ b/redash/__init__.py @@ -10,6 +10,7 @@ from flask_mail import Mail from redash import settings from redash.query_runner import import_query_runners +from redash.destinations import import_destinations __version__ = '0.10.0' @@ -51,6 +52,7 @@ mail.init_mail(settings.all_settings()) statsd_client = StatsClient(host=settings.STATSD_HOST, port=settings.STATSD_PORT, prefix=settings.STATSD_PREFIX) import_query_runners(settings.QUERY_RUNNERS) +import_destinations(settings.DESTINATIONS) from redash.version_check import reset_new_version_status reset_new_version_status() diff --git a/redash/destinations/__init__.py b/redash/destinations/__init__.py new file mode 100644 index 000000000..a1daf49f5 --- /dev/null +++ b/redash/destinations/__init__.py @@ -0,0 +1,91 @@ +import logging +import json + +import jsonschema +from jsonschema import ValidationError +from redash import settings + +logger = logging.getLogger(__name__) + +__all__ = [ + 'ValidationError', + 'BaseDestination', + 'register', + 'get_destination', + 'import_destinations' +] + + +class BaseDestination(object): + def __init__(self, configuration): + jsonschema.validate(configuration, self.configuration_schema()) + self.configuration = configuration + + @classmethod + def name(cls): + return cls.__name__ + + @classmethod + def type(cls): + return cls.__name__.lower() + + @classmethod + def enabled(cls): + return True + + @classmethod + def configuration_schema(cls): + return {} + + def notify(self, query): + raise NotImplementedError() + + @classmethod + def to_dict(cls): + return { + 'name': cls.name(), + 'type': cls.type(), + 'configuration_schema': cls.configuration_schema() + } + + +destinations = {} + + +def register(destination_class): + global destinations + if destination_class.enabled(): + logger.debug("Registering %s (%s) destinations.", destination_class.name(), destination_class.type()) + destinations[destination_class.type()] = destination_class + else: + logger.warning("%s destination enabled but not supported, not registering. Either disable or install missing dependencies.", destination_class.name()) + + +def get_destination(destination_type, configuration_json): + destination_class = destinations.get(destination_type, None) + if destination_class is None: + return None + + return destination_class(json.loads(configuration_json)) + + +def validate_configuration(destination_type, configuration_json): + destination_class = destinations.get(destination_type, None) + if destination_class is None: + return False + + try: + if isinstance(configuration_json, basestring): + configuration = json.loads(configuration_json) + else: + configuration = configuration_json + jsonschema.validate(configuration, destination_class.configuration_schema()) + except (ValidationError, ValueError): + return False + + return True + + +def import_destinations(destination_imports): + for destination_import in destination_imports: + __import__(destination_import) diff --git a/redash/destinations/slack.py b/redash/destinations/slack.py new file mode 100644 index 000000000..f81fd33ee --- /dev/null +++ b/redash/destinations/slack.py @@ -0,0 +1,21 @@ +from redash.destinations import * + + +class Slack(BaseDestination): + + @classmethod + def configuration_schema(cls): + return { + 'type': 'object', + 'properties': { + 'url': { + 'type': 'string', + 'title': 'Slack webhook URL' + } + } + } + + def notify(self, query): + pass + +register(Slack) diff --git a/redash/handlers/api.py b/redash/handlers/api.py index ebd36903f..87ab656eb 100644 --- a/redash/handlers/api.py +++ b/redash/handlers/api.py @@ -16,6 +16,7 @@ from redash.handlers.visualizations import VisualizationResource from redash.handlers.widgets import WidgetResource, WidgetListResource from redash.handlers.groups import GroupListResource, GroupResource, GroupMemberListResource, GroupMemberResource, \ GroupDataSourceListResource, GroupDataSourceResource +from redash.handlers.destinations import DestinationTypeListResource, DestinationResource, DestinationListResource class ApiExt(Api): @@ -85,4 +86,6 @@ api.add_org_resource(VisualizationResource, '/api/visualizations/', endpoint='widget') - +api.add_org_resource(DestinationTypeListResource, '/api/destinations/types', endpoint='destination_types') +api.add_org_resource(DestinationResource, '/api/destinations/', endpoint='destination') +api.add_org_resource(DestinationListResource, '/api/destinations', endpoint='destinations') diff --git a/redash/handlers/destinations.py b/redash/handlers/destinations.py new file mode 100644 index 000000000..407035931 --- /dev/null +++ b/redash/handlers/destinations.py @@ -0,0 +1,83 @@ +import json + +from flask import make_response, request +from flask.ext.restful import abort +from funcy import project + +from redash import models +from redash.permissions import require_admin +from redash.destinations import destinations, validate_configuration +from redash.handlers.base import BaseResource, get_object_or_404 + + +class DestinationTypeListResource(BaseResource): + @require_admin + def get(self): + return [q.to_dict() for q in destinations.values()] + + +class DestinationResource(BaseResource): + @require_admin + def get(self, destination_id): + destination = models.NotificationDestination.get_by_id_and_org(destination_id, self.current_org) + return destination.to_dict(all=True) + + @require_admin + def post(self, destination_id): + destination = models.NotificationDestination.get_by_id_and_org(destination_id, self.current_org) + req = request.get_json(True) + + destination.replace_secret_placeholders(req['options']) + + if not validate_configuration(req['type'], req['options']): + abort(400) + + destination.name = req['name'] + destination.options = json.dumps(req['options']) + + destination.save() + + return destination.to_dict(all=True) + + @require_admin + def delete(self, destination_id): + destination = models.NotificationDestination.get_by_id_and_org(destination_id, self.current_org) + destination.delete_instance(recursive=True) + + return make_response('', 204) + + +class DestinationListResource(BaseResource): + def get(self): + if self.current_user.has_permission('admin'): + destinations = models.NotificationDestination.all(self.current_org) + else: + destinations = models.NotificationDestination.all(self.current_org, groups=self.current_user.groups) + + response = {} + for ds in destinations: + if ds.id in response: + continue + + d = ds.to_dict() + d['view_only'] = all(project(ds.groups, self.current_user.groups).values()) + response[ds.id] = d + + return response.values() + + @require_admin + def post(self): + req = request.get_json(True) + required_fields = ('options', 'name', 'type') + for f in required_fields: + if f not in req: + abort(400) + + if not validate_configuration(req['type'], req['options']): + abort(400) + + destination = models.NotificationDestination.create_with_group(org=self.current_org, + name=req['name'], + type=req['type'], options=json.dumps(req['options'])) + + return destination.to_dict(all=True) diff --git a/redash/models.py b/redash/models.py index 3d0d459e6..d2c1c353c 100644 --- a/redash/models.py +++ b/redash/models.py @@ -17,6 +17,7 @@ from permissions import has_access, view_only from redash import utils, settings, redis_connection from redash.query_runner import get_query_runner, get_configuration_schema_for_type +from redash.destinations import get_destination from redash.metrics.database import MeteredPostgresqlExtDatabase, MeteredModel from redash.utils import generate_token from redash.utils.configuration import ConfigurationContainer @@ -1068,7 +1069,109 @@ class ApiKey(ModelTimestampsMixin, BaseModel): return cls.create(org=user.org, object=object, created_by=user) -all_models = (Organization, Group, DataSource, DataSourceGroup, User, QueryResult, Query, Alert, AlertSubscription, Dashboard, Visualization, Widget, Event, ApiKey) +class NotificationDestination(BelongsToOrgMixin, BaseModel): + + id = peewee.PrimaryKeyField() + org = peewee.ForeignKeyField(Organization, related_name="notification_destinations") + name = peewee.CharField() + type = peewee.CharField() + options = peewee.TextField() + created_at = DateTimeTZField(default=datetime.datetime.now) + + class Meta: + db_table = 'notification_destinations' + + indexes = ( + (('org', 'name'), True), + ) + + def to_dict(self, all=False, with_permissions=False): + d = { + 'id': self.id, + 'name': self.name, + 'type': self.type, + } + + if all: + d['options'] = self.configuration + d['groups'] = self.groups + + if with_permissions: + d['view_only'] = self.notification_destination_groups.view_only + + return d + + def __unicode__(self): + return self.name + + @classmethod + def create_with_group(cls, *args, **kwargs): + notification_destination = cls.create(*args, **kwargs) + NotificationDestinationGroup.create( + notification_destination=notification_destination, + group=notification_destination.org.default_group + ) + return notification_destination + + @property + def configuration(self): + configuration = json.loads(self.options) + schema = self.destination.configuration_schema() + for prop in schema.get('secret', []): + if prop in configuration and configuration[prop]: + configuration[prop] = self.SECRET_PLACEHOLDER + + return configuration + + def replace_secret_placeholders(self, configuration): + current_configuration = json.loads(self.options) + schema = self.destination.configuration_schema() + for prop in schema.get('secret', []): + if prop in configuration and configuration[prop] == self.SECRET_PLACEHOLDER: + configuration[prop] = current_configuration[prop] + + def add_group(self, group, view_only=False): + ndg = NotificationDestinationGroup.create(group=group, notification_destination=self, view_only=view_only) + setattr(self, 'notification_destination_groups', ndg) + + def remove_group(self, group): + NotificationDestinationGroup.delete().where(NotificationDestinationGroup.group==group, NotificationDestinationGroup.notification_destination==self).execute() + + def update_group_permission(self, group, view_only): + ndg = NotificationDestinationGroup.get(NotificationDestinationGroup.group==group, NotificationDestinationGroup.notification_destination==self) + ndg.view_only = view_only + ndg.save() + setattr(self, 'notification_destination_groups', dsg) + + @property + def destination(self): + return get_destination(self.type, self.options) + + @classmethod + def all(cls, org, groups=None): + notification_destinations = cls.select().where(cls.org==org).order_by(cls.id.asc()) + + if groups: + notification_destinations = notification_destinations.join(NotificationDestinationGroup).where(NotificationDestinationGroup.group << groups) + + return notification_destinations + + @property + def groups(self): + groups = NotificationDestinationsGroup.select().where(NotificationDestinationGroup.notification_destination==self) + return dict(map(lambda g: (g.group_id, g.view_only), groups)) + + +class NotificationDestinationGroup(BaseModel): + notification_destination = peewee.ForeignKeyField(NotificationDestination) + group = peewee.ForeignKeyField(Group, related_name="notification_destinations") + view_only = peewee.BooleanField(default=False) + + class Meta: + db_table = "notification_destination_groups" + + +all_models = (Organization, Group, DataSource, DataSourceGroup, User, QueryResult, Query, Alert, AlertSubscription, Dashboard, Visualization, Widget, Event, ApiKey, NotificationDestination, NotificationDestinationGroup) def init_db(): diff --git a/redash/settings.py b/redash/settings.py index 8c5ac2f83..14bd3387d 100644 --- a/redash/settings.py +++ b/redash/settings.py @@ -178,6 +178,16 @@ additional_query_runners = array_from_string(os.environ.get("REDASH_ADDITIONAL_Q QUERY_RUNNERS = distinct(enabled_query_runners + additional_query_runners) +# Destinations +default_destinations = [ + 'redash.destinations.slack', +] + +enabled_destinations = array_from_string(os.environ.get("REDASH_ENABLED_DESTINATIONS", ",".join(default_destinations))) +additional_destinations = array_from_string(os.environ.get("REDASH_ADDITIONAL_DESTINATIONS", "")) + +DESTINATIONS = distinct(enabled_destinations + additional_destinations) + EVENT_REPORTING_WEBHOOKS = array_from_string(os.environ.get("REDASH_EVENT_REPORTING_WEBHOOKS", "")) # Support for Sentry (http://getsentry.com/). Just set your Sentry DSN to enable it: From 53f8f1de3b994a7d12a54f8a488758fae2bd6550 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Fri, 19 Feb 2016 13:33:29 +0000 Subject: [PATCH 02/38] Fix typo --- redash/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redash/models.py b/redash/models.py index d2c1c353c..848d12b70 100644 --- a/redash/models.py +++ b/redash/models.py @@ -1158,7 +1158,7 @@ class NotificationDestination(BelongsToOrgMixin, BaseModel): @property def groups(self): - groups = NotificationDestinationsGroup.select().where(NotificationDestinationGroup.notification_destination==self) + groups = NotificationDestinationGroup.select().where(NotificationDestinationGroup.notification_destination==self) return dict(map(lambda g: (g.group_id, g.view_only), groups)) From 3844483776d5a915cc90ae25c9d88a5f288cfd92 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Fri, 19 Feb 2016 14:16:41 +0000 Subject: [PATCH 03/38] Add destination elements to rd_ui --- rd_ui/app/app_layout.html | 2 + rd_ui/app/index.html | 2 - rd_ui/app/scripts/app.js | 9 +++ rd_ui/app/scripts/controllers/destinations.js | 47 +++++++++++ rd_ui/app/scripts/controllers/users.js | 43 ++++++++++ .../directives/destination_directives.js | 80 +++++++++++++++++++ rd_ui/app/scripts/services/resources.js | 16 +++- rd_ui/app/views/app_header.html | 3 + rd_ui/app/views/destinations/edit.html | 11 +++ rd_ui/app/views/destinations/form.html | 20 +++++ rd_ui/app/views/destinations/list.html | 18 +++++ rd_ui/app/views/groups/show.html | 3 +- rd_ui/app/views/groups/show_data_sources.html | 1 + rd_ui/app/views/groups/show_destinations.html | 58 ++++++++++++++ redash/handlers/destinations.py | 1 - 15 files changed, 309 insertions(+), 5 deletions(-) create mode 100644 rd_ui/app/scripts/controllers/destinations.js create mode 100644 rd_ui/app/scripts/directives/destination_directives.js create mode 100644 rd_ui/app/views/destinations/edit.html create mode 100644 rd_ui/app/views/destinations/form.html create mode 100644 rd_ui/app/views/destinations/list.html create mode 100644 rd_ui/app/views/groups/show_destinations.html diff --git a/rd_ui/app/app_layout.html b/rd_ui/app/app_layout.html index 4968d8142..c173791d8 100644 --- a/rd_ui/app/app_layout.html +++ b/rd_ui/app/app_layout.html @@ -68,6 +68,7 @@ + @@ -84,6 +85,7 @@ + diff --git a/rd_ui/app/index.html b/rd_ui/app/index.html index 1543811de..4543fe5b7 100644 --- a/rd_ui/app/index.html +++ b/rd_ui/app/index.html @@ -1,7 +1,5 @@ {% extends 'app_layout.html' %} - {% block content %} {% endblock %} - diff --git a/rd_ui/app/scripts/app.js b/rd_ui/app/scripts/app.js index 7236ad775..f9f6492cf 100644 --- a/rd_ui/app/scripts/app.js +++ b/rd_ui/app/scripts/app.js @@ -107,6 +107,15 @@ angular.module('redash', [ controller: 'DataSourcesCtrl' }); + $routeProvider.when('/destinations/:destinationId', { + templateurl: '/views/destinations/edit.html', + controller: 'destinationctrl' + }); + $routeProvider.when('/destinations', { + templateUrl: '/views/destinations/list.html', + controller: 'DestinationsCtrl' + }); + $routeProvider.when('/users/new', { templateUrl: '/views/users/new.html', controller: 'NewUserCtrl' diff --git a/rd_ui/app/scripts/controllers/destinations.js b/rd_ui/app/scripts/controllers/destinations.js new file mode 100644 index 000000000..5a4f3122f --- /dev/null +++ b/rd_ui/app/scripts/controllers/destinations.js @@ -0,0 +1,47 @@ +(function () { + var DestinationsCtrl = function ($scope, $location, growl, Events, Destination) { + Events.record(currentUser, "view", "page", "admin/destinations"); + $scope.$parent.pageTitle = "Destinations"; + + $scope.destinations = Destination.query(); + + $scope.openDestination = function(destination) { + $location.path('/destinations/' + destination.id); + }; + + $scope.deleteDestination = function(event, destination) { + event.stopPropagation(); + Events.record(currentUser, "delete", "destination", destination.id); + destination.$delete(function(resource) { + growl.addSuccessMessage("Destination deleted successfully."); + this.$parent.destinations = _.without(this.destinations, resource); + }.bind(this), function(httpResponse) { + console.log("Failed to delete destination: ", httpResponse.status, httpResponse.statusText, httpResponse.data); + growl.addErrorMessage("Failed to delete destination."); + }); + } + }; + + var DestinationCtrl = function ($scope, $routeParams, $http, $location, Events, Destination) { + Events.record(currentUser, "view", "page", "admin/destination"); + $scope.$parent.pageTitle = "Destinations"; + + $scope.destinationId = $routeParams.destinationId; + + if ($scope.destinationId == "new") { + $scope.destination = new Destination({options: {}}); + } else { + $scope.destination = Destination.get({id: $routeParams.destinationId}); + } + + $scope.$watch('destination.id', function(id) { + if (id != $scope.destinationId && id !== undefined) { + $location.path('/destinations/' + id).replace(); + } + }); + }; + + angular.module('redash.controllers') + .controller('DestinationsCtrl', ['$scope', '$location', 'growl', 'Events', 'Destination', DestinationsCtrl]) + .controller('DestinationCtrl', ['$scope', '$routeParams', '$http', '$location', 'Events', 'Destination', DestinationCtrl]) +})(); diff --git a/rd_ui/app/scripts/controllers/users.js b/rd_ui/app/scripts/controllers/users.js index 915278366..b7b7886e7 100644 --- a/rd_ui/app/scripts/controllers/users.js +++ b/rd_ui/app/scripts/controllers/users.js @@ -153,6 +153,48 @@ }; } + var GroupDestinationsCtrl = function($scope, $routeParams, $http, $location, growl, Events, Group, Destination) { + Events.record(currentUser, "view", "group_destinations", $scope.groupId); + $scope.group = Group.get({id: $routeParams.groupId}); + $scope.destinations = Group.destinations({id: $routeParams.groupId}); + $scope.newDestination= {}; + + $scope.findDestination = function(search) { + if ($scope.foundDestinations === undefined) { + Destination.query(function(destinations) { + var existingIds = _.map($scope.destinations, function(m) { return m.id; }); + $scope.foundDestinations = _.filter(destinations, function(d) { return !_.contains(existingIds, d.id); }); + }); + } + }; + + $scope.addDestination = function(destination) { + // Clear selection, to clear up the input control. + $scope.newDestination.selected = undefined; + + $http.post('api/groups/' + $routeParams.groupId + '/destinations', {'destination_id': destination.id}).success(function(user) { + destination.view_only = false; + $scope.destinations.unshift(destination); + + if ($scope.foundDestinations) { + $scope.foundDestinations = _.filter($scope.foundDestinations, function(d) { return d != destination; }); + } + }); + }; + + $scope.changePermission = function(destination, viewOnly) { + $http.post('api/groups/' + $routeParams.groupId + '/destinations/' + destination.id, {view_only: viewOnly}).success(function() { + destination.view_only = viewOnly; + }); + }; + + $scope.removeDestination = function(destination) { + $http.delete('api/groups/' + $routeParams.groupId + '/destinations/' + destination.id).success(function() { + $scope.destinations = _.filter($scope.destinations, function(d) { return destination != d; }); + }); + }; + } + var GroupCtrl = function($scope, $routeParams, $http, $location, growl, Events, Group, User) { Events.record(currentUser, "view", "group", $scope.groupId); $scope.group = Group.get({id: $routeParams.groupId}); @@ -352,6 +394,7 @@ .directive('usersNav', ['$location', usersNav]) .controller('GroupCtrl', ['$scope', '$routeParams', '$http', '$location', 'growl', 'Events', 'Group', 'User', GroupCtrl]) .controller('GroupDataSourcesCtrl', ['$scope', '$routeParams', '$http', '$location', 'growl', 'Events', 'Group', 'DataSource', GroupDataSourcesCtrl]) + .controller('GroupDestinationsCtrl', ['$scope', '$routeParams', '$http', '$location', 'growl', 'Events', 'Group', 'Destination', GroupDestinationsCtrl]) .controller('UsersCtrl', ['$scope', '$location', 'growl', 'Events', 'User', UsersCtrl]) .controller('UserCtrl', ['$scope', '$routeParams', '$http', '$location', 'growl', 'Events', 'User', UserCtrl]) .controller('NewUserCtrl', ['$scope', '$location', 'growl', 'Events', 'User', NewUserCtrl]) diff --git a/rd_ui/app/scripts/directives/destination_directives.js b/rd_ui/app/scripts/directives/destination_directives.js new file mode 100644 index 000000000..738a7885e --- /dev/null +++ b/rd_ui/app/scripts/directives/destination_directives.js @@ -0,0 +1,80 @@ +(function () { + 'use strict'; + + var directives = angular.module('redash.directives'); + + directives.directive('destinationForm', ['$http', 'growl', function ($http, growl) { + return { + restrict: 'E', + replace: true, + templateUrl: '/views/destinations/form.html', + scope: { + 'destination': '=' + }, + link: function ($scope) { + var setType = function(types) { + if ($scope.destination.type === undefined) { + $scope.destination.type = types[0].type; + return types[0]; + } + + $scope.type = _.find(types, function (t) { + return t.type == $scope.destination.type; + }); + }; + + $scope.files = {}; + + $scope.$watchCollection('files', function() { + _.each($scope.files, function(v, k) { + if (v) { + $scope.dataSource.options[k] = v.base64; + } + }); + }); + + + $http.get('api/destinations/types').success(function (types) { + setType(types); + + $scope.destinationTypes = types; + + _.each(types, function (type) { + _.each(type.configuration_schema.properties, function (prop, name) { + if (name == 'password' || name == 'passwd') { + prop.type = 'password'; + } + + if (_.string.endsWith(name, "File")) { + prop.type = 'file'; + } + + if (prop.type == 'boolean') { + prop.type = 'checkbox'; + } + + prop.required = _.contains(type.configuration_schema.required, name); + }); + }); + }); + + $scope.$watch('destination.type', function(current, prev) { + if (prev !== current) { + if (prev !== undefined) { + $scope.destination.options = {}; + } + setType($scope.destinationTypes); + } + }); + + $scope.saveChanges = function() { + $scope.destination.$save(function() { + growl.addSuccessMessage("Saved."); + }, function() { + growl.addErrorMessage("Failed saving."); + }); + } + } + } + }]); +})(); diff --git a/rd_ui/app/scripts/services/resources.js b/rd_ui/app/scripts/services/resources.js index a048dcb75..e82667e60 100644 --- a/rd_ui/app/scripts/services/resources.js +++ b/rd_ui/app/scripts/services/resources.js @@ -556,6 +556,18 @@ return DataSourceResource; }; + var Destination = function ($resource) { + var actions = { + 'get': {'method': 'GET', 'cache': false, 'isArray': false}, + 'query': {'method': 'GET', 'cache': false, 'isArray': true}, + 'getSchema': {'method': 'GET', 'cache': true, 'isArray': true, 'url': 'api/destinations/:id/schema'} + }; + + var DestinationResource = $resource('api/destinations/:id', {id: '@id'}, actions); + + return DestinationResource; + }; + var User = function ($resource, $http) { var transformSingle = function(user) { if (user.groups !== undefined) { @@ -589,7 +601,8 @@ 'get': {'method': 'GET', 'cache': false, 'isArray': false}, 'query': {'method': 'GET', 'cache': false, 'isArray': true}, 'members': {'method': 'GET', 'cache': true, 'isArray': true, 'url': 'api/groups/:id/members'}, - 'dataSources': {'method': 'GET', 'cache': true, 'isArray': true, 'url': 'api/groups/:id/data_sources'} + 'dataSources': {'method': 'GET', 'cache': true, 'isArray': true, 'url': 'api/groups/:id/data_sources'}, + 'destinations': {'method': 'GET', 'cache': true, 'isArray': true, 'url': 'api/groups/:id/destinations'} }; var resource = $resource('api/groups/:id', {id: '@id'}, actions); return resource; @@ -645,6 +658,7 @@ .factory('QueryResult', ['$resource', '$timeout', '$q', QueryResult]) .factory('Query', ['$resource', 'QueryResult', 'DataSource', Query]) .factory('DataSource', ['$resource', DataSource]) + .factory('Destination', ['$resource', Destination]) .factory('Alert', ['$resource', '$http', Alert]) .factory('AlertSubscription', ['$resource', AlertSubscription]) .factory('Widget', ['$resource', 'Query', Widget]) diff --git a/rd_ui/app/views/app_header.html b/rd_ui/app/views/app_header.html index 86a702a98..aa4dbf120 100644 --- a/rd_ui/app/views/app_header.html +++ b/rd_ui/app/views/app_header.html @@ -50,6 +50,9 @@
    +
  • + +
    • diff --git a/rd_ui/app/views/destinations/edit.html b/rd_ui/app/views/destinations/edit.html new file mode 100644 index 000000000..cc71e44c2 --- /dev/null +++ b/rd_ui/app/views/destinations/edit.html @@ -0,0 +1,11 @@ +
    +
      +
    1. Destinations
      2. +
    2. {{destination.name || "New"}}
      3. +
    +
    +
    + +
    +
    +
    diff --git a/rd_ui/app/views/destinations/form.html b/rd_ui/app/views/destinations/form.html new file mode 100644 index 000000000..868e668d0 --- /dev/null +++ b/rd_ui/app/views/destinations/form.html @@ -0,0 +1,20 @@ +
    +
    + + +
    +
    + + +
    +
    + + + + +
    + +
    diff --git a/rd_ui/app/views/destinations/list.html b/rd_ui/app/views/destinations/list.html new file mode 100644 index 000000000..e22e8bf24 --- /dev/null +++ b/rd_ui/app/views/destinations/list.html @@ -0,0 +1,18 @@ +
    +
      +
    1. Destinations
      2. +
    +
    +
    +
    +
    + {{destination.name}} + +
    + + Add Destination + +
    +
    +
    +
    diff --git a/rd_ui/app/views/groups/show.html b/rd_ui/app/views/groups/show.html index 1ed8557da..21bcb463e 100644 --- a/rd_ui/app/views/groups/show.html +++ b/rd_ui/app/views/groups/show.html @@ -8,6 +8,7 @@ @@ -39,4 +40,4 @@ - \ No newline at end of file + diff --git a/rd_ui/app/views/groups/show_data_sources.html b/rd_ui/app/views/groups/show_data_sources.html index 744cc6798..430790868 100644 --- a/rd_ui/app/views/groups/show_data_sources.html +++ b/rd_ui/app/views/groups/show_data_sources.html @@ -8,6 +8,7 @@
    diff --git a/rd_ui/app/views/groups/show_destinations.html b/rd_ui/app/views/groups/show_destinations.html new file mode 100644 index 000000000..ef12952cf --- /dev/null +++ b/rd_ui/app/views/groups/show_destinations.html @@ -0,0 +1,58 @@ +
    + + + + +
    +
    + +
    +
    + + + +
    + {{destination.name}} +
    +     +     +
    +
    +
    +
    + + + + + + + + + +
    {{destination.name}} +
    + + + + + +
    + + +
    +
    +
    +
    diff --git a/redash/handlers/destinations.py b/redash/handlers/destinations.py index 407035931..ac76ed3f7 100644 --- a/redash/handlers/destinations.py +++ b/redash/handlers/destinations.py @@ -60,7 +60,6 @@ class DestinationListResource(BaseResource): continue d = ds.to_dict() - d['view_only'] = all(project(ds.groups, self.current_user.groups).values()) response[ds.id] = d return response.values() From 16c0df4117da57b40f0fd1de86eaa486738c59a5 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Fri, 19 Feb 2016 15:26:22 +0000 Subject: [PATCH 04/38] Group handlers for Destinations --- redash/handlers/groups.py | 2 -- redash/models.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/redash/handlers/groups.py b/redash/handlers/groups.py index a8c0cdf05..6ea845acc 100644 --- a/redash/handlers/groups.py +++ b/redash/handlers/groups.py @@ -176,5 +176,3 @@ class GroupDataSourceResource(BaseResource): 'object_type': 'group', 'member_id': data_source.id }) - - diff --git a/redash/models.py b/redash/models.py index 848d12b70..8762f19d2 100644 --- a/redash/models.py +++ b/redash/models.py @@ -1141,7 +1141,7 @@ class NotificationDestination(BelongsToOrgMixin, BaseModel): ndg = NotificationDestinationGroup.get(NotificationDestinationGroup.group==group, NotificationDestinationGroup.notification_destination==self) ndg.view_only = view_only ndg.save() - setattr(self, 'notification_destination_groups', dsg) + setattr(self, 'notification_destination_groups', ndg) @property def destination(self): From eed2a418168f1db101de4b62609f718eda8d4dc5 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Mon, 22 Feb 2016 16:53:05 +0000 Subject: [PATCH 05/38] Add destination field to AlertSubscription --- .../0023_add_notification_destination.py | 10 +++- redash/models.py | 50 ++++++++++--------- 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/migrations/0023_add_notification_destination.py b/migrations/0023_add_notification_destination.py index 685d32abc..d7f49b143 100644 --- a/migrations/0023_add_notification_destination.py +++ b/migrations/0023_add_notification_destination.py @@ -1,6 +1,8 @@ -from redash.models import db, NotificationDestination, NotificationDestinationGroup +from redash.models import db, NotificationDestination, NotificationDestinationGroup, AlertSubscription +from playhouse.migrate import PostgresqlMigrator, migrate if __name__ == '__main__': + migrator = PostgresqlMigrator(db.database) with db.database.transaction(): if not NotificationDestination.table_exists(): @@ -9,5 +11,9 @@ if __name__ == '__main__': if not NotificationDestinationGroup.table_exists(): NotificationDestinationGroup.create_table() - db.close_db(None) + # Update alert subscription fields + migrate( + migrator.add_column('alert_subscriptions', 'destination_id', AlertSubscription.destination) + ) + db.close_db(None) diff --git a/redash/models.py b/redash/models.py index 8762f19d2..ff8841b18 100644 --- a/redash/models.py +++ b/redash/models.py @@ -795,29 +795,6 @@ class Alert(ModelTimestampsMixin, BaseModel): return self.query.groups -class AlertSubscription(ModelTimestampsMixin, BaseModel): - user = peewee.ForeignKeyField(User) - alert = peewee.ForeignKeyField(Alert) - - class Meta: - db_table = 'alert_subscriptions' - - def to_dict(self): - return { - 'user': self.user.to_dict(), - 'alert_id': self.alert_id - } - - @classmethod - def all(cls, alert_id): - return AlertSubscription.select(AlertSubscription, User).join(User).where(AlertSubscription.alert==alert_id) - - @classmethod - def unsubscribe(cls, alert_id, user_id): - query = AlertSubscription.delete().where(AlertSubscription.alert==alert_id).where(AlertSubscription.user==user_id) - return query.execute() - - class Dashboard(ModelTimestampsMixin, BaseModel, BelongsToOrgMixin): id = peewee.PrimaryKeyField() org = peewee.ForeignKeyField(Organization, related_name="dashboards") @@ -1171,7 +1148,32 @@ class NotificationDestinationGroup(BaseModel): db_table = "notification_destination_groups" -all_models = (Organization, Group, DataSource, DataSourceGroup, User, QueryResult, Query, Alert, AlertSubscription, Dashboard, Visualization, Widget, Event, ApiKey, NotificationDestination, NotificationDestinationGroup) +class AlertSubscription(ModelTimestampsMixin, BaseModel): + user = peewee.ForeignKeyField(User) + destination = peewee.ForeignKeyField(NotificationDestination, null=True) + alert = peewee.ForeignKeyField(Alert) + + class Meta: + db_table = 'alert_subscriptions' + + def to_dict(self): + return { + 'user': self.user.to_dict(), + 'destination': self.destination.to_dict(), + 'alert_id': self.alert_id + } + + @classmethod + def all(cls, alert_id): + return AlertSubscription.select(AlertSubscription, User).join(User).where(AlertSubscription.alert==alert_id) + + @classmethod + def unsubscribe(cls, alert_id, user_id): + query = AlertSubscription.delete().where(AlertSubscription.alert==alert_id).where(AlertSubscription.user==user_id) + return query.execute() + + +all_models = (Organization, Group, DataSource, DataSourceGroup, User, QueryResult, Query, Alert, AlertSubscription, Dashboard, Visualization, Widget, Event, NotificationDestination, NotificationDestinationGroup) def init_db(): From f2d5d52310325aeb7082bfca29b8e7ea13546568 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Wed, 24 Feb 2016 20:36:12 +0000 Subject: [PATCH 06/38] Remove destination groups; use ConfigurationContainer for options; Add user field on NotificationDestination --- .../0023_add_notification_destination.py | 5 +- rd_ui/app/scripts/controllers/users.js | 43 ----------- rd_ui/app/scripts/services/resources.js | 3 +- rd_ui/app/views/groups/show.html | 1 - rd_ui/app/views/groups/show_data_sources.html | 1 - rd_ui/app/views/groups/show_destinations.html | 58 -------------- redash/destinations/__init__.py | 23 ++---- redash/handlers/destinations.py | 37 +++++---- redash/models.py | 75 +++---------------- 9 files changed, 40 insertions(+), 206 deletions(-) delete mode 100644 rd_ui/app/views/groups/show_destinations.html diff --git a/migrations/0023_add_notification_destination.py b/migrations/0023_add_notification_destination.py index d7f49b143..bfae939e7 100644 --- a/migrations/0023_add_notification_destination.py +++ b/migrations/0023_add_notification_destination.py @@ -1,4 +1,4 @@ -from redash.models import db, NotificationDestination, NotificationDestinationGroup, AlertSubscription +from redash.models import db, NotificationDestination, AlertSubscription from playhouse.migrate import PostgresqlMigrator, migrate if __name__ == '__main__': @@ -8,9 +8,6 @@ if __name__ == '__main__': if not NotificationDestination.table_exists(): NotificationDestination.create_table() - if not NotificationDestinationGroup.table_exists(): - NotificationDestinationGroup.create_table() - # Update alert subscription fields migrate( migrator.add_column('alert_subscriptions', 'destination_id', AlertSubscription.destination) diff --git a/rd_ui/app/scripts/controllers/users.js b/rd_ui/app/scripts/controllers/users.js index b7b7886e7..915278366 100644 --- a/rd_ui/app/scripts/controllers/users.js +++ b/rd_ui/app/scripts/controllers/users.js @@ -153,48 +153,6 @@ }; } - var GroupDestinationsCtrl = function($scope, $routeParams, $http, $location, growl, Events, Group, Destination) { - Events.record(currentUser, "view", "group_destinations", $scope.groupId); - $scope.group = Group.get({id: $routeParams.groupId}); - $scope.destinations = Group.destinations({id: $routeParams.groupId}); - $scope.newDestination= {}; - - $scope.findDestination = function(search) { - if ($scope.foundDestinations === undefined) { - Destination.query(function(destinations) { - var existingIds = _.map($scope.destinations, function(m) { return m.id; }); - $scope.foundDestinations = _.filter(destinations, function(d) { return !_.contains(existingIds, d.id); }); - }); - } - }; - - $scope.addDestination = function(destination) { - // Clear selection, to clear up the input control. - $scope.newDestination.selected = undefined; - - $http.post('api/groups/' + $routeParams.groupId + '/destinations', {'destination_id': destination.id}).success(function(user) { - destination.view_only = false; - $scope.destinations.unshift(destination); - - if ($scope.foundDestinations) { - $scope.foundDestinations = _.filter($scope.foundDestinations, function(d) { return d != destination; }); - } - }); - }; - - $scope.changePermission = function(destination, viewOnly) { - $http.post('api/groups/' + $routeParams.groupId + '/destinations/' + destination.id, {view_only: viewOnly}).success(function() { - destination.view_only = viewOnly; - }); - }; - - $scope.removeDestination = function(destination) { - $http.delete('api/groups/' + $routeParams.groupId + '/destinations/' + destination.id).success(function() { - $scope.destinations = _.filter($scope.destinations, function(d) { return destination != d; }); - }); - }; - } - var GroupCtrl = function($scope, $routeParams, $http, $location, growl, Events, Group, User) { Events.record(currentUser, "view", "group", $scope.groupId); $scope.group = Group.get({id: $routeParams.groupId}); @@ -394,7 +352,6 @@ .directive('usersNav', ['$location', usersNav]) .controller('GroupCtrl', ['$scope', '$routeParams', '$http', '$location', 'growl', 'Events', 'Group', 'User', GroupCtrl]) .controller('GroupDataSourcesCtrl', ['$scope', '$routeParams', '$http', '$location', 'growl', 'Events', 'Group', 'DataSource', GroupDataSourcesCtrl]) - .controller('GroupDestinationsCtrl', ['$scope', '$routeParams', '$http', '$location', 'growl', 'Events', 'Group', 'Destination', GroupDestinationsCtrl]) .controller('UsersCtrl', ['$scope', '$location', 'growl', 'Events', 'User', UsersCtrl]) .controller('UserCtrl', ['$scope', '$routeParams', '$http', '$location', 'growl', 'Events', 'User', UserCtrl]) .controller('NewUserCtrl', ['$scope', '$location', 'growl', 'Events', 'User', NewUserCtrl]) diff --git a/rd_ui/app/scripts/services/resources.js b/rd_ui/app/scripts/services/resources.js index e82667e60..efee63954 100644 --- a/rd_ui/app/scripts/services/resources.js +++ b/rd_ui/app/scripts/services/resources.js @@ -601,8 +601,7 @@ 'get': {'method': 'GET', 'cache': false, 'isArray': false}, 'query': {'method': 'GET', 'cache': false, 'isArray': true}, 'members': {'method': 'GET', 'cache': true, 'isArray': true, 'url': 'api/groups/:id/members'}, - 'dataSources': {'method': 'GET', 'cache': true, 'isArray': true, 'url': 'api/groups/:id/data_sources'}, - 'destinations': {'method': 'GET', 'cache': true, 'isArray': true, 'url': 'api/groups/:id/destinations'} + 'dataSources': {'method': 'GET', 'cache': true, 'isArray': true, 'url': 'api/groups/:id/data_sources'} }; var resource = $resource('api/groups/:id', {id: '@id'}, actions); return resource; diff --git a/rd_ui/app/views/groups/show.html b/rd_ui/app/views/groups/show.html index 21bcb463e..22053747b 100644 --- a/rd_ui/app/views/groups/show.html +++ b/rd_ui/app/views/groups/show.html @@ -8,7 +8,6 @@
    diff --git a/rd_ui/app/views/groups/show_data_sources.html b/rd_ui/app/views/groups/show_data_sources.html index 430790868..744cc6798 100644 --- a/rd_ui/app/views/groups/show_data_sources.html +++ b/rd_ui/app/views/groups/show_data_sources.html @@ -8,7 +8,6 @@
    diff --git a/rd_ui/app/views/groups/show_destinations.html b/rd_ui/app/views/groups/show_destinations.html deleted file mode 100644 index ef12952cf..000000000 --- a/rd_ui/app/views/groups/show_destinations.html +++ /dev/null @@ -1,58 +0,0 @@ -
    - - - - -
    -
    - -
    -
    - - - -
    - {{destination.name}} -
    -     -     -
    -
    -
    -
    - - - - - - - - - -
    {{destination.name}} -
    - - - - - -
    - - -
    -
    -
    -
    diff --git a/redash/destinations/__init__.py b/redash/destinations/__init__.py index a1daf49f5..07728fea9 100644 --- a/redash/destinations/__init__.py +++ b/redash/destinations/__init__.py @@ -1,14 +1,11 @@ import logging import json -import jsonschema -from jsonschema import ValidationError from redash import settings logger = logging.getLogger(__name__) __all__ = [ - 'ValidationError', 'BaseDestination', 'register', 'get_destination', @@ -18,7 +15,6 @@ __all__ = [ class BaseDestination(object): def __init__(self, configuration): - jsonschema.validate(configuration, self.configuration_schema()) self.configuration = configuration @classmethod @@ -61,29 +57,20 @@ def register(destination_class): logger.warning("%s destination enabled but not supported, not registering. Either disable or install missing dependencies.", destination_class.name()) -def get_destination(destination_type, configuration_json): +def get_destination(destination_type, configuration): destination_class = destinations.get(destination_type, None) if destination_class is None: return None - return destination_class(json.loads(configuration_json)) + return destination_class(json.loads(configuration)) -def validate_configuration(destination_type, configuration_json): +def get_configuration_schema_for_type(destination_type): destination_class = destinations.get(destination_type, None) if destination_class is None: - return False + return None - try: - if isinstance(configuration_json, basestring): - configuration = json.loads(configuration_json) - else: - configuration = configuration_json - jsonschema.validate(configuration, destination_class.configuration_schema()) - except (ValidationError, ValueError): - return False - - return True + return destination_class.configuration_schema() def import_destinations(destination_imports): diff --git a/redash/handlers/destinations.py b/redash/handlers/destinations.py index ac76ed3f7..9d6826cc5 100644 --- a/redash/handlers/destinations.py +++ b/redash/handlers/destinations.py @@ -6,7 +6,8 @@ from funcy import project from redash import models from redash.permissions import require_admin -from redash.destinations import destinations, validate_configuration +from redash.destinations import destinations, get_configuration_schema_for_type +from redash.utils.configuration import ConfigurationContainer, ValidationError from redash.handlers.base import BaseResource, get_object_or_404 @@ -27,13 +28,18 @@ class DestinationResource(BaseResource): destination = models.NotificationDestination.get_by_id_and_org(destination_id, self.current_org) req = request.get_json(True) - destination.replace_secret_placeholders(req['options']) - - if not validate_configuration(req['type'], req['options']): + schema = get_configuration_schema_for_type(req['type']) + if schema is None: abort(400) + try: + destination.options.set_schema(schema) + destination.options.update(req['options']) + except ValidationError: + abort(400) + + destination.type = req['type'] destination.name = req['name'] - destination.options = json.dumps(req['options']) destination.save() @@ -49,10 +55,7 @@ class DestinationResource(BaseResource): class DestinationListResource(BaseResource): def get(self): - if self.current_user.has_permission('admin'): - destinations = models.NotificationDestination.all(self.current_org) - else: - destinations = models.NotificationDestination.all(self.current_org, groups=self.current_user.groups) + destinations = models.NotificationDestination.all(self.current_org) response = {} for ds in destinations: @@ -72,11 +75,19 @@ class DestinationListResource(BaseResource): if f not in req: abort(400) - if not validate_configuration(req['type'], req['options']): + schema = get_configuration_schema_for_type(req['type']) + if schema is None: abort(400) - destination = models.NotificationDestination.create_with_group(org=self.current_org, - name=req['name'], - type=req['type'], options=json.dumps(req['options'])) + config = ConfigurationContainer(req['options'], schema) + if not config.is_valid(): + abort(400) + + destination = models.NotificationDestination(org=self.current_org, + name=req['name'], + type=req['type'], + options=config, + user=self.current_user) + destination.save() return destination.to_dict(all=True) diff --git a/redash/models.py b/redash/models.py index ff8841b18..acc1ea2c0 100644 --- a/redash/models.py +++ b/redash/models.py @@ -17,7 +17,7 @@ from permissions import has_access, view_only from redash import utils, settings, redis_connection from redash.query_runner import get_query_runner, get_configuration_schema_for_type -from redash.destinations import get_destination +from redash.destinations import get_destination, get_configuration_schema_for_type from redash.metrics.database import MeteredPostgresqlExtDatabase, MeteredModel from redash.utils import generate_token from redash.utils.configuration import ConfigurationContainer @@ -1050,9 +1050,10 @@ class NotificationDestination(BelongsToOrgMixin, BaseModel): id = peewee.PrimaryKeyField() org = peewee.ForeignKeyField(Organization, related_name="notification_destinations") + user = peewee.ForeignKeyField(User, related_name="notification_destinations") name = peewee.CharField() type = peewee.CharField() - options = peewee.TextField() + options = ConfigurationField() created_at = DateTimeTZField(default=datetime.datetime.now) class Meta: @@ -1062,7 +1063,7 @@ class NotificationDestination(BelongsToOrgMixin, BaseModel): (('org', 'name'), True), ) - def to_dict(self, all=False, with_permissions=False): + def to_dict(self, all=False): d = { 'id': self.id, 'name': self.name, @@ -1070,83 +1071,25 @@ class NotificationDestination(BelongsToOrgMixin, BaseModel): } if all: - d['options'] = self.configuration - d['groups'] = self.groups - - if with_permissions: - d['view_only'] = self.notification_destination_groups.view_only + schema = get_configuration_schema_for_type(self.type) + self.options.set_schema(schema) + d['options'] = self.options.to_dict(mask_secrets=True) return d def __unicode__(self): return self.name - @classmethod - def create_with_group(cls, *args, **kwargs): - notification_destination = cls.create(*args, **kwargs) - NotificationDestinationGroup.create( - notification_destination=notification_destination, - group=notification_destination.org.default_group - ) - return notification_destination - - @property - def configuration(self): - configuration = json.loads(self.options) - schema = self.destination.configuration_schema() - for prop in schema.get('secret', []): - if prop in configuration and configuration[prop]: - configuration[prop] = self.SECRET_PLACEHOLDER - - return configuration - - def replace_secret_placeholders(self, configuration): - current_configuration = json.loads(self.options) - schema = self.destination.configuration_schema() - for prop in schema.get('secret', []): - if prop in configuration and configuration[prop] == self.SECRET_PLACEHOLDER: - configuration[prop] = current_configuration[prop] - - def add_group(self, group, view_only=False): - ndg = NotificationDestinationGroup.create(group=group, notification_destination=self, view_only=view_only) - setattr(self, 'notification_destination_groups', ndg) - - def remove_group(self, group): - NotificationDestinationGroup.delete().where(NotificationDestinationGroup.group==group, NotificationDestinationGroup.notification_destination==self).execute() - - def update_group_permission(self, group, view_only): - ndg = NotificationDestinationGroup.get(NotificationDestinationGroup.group==group, NotificationDestinationGroup.notification_destination==self) - ndg.view_only = view_only - ndg.save() - setattr(self, 'notification_destination_groups', ndg) - @property def destination(self): return get_destination(self.type, self.options) @classmethod - def all(cls, org, groups=None): + def all(cls, org): notification_destinations = cls.select().where(cls.org==org).order_by(cls.id.asc()) - if groups: - notification_destinations = notification_destinations.join(NotificationDestinationGroup).where(NotificationDestinationGroup.group << groups) - return notification_destinations - @property - def groups(self): - groups = NotificationDestinationGroup.select().where(NotificationDestinationGroup.notification_destination==self) - return dict(map(lambda g: (g.group_id, g.view_only), groups)) - - -class NotificationDestinationGroup(BaseModel): - notification_destination = peewee.ForeignKeyField(NotificationDestination) - group = peewee.ForeignKeyField(Group, related_name="notification_destinations") - view_only = peewee.BooleanField(default=False) - - class Meta: - db_table = "notification_destination_groups" - class AlertSubscription(ModelTimestampsMixin, BaseModel): user = peewee.ForeignKeyField(User) @@ -1173,7 +1116,7 @@ class AlertSubscription(ModelTimestampsMixin, BaseModel): return query.execute() -all_models = (Organization, Group, DataSource, DataSourceGroup, User, QueryResult, Query, Alert, AlertSubscription, Dashboard, Visualization, Widget, Event, NotificationDestination, NotificationDestinationGroup) +all_models = (Organization, Group, DataSource, DataSourceGroup, User, QueryResult, Query, Alert, Dashboard, Visualization, Widget, Event, NotificationDestination, AlertSubscription) def init_db(): From a3703b2058dc81900b0b08c21052b187f09d0a11 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Wed, 24 Feb 2016 21:50:57 +0000 Subject: [PATCH 07/38] Fix broken tests --- redash/cli/data_sources.py | 4 ++-- redash/destinations/__init__.py | 2 +- redash/handlers/data_sources.py | 8 ++++---- redash/handlers/destinations.py | 6 +++--- redash/models.py | 16 ++++++++++------ redash/query_runner/__init__.py | 2 +- 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/redash/cli/data_sources.py b/redash/cli/data_sources.py index ba3b23794..6bd5afd7d 100644 --- a/redash/cli/data_sources.py +++ b/redash/cli/data_sources.py @@ -2,7 +2,7 @@ import json import click from flask_script import Manager from redash import models -from redash.query_runner import query_runners, get_configuration_schema_for_type +from redash.query_runner import query_runners, get_configuration_schema_for_query_runner_type from redash.utils.configuration import ConfigurationContainer manager = Manager(help="Data sources management commands.") @@ -119,7 +119,7 @@ def edit(name, new_name=None, options=None, type=None): data_source = models.DataSource.get(models.DataSource.name==name) if options is not None: - schema = get_configuration_schema_for_type(data_source.type) + schema = get_configuration_schema_for_query_runner_type(data_source.type) options = json.loads(options) data_source.options.set_schema(schema) data_source.options.update(options) diff --git a/redash/destinations/__init__.py b/redash/destinations/__init__.py index 07728fea9..1e4e0751c 100644 --- a/redash/destinations/__init__.py +++ b/redash/destinations/__init__.py @@ -65,7 +65,7 @@ def get_destination(destination_type, configuration): return destination_class(json.loads(configuration)) -def get_configuration_schema_for_type(destination_type): +def get_configuration_schema_for_destination_type(destination_type): destination_class = destinations.get(destination_type, None) if destination_class is None: return None diff --git a/redash/handlers/data_sources.py b/redash/handlers/data_sources.py index 5c4ca0b15..802ca4a15 100644 --- a/redash/handlers/data_sources.py +++ b/redash/handlers/data_sources.py @@ -5,7 +5,7 @@ from funcy import project from redash import models from redash.utils.configuration import ConfigurationContainer, ValidationError from redash.permissions import require_admin, require_permission, require_access, view_only -from redash.query_runner import query_runners, get_configuration_schema_for_type +from redash.query_runner import query_runners, get_configuration_schema_for_query_runner_type from redash.handlers.base import BaseResource, get_object_or_404 @@ -26,7 +26,7 @@ class DataSourceResource(BaseResource): data_source = models.DataSource.get_by_id_and_org(data_source_id, self.current_org) req = request.get_json(True) - schema = get_configuration_schema_for_type(req['type']) + schema = get_configuration_schema_for_query_runner_type(req['type']) if schema is None: abort(400) @@ -35,7 +35,7 @@ class DataSourceResource(BaseResource): data_source.options.update(req['options']) except ValidationError: abort(400) - + data_source.type = req['type'] data_source.name = req['name'] data_source.save() @@ -77,7 +77,7 @@ class DataSourceListResource(BaseResource): if f not in req: abort(400) - schema = get_configuration_schema_for_type(req['type']) + schema = get_configuration_schema_for_query_runner_type(req['type']) if schema is None: abort(400) diff --git a/redash/handlers/destinations.py b/redash/handlers/destinations.py index 9d6826cc5..1b8a74451 100644 --- a/redash/handlers/destinations.py +++ b/redash/handlers/destinations.py @@ -6,7 +6,7 @@ from funcy import project from redash import models from redash.permissions import require_admin -from redash.destinations import destinations, get_configuration_schema_for_type +from redash.destinations import destinations, get_configuration_schema_for_destination_type from redash.utils.configuration import ConfigurationContainer, ValidationError from redash.handlers.base import BaseResource, get_object_or_404 @@ -28,7 +28,7 @@ class DestinationResource(BaseResource): destination = models.NotificationDestination.get_by_id_and_org(destination_id, self.current_org) req = request.get_json(True) - schema = get_configuration_schema_for_type(req['type']) + schema = get_configuration_schema_for_destination_type(req['type']) if schema is None: abort(400) @@ -75,7 +75,7 @@ class DestinationListResource(BaseResource): if f not in req: abort(400) - schema = get_configuration_schema_for_type(req['type']) + schema = get_configuration_schema_for_destination_type(req['type']) if schema is None: abort(400) diff --git a/redash/models.py b/redash/models.py index acc1ea2c0..f3682f463 100644 --- a/redash/models.py +++ b/redash/models.py @@ -16,8 +16,8 @@ from playhouse.postgres_ext import ArrayField, DateTimeTZField from permissions import has_access, view_only from redash import utils, settings, redis_connection -from redash.query_runner import get_query_runner, get_configuration_schema_for_type -from redash.destinations import get_destination, get_configuration_schema_for_type +from redash.query_runner import get_query_runner, get_configuration_schema_for_query_runner_type +from redash.destinations import get_destination, get_configuration_schema_for_destination_type from redash.metrics.database import MeteredPostgresqlExtDatabase, MeteredModel from redash.utils import generate_token from redash.utils.configuration import ConfigurationContainer @@ -366,7 +366,7 @@ class DataSource(BelongsToOrgMixin, BaseModel): } if all: - schema = get_configuration_schema_for_type(self.type) + schema = get_configuration_schema_for_query_runner_type(self.type) self.options.set_schema(schema) d['options'] = self.options.to_dict(mask_secrets=True) d['queue_name'] = self.queue_name @@ -1071,7 +1071,7 @@ class NotificationDestination(BelongsToOrgMixin, BaseModel): } if all: - schema = get_configuration_schema_for_type(self.type) + schema = get_configuration_schema_for_destination_type(self.type) self.options.set_schema(schema) d['options'] = self.options.to_dict(mask_secrets=True) @@ -1100,12 +1100,16 @@ class AlertSubscription(ModelTimestampsMixin, BaseModel): db_table = 'alert_subscriptions' def to_dict(self): - return { + d = { 'user': self.user.to_dict(), - 'destination': self.destination.to_dict(), 'alert_id': self.alert_id } + if self.destination: + d['destination'] = self.destination.to_dict() + + return d + @classmethod def all(cls, alert_id): return AlertSubscription.select(AlertSubscription, User).join(User).where(AlertSubscription.alert==alert_id) diff --git a/redash/query_runner/__init__.py b/redash/query_runner/__init__.py index c93263314..aa777885c 100644 --- a/redash/query_runner/__init__.py +++ b/redash/query_runner/__init__.py @@ -148,7 +148,7 @@ def get_query_runner(query_runner_type, configuration): return query_runner_class(configuration) -def get_configuration_schema_for_type(query_runner_type): +def get_configuration_schema_for_query_runner_type(query_runner_type): query_runner_class = query_runners.get(query_runner_type, None) if query_runner_class is None: return None From a43761da39a954f0c615b6e61348f8435f90d1b4 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Thu, 25 Feb 2016 15:02:45 +0000 Subject: [PATCH 08/38] Require destination_id in POSTs that create a subscription --- redash/handlers/alerts.py | 13 ++++++++++--- tests/factories.py | 12 +++++++++++- tests/handlers/test_alerts.py | 14 ++++++++++---- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/redash/handlers/alerts.py b/redash/handlers/alerts.py index 71db01854..aa7ed070a 100644 --- a/redash/handlers/alerts.py +++ b/redash/handlers/alerts.py @@ -38,8 +38,9 @@ class AlertResource(BaseResource): class AlertListResource(BaseResource): def post(self): req = request.get_json(True) - require_fields(req, ('options', 'name', 'query_id')) + require_fields(req, ('options', 'name', 'query_id', 'destination_id')) + destination = models.NotificationDestination.get_by_id_and_org(req['destination_id'], self.current_org) query = models.Query.get_by_id_and_org(req['query_id'], self.current_org) require_access(query.groups, self.current_user, view_only) @@ -58,7 +59,8 @@ class AlertListResource(BaseResource): }) # TODO: should be in model? - models.AlertSubscription.create(alert=alert, user=self.current_user) + models.AlertSubscription.create(alert=alert, user=self.current_user, + destination=destination) self.record_event({ 'action': 'subscribe', @@ -76,10 +78,15 @@ class AlertListResource(BaseResource): class AlertSubscriptionListResource(BaseResource): def post(self, alert_id): + req = request.get_json(True) + require_fields(req, ('destination_id',)) + + destination = models.NotificationDestination.get_by_id_and_org(req['destination_id'], self.current_org) alert = models.Alert.get_by_id_and_org(alert_id, self.current_org) require_access(alert.groups, self.current_user, view_only) - subscription = models.AlertSubscription.create(alert=alert_id, user=self.current_user) + subscription = models.AlertSubscription.create(alert=alert_id, user=self.current_user, + destination=destination) self.record_event({ 'action': 'subscribe', 'timestamp': int(time.time()), diff --git a/tests/factories.py b/tests/factories.py index 7bf04bde9..056d5cb3d 100644 --- a/tests/factories.py +++ b/tests/factories.py @@ -100,6 +100,13 @@ widget_factory = ModelFactory(redash.models.Widget, dashboard=dashboard_factory.create, visualization=visualization_factory.create) +destination_factory = ModelFactory(redash.models.NotificationDestination, + org=1, + user=user_factory.create, + name='Destination', + type='slack', + options=ConfigurationContainer.from_json('{"url": "https://www.slack.com"}')) + class Factory(object): def __init__(self): @@ -227,8 +234,11 @@ class Factory(object): return widget_factory.create(**args) def create_api_key(self, **kwargs): + return api_key_factory.create(**args) + + def create_destination(self, **kwargs): args = { 'org': self.org } args.update(kwargs) - return api_key_factory.create(**args) + return destination_factory.create(**args) diff --git a/tests/handlers/test_alerts.py b/tests/handlers/test_alerts.py index 280a19be0..4589f4049 100644 --- a/tests/handlers/test_alerts.py +++ b/tests/handlers/test_alerts.py @@ -33,23 +33,28 @@ class TestAlertResourceGet(BaseTestCase): class TestAlertListPost(BaseTestCase): def test_returns_200_if_has_access_to_query(self): query = self.factory.create_query() + destination = self.factory.create_destination() - rv = self.make_request('post', "/api/alerts", data=dict(name='Alert', query_id=query.id, options={})) + rv = self.make_request('post', "/api/alerts", data=dict(name='Alert', query_id=query.id, + destination_id=destination.id, options={})) self.assertEqual(rv.status_code, 200) def test_fails_if_doesnt_have_access_to_query(self): data_source = self.factory.create_data_source(group=self.factory.create_group()) query = self.factory.create_query(data_source=data_source) + destination = self.factory.create_destination() - rv = self.make_request('post', "/api/alerts", data=dict(name='Alert', query_id=query.id, options={})) + rv = self.make_request('post', "/api/alerts", data=dict(name='Alert', query_id=query.id, + destination_id=destination.id, options={})) self.assertEqual(rv.status_code, 403) class TestAlertSubscriptionListResourcePost(BaseTestCase): def test_subscribers_user_to_alert(self): alert = self.factory.create_alert() + destination = self.factory.create_destination() - rv = self.make_request('post', "/api/alerts/{}/subscriptions".format(alert.id)) + rv = self.make_request('post', "/api/alerts/{}/subscriptions".format(alert.id), data=dict(destination_id=destination.id)) self.assertEqual(rv.status_code, 200) self.assertIn(self.factory.user, alert.subscribers()) @@ -57,8 +62,9 @@ class TestAlertSubscriptionListResourcePost(BaseTestCase): data_source = self.factory.create_data_source(group=self.factory.create_group()) query = self.factory.create_query(data_source=data_source) alert = self.factory.create_alert(query=query) + destination = self.factory.create_destination() - rv = self.make_request('post', "/api/alerts/{}/subscriptions".format(alert.id)) + rv = self.make_request('post', "/api/alerts/{}/subscriptions".format(alert.id), data=dict(destination_id=destination.id)) self.assertEqual(rv.status_code, 403) self.assertNotIn(self.factory.user, alert.subscribers()) From 4938f8e013a950f6d6bf8d29a89a89efb76d9415 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Fri, 26 Feb 2016 16:24:08 +0000 Subject: [PATCH 09/38] Add ability to choose destination when creating alert --- rd_ui/app/scripts/controllers/alerts.js | 6 ++++-- rd_ui/app/scripts/services/resources.js | 2 ++ rd_ui/app/views/alerts/edit.html | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/rd_ui/app/scripts/controllers/alerts.js b/rd_ui/app/scripts/controllers/alerts.js index 6ac7f95aa..b09230fdb 100644 --- a/rd_ui/app/scripts/controllers/alerts.js +++ b/rd_ui/app/scripts/controllers/alerts.js @@ -46,7 +46,7 @@ ]; }; - var AlertCtrl = function($scope, $routeParams, $location, growl, Query, Events, Alert) { + var AlertCtrl = function($scope, $routeParams, $location, growl, Query, Events, Alert, Destination) { $scope.$parent.pageTitle = "Alerts"; $scope.alertId = $routeParams.alertId; @@ -92,6 +92,8 @@ }); }; + $scope.destinations = Destination.query(); + $scope.saveChanges = function() { if ($scope.alert.name === undefined || $scope.alert.name === '') { $scope.alert.name = $scope.getDefaultName(); @@ -171,6 +173,6 @@ angular.module('redash.controllers') .controller('AlertsCtrl', ['$scope', 'Events', 'Alert', AlertsCtrl]) - .controller('AlertCtrl', ['$scope', '$routeParams', '$location', 'growl', 'Query', 'Events', 'Alert', AlertCtrl]) + .controller('AlertCtrl', ['$scope', '$routeParams', '$location', 'growl', 'Query', 'Events', 'Alert', 'Destination', AlertCtrl]) })(); diff --git a/rd_ui/app/scripts/services/resources.js b/rd_ui/app/scripts/services/resources.js index efee63954..90a0aba21 100644 --- a/rd_ui/app/scripts/services/resources.js +++ b/rd_ui/app/scripts/services/resources.js @@ -620,7 +620,9 @@ var newData = _.extend({}, data); if (newData.query_id === undefined) { newData.query_id = newData.query.id; + newData.destination_id = newData.destinations; delete newData.query; + delete newData.destinations; } return newData; diff --git a/rd_ui/app/views/alerts/edit.html b/rd_ui/app/views/alerts/edit.html index d71d7e4df..2edbcc498 100644 --- a/rd_ui/app/views/alerts/edit.html +++ b/rd_ui/app/views/alerts/edit.html @@ -50,6 +50,10 @@
    + +
    + +
    From 3cfbb9855bb9966507eb06fa1c7d31472f639083 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Fri, 26 Feb 2016 20:44:13 +0000 Subject: [PATCH 10/38] Update notify logic in tasks and add destinations for Slack, email, and webhooks --- redash/destinations/__init__.py | 5 ++-- redash/destinations/email.py | 31 +++++++++++++++++++++ redash/destinations/slack.py | 18 +++++++++++-- redash/destinations/webhook.py | 48 +++++++++++++++++++++++++++++++++ redash/models.py | 8 +++++- redash/settings.py | 2 ++ redash/tasks.py | 48 +++++---------------------------- 7 files changed, 113 insertions(+), 47 deletions(-) create mode 100644 redash/destinations/email.py create mode 100644 redash/destinations/webhook.py diff --git a/redash/destinations/__init__.py b/redash/destinations/__init__.py index 1e4e0751c..d2208d40c 100644 --- a/redash/destinations/__init__.py +++ b/redash/destinations/__init__.py @@ -33,7 +33,7 @@ class BaseDestination(object): def configuration_schema(cls): return {} - def notify(self, query): + def notify(self, alert_id, query_id, user_id, new_state, app, host, options): raise NotImplementedError() @classmethod @@ -61,8 +61,7 @@ def get_destination(destination_type, configuration): destination_class = destinations.get(destination_type, None) if destination_class is None: return None - - return destination_class(json.loads(configuration)) + return destination_class(configuration) def get_configuration_schema_for_destination_type(destination_type): diff --git a/redash/destinations/email.py b/redash/destinations/email.py new file mode 100644 index 000000000..22bc1b28f --- /dev/null +++ b/redash/destinations/email.py @@ -0,0 +1,31 @@ +import logging + +from redash import models, mail +from redash.destinations import * + + +class Email(BaseDestination): + + @classmethod + def configuration_schema(cls): + return {} + + def notify(self, alert_id, query_id, user_id, new_state, app, host, options): + user = models.User.get_by_id(user_id) + recipients = [user.email] + alert = models.Alert.get_by_id(alert_id) + html = """ + Check alert / check query. + """.format(host=host, alert_id=alert.id, query_id=query.id) + logging.debug("Notifying: %s", recipients) + + try: + with app.app_context(): + message = Message(recipients=recipients, + subject="[{1}] {0}".format(alert.name.encode('utf-8', 'ignore'), new_state.upper()), + html=html) + mail.send(message) + except Exception: + logging.exception("mail send ERROR.") + +register(Email) diff --git a/redash/destinations/slack.py b/redash/destinations/slack.py index f81fd33ee..8c4510631 100644 --- a/redash/destinations/slack.py +++ b/redash/destinations/slack.py @@ -1,3 +1,7 @@ +import json +import logging +import requests + from redash.destinations import * @@ -15,7 +19,17 @@ class Slack(BaseDestination): } } - def notify(self, query): - pass + def notify(self, alert_id, query_id, user_id, new_state, app, host, options): + msg = "Check <{host}/alerts/{alert_id}|alert> / check <{host}/queries/{query_id}|query>".format( + host=host, alert_id=alert_id, query_id=query_id) + payload = {'text': msg} + try: + resp = requests.post(options.get('url'), data=json.dumps(payload)) + logging.warning(resp.text) + if resp.status_code != 200: + logging.error("Slack send ERROR. status_code => {status}".format(status=resp.status_code)) + except Exception: + logging.exception("Slack send ERROR.") + register(Slack) diff --git a/redash/destinations/webhook.py b/redash/destinations/webhook.py new file mode 100644 index 000000000..9b44a473f --- /dev/null +++ b/redash/destinations/webhook.py @@ -0,0 +1,48 @@ +import logging +import requests +from requests.auth import HTTPBasicAuth + +from redash import models, mail +from redash.destinations import * +from redash.utils import json_dumps + + +class Webhook(BaseDestination): + + @classmethod + def configuration_schema(cls): + return { + "type": "object", + "properties": { + "url": { + "type": "string", + }, + "username": { + "type": "string" + }, + "password": { + "type": "string" + } + }, + "required": ["url"], + "secret": ["password"] + } + + def notify(self, alert_id, query_id, user_id, new_state, app, host, options): + alert = models.Alert.get_by_id(alert_id) + try: + data = { + 'event': 'alert_state_change', + 'alert': alert.to_dict(full=False), + 'url_base': host + } + headers = {'Content-Type': 'application/json'} + auth = HTTPBasicAuth(options.get('username'), options.get('password')) if options.get('username') else None + resp = requests.post(options.get('url'), data=json_dumps(data), auth=auth, headers=headers) + if resp.status_code != 200: + logging.error("webhook send ERROR. status_code => {status}".format(status=resp.status_code)) + except Exception: + logging.exception("webhook send ERROR.") + + +register(Webhook) diff --git a/redash/models.py b/redash/models.py index f3682f463..45841d526 100644 --- a/redash/models.py +++ b/redash/models.py @@ -1090,11 +1090,17 @@ class NotificationDestination(BelongsToOrgMixin, BaseModel): return notification_destinations + def notify(self, alert_id, query_id, user_id, new_state, app, host): + schema = get_configuration_schema_for_destination_type(self.type) + self.options.set_schema(schema) + return self.destination.notify(alert_id, query_id, user_id, new_state, + app, host, self.options) + class AlertSubscription(ModelTimestampsMixin, BaseModel): user = peewee.ForeignKeyField(User) destination = peewee.ForeignKeyField(NotificationDestination, null=True) - alert = peewee.ForeignKeyField(Alert) + alert = peewee.ForeignKeyField(Alert, related_name="subscriptions") class Meta: db_table = 'alert_subscriptions' diff --git a/redash/settings.py b/redash/settings.py index 14bd3387d..40aa66467 100644 --- a/redash/settings.py +++ b/redash/settings.py @@ -180,7 +180,9 @@ QUERY_RUNNERS = distinct(enabled_query_runners + additional_query_runners) # Destinations default_destinations = [ + 'redash.destinations.email', 'redash.destinations.slack', + 'redash.destinations.webhook' ] enabled_destinations = array_from_string(os.environ.get("REDASH_ENABLED_DESTINATIONS", ",".join(default_destinations))) diff --git a/redash/tasks.py b/redash/tasks.py index 0bfbcbd16..607e89c49 100644 --- a/redash/tasks.py +++ b/redash/tasks.py @@ -360,18 +360,13 @@ def check_alerts_for_query(self, query_id): logger.debug("Skipping notification (previous state was unknown and now it's ok).") continue - # message = Message - html = """ - Check alert / check query. - """.format(host=base_url(alert.query.org), alert_id=alert.id, query_id=query.id) - - notify_mail(alert, html, new_state, app) - - if settings.HIPCHAT_API_TOKEN: - notify_hipchat(alert, html, new_state) - - if settings.WEBHOOK_ENDPOINT: - notify_webhook(alert, query, html, new_state) + host = base_url(alert.query.org) + + for subscription in alert.subscriptions: + try: + subscription.destination.notify(alert.id, query.id, subscription.destination.user.id, new_state, app, host) + except Exception as e: + logger.warn("Exception: {}".format(e)) def notify_hipchat(alert, html, new_state): @@ -386,35 +381,6 @@ def notify_hipchat(alert, html, new_state): logger.exception("hipchat send ERROR.") -def notify_mail(alert, html, new_state, app): - recipients = [s.email for s in alert.subscribers()] - logger.debug("Notifying: %s", recipients) - try: - with app.app_context(): - message = Message(recipients=recipients, - subject="[{1}] {0}".format(alert.name.encode('utf-8', 'ignore'), new_state.upper()), - html=html) - mail.send(message) - except Exception: - logger.exception("mail send ERROR.") - - -def notify_webhook(alert, query, html, new_state): - try: - data = { - 'event': 'alert_state_change', - 'alert': alert.to_dict(full=False), - 'url_base': base_url(query.org) - } - headers = {'Content-Type': 'application/json'} - auth = HTTPBasicAuth(settings.WEBHOOK_USERNAME, settings.WEBHOOK_PASSWORD) if settings.WEBHOOK_USERNAME else None - resp = requests.post(settings.WEBHOOK_ENDPOINT, data=json_dumps(data), auth=auth, headers=headers) - if resp.status_code != 200: - logger.error("webhook send ERROR. status_code => {status}".format(status=resp.status_code)) - except Exception: - logger.exception("webhook send ERROR.") - - @celery.task(base=BaseTask) def send_mail(to, subject, html, text): from redash.wsgi import app From 82b7146216165fc21da564478f22ce5f8f4658f5 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Mon, 14 Mar 2016 18:21:04 +0000 Subject: [PATCH 11/38] Enforce AlertSubscription uniqueness; update AlertSubscription delete handler --- redash/handlers/alerts.py | 6 ++++-- redash/models.py | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/redash/handlers/alerts.py b/redash/handlers/alerts.py index aa7ed070a..e3b15d67c 100644 --- a/redash/handlers/alerts.py +++ b/redash/handlers/alerts.py @@ -106,8 +106,10 @@ class AlertSubscriptionListResource(BaseResource): class AlertSubscriptionResource(BaseResource): def delete(self, alert_id, subscriber_id): - models.AlertSubscription.unsubscribe(alert_id, subscriber_id) - require_admin_or_owner(subscriber_id) + + subscription = get_object_or_404(models.AlertSubscription.get_by_id, subscriber_id) + require_admin_or_owner(subscription.id) + subscription.delete_instance() self.record_event({ 'action': 'unsubscribe', diff --git a/redash/models.py b/redash/models.py index 45841d526..df6affecf 100644 --- a/redash/models.py +++ b/redash/models.py @@ -1105,8 +1105,13 @@ class AlertSubscription(ModelTimestampsMixin, BaseModel): class Meta: db_table = 'alert_subscriptions' + indexes = ( + (('destination', 'alert'), True), + ) + def to_dict(self): d = { + 'id': self.id, 'user': self.user.to_dict(), 'alert_id': self.alert_id } @@ -1120,11 +1125,6 @@ class AlertSubscription(ModelTimestampsMixin, BaseModel): def all(cls, alert_id): return AlertSubscription.select(AlertSubscription, User).join(User).where(AlertSubscription.alert==alert_id) - @classmethod - def unsubscribe(cls, alert_id, user_id): - query = AlertSubscription.delete().where(AlertSubscription.alert==alert_id).where(AlertSubscription.user==user_id) - return query.execute() - all_models = (Organization, Group, DataSource, DataSourceGroup, User, QueryResult, Query, Alert, Dashboard, Visualization, Widget, Event, NotificationDestination, AlertSubscription) From ed7f9ea5f02d9100214b094a55729d80d60412d2 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Mon, 14 Mar 2016 18:25:41 +0000 Subject: [PATCH 12/38] Create UI for adding/removing alert subscriptions --- rd_ui/app/scripts/controllers/alerts.js | 42 ++++++++++++++++++++++--- rd_ui/app/scripts/services/resources.js | 7 ++++- rd_ui/app/views/alerts/subscribers.html | 23 ++++++++++++-- 3 files changed, 65 insertions(+), 7 deletions(-) diff --git a/rd_ui/app/scripts/controllers/alerts.js b/rd_ui/app/scripts/controllers/alerts.js index b09230fdb..794dae599 100644 --- a/rd_ui/app/scripts/controllers/alerts.js +++ b/rd_ui/app/scripts/controllers/alerts.js @@ -74,6 +74,7 @@ $scope.ops = ['greater than', 'less than', 'equals']; $scope.selectedQuery = null; + $scope.destinations = Destination.query(); $scope.getDefaultName = function() { if (!$scope.alert.query) { @@ -92,8 +93,6 @@ }); }; - $scope.destinations = Destination.query(); - $scope.saveChanges = function() { if ($scope.alert.name === undefined || $scope.alert.name === '') { $scope.alert.name = $scope.getDefaultName(); @@ -110,9 +109,10 @@ growl.addErrorMessage("Failed saving alert."); }); }; + }; - angular.module('redash.directives').directive('alertSubscribers', ['AlertSubscription', function (AlertSubscription) { + angular.module('redash.directives').directive('alertSubscribers', ['AlertSubscription', 'Destination', 'growl', function (AlertSubscription, Destination, growl) { return { restrict: 'E', replace: true, @@ -122,6 +122,40 @@ }, controller: function ($scope) { $scope.subscribers = AlertSubscription.query({alertId: $scope.alertId}); + $scope.subscription = {}; + $scope.destinations = Destination.query(); + + $scope.destinationsDisplay = function(destination) { + var icons = { + 'slack': 'fa-slack', + 'email': 'fa-envelope', + 'webhook': 'fa-bolt', + 'hipchat': 'fa-comment-o' + } + var icon = icons[destination.type] || 'fa-bullseye' + + return ' ' + destination.name + }; + + $scope.saveSubscriber = function() { + $scope.sub = new AlertSubscription({alert_id: $scope.alertId, destination_id: $scope.subscription.destination.id}); + $scope.sub.$save(function() { + growl.addSuccessMessage("Subscribed."); + $scope.subscribers.push($scope.sub); + }, function() { + growl.addErrorMessage("Failed saving subscription."); + }); + }; + + $scope.unsubscribe = function(subscriber) { + $scope.sub = new AlertSubscription({alert_id: subscriber.alert_id, subscriber_id: subscriber.id}); + $scope.sub.$delete(function() { + growl.addSuccessMessage("Unsubscribed"); + $scope.subscribers = _.without($scope.subscribers, subscriber); + }, function() { + growl.addErrorMessage("Failed unsubscribing."); + }); + }; } } }]); @@ -159,7 +193,7 @@ }); } else { $scope.subscription = new AlertSubscription({alert_id: $scope.alertId}); - $scope.subscription.$save(function() { + $scope.subscription.$delete(function() { $scope.subscribers.push($scope.subscription); updateClass(); }, function() { diff --git a/rd_ui/app/scripts/services/resources.js b/rd_ui/app/scripts/services/resources.js index 90a0aba21..12431f3f2 100644 --- a/rd_ui/app/scripts/services/resources.js +++ b/rd_ui/app/scripts/services/resources.js @@ -608,7 +608,12 @@ }; var AlertSubscription = function ($resource) { - var resource = $resource('api/alerts/:alertId/subscriptions/:userId', {alertId: '@alert_id', userId: '@user.id'}); + var actions = { + 'get': {method: 'GET'}, + 'save': {method: 'POST'}, + 'delete': {method: 'DELETE'} + }; + var resource = $resource('api/alerts/:alertId/subscriptions/:subscriberId', {alertId: '@alert_id', subscriberId: '@subscriber_id'}); return resource; }; diff --git a/rd_ui/app/views/alerts/subscribers.html b/rd_ui/app/views/alerts/subscribers.html index f6f3d1a8c..8d2e1c964 100644 --- a/rd_ui/app/views/alerts/subscribers.html +++ b/rd_ui/app/views/alerts/subscribers.html @@ -1,4 +1,23 @@
    - Subscribers
    - {{s.user.name}} +
    +
    + + + {{$select.selected.name}} + + + + +
    +
    + +
    +
    +
    + +
    + + +
    +
    From a3c0917d85f684a1e0ca75011508257c4a312bff Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Mon, 14 Mar 2016 19:11:13 +0000 Subject: [PATCH 13/38] Fix AlertSubscription unsubscribe permissions and broken tests --- redash/handlers/alerts.py | 4 ++-- tests/factories.py | 8 ++++++++ tests/handlers/test_alerts.py | 18 ++++++++++-------- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/redash/handlers/alerts.py b/redash/handlers/alerts.py index e3b15d67c..708dd5d28 100644 --- a/redash/handlers/alerts.py +++ b/redash/handlers/alerts.py @@ -106,9 +106,9 @@ class AlertSubscriptionListResource(BaseResource): class AlertSubscriptionResource(BaseResource): def delete(self, alert_id, subscriber_id): - + subscription = get_object_or_404(models.AlertSubscription.get_by_id, subscriber_id) - require_admin_or_owner(subscription.id) + require_admin_or_owner(subscription.user.id) subscription.delete_instance() self.record_event({ diff --git a/tests/factories.py b/tests/factories.py index 056d5cb3d..e0e32d1c1 100644 --- a/tests/factories.py +++ b/tests/factories.py @@ -107,6 +107,11 @@ destination_factory = ModelFactory(redash.models.NotificationDestination, type='slack', options=ConfigurationContainer.from_json('{"url": "https://www.slack.com"}')) +alert_subscription_factory = ModelFactory(redash.models.AlertSubscription, + user=user_factory.create, + destination=destination_factory.create, + alert=alert_factory.create) + class Factory(object): def __init__(self): @@ -242,3 +247,6 @@ class Factory(object): } args.update(kwargs) return destination_factory.create(**args) + + def create_alert_subscription(self, **kwargs): + return alert_subscription_factory.create(**kwargs) diff --git a/tests/handlers/test_alerts.py b/tests/handlers/test_alerts.py index 4589f4049..46c10e310 100644 --- a/tests/handlers/test_alerts.py +++ b/tests/handlers/test_alerts.py @@ -87,18 +87,20 @@ class TestAlertSubscriptionListResourceGet(BaseTestCase): class TestAlertSubscriptionresourceDelete(BaseTestCase): def test_only_subscriber_or_admin_can_unsubscribe(self): - alert = self.factory.create_alert() + subscription = self.factory.create_alert_subscription() + alert = subscription.alert + user = subscription.user + path = '/api/alerts/{}/subscriptions/{}'.format(alert.id, subscription.id) + other_user = self.factory.create_user() - path = '/api/alerts/{}/subscriptions/{}'.format(alert.id, other_user.id) - AlertSubscription.create(alert=alert, user=other_user) - - response = self.make_request('delete', path) + response = self.make_request('delete', path, user=other_user) self.assertEqual(response.status_code, 403) - response = self.make_request('delete', path, user=self.factory.create_admin()) + response = self.make_request('delete', path, user=user) self.assertEqual(response.status_code, 200) - AlertSubscription.create(alert=alert, user=other_user) - response = self.make_request('delete', path, user=other_user) + subscription_two = AlertSubscription.create(alert=alert, user=other_user) + path = '/api/alerts/{}/subscriptions/{}'.format(alert.id, subscription_two.id) + response = self.make_request('delete', path, user=self.factory.create_admin()) self.assertEqual(response.status_code, 200) From eef18510d5d0b227c697bb4f52e22c21823acab7 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Mon, 14 Mar 2016 20:18:12 +0000 Subject: [PATCH 14/38] Fix email destination bugs; make email alerts backward compatible --- redash/destinations/email.py | 13 ++++++++----- redash/tasks.py | 9 ++++++++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/redash/destinations/email.py b/redash/destinations/email.py index 22bc1b28f..3b4e99411 100644 --- a/redash/destinations/email.py +++ b/redash/destinations/email.py @@ -1,5 +1,6 @@ import logging +from flask_mail import Message from redash import models, mail from redash.destinations import * @@ -16,15 +17,17 @@ class Email(BaseDestination): alert = models.Alert.get_by_id(alert_id) html = """ Check alert / check query. - """.format(host=host, alert_id=alert.id, query_id=query.id) + """.format(host=host, alert_id=alert.id, query_id=query_id) logging.debug("Notifying: %s", recipients) try: with app.app_context(): - message = Message(recipients=recipients, - subject="[{1}] {0}".format(alert.name.encode('utf-8', 'ignore'), new_state.upper()), - html=html) - mail.send(message) + message = Message( + recipients=recipients, + subject="[{1}] {0}".format(alert.name.encode('utf-8', 'ignore'), new_state.upper()), + html=html + ) + mail.send(message) except Exception: logging.exception("mail send ERROR.") diff --git a/redash/tasks.py b/redash/tasks.py index 607e89c49..da6202f54 100644 --- a/redash/tasks.py +++ b/redash/tasks.py @@ -364,7 +364,14 @@ def check_alerts_for_query(self, query_id): for subscription in alert.subscriptions: try: - subscription.destination.notify(alert.id, query.id, subscription.destination.user.id, new_state, app, host) + if subscription.destination: + subscription.destination.notify(alert.id, query.id, subscription.destination.user.id, new_state, app, host) + else: + # For backwards compatibility with prior alert system that was primarily email-based + from redash.destinations import get_destination + config = {} + destination = get_destination('email', config) + destination.notify(alert.id, query.id, subscription.user.id, new_state, app, host) except Exception as e: logger.warn("Exception: {}".format(e)) From bb3874e6315627b6a65b9f94078c7af494465657 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Mon, 14 Mar 2016 20:34:56 +0000 Subject: [PATCH 15/38] Pass subscription user to notify method --- redash/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redash/tasks.py b/redash/tasks.py index da6202f54..ec2e1fcb1 100644 --- a/redash/tasks.py +++ b/redash/tasks.py @@ -365,7 +365,7 @@ def check_alerts_for_query(self, query_id): for subscription in alert.subscriptions: try: if subscription.destination: - subscription.destination.notify(alert.id, query.id, subscription.destination.user.id, new_state, app, host) + subscription.destination.notify(alert.id, query.id, subscription.user.id, new_state, app, host) else: # For backwards compatibility with prior alert system that was primarily email-based from redash.destinations import get_destination From 54f3df6988468055e79a069466730fc10f51cdb5 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Tue, 15 Mar 2016 13:35:22 +0000 Subject: [PATCH 16/38] Move destination icons to BaseDestination --- rd_ui/app/scripts/controllers/alerts.js | 10 +--------- rd_ui/app/views/destinations/list.html | 2 +- redash/destinations/__init__.py | 5 +++++ redash/destinations/email.py | 4 ++++ redash/destinations/slack.py | 4 ++++ redash/destinations/webhook.py | 4 ++++ redash/models.py | 1 + 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/rd_ui/app/scripts/controllers/alerts.js b/rd_ui/app/scripts/controllers/alerts.js index 794dae599..623fef4ac 100644 --- a/rd_ui/app/scripts/controllers/alerts.js +++ b/rd_ui/app/scripts/controllers/alerts.js @@ -126,15 +126,7 @@ $scope.destinations = Destination.query(); $scope.destinationsDisplay = function(destination) { - var icons = { - 'slack': 'fa-slack', - 'email': 'fa-envelope', - 'webhook': 'fa-bolt', - 'hipchat': 'fa-comment-o' - } - var icon = icons[destination.type] || 'fa-bullseye' - - return ' ' + destination.name + return ' ' + destination.name }; $scope.saveSubscriber = function() { diff --git a/rd_ui/app/views/destinations/list.html b/rd_ui/app/views/destinations/list.html index e22e8bf24..5bdc19f5e 100644 --- a/rd_ui/app/views/destinations/list.html +++ b/rd_ui/app/views/destinations/list.html @@ -6,7 +6,7 @@
    - {{destination.name}} + {{destination.name}}
    diff --git a/redash/destinations/__init__.py b/redash/destinations/__init__.py index d2208d40c..ab5dc9b21 100644 --- a/redash/destinations/__init__.py +++ b/redash/destinations/__init__.py @@ -25,6 +25,10 @@ class BaseDestination(object): def type(cls): return cls.__name__.lower() + @classmethod + def icon(cls): + return 'fa-bullseye' + @classmethod def enabled(cls): return True @@ -41,6 +45,7 @@ class BaseDestination(object): return { 'name': cls.name(), 'type': cls.type(), + 'icon': cls.icon(), 'configuration_schema': cls.configuration_schema() } diff --git a/redash/destinations/email.py b/redash/destinations/email.py index 3b4e99411..fb38bbc0b 100644 --- a/redash/destinations/email.py +++ b/redash/destinations/email.py @@ -11,6 +11,10 @@ class Email(BaseDestination): def configuration_schema(cls): return {} + @classmethod + def icon(cls): + return 'fa-envelope' + def notify(self, alert_id, query_id, user_id, new_state, app, host, options): user = models.User.get_by_id(user_id) recipients = [user.email] diff --git a/redash/destinations/slack.py b/redash/destinations/slack.py index 8c4510631..665403d9d 100644 --- a/redash/destinations/slack.py +++ b/redash/destinations/slack.py @@ -19,6 +19,10 @@ class Slack(BaseDestination): } } + @classmethod + def icon(cls): + return 'fa-slack' + def notify(self, alert_id, query_id, user_id, new_state, app, host, options): msg = "Check <{host}/alerts/{alert_id}|alert> / check <{host}/queries/{query_id}|query>".format( host=host, alert_id=alert_id, query_id=query_id) diff --git a/redash/destinations/webhook.py b/redash/destinations/webhook.py index 9b44a473f..a880f1d6b 100644 --- a/redash/destinations/webhook.py +++ b/redash/destinations/webhook.py @@ -28,6 +28,10 @@ class Webhook(BaseDestination): "secret": ["password"] } + @classmethod + def icon(cls): + return 'fa-bolt' + def notify(self, alert_id, query_id, user_id, new_state, app, host, options): alert = models.Alert.get_by_id(alert_id) try: diff --git a/redash/models.py b/redash/models.py index df6affecf..e7d635b63 100644 --- a/redash/models.py +++ b/redash/models.py @@ -1068,6 +1068,7 @@ class NotificationDestination(BelongsToOrgMixin, BaseModel): 'id': self.id, 'name': self.name, 'type': self.type, + 'icon': self.destination.icon() } if all: From 63786c98df28b35e7e2a10bec098190ee968de68 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Tue, 15 Mar 2016 14:26:42 +0000 Subject: [PATCH 17/38] Remove unnecessary code --- rd_ui/app/scripts/services/resources.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/rd_ui/app/scripts/services/resources.js b/rd_ui/app/scripts/services/resources.js index 12431f3f2..11199ebb6 100644 --- a/rd_ui/app/scripts/services/resources.js +++ b/rd_ui/app/scripts/services/resources.js @@ -559,8 +559,7 @@ var Destination = function ($resource) { var actions = { 'get': {'method': 'GET', 'cache': false, 'isArray': false}, - 'query': {'method': 'GET', 'cache': false, 'isArray': true}, - 'getSchema': {'method': 'GET', 'cache': true, 'isArray': true, 'url': 'api/destinations/:id/schema'} + 'query': {'method': 'GET', 'cache': false, 'isArray': true} }; var DestinationResource = $resource('api/destinations/:id', {id: '@id'}, actions); @@ -608,11 +607,6 @@ }; var AlertSubscription = function ($resource) { - var actions = { - 'get': {method: 'GET'}, - 'save': {method: 'POST'}, - 'delete': {method: 'DELETE'} - }; var resource = $resource('api/alerts/:alertId/subscriptions/:subscriberId', {alertId: '@alert_id', subscriberId: '@subscriber_id'}); return resource; }; From e91610f4b40f87d20c9b89a65f476582b80c55af Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Tue, 15 Mar 2016 14:30:26 +0000 Subject: [PATCH 18/38] Remove hacky backwards compatibility for notifications --- redash/tasks.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/redash/tasks.py b/redash/tasks.py index ec2e1fcb1..80fafa29a 100644 --- a/redash/tasks.py +++ b/redash/tasks.py @@ -364,14 +364,7 @@ def check_alerts_for_query(self, query_id): for subscription in alert.subscriptions: try: - if subscription.destination: - subscription.destination.notify(alert.id, query.id, subscription.user.id, new_state, app, host) - else: - # For backwards compatibility with prior alert system that was primarily email-based - from redash.destinations import get_destination - config = {} - destination = get_destination('email', config) - destination.notify(alert.id, query.id, subscription.user.id, new_state, app, host) + subscription.destination.notify(alert.id, query.id, subscription.user.id, new_state, app, host) except Exception as e: logger.warn("Exception: {}".format(e)) From 04eb37a7f28095284f7fff8f2d2e27d489c640f2 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Tue, 15 Mar 2016 15:02:50 +0000 Subject: [PATCH 19/38] Pass objects instead of IDs to notify method --- redash/destinations/__init__.py | 2 +- redash/destinations/email.py | 6 ++---- redash/destinations/slack.py | 4 ++-- redash/destinations/webhook.py | 3 +-- redash/models.py | 4 ++-- redash/tasks.py | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/redash/destinations/__init__.py b/redash/destinations/__init__.py index ab5dc9b21..2170313cb 100644 --- a/redash/destinations/__init__.py +++ b/redash/destinations/__init__.py @@ -37,7 +37,7 @@ class BaseDestination(object): def configuration_schema(cls): return {} - def notify(self, alert_id, query_id, user_id, new_state, app, host, options): + def notify(self, alert, query, user, new_state, app, host, options): raise NotImplementedError() @classmethod diff --git a/redash/destinations/email.py b/redash/destinations/email.py index fb38bbc0b..b5b26b038 100644 --- a/redash/destinations/email.py +++ b/redash/destinations/email.py @@ -15,13 +15,11 @@ class Email(BaseDestination): def icon(cls): return 'fa-envelope' - def notify(self, alert_id, query_id, user_id, new_state, app, host, options): - user = models.User.get_by_id(user_id) + def notify(self, alert, query, user, new_state, app, host, options): recipients = [user.email] - alert = models.Alert.get_by_id(alert_id) html = """ Check alert / check query. - """.format(host=host, alert_id=alert.id, query_id=query_id) + """.format(host=host, alert_id=alert.id, query_id=query.id) logging.debug("Notifying: %s", recipients) try: diff --git a/redash/destinations/slack.py b/redash/destinations/slack.py index 665403d9d..552a91299 100644 --- a/redash/destinations/slack.py +++ b/redash/destinations/slack.py @@ -23,9 +23,9 @@ class Slack(BaseDestination): def icon(cls): return 'fa-slack' - def notify(self, alert_id, query_id, user_id, new_state, app, host, options): + def notify(self, alert, query, user, new_state, app, host, options): msg = "Check <{host}/alerts/{alert_id}|alert> / check <{host}/queries/{query_id}|query>".format( - host=host, alert_id=alert_id, query_id=query_id) + host=host, alert_id=alert.id, query_id=query.id) payload = {'text': msg} try: resp = requests.post(options.get('url'), data=json.dumps(payload)) diff --git a/redash/destinations/webhook.py b/redash/destinations/webhook.py index a880f1d6b..a6b7d6fc8 100644 --- a/redash/destinations/webhook.py +++ b/redash/destinations/webhook.py @@ -32,8 +32,7 @@ class Webhook(BaseDestination): def icon(cls): return 'fa-bolt' - def notify(self, alert_id, query_id, user_id, new_state, app, host, options): - alert = models.Alert.get_by_id(alert_id) + def notify(self, alert, query, user, new_state, app, host, options): try: data = { 'event': 'alert_state_change', diff --git a/redash/models.py b/redash/models.py index e7d635b63..05092b6f2 100644 --- a/redash/models.py +++ b/redash/models.py @@ -1091,10 +1091,10 @@ class NotificationDestination(BelongsToOrgMixin, BaseModel): return notification_destinations - def notify(self, alert_id, query_id, user_id, new_state, app, host): + def notify(self, alert, query, user, new_state, app, host): schema = get_configuration_schema_for_destination_type(self.type) self.options.set_schema(schema) - return self.destination.notify(alert_id, query_id, user_id, new_state, + return self.destination.notify(alert, query, user, new_state, app, host, self.options) diff --git a/redash/tasks.py b/redash/tasks.py index 80fafa29a..5f30c16b9 100644 --- a/redash/tasks.py +++ b/redash/tasks.py @@ -364,7 +364,7 @@ def check_alerts_for_query(self, query_id): for subscription in alert.subscriptions: try: - subscription.destination.notify(alert.id, query.id, subscription.user.id, new_state, app, host) + subscription.destination.notify(alert, query, subscription.user, new_state, app, host) except Exception as e: logger.warn("Exception: {}".format(e)) From becf315e66e42314b77fab76090d6a10b61081d7 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Wed, 16 Mar 2016 20:22:30 +0000 Subject: [PATCH 20/38] Add hipchat destination --- redash/destinations/hipchat.py | 49 ++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 redash/destinations/hipchat.py diff --git a/redash/destinations/hipchat.py b/redash/destinations/hipchat.py new file mode 100644 index 000000000..c46dc4ab4 --- /dev/null +++ b/redash/destinations/hipchat.py @@ -0,0 +1,49 @@ +import logging +import hipchat + +from redash import models +from redash.destinations import * +from redash.utils import json_dumps + + +class Hipchat(BaseDestination): + + @classmethod + def configuration_schema(cls): + return { + "type": "object", + "properties": { + "url": { + "type": "string" + }, + "token": { + "type": "string" + }, + "room_id": { + "type": "string" + } + }, + "required": ["token", "room_id"], + "secret": ["token"] + } + + @classmethod + def icon(cls): + return 'fa-comment-o' + + def notify(self, alert, query, user, new_state, app, host, options): + try: + if options.url: + hipchat_client = hipchat.HipChat(token=options.token, url=options.url) + else: + hipchat_client = hipchat.HipChat(token=options.token) + html = """ + Check alert / check query. + """.format(host=host, alert_id=alert.id, query_id=query.id) + message = '[' + new_state.upper() + '] ' + alert.name + '
    ' + html + hipchat_client.message_room(options.room_id, settings.NAME, message.encode('utf-8', 'ignore'), message_format='html') + except Exception: + logging.exception("hipchat send ERROR.") + + +register(Hipchat) From a11fa2717d865035602e88e481b3cac0793c6dc7 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Wed, 16 Mar 2016 20:22:57 +0000 Subject: [PATCH 21/38] Add migrations of existing alerts --- .../0023_add_notification_destination.py | 73 +++++++++++++++++-- redash/models.py | 2 +- 2 files changed, 69 insertions(+), 6 deletions(-) diff --git a/migrations/0023_add_notification_destination.py b/migrations/0023_add_notification_destination.py index bfae939e7..d193ccdb7 100644 --- a/migrations/0023_add_notification_destination.py +++ b/migrations/0023_add_notification_destination.py @@ -1,4 +1,7 @@ -from redash.models import db, NotificationDestination, AlertSubscription +from redash import settings +from redash.models import db, NotificationDestination, AlertSubscription, Alert +from redash.destinations import get_configuration_schema_for_destination_type +from redash.utils.configuration import ConfigurationContainer from playhouse.migrate import PostgresqlMigrator, migrate if __name__ == '__main__': @@ -7,10 +10,70 @@ if __name__ == '__main__': if not NotificationDestination.table_exists(): NotificationDestination.create_table() + + # Create an email destination to migrate existing AlertSubscriptions + schema = get_configuration_schema_for_destination_type('email') + options = ConfigurationContainer('{}', schema) - # Update alert subscription fields - migrate( - migrator.add_column('alert_subscriptions', 'destination_id', AlertSubscription.destination) - ) + email = NotificationDestination.create( + org=1, + user=1, + name="Email", + type="email", + options=options + ) + + # Update alert subscription fields + migrate( + migrator.add_column('alert_subscriptions', 'destination_id', AlertSubscription.destination) + ) + + if settings.WEBHOOK_ENDPOINT: + # Have all existing alerts send to webhook if already configured + schema = get_configuration_schema_for_destination_type('webhook') + conf = {'url': settings.WEBHOOK_ENDPOINT} + if settings.WEBHOOK_USERNAME: + conf['username'] = settings.WEBHOOK_USERNAME + conf['password'] = settings.WEBHOOK_PASSWORD + options = ConfigurationContainer(conf, schema) + + webhook = NotificationDestination.create( + org=1, + user=1, + name="Webhook", + type="webhook", + options=options + ) + + for alert in Alert.select(): + AlertSubscription.create( + user=1, + destination=webhook, + alert=alert + ) + + if settings.HIPCHAT_API_TOKEN: + # Have all existing alerts send to HipChat if already configured + schema = get_configuration_schema_for_destination_type('hipchat') + conf = {'token': settings.HIPCHAT_API_TOKEN, + 'room_id': settings.HIPCHAT_ROOM_ID} + if settings.HIPCHAT_API_URL: + conf['url'] = settings.HIPCHAT_API_URL + options = ConfigurationContainer(conf, schema) + + hipchat = NotificationDestination.create( + org=1, + user=1, + name="Hipchat", + type="hipchat", + options=options + ) + + for alert in Alert.select(): + AlertSubscription.create( + user=1, + destination=hipchat, + alert=alert + ) db.close_db(None) diff --git a/redash/models.py b/redash/models.py index 05092b6f2..d04e45841 100644 --- a/redash/models.py +++ b/redash/models.py @@ -1100,7 +1100,7 @@ class NotificationDestination(BelongsToOrgMixin, BaseModel): class AlertSubscription(ModelTimestampsMixin, BaseModel): user = peewee.ForeignKeyField(User) - destination = peewee.ForeignKeyField(NotificationDestination, null=True) + destination = peewee.ForeignKeyField(NotificationDestination, default=1) alert = peewee.ForeignKeyField(Alert, related_name="subscriptions") class Meta: From 3838b0341778da05fd7f00a6c3eb4b366b1279ea Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Wed, 16 Mar 2016 20:26:21 +0000 Subject: [PATCH 22/38] Clean up tasks.py to remove unneeded code --- redash/tasks.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/redash/tasks.py b/redash/tasks.py index 5f30c16b9..5cabaa058 100644 --- a/redash/tasks.py +++ b/redash/tasks.py @@ -4,14 +4,11 @@ import logging import signal from flask_mail import Message import redis -import hipchat -import requests -from redash.utils import json_dumps, base_url -from requests.auth import HTTPBasicAuth +from redash.utils import base_url from celery import Task from celery.result import AsyncResult from celery.utils.log import get_task_logger -from redash import redis_connection, models, statsd_client, settings, utils, mail +from redash import redis_connection, models, statsd_client, settings, utils from redash.utils import gen_query_hash from redash.worker import celery from redash.query_runner import InterruptException @@ -369,18 +366,6 @@ def check_alerts_for_query(self, query_id): logger.warn("Exception: {}".format(e)) -def notify_hipchat(alert, html, new_state): - try: - if settings.HIPCHAT_API_URL: - hipchat_client = hipchat.HipChat(token=settings.HIPCHAT_API_TOKEN, url=settings.HIPCHAT_API_URL) - else: - hipchat_client = hipchat.HipChat(token=settings.HIPCHAT_API_TOKEN) - message = '[' + new_state.upper() + '] ' + alert.name + '
    ' + html - hipchat_client.message_room(settings.HIPCHAT_ROOM_ID, settings.NAME, message.encode('utf-8', 'ignore'), message_format='html') - except Exception: - logger.exception("hipchat send ERROR.") - - @celery.task(base=BaseTask) def send_mail(to, subject, html, text): from redash.wsgi import app From 70b4f9d447dd10fee857efd4c8e0e9fa3e20949d Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Thu, 17 Mar 2016 14:01:48 +0000 Subject: [PATCH 23/38] Create dynamicForm directive --- rd_ui/app/app_layout.html | 2 - .../directives/destination_directives.js | 80 ------------------ rd_ui/app/scripts/directives/directives.js | 82 ++++++++++++++++++- rd_ui/app/views/data_sources/edit.html | 2 +- rd_ui/app/views/data_sources/form.html | 8 +- rd_ui/app/views/destinations/edit.html | 2 +- rd_ui/app/views/destinations/form.html | 8 +- 7 files changed, 91 insertions(+), 93 deletions(-) delete mode 100644 rd_ui/app/scripts/directives/destination_directives.js diff --git a/rd_ui/app/app_layout.html b/rd_ui/app/app_layout.html index c173791d8..cd05a5a29 100644 --- a/rd_ui/app/app_layout.html +++ b/rd_ui/app/app_layout.html @@ -84,8 +84,6 @@ - - diff --git a/rd_ui/app/scripts/directives/destination_directives.js b/rd_ui/app/scripts/directives/destination_directives.js deleted file mode 100644 index 738a7885e..000000000 --- a/rd_ui/app/scripts/directives/destination_directives.js +++ /dev/null @@ -1,80 +0,0 @@ -(function () { - 'use strict'; - - var directives = angular.module('redash.directives'); - - directives.directive('destinationForm', ['$http', 'growl', function ($http, growl) { - return { - restrict: 'E', - replace: true, - templateUrl: '/views/destinations/form.html', - scope: { - 'destination': '=' - }, - link: function ($scope) { - var setType = function(types) { - if ($scope.destination.type === undefined) { - $scope.destination.type = types[0].type; - return types[0]; - } - - $scope.type = _.find(types, function (t) { - return t.type == $scope.destination.type; - }); - }; - - $scope.files = {}; - - $scope.$watchCollection('files', function() { - _.each($scope.files, function(v, k) { - if (v) { - $scope.dataSource.options[k] = v.base64; - } - }); - }); - - - $http.get('api/destinations/types').success(function (types) { - setType(types); - - $scope.destinationTypes = types; - - _.each(types, function (type) { - _.each(type.configuration_schema.properties, function (prop, name) { - if (name == 'password' || name == 'passwd') { - prop.type = 'password'; - } - - if (_.string.endsWith(name, "File")) { - prop.type = 'file'; - } - - if (prop.type == 'boolean') { - prop.type = 'checkbox'; - } - - prop.required = _.contains(type.configuration_schema.required, name); - }); - }); - }); - - $scope.$watch('destination.type', function(current, prev) { - if (prev !== current) { - if (prev !== undefined) { - $scope.destination.options = {}; - } - setType($scope.destinationTypes); - } - }); - - $scope.saveChanges = function() { - $scope.destination.$save(function() { - growl.addSuccessMessage("Saved."); - }, function() { - growl.addErrorMessage("Failed saving."); - }); - } - } - } - }]); -})(); diff --git a/rd_ui/app/scripts/directives/directives.js b/rd_ui/app/scripts/directives/directives.js index 91e1025a2..9893cd55a 100644 --- a/rd_ui/app/scripts/directives/directives.js +++ b/rd_ui/app/scripts/directives/directives.js @@ -382,6 +382,86 @@ '
    ' + '
    ' } - }) + }); + + directives.directive('dynamicForm', ['$http', 'growl', '$q', function ($http, growl, $q) { + return { + restrict: 'E', + replace: 'true', + templateUrl: function(elem, attr) { + return '/views/' + attr.type+ '/form.html'; + }, + scope: { + 'target': '=', + 'type': '@type' + }, + link: function ($scope) { + var setType = function(types) { + if ($scope.target.type === undefined) { + $scope.target.type = types[0].type; + return types[0]; + } + + $scope.type = _.find(types, function (t) { + return t.type == $scope.target.type; + }); + }; + + $scope.files = {}; + + $scope.$watchCollection('files', function() { + _.each($scope.files, function(v, k) { + if (v) { + $scope.target.options[k] = v.base64; + } + }); + }); + + var typesPromise = $http.get('api/' + $scope.type + '/types'); + + $q.all([typesPromise, $scope.target.$promise]).then(function(responses) { + var types = responses[0].data; + setType(types); + + $scope.types = types; + + _.each(types, function (type) { + _.each(type.configuration_schema.properties, function (prop, name) { + if (name == 'password' || name == 'passwd') { + prop.type = 'password'; + } + + if (_.string.endsWith(name, "File")) { + prop.type = 'file'; + } + + if (prop.type == 'boolean') { + prop.type = 'checkbox'; + } + + prop.required = _.contains(type.configuration_schema.required, name); + }); + }); + }); + + $scope.$watch('target.type', function(current, prev) { + if (prev !== current) { + if (prev !== undefined) { + $scope.target.options = {}; + } + setType($scope.types); + } + }); + + $scope.saveChanges = function() { + $scope.target.$save(function() { + growl.addSuccessMessage("Saved."); + }, function() { + growl.addErrorMessage("Failed saving."); + }); + } + } + } + }]); })(); diff --git a/rd_ui/app/views/data_sources/edit.html b/rd_ui/app/views/data_sources/edit.html index f0bd19e8c..33f0bebdb 100644 --- a/rd_ui/app/views/data_sources/edit.html +++ b/rd_ui/app/views/data_sources/edit.html @@ -5,7 +5,7 @@
    - +
    diff --git a/rd_ui/app/views/data_sources/form.html b/rd_ui/app/views/data_sources/form.html index f44663112..aba31b6ef 100644 --- a/rd_ui/app/views/data_sources/form.html +++ b/rd_ui/app/views/data_sources/form.html @@ -1,18 +1,18 @@
    - +
    - +
    - -
    diff --git a/rd_ui/app/views/destinations/edit.html b/rd_ui/app/views/destinations/edit.html index cc71e44c2..a157da044 100644 --- a/rd_ui/app/views/destinations/edit.html +++ b/rd_ui/app/views/destinations/edit.html @@ -5,7 +5,7 @@
    - +
    diff --git a/rd_ui/app/views/destinations/form.html b/rd_ui/app/views/destinations/form.html index 868e668d0..f7a90edb9 100644 --- a/rd_ui/app/views/destinations/form.html +++ b/rd_ui/app/views/destinations/form.html @@ -1,18 +1,18 @@
    - +
    - +
    - -
    From ce6ceac5c4dcd33ee2ab3d643087cde73554b46d Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Thu, 17 Mar 2016 14:27:23 +0000 Subject: [PATCH 24/38] Add hipchat to default destinations --- redash/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/redash/settings.py b/redash/settings.py index 40aa66467..abd666d00 100644 --- a/redash/settings.py +++ b/redash/settings.py @@ -182,7 +182,8 @@ QUERY_RUNNERS = distinct(enabled_query_runners + additional_query_runners) default_destinations = [ 'redash.destinations.email', 'redash.destinations.slack', - 'redash.destinations.webhook' + 'redash.destinations.webhook', + 'redash.destinations.hipchat', ] enabled_destinations = array_from_string(os.environ.get("REDASH_ENABLED_DESTINATIONS", ",".join(default_destinations))) From bf880a834b90d32b4f9ac1bde0ccd3b385a7a4ef Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Wed, 23 Mar 2016 13:51:36 +0000 Subject: [PATCH 25/38] Move notify to AlertSubscription; adjust email destination to take multiple addresses --- redash/destinations/email.py | 12 ++++++++++-- redash/handlers/alerts.py | 25 ++++++++----------------- redash/models.py | 15 ++++++++++++++- redash/tasks.py | 2 +- 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/redash/destinations/email.py b/redash/destinations/email.py index b5b26b038..766a7750d 100644 --- a/redash/destinations/email.py +++ b/redash/destinations/email.py @@ -9,14 +9,22 @@ class Email(BaseDestination): @classmethod def configuration_schema(cls): - return {} + return { + "type": "object", + "properties": { + "addresses": { + "type": "string" + }, + }, + "required": ["addresses"] + } @classmethod def icon(cls): return 'fa-envelope' def notify(self, alert, query, user, new_state, app, host, options): - recipients = [user.email] + recipients = [email for email in options.get('addresses').split(',') if email] html = """ Check alert / check query. """.format(host=host, alert_id=alert.id, query_id=query.id) diff --git a/redash/handlers/alerts.py b/redash/handlers/alerts.py index 708dd5d28..a2dee9ff1 100644 --- a/redash/handlers/alerts.py +++ b/redash/handlers/alerts.py @@ -38,9 +38,8 @@ class AlertResource(BaseResource): class AlertListResource(BaseResource): def post(self): req = request.get_json(True) - require_fields(req, ('options', 'name', 'query_id', 'destination_id')) + require_fields(req, ('options', 'name', 'query_id')) - destination = models.NotificationDestination.get_by_id_and_org(req['destination_id'], self.current_org) query = models.Query.get_by_id_and_org(req['query_id'], self.current_org) require_access(query.groups, self.current_user, view_only) @@ -58,17 +57,6 @@ class AlertListResource(BaseResource): 'object_type': 'alert' }) - # TODO: should be in model? - models.AlertSubscription.create(alert=alert, user=self.current_user, - destination=destination) - - self.record_event({ - 'action': 'subscribe', - 'timestamp': int(time.time()), - 'object_id': alert.id, - 'object_type': 'alert' - }) - return alert.to_dict() @require_permission('list_alerts') @@ -79,14 +67,17 @@ class AlertListResource(BaseResource): class AlertSubscriptionListResource(BaseResource): def post(self, alert_id): req = request.get_json(True) - require_fields(req, ('destination_id',)) - destination = models.NotificationDestination.get_by_id_and_org(req['destination_id'], self.current_org) alert = models.Alert.get_by_id_and_org(alert_id, self.current_org) require_access(alert.groups, self.current_user, view_only) + kwargs = {'alert': alert, 'user': self.current_user} + + if 'destination_id' in req: + destination = models.NotificationDestination.get_by_id_and_org(req['destination_id'], self.current_org) + kwargs['destination'] = destination + + subscription = models.AlertSubscription.create(**kwargs) - subscription = models.AlertSubscription.create(alert=alert_id, user=self.current_user, - destination=destination) self.record_event({ 'action': 'subscribe', 'timestamp': int(time.time()), diff --git a/redash/models.py b/redash/models.py index d04e45841..cb62eb3d9 100644 --- a/redash/models.py +++ b/redash/models.py @@ -1100,7 +1100,7 @@ class NotificationDestination(BelongsToOrgMixin, BaseModel): class AlertSubscription(ModelTimestampsMixin, BaseModel): user = peewee.ForeignKeyField(User) - destination = peewee.ForeignKeyField(NotificationDestination, default=1) + destination = peewee.ForeignKeyField(NotificationDestination, null=True) alert = peewee.ForeignKeyField(Alert, related_name="subscriptions") class Meta: @@ -1126,6 +1126,19 @@ class AlertSubscription(ModelTimestampsMixin, BaseModel): def all(cls, alert_id): return AlertSubscription.select(AlertSubscription, User).join(User).where(AlertSubscription.alert==alert_id) + def notify(self, alert, query, user, new_state, app, host): + if self.destination: + return self.destination.notify(alert, query, user, new_state, + app, host) + else: + # User email subscription, so create an email destination object + config = {'email': self.user.email} + schema = get_configuration_schema_for_destination_type('email') + options = ConfigurationContainer(json.dumps(config), schema) + destination = get_destination('email', options) + return destination.notify(alert, query, user, new_state, + app, host, options) + all_models = (Organization, Group, DataSource, DataSourceGroup, User, QueryResult, Query, Alert, Dashboard, Visualization, Widget, Event, NotificationDestination, AlertSubscription) diff --git a/redash/tasks.py b/redash/tasks.py index 5cabaa058..3ff7ff4a1 100644 --- a/redash/tasks.py +++ b/redash/tasks.py @@ -361,7 +361,7 @@ def check_alerts_for_query(self, query_id): for subscription in alert.subscriptions: try: - subscription.destination.notify(alert, query, subscription.user, new_state, app, host) + subscription.notify(alert, query, subscription.user, new_state, app, host) except Exception as e: logger.warn("Exception: {}".format(e)) From faf2f7dede0e6fb16abc7d0d11966d1252460935 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Wed, 23 Mar 2016 15:54:12 +0000 Subject: [PATCH 26/38] Add user subscriptions back to Alert page --- rd_ui/app/scripts/controllers/alerts.js | 36 ++++----------------- rd_ui/app/scripts/services/resources.js | 2 +- rd_ui/app/views/alerts/edit.html | 8 ++--- rd_ui/app/views/alerts/subscribers.html | 23 ------------- rd_ui/app/views/alerts/usersubscribers.html | 5 +++ 5 files changed, 16 insertions(+), 58 deletions(-) delete mode 100644 rd_ui/app/views/alerts/subscribers.html create mode 100644 rd_ui/app/views/alerts/usersubscribers.html diff --git a/rd_ui/app/scripts/controllers/alerts.js b/rd_ui/app/scripts/controllers/alerts.js index 623fef4ac..352fb129d 100644 --- a/rd_ui/app/scripts/controllers/alerts.js +++ b/rd_ui/app/scripts/controllers/alerts.js @@ -74,7 +74,6 @@ $scope.ops = ['greater than', 'less than', 'equals']; $scope.selectedQuery = null; - $scope.destinations = Destination.query(); $scope.getDefaultName = function() { if (!$scope.alert.query) { @@ -112,42 +111,21 @@ }; - angular.module('redash.directives').directive('alertSubscribers', ['AlertSubscription', 'Destination', 'growl', function (AlertSubscription, Destination, growl) { + angular.module('redash.directives').directive('userSubscribers', ['AlertSubscription', 'growl', function (AlertSubscription, growl) { return { restrict: 'E', replace: true, - templateUrl: '/views/alerts/subscribers.html', + templateUrl: '/views/alerts/userSubscribers.html', scope: { 'alertId': '=' }, controller: function ($scope) { - $scope.subscribers = AlertSubscription.query({alertId: $scope.alertId}); $scope.subscription = {}; - $scope.destinations = Destination.query(); + $scope.subscribers = []; - $scope.destinationsDisplay = function(destination) { - return ' ' + destination.name - }; - - $scope.saveSubscriber = function() { - $scope.sub = new AlertSubscription({alert_id: $scope.alertId, destination_id: $scope.subscription.destination.id}); - $scope.sub.$save(function() { - growl.addSuccessMessage("Subscribed."); - $scope.subscribers.push($scope.sub); - }, function() { - growl.addErrorMessage("Failed saving subscription."); - }); - }; - - $scope.unsubscribe = function(subscriber) { - $scope.sub = new AlertSubscription({alert_id: subscriber.alert_id, subscriber_id: subscriber.id}); - $scope.sub.$delete(function() { - growl.addSuccessMessage("Unsubscribed"); - $scope.subscribers = _.without($scope.subscribers, subscriber); - }, function() { - growl.addErrorMessage("Failed unsubscribing."); - }); - }; + $scope.subscribers = AlertSubscription.query({alertId: $scope.alertId}, function(subscriptions) { + $scope.subscribers = _.filter(subscriptions, function(subscription) { return typeof subscription.destination === "undefined"; }); + }); } } }]); @@ -185,7 +163,7 @@ }); } else { $scope.subscription = new AlertSubscription({alert_id: $scope.alertId}); - $scope.subscription.$delete(function() { + $scope.subscription.$save(function() { $scope.subscribers.push($scope.subscription); updateClass(); }, function() { diff --git a/rd_ui/app/scripts/services/resources.js b/rd_ui/app/scripts/services/resources.js index 11199ebb6..6745459d1 100644 --- a/rd_ui/app/scripts/services/resources.js +++ b/rd_ui/app/scripts/services/resources.js @@ -607,7 +607,7 @@ }; var AlertSubscription = function ($resource) { - var resource = $resource('api/alerts/:alertId/subscriptions/:subscriberId', {alertId: '@alert_id', subscriberId: '@subscriber_id'}); + var resource = $resource('api/alerts/:alertId/subscriptions/:subscriberId', {alertId: '@alert_id', subscriberId: '@id'}); return resource; }; diff --git a/rd_ui/app/views/alerts/edit.html b/rd_ui/app/views/alerts/edit.html index 2edbcc498..00a26e09d 100644 --- a/rd_ui/app/views/alerts/edit.html +++ b/rd_ui/app/views/alerts/edit.html @@ -6,6 +6,7 @@
    +

    Alert

    @@ -50,10 +51,6 @@
    - -
    - -
    @@ -63,7 +60,8 @@
    - +

    Subscriptions

    +
    diff --git a/rd_ui/app/views/alerts/subscribers.html b/rd_ui/app/views/alerts/subscribers.html deleted file mode 100644 index 8d2e1c964..000000000 --- a/rd_ui/app/views/alerts/subscribers.html +++ /dev/null @@ -1,23 +0,0 @@ -
    -
    -
    - - - {{$select.selected.name}} - - - - -
    -
    - -
    -
    -
    - -
    - - -
    -
    -
    diff --git a/rd_ui/app/views/alerts/usersubscribers.html b/rd_ui/app/views/alerts/usersubscribers.html new file mode 100644 index 000000000..0da211f40 --- /dev/null +++ b/rd_ui/app/views/alerts/usersubscribers.html @@ -0,0 +1,5 @@ +
    + User subscriptions
    +

    User subscriptions will send a notification to your email

    + {{s.id}} +
    From 6c3b713b3d8da6bf47312213c2f3a91e74c38ca2 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Wed, 23 Mar 2016 16:33:07 +0000 Subject: [PATCH 27/38] Add destination subscriptions to Alert page --- rd_ui/app/scripts/controllers/alerts.js | 44 +++++++++++++++++++ .../views/alerts/destinationsubscribers.html | 25 +++++++++++ rd_ui/app/views/alerts/edit.html | 1 + rd_ui/app/views/alerts/usersubscribers.html | 2 +- 4 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 rd_ui/app/views/alerts/destinationsubscribers.html diff --git a/rd_ui/app/scripts/controllers/alerts.js b/rd_ui/app/scripts/controllers/alerts.js index 352fb129d..4a811ef58 100644 --- a/rd_ui/app/scripts/controllers/alerts.js +++ b/rd_ui/app/scripts/controllers/alerts.js @@ -130,6 +130,50 @@ } }]); + angular.module('redash.directives').directive('destinationSubscribers', ['AlertSubscription', 'Destination', 'growl', function (AlertSubscription, Destination, growl) { + return { + restrict: 'E', + replace: true, + templateUrl: '/views/alerts/destinationSubscribers.html', + scope: { + 'alertId': '=' + }, + controller: function ($scope) { + $scope.subscription = {}; + $scope.subscribers = []; + $scope.destinations = Destination.query(); + + $scope.destinationsDisplay = function(destination) { + return ' ' + destination.name + }; + + $scope.subscribers = AlertSubscription.query({alertId: $scope.alertId}, function(subscriptions) { + $scope.subscribers = _.filter(subscriptions, function(subscription) { return typeof subscription.destination !== "undefined"; }); + }); + $scope.saveSubscriber = function() { + $scope.sub = new AlertSubscription({alert_id: $scope.alertId, destination_id: $scope.subscription.destination.id}); + $scope.sub.$save(function() { + growl.addSuccessMessage("Subscribed."); + $scope.subscribers.push($scope.sub); + }, function(response) { + console.log(response); + growl.addErrorMessage("Failed saving subscription."); + }); + }; + + $scope.unsubscribe = function(subscriber) { + $scope.sub = new AlertSubscription({alert_id: subscriber.alert_id, id: subscriber.id}); + $scope.sub.$delete(function() { + growl.addSuccessMessage("Unsubscribed"); + $scope.subscribers = _.without($scope.subscribers, subscriber); + }, function() { + growl.addErrorMessage("Failed unsubscribing."); + }); + }; + } + } + }]); + angular.module('redash.directives').directive('subscribeButton', ['AlertSubscription', 'growl', function (AlertSubscription, growl) { return { restrict: 'E', diff --git a/rd_ui/app/views/alerts/destinationsubscribers.html b/rd_ui/app/views/alerts/destinationsubscribers.html new file mode 100644 index 000000000..11d3df6f6 --- /dev/null +++ b/rd_ui/app/views/alerts/destinationsubscribers.html @@ -0,0 +1,25 @@ +
    + Destination subscriptions +

    Destination subscriptions will send a notification to the configured destination

    +
    +
    + + + {{$select.selected.name}} + + + + +
    +
    + +
    +
    +
    + +
    + + +
    +
    +
    diff --git a/rd_ui/app/views/alerts/edit.html b/rd_ui/app/views/alerts/edit.html index 00a26e09d..ae910613b 100644 --- a/rd_ui/app/views/alerts/edit.html +++ b/rd_ui/app/views/alerts/edit.html @@ -62,6 +62,7 @@

    Subscriptions

    +
    diff --git a/rd_ui/app/views/alerts/usersubscribers.html b/rd_ui/app/views/alerts/usersubscribers.html index 0da211f40..9583b2d32 100644 --- a/rd_ui/app/views/alerts/usersubscribers.html +++ b/rd_ui/app/views/alerts/usersubscribers.html @@ -1,4 +1,4 @@ -
    +
    User subscriptions

    User subscriptions will send a notification to your email

    {{s.id}} From 601010e44e0e4769f9ee43ca81c89f324b4627a4 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Wed, 23 Mar 2016 16:34:06 +0000 Subject: [PATCH 28/38] Remove email destination from AlertSubscription migration --- migrations/0023_add_notification_destination.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/migrations/0023_add_notification_destination.py b/migrations/0023_add_notification_destination.py index d193ccdb7..6bdf87c4f 100644 --- a/migrations/0023_add_notification_destination.py +++ b/migrations/0023_add_notification_destination.py @@ -11,18 +11,6 @@ if __name__ == '__main__': if not NotificationDestination.table_exists(): NotificationDestination.create_table() - # Create an email destination to migrate existing AlertSubscriptions - schema = get_configuration_schema_for_destination_type('email') - options = ConfigurationContainer('{}', schema) - - email = NotificationDestination.create( - org=1, - user=1, - name="Email", - type="email", - options=options - ) - # Update alert subscription fields migrate( migrator.add_column('alert_subscriptions', 'destination_id', AlertSubscription.destination) From df2067eec1f0791658c5241262cea8e4bd0e53bb Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Wed, 23 Mar 2016 18:47:16 +0000 Subject: [PATCH 29/38] Make subscription display more clear --- rd_ui/app/scripts/controllers/alerts.js | 14 +++--- rd_ui/app/styles/redash.css | 5 +++ .../views/alerts/destinationsubscribers.html | 44 ++++++++++--------- rd_ui/app/views/alerts/edit.html | 1 + rd_ui/app/views/alerts/usersubscribers.html | 6 ++- 5 files changed, 40 insertions(+), 30 deletions(-) diff --git a/rd_ui/app/scripts/controllers/alerts.js b/rd_ui/app/scripts/controllers/alerts.js index 4a811ef58..ec6acf87d 100644 --- a/rd_ui/app/scripts/controllers/alerts.js +++ b/rd_ui/app/scripts/controllers/alerts.js @@ -178,13 +178,13 @@ return { restrict: 'E', replace: true, - template: '', + template: '', controller: function ($scope) { - var updateClass = function() { + var updateMessage = function() { if ($scope.subscription) { - $scope.class = "fa fa-eye-slash"; + $scope.message = "Unsubscribe"; } else { - $scope.class = "fa fa-eye"; + $scope.message = "Subscribe"; } } @@ -193,7 +193,7 @@ return (subscription.user.email == currentUser.email); }); - updateClass(); + updateMessage(); }); $scope.toggleSubscription = function() { @@ -201,7 +201,7 @@ $scope.subscription.$delete(function() { $scope.subscribers = _.without($scope.subscribers, $scope.subscription); $scope.subscription = undefined; - updateClass(); + updateMessage(); }, function() { growl.addErrorMessage("Failed saving subscription."); }); @@ -209,7 +209,7 @@ $scope.subscription = new AlertSubscription({alert_id: $scope.alertId}); $scope.subscription.$save(function() { $scope.subscribers.push($scope.subscription); - updateClass(); + updateMessage(); }, function() { growl.addErrorMessage("Unsubscription failed."); }); diff --git a/rd_ui/app/styles/redash.css b/rd_ui/app/styles/redash.css index 9e237935a..8078cebbf 100644 --- a/rd_ui/app/styles/redash.css +++ b/rd_ui/app/styles/redash.css @@ -581,3 +581,8 @@ div.table-name { padding-left: 5px; padding-right: 5px; } + +hr.subscription { + height: 2px; + background: #333; +} diff --git a/rd_ui/app/views/alerts/destinationsubscribers.html b/rd_ui/app/views/alerts/destinationsubscribers.html index 11d3df6f6..f7f617862 100644 --- a/rd_ui/app/views/alerts/destinationsubscribers.html +++ b/rd_ui/app/views/alerts/destinationsubscribers.html @@ -1,25 +1,27 @@
    - Destination subscriptions -

    Destination subscriptions will send a notification to the configured destination

    -
    -
    - - - {{$select.selected.name}} - - - - -
    -
    - -
    -
    -
    - -
    - - +
    + Destination subscriptions +

    Destination subscriptions will send a notification to the configured destination

    +
    +

    Add a destination subscription

    +
    + + {{$select.selected.name}} + + + + +
    +
    + +
    +
    +
    + +
    + + +
    diff --git a/rd_ui/app/views/alerts/edit.html b/rd_ui/app/views/alerts/edit.html index ae910613b..b33c395cf 100644 --- a/rd_ui/app/views/alerts/edit.html +++ b/rd_ui/app/views/alerts/edit.html @@ -62,6 +62,7 @@

    Subscriptions

    +
    diff --git a/rd_ui/app/views/alerts/usersubscribers.html b/rd_ui/app/views/alerts/usersubscribers.html index 9583b2d32..5722d2af2 100644 --- a/rd_ui/app/views/alerts/usersubscribers.html +++ b/rd_ui/app/views/alerts/usersubscribers.html @@ -1,5 +1,7 @@ -
    - User subscriptions
    +
    +
    +

    +

    User subscriptions will send a notification to your email

    {{s.id}}
    From ee29f07802593049c216f815e38f36d16ba42015 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Thu, 24 Mar 2016 02:46:59 +0000 Subject: [PATCH 30/38] Clean up after rebase --- rd_ui/app/scripts/app.js | 4 +- rd_ui/app/scripts/controllers/alerts.js | 1 - .../directives/data_source_directives.js | 83 ------------------- 3 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 rd_ui/app/scripts/directives/data_source_directives.js diff --git a/rd_ui/app/scripts/app.js b/rd_ui/app/scripts/app.js index f9f6492cf..bfb6659fc 100644 --- a/rd_ui/app/scripts/app.js +++ b/rd_ui/app/scripts/app.js @@ -108,8 +108,8 @@ angular.module('redash', [ }); $routeProvider.when('/destinations/:destinationId', { - templateurl: '/views/destinations/edit.html', - controller: 'destinationctrl' + templateUrl: '/views/destinations/edit.html', + controller: 'DestinationCtrl' }); $routeProvider.when('/destinations', { templateUrl: '/views/destinations/list.html', diff --git a/rd_ui/app/scripts/controllers/alerts.js b/rd_ui/app/scripts/controllers/alerts.js index ec6acf87d..38ff07683 100644 --- a/rd_ui/app/scripts/controllers/alerts.js +++ b/rd_ui/app/scripts/controllers/alerts.js @@ -156,7 +156,6 @@ growl.addSuccessMessage("Subscribed."); $scope.subscribers.push($scope.sub); }, function(response) { - console.log(response); growl.addErrorMessage("Failed saving subscription."); }); }; diff --git a/rd_ui/app/scripts/directives/data_source_directives.js b/rd_ui/app/scripts/directives/data_source_directives.js deleted file mode 100644 index ebc8a35e3..000000000 --- a/rd_ui/app/scripts/directives/data_source_directives.js +++ /dev/null @@ -1,83 +0,0 @@ -(function () { - 'use strict'; - - var directives = angular.module('redash.directives'); - - // Angular strips data- from the directive, so data-source-form becomes sourceForm... - directives.directive('sourceForm', ['$http', 'growl', '$q', function ($http, growl, $q) { - return { - restrict: 'E', - replace: true, - templateUrl: '/views/data_sources/form.html', - scope: { - 'dataSource': '=' - }, - link: function ($scope) { - var setType = function(types) { - if ($scope.dataSource.type === undefined) { - $scope.dataSource.type = types[0].type; - return types[0]; - } - - $scope.type = _.find(types, function (t) { - return t.type == $scope.dataSource.type; - }); - }; - - $scope.files = {}; - - $scope.$watchCollection('files', function() { - _.each($scope.files, function(v, k) { - if (v) { - $scope.dataSource.options[k] = v.base64; - } - }); - }); - - var typesPromise = $http.get('api/data_sources/types'); - - $q.all([typesPromise, $scope.dataSource.$promise]).then(function(responses) { - var types = responses[0].data; - setType(types); - - $scope.dataSourceTypes = types; - - _.each(types, function (type) { - _.each(type.configuration_schema.properties, function (prop, name) { - if (name == 'password' || name == 'passwd') { - prop.type = 'password'; - } - - if (_.string.endsWith(name, "File")) { - prop.type = 'file'; - } - - if (prop.type == 'boolean') { - prop.type = 'checkbox'; - } - - prop.required = _.contains(type.configuration_schema.required, name); - }); - }); - }); - - $scope.$watch('dataSource.type', function(current, prev) { - if (prev !== current) { - if (prev !== undefined) { - $scope.dataSource.options = {}; - } - setType($scope.dataSourceTypes); - } - }); - - $scope.saveChanges = function() { - $scope.dataSource.$save(function() { - growl.addSuccessMessage("Saved."); - }, function() { - growl.addErrorMessage("Failed saving."); - }); - } - } - } - }]); -})(); From 1c04f3cc29439baf2c501cfff3ece797977171ac Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Thu, 24 Mar 2016 13:55:46 +0000 Subject: [PATCH 31/38] Fix broken tests --- redash/models.py | 2 +- tests/factories.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/redash/models.py b/redash/models.py index cb62eb3d9..976a05869 100644 --- a/redash/models.py +++ b/redash/models.py @@ -1140,7 +1140,7 @@ class AlertSubscription(ModelTimestampsMixin, BaseModel): app, host, options) -all_models = (Organization, Group, DataSource, DataSourceGroup, User, QueryResult, Query, Alert, Dashboard, Visualization, Widget, Event, NotificationDestination, AlertSubscription) +all_models = (Organization, Group, DataSource, DataSourceGroup, User, QueryResult, Query, Alert, Dashboard, Visualization, Widget, Event, NotificationDestination, AlertSubscription, ApiKey) def init_db(): diff --git a/tests/factories.py b/tests/factories.py index e0e32d1c1..6104b420e 100644 --- a/tests/factories.py +++ b/tests/factories.py @@ -239,14 +239,14 @@ class Factory(object): return widget_factory.create(**args) def create_api_key(self, **kwargs): - return api_key_factory.create(**args) - - def create_destination(self, **kwargs): args = { 'org': self.org } args.update(kwargs) - return destination_factory.create(**args) + return api_key_factory.create(**args) + + def create_destination(self, **kwargs): + return destination_factory.create(**kwargs) def create_alert_subscription(self, **kwargs): return alert_subscription_factory.create(**kwargs) From 4bcb705a2a9d585cd27505737e4b53e62f7aaa47 Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Thu, 24 Mar 2016 14:28:47 +0000 Subject: [PATCH 32/38] Hide user subscriptions if email is not enabled --- rd_ui/app/scripts/controllers/alerts.js | 1 + rd_ui/app/views/alerts/edit.html | 1 - rd_ui/app/views/alerts/usersubscribers.html | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rd_ui/app/scripts/controllers/alerts.js b/rd_ui/app/scripts/controllers/alerts.js index 38ff07683..83b73a1e6 100644 --- a/rd_ui/app/scripts/controllers/alerts.js +++ b/rd_ui/app/scripts/controllers/alerts.js @@ -122,6 +122,7 @@ controller: function ($scope) { $scope.subscription = {}; $scope.subscribers = []; + $scope.enabled = !clientConfig.mailSettingsMissing; $scope.subscribers = AlertSubscription.query({alertId: $scope.alertId}, function(subscriptions) { $scope.subscribers = _.filter(subscriptions, function(subscription) { return typeof subscription.destination === "undefined"; }); diff --git a/rd_ui/app/views/alerts/edit.html b/rd_ui/app/views/alerts/edit.html index b33c395cf..ae910613b 100644 --- a/rd_ui/app/views/alerts/edit.html +++ b/rd_ui/app/views/alerts/edit.html @@ -62,7 +62,6 @@

    Subscriptions

    -
    diff --git a/rd_ui/app/views/alerts/usersubscribers.html b/rd_ui/app/views/alerts/usersubscribers.html index 5722d2af2..84e19f54a 100644 --- a/rd_ui/app/views/alerts/usersubscribers.html +++ b/rd_ui/app/views/alerts/usersubscribers.html @@ -1,7 +1,8 @@ -
    +


    User subscriptions will send a notification to your email

    {{s.id}} +
    From 9b6f555d76183e32ffba78f22bc4721c541870ef Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Sat, 7 May 2016 17:58:15 +0300 Subject: [PATCH 33/38] Update alert task to use destinations --- redash/destinations/hipchat.py | 3 +- redash/tasks/alerts.py | 69 +++++----------------------------- 2 files changed, 10 insertions(+), 62 deletions(-) diff --git a/redash/destinations/hipchat.py b/redash/destinations/hipchat.py index c46dc4ab4..024330cd3 100644 --- a/redash/destinations/hipchat.py +++ b/redash/destinations/hipchat.py @@ -1,9 +1,8 @@ import logging import hipchat -from redash import models +from redash import settings from redash.destinations import * -from redash.utils import json_dumps class Hipchat(BaseDestination): diff --git a/redash/tasks/alerts.py b/redash/tasks/alerts.py index db243d5d2..d9cf2e04d 100644 --- a/redash/tasks/alerts.py +++ b/redash/tasks/alerts.py @@ -1,12 +1,7 @@ from celery.utils.log import get_task_logger import datetime -from flask.ext.mail import Message -import hipchat -import requests -from redash.utils import json_dumps -from requests.auth import HTTPBasicAuth from redash.worker import celery -from redash import utils, mail +from redash import utils from redash import models, settings from .base import BaseTask @@ -21,8 +16,8 @@ def base_url(org): return settings.HOST -@celery.task(name="redash.tasks.check_alerts_for_query", bind=True, base=BaseTask) -def check_alerts_for_query(self, query_id): +@celery.task(name="redash.tasks.check_alerts_for_query", base=BaseTask) +def check_alerts_for_query(query_id): from redash.wsgi import app logger.debug("Checking query %d for alerts", query_id) @@ -42,56 +37,10 @@ def check_alerts_for_query(self, query_id): logger.debug("Skipping notification (previous state was unknown and now it's ok).") continue - # message = Message - html = """ - Check alert / check query. - """.format(host=base_url(alert.query.org), alert_id=alert.id, query_id=query.id) + host = base_url(alert.query.org) + for subscription in alert.subscriptions: + try: + subscription.notify(alert, query, subscription.user, new_state, app, host) + except Exception as e: + logger.warn("Exception: {}".format(e)) - notify_mail(alert, html, new_state, app) - - if settings.HIPCHAT_API_TOKEN: - notify_hipchat(alert, html, new_state) - - if settings.WEBHOOK_ENDPOINT: - notify_webhook(alert, query, html, new_state) - - -def notify_hipchat(alert, html, new_state): - try: - if settings.HIPCHAT_API_URL: - hipchat_client = hipchat.HipChat(token=settings.HIPCHAT_API_TOKEN, url=settings.HIPCHAT_API_URL) - else: - hipchat_client = hipchat.HipChat(token=settings.HIPCHAT_API_TOKEN) - message = '[' + new_state.upper() + '] ' + alert.name + '
    ' + html - hipchat_client.message_room(settings.HIPCHAT_ROOM_ID, settings.NAME, message.encode('utf-8', 'ignore'), message_format='html') - except Exception: - logger.exception("hipchat send ERROR.") - - -def notify_mail(alert, html, new_state, app): - recipients = [s.email for s in alert.subscribers()] - logger.debug("Notifying: %s", recipients) - try: - with app.app_context(): - message = Message(recipients=recipients, - subject="[{1}] {0}".format(alert.name.encode('utf-8', 'ignore'), new_state.upper()), - html=html) - mail.send(message) - except Exception: - logger.exception("mail send ERROR.") - - -def notify_webhook(alert, query, html, new_state): - try: - data = { - 'event': 'alert_state_change', - 'alert': alert.to_dict(full=False), - 'url_base': base_url(query.org) - } - headers = {'Content-Type': 'application/json'} - auth = HTTPBasicAuth(settings.WEBHOOK_USERNAME, settings.WEBHOOK_PASSWORD) if settings.WEBHOOK_USERNAME else None - resp = requests.post(settings.WEBHOOK_ENDPOINT, data=json_dumps(data), auth=auth, headers=headers) - if resp.status_code != 200: - logger.error("webhook send ERROR. status_code => {status}".format(status=resp.status_code)) - except Exception: - logger.exception("webhook send ERROR.") From f07e7273c104972feede4241059dd4813a9e8f9b Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Sat, 7 May 2016 22:19:53 +0300 Subject: [PATCH 34/38] Fix: add destination to list of static routes --- .../{data_sources/form.html => directives/dynamic_form.html} | 3 +++ redash/handlers/static.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) rename rd_ui/app/views/{data_sources/form.html => directives/dynamic_form.html} (97%) diff --git a/rd_ui/app/views/data_sources/form.html b/rd_ui/app/views/directives/dynamic_form.html similarity index 97% rename from rd_ui/app/views/data_sources/form.html rename to rd_ui/app/views/directives/dynamic_form.html index aba31b6ef..dcec14184 100644 --- a/rd_ui/app/views/data_sources/form.html +++ b/rd_ui/app/views/directives/dynamic_form.html @@ -17,4 +17,7 @@ ng-if="input.type === 'file'">
    + + + diff --git a/redash/handlers/static.py b/redash/handlers/static.py index 14ee2dc9f..7fc1d6ad6 100644 --- a/redash/handlers/static.py +++ b/redash/handlers/static.py @@ -22,7 +22,6 @@ def send_static(filename): # The following is copied from send_from_directory, and extended to support multiple directories for path in settings.STATIC_ASSETS_PATHS: - print path full_path = safe_join(path, filename) if os.path.isfile(full_path): return send_file(full_path, **dict(cache_timeout=cache_timeout, conditional=True)) @@ -80,6 +79,8 @@ rules = ['/admin//', '/data_sources/', '/users', '/users/', + '/destinations', + '/destinations/', '/groups', '/groups/', '/groups//data_sources', From aa837ed09bbdf2968626b8ee109ffe79ad451dcf Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Sat, 7 May 2016 22:20:06 +0300 Subject: [PATCH 35/38] Update for new design --- .../0023_add_notification_destination.py | 2 +- rd_ui/app/scripts/controllers/data_sources.js | 16 ++++++++-- rd_ui/app/scripts/controllers/destinations.js | 31 +++++++++---------- rd_ui/app/scripts/directives/directives.js | 7 +++-- rd_ui/app/styles/redash.css | 1 - rd_ui/app/views/alerts/edit.html | 1 - rd_ui/app/views/data_sources/edit.html | 4 ++- rd_ui/app/views/destinations/edit.html | 20 ++++++------ rd_ui/app/views/destinations/list.html | 28 +++++++---------- .../app/views/directives/settings_screen.html | 1 + 10 files changed, 58 insertions(+), 53 deletions(-) diff --git a/migrations/0023_add_notification_destination.py b/migrations/0023_add_notification_destination.py index 6bdf87c4f..68a44dfbf 100644 --- a/migrations/0023_add_notification_destination.py +++ b/migrations/0023_add_notification_destination.py @@ -52,7 +52,7 @@ if __name__ == '__main__': hipchat = NotificationDestination.create( org=1, user=1, - name="Hipchat", + name="HipChat", type="hipchat", options=options ) diff --git a/rd_ui/app/scripts/controllers/data_sources.js b/rd_ui/app/scripts/controllers/data_sources.js index 522ab360c..cec140be9 100644 --- a/rd_ui/app/scripts/controllers/data_sources.js +++ b/rd_ui/app/scripts/controllers/data_sources.js @@ -7,7 +7,7 @@ }; - var DataSourceCtrl = function ($scope, $routeParams, $http, $location, Events, DataSource) { + var DataSourceCtrl = function ($scope, $routeParams, $http, $location, growl, Events, DataSource) { Events.record(currentUser, "view", "page", "admin/data_source"); $scope.$parent.pageTitle = "Data Sources"; @@ -24,9 +24,21 @@ $location.path('/data_sources/' + id).replace(); } }); + + $scope.delete = function () { + Events.record(currentUser, "delete", "datasource", $scope.dataSource.id); + + $scope.dataSource.$delete(function (resource) { + growl.addSuccessMessage("Data source deleted successfully."); + $location.path('/data_sources/'); + }.bind(this), function (httpResponse) { + console.log("Failed to delete data source: ", httpResponse.status, httpResponse.statusText, httpResponse.data); + growl.addErrorMessage("Failed to delete data source."); + }); + } }; angular.module('redash.controllers') .controller('DataSourcesCtrl', ['$scope', '$location', 'growl', 'Events', 'DataSource', DataSourcesCtrl]) - .controller('DataSourceCtrl', ['$scope', '$routeParams', '$http', '$location', 'Events', 'DataSource', DataSourceCtrl]) + .controller('DataSourceCtrl', ['$scope', '$routeParams', '$http', '$location', 'growl', 'Events', 'DataSource', DataSourceCtrl]) })(); diff --git a/rd_ui/app/scripts/controllers/destinations.js b/rd_ui/app/scripts/controllers/destinations.js index 5a4f3122f..28474e6ac 100644 --- a/rd_ui/app/scripts/controllers/destinations.js +++ b/rd_ui/app/scripts/controllers/destinations.js @@ -5,24 +5,9 @@ $scope.destinations = Destination.query(); - $scope.openDestination = function(destination) { - $location.path('/destinations/' + destination.id); - }; - - $scope.deleteDestination = function(event, destination) { - event.stopPropagation(); - Events.record(currentUser, "delete", "destination", destination.id); - destination.$delete(function(resource) { - growl.addSuccessMessage("Destination deleted successfully."); - this.$parent.destinations = _.without(this.destinations, resource); - }.bind(this), function(httpResponse) { - console.log("Failed to delete destination: ", httpResponse.status, httpResponse.statusText, httpResponse.data); - growl.addErrorMessage("Failed to delete destination."); - }); - } }; - var DestinationCtrl = function ($scope, $routeParams, $http, $location, Events, Destination) { + var DestinationCtrl = function ($scope, $routeParams, $http, $location, growl, Events, Destination) { Events.record(currentUser, "view", "page", "admin/destination"); $scope.$parent.pageTitle = "Destinations"; @@ -39,9 +24,21 @@ $location.path('/destinations/' + id).replace(); } }); + + $scope.delete = function() { + Events.record(currentUser, "delete", "destination", $scope.destination.id); + + $scope.destination.$delete(function(resource) { + growl.addSuccessMessage("Destination deleted successfully."); + $location.path('/destinations/'); + }.bind(this), function(httpResponse) { + console.log("Failed to delete destination: ", httpResponse.status, httpResponse.statusText, httpResponse.data); + growl.addErrorMessage("Failed to delete destination."); + }); + } }; angular.module('redash.controllers') .controller('DestinationsCtrl', ['$scope', '$location', 'growl', 'Events', 'Destination', DestinationsCtrl]) - .controller('DestinationCtrl', ['$scope', '$routeParams', '$http', '$location', 'Events', 'Destination', DestinationCtrl]) + .controller('DestinationCtrl', ['$scope', '$routeParams', '$http', '$location', 'growl', 'Events', 'Destination', DestinationCtrl]) })(); diff --git a/rd_ui/app/scripts/directives/directives.js b/rd_ui/app/scripts/directives/directives.js index e7a4595c5..fef6a423f 100644 --- a/rd_ui/app/scripts/directives/directives.js +++ b/rd_ui/app/scripts/directives/directives.js @@ -389,9 +389,8 @@ return { restrict: 'E', replace: 'true', - templateUrl: function(elem, attr) { - return '/views/' + attr.type+ '/form.html'; - }, + transclude: true, + templateUrl: '/views/directives/dynamic_form.html', scope: { 'target': '=', 'type': '@type' @@ -487,10 +486,12 @@ scope.usersPage = _.string.startsWith($location.path(), '/users'); scope.groupsPage = _.string.startsWith($location.path(), '/groups'); scope.dsPage = _.string.startsWith($location.path(), '/data_sources'); + scope.destinationsPage = _.string.startsWith($location.path(), '/destinations'); scope.showGroupsLink = currentUser.hasPermission('list_users'); scope.showUsersLink = currentUser.hasPermission('list_users'); scope.showDsLink = currentUser.hasPermission('admin'); + scope.showDestinationsLink = currentUser.hasPermission('admin'); } } }]); diff --git a/rd_ui/app/styles/redash.css b/rd_ui/app/styles/redash.css index bb4cd99ef..c93fc193f 100644 --- a/rd_ui/app/styles/redash.css +++ b/rd_ui/app/styles/redash.css @@ -566,7 +566,6 @@ div.table-name:hover { padding-right: 5px; } -<<<<<<< HEAD .modal-xl { position: fixed; top: 0; diff --git a/rd_ui/app/views/alerts/edit.html b/rd_ui/app/views/alerts/edit.html index c8bb69e0f..6daf61e7a 100644 --- a/rd_ui/app/views/alerts/edit.html +++ b/rd_ui/app/views/alerts/edit.html @@ -20,7 +20,6 @@
    -<<<<<<< HEAD
    diff --git a/rd_ui/app/views/data_sources/edit.html b/rd_ui/app/views/data_sources/edit.html index b843973bd..4220fcdde 100644 --- a/rd_ui/app/views/data_sources/edit.html +++ b/rd_ui/app/views/data_sources/edit.html @@ -1,7 +1,9 @@
    - + + +
    diff --git a/rd_ui/app/views/destinations/edit.html b/rd_ui/app/views/destinations/edit.html index a157da044..6f26d16cc 100644 --- a/rd_ui/app/views/destinations/edit.html +++ b/rd_ui/app/views/destinations/edit.html @@ -1,11 +1,11 @@ -
    -
      -
    1. Destinations
      2. -
    2. {{destination.name || "New"}}
      3. -
    -
    -
    - -
    + +
    +
    + + + +
    -
    +
    + + diff --git a/rd_ui/app/views/destinations/list.html b/rd_ui/app/views/destinations/list.html index 5bdc19f5e..794f6d795 100644 --- a/rd_ui/app/views/destinations/list.html +++ b/rd_ui/app/views/destinations/list.html @@ -1,18 +1,12 @@ -
    -
      -
    1. Destinations
      2. -
    -
    -
    -
    -
    - {{destination.name}} - -
    - - Add Destination - -
    -
    + +
    +
    +

    + New Notification Destination +

    +
    + {{destination.name}} +
    -
    +
    + diff --git a/rd_ui/app/views/directives/settings_screen.html b/rd_ui/app/views/directives/settings_screen.html index 35b12c6cb..9f241f83b 100644 --- a/rd_ui/app/views/directives/settings_screen.html +++ b/rd_ui/app/views/directives/settings_screen.html @@ -7,6 +7,7 @@
  • Data Sources
  • Users
  • Groups
    • +
  • Notification Destinations
From f8120284d504510d970fbb44f07938e0b411e904 Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Mon, 30 May 2016 14:39:01 +0300 Subject: [PATCH 36/38] WIP: updated look and feel --- rd_ui/app/scripts/controllers/alerts.js | 3 +- .../views/alerts/destinationsubscribers.html | 43 ++++++++----------- rd_ui/app/views/alerts/edit.html | 10 +++-- rd_ui/app/views/alerts/usersubscribers.html | 15 ++++--- 4 files changed, 36 insertions(+), 35 deletions(-) diff --git a/rd_ui/app/scripts/controllers/alerts.js b/rd_ui/app/scripts/controllers/alerts.js index 83b73a1e6..39798e97f 100644 --- a/rd_ui/app/scripts/controllers/alerts.js +++ b/rd_ui/app/scripts/controllers/alerts.js @@ -47,6 +47,7 @@ }; var AlertCtrl = function($scope, $routeParams, $location, growl, Query, Events, Alert, Destination) { + $scope.selectedTab = 'users'; $scope.$parent.pageTitle = "Alerts"; $scope.alertId = $routeParams.alertId; @@ -178,7 +179,7 @@ return { restrict: 'E', replace: true, - template: '', + template: '', controller: function ($scope) { var updateMessage = function() { if ($scope.subscription) { diff --git a/rd_ui/app/views/alerts/destinationsubscribers.html b/rd_ui/app/views/alerts/destinationsubscribers.html index f7f617862..3efad2e80 100644 --- a/rd_ui/app/views/alerts/destinationsubscribers.html +++ b/rd_ui/app/views/alerts/destinationsubscribers.html @@ -1,27 +1,20 @@ -
-
- Destination subscriptions -

Destination subscriptions will send a notification to the configured destination

-
-

Add a destination subscription

-
- - {{$select.selected.name}} - - - - -
-
- -
-
-
- -
- - -
-
+
+
+ + + {{$select.selected.name}} + + + + + +
+ +
+ +
+ +
+
diff --git a/rd_ui/app/views/alerts/edit.html b/rd_ui/app/views/alerts/edit.html index 6daf61e7a..f10915a87 100644 --- a/rd_ui/app/views/alerts/edit.html +++ b/rd_ui/app/views/alerts/edit.html @@ -62,9 +62,13 @@
-

Subscriptions

- - + + + +
diff --git a/rd_ui/app/views/alerts/usersubscribers.html b/rd_ui/app/views/alerts/usersubscribers.html index 84e19f54a..f3fe6d326 100644 --- a/rd_ui/app/views/alerts/usersubscribers.html +++ b/rd_ui/app/views/alerts/usersubscribers.html @@ -1,8 +1,11 @@ -
-
-

-
-

User subscriptions will send a notification to your email

+
+
{{s.id}} -
+
+
+ +
+
+ Subscribed users will receive alert notifications by email. +
From 4d6599e0ead118add7a369b05e16cbfa6aba10cd Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Sun, 5 Jun 2016 15:51:49 +0300 Subject: [PATCH 37/38] WIP --- rd_ui/app/scripts/controllers/alerts.js | 35 +++++++++++++++---- .../views/alerts/destinationsubscribers.html | 10 +++--- rd_ui/app/views/alerts/edit.html | 9 ++--- rd_ui/app/views/alerts/usersubscribers.html | 4 +-- rd_ui/app/views/directives/dynamic_form.html | 4 +-- redash/destinations/hipchat.py | 5 ++- redash/destinations/slack.py | 3 +- redash/destinations/webhook.py | 2 -- 8 files changed, 43 insertions(+), 29 deletions(-) diff --git a/rd_ui/app/scripts/controllers/alerts.js b/rd_ui/app/scripts/controllers/alerts.js index 39798e97f..2b86cda80 100644 --- a/rd_ui/app/scripts/controllers/alerts.js +++ b/rd_ui/app/scripts/controllers/alerts.js @@ -126,13 +126,13 @@ $scope.enabled = !clientConfig.mailSettingsMissing; $scope.subscribers = AlertSubscription.query({alertId: $scope.alertId}, function(subscriptions) { - $scope.subscribers = _.filter(subscriptions, function(subscription) { return typeof subscription.destination === "undefined"; }); + $scope.subscribers = _.filter(subscriptions, function(subscription) { return typeof subscription.destination === "undefined"; }); }); } } }]); - angular.module('redash.directives').directive('destinationSubscribers', ['AlertSubscription', 'Destination', 'growl', function (AlertSubscription, Destination, growl) { + angular.module('redash.directives').directive('destinationSubscribers', ['$sce', 'AlertSubscription', 'Destination', 'growl', function ($sce, AlertSubscription, Destination, growl) { return { restrict: 'E', replace: true, @@ -143,15 +143,37 @@ controller: function ($scope) { $scope.subscription = {}; $scope.subscribers = []; - $scope.destinations = Destination.query(); + $scope.destinations = []; + + Destination.query(function(destinations) { + $scope.destinations = destinations; + destinations.unshift({name: currentUser.name + ' (Email)', icon: 'fa-envelope', type: 'user'}); + $scope.subscription.destination = destinations[0]; + }); $scope.destinationsDisplay = function(destination) { - return ' ' + destination.name + if (destination.destination) { + destination = destination; + } + + if (destination.user) { + destination = { + name: destination.user.name + ' (Email)', + icon: 'fa-envelope', + type: 'user' + }; + } + + if (!destination) { + return ''; + } + return $sce.trustAsHtml(' ' + destination.name); }; $scope.subscribers = AlertSubscription.query({alertId: $scope.alertId}, function(subscriptions) { - $scope.subscribers = _.filter(subscriptions, function(subscription) { return typeof subscription.destination !== "undefined"; }); + // $scope.subscribers = _.filter(subscriptions, function(subscription) { return typeof subscription.destination !== "undefined"; }); }); + $scope.saveSubscriber = function() { $scope.sub = new AlertSubscription({alert_id: $scope.alertId, destination_id: $scope.subscription.destination.id}); $scope.sub.$save(function() { @@ -179,7 +201,7 @@ return { restrict: 'E', replace: true, - template: '', + template: '', controller: function ($scope) { var updateMessage = function() { if ($scope.subscription) { @@ -210,6 +232,7 @@ $scope.subscription = new AlertSubscription({alert_id: $scope.alertId}); $scope.subscription.$save(function() { $scope.subscribers.push($scope.subscription); + console.log($scope.subscribers); updateMessage(); }, function() { growl.addErrorMessage("Unsubscription failed."); diff --git a/rd_ui/app/views/alerts/destinationsubscribers.html b/rd_ui/app/views/alerts/destinationsubscribers.html index 3efad2e80..eb3a6c4f4 100644 --- a/rd_ui/app/views/alerts/destinationsubscribers.html +++ b/rd_ui/app/views/alerts/destinationsubscribers.html @@ -1,20 +1,18 @@
- - {{$select.selected.name}} + - +
-
- - + +
diff --git a/rd_ui/app/views/alerts/edit.html b/rd_ui/app/views/alerts/edit.html index f10915a87..028401bcd 100644 --- a/rd_ui/app/views/alerts/edit.html +++ b/rd_ui/app/views/alerts/edit.html @@ -62,13 +62,10 @@
- + Notifications - - + +
diff --git a/rd_ui/app/views/alerts/usersubscribers.html b/rd_ui/app/views/alerts/usersubscribers.html index f3fe6d326..465a297c2 100644 --- a/rd_ui/app/views/alerts/usersubscribers.html +++ b/rd_ui/app/views/alerts/usersubscribers.html @@ -1,8 +1,8 @@
-
+
{{s.id}}
-
+
diff --git a/rd_ui/app/views/directives/dynamic_form.html b/rd_ui/app/views/directives/dynamic_form.html index dcec14184..bd7b76d83 100644 --- a/rd_ui/app/views/directives/dynamic_form.html +++ b/rd_ui/app/views/directives/dynamic_form.html @@ -1,4 +1,4 @@ -
+
@@ -16,7 +16,7 @@ base-sixty-four-input ng-if="input.type === 'file'">
- + diff --git a/redash/destinations/hipchat.py b/redash/destinations/hipchat.py index 024330cd3..0c2596ef9 100644 --- a/redash/destinations/hipchat.py +++ b/redash/destinations/hipchat.py @@ -5,8 +5,7 @@ from redash import settings from redash.destinations import * -class Hipchat(BaseDestination): - +class HipChat(BaseDestination): @classmethod def configuration_schema(cls): return { @@ -45,4 +44,4 @@ class Hipchat(BaseDestination): logging.exception("hipchat send ERROR.") -register(Hipchat) +register(HipChat) diff --git a/redash/destinations/slack.py b/redash/destinations/slack.py index 552a91299..89b53c37b 100644 --- a/redash/destinations/slack.py +++ b/redash/destinations/slack.py @@ -6,7 +6,6 @@ from redash.destinations import * class Slack(BaseDestination): - @classmethod def configuration_schema(cls): return { @@ -14,7 +13,7 @@ class Slack(BaseDestination): 'properties': { 'url': { 'type': 'string', - 'title': 'Slack webhook URL' + 'title': 'Slack Webhook URL' } } } diff --git a/redash/destinations/webhook.py b/redash/destinations/webhook.py index a6b7d6fc8..952a2584f 100644 --- a/redash/destinations/webhook.py +++ b/redash/destinations/webhook.py @@ -2,13 +2,11 @@ import logging import requests from requests.auth import HTTPBasicAuth -from redash import models, mail from redash.destinations import * from redash.utils import json_dumps class Webhook(BaseDestination): - @classmethod def configuration_schema(cls): return { From eed5485080b5f7968c86576402523142aac2411b Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Tue, 7 Jun 2016 15:10:11 +0300 Subject: [PATCH 38/38] Update Alerts/subscriptions UI for new look and feel. --- rd_ui/app/scripts/controllers/alerts.js | 157 +++++++----------- .../app/views/alerts/alert_subscriptions.html | 27 +++ .../views/alerts/destinationsubscribers.html | 18 -- rd_ui/app/views/alerts/edit.html | 5 +- rd_ui/app/views/alerts/usersubscribers.html | 11 -- rd_ui/app/views/app_header.html | 3 - rd_ui/app/views/destinations/form.html | 20 --- rd_ui/app/views/destinations/list.html | 2 +- .../app/views/directives/settings_screen.html | 2 +- redash/handlers/alerts.py | 3 +- 10 files changed, 94 insertions(+), 154 deletions(-) create mode 100644 rd_ui/app/views/alerts/alert_subscriptions.html delete mode 100644 rd_ui/app/views/alerts/destinationsubscribers.html delete mode 100644 rd_ui/app/views/alerts/usersubscribers.html delete mode 100644 rd_ui/app/views/destinations/form.html diff --git a/rd_ui/app/scripts/controllers/alerts.js b/rd_ui/app/scripts/controllers/alerts.js index 2b86cda80..342792785 100644 --- a/rd_ui/app/scripts/controllers/alerts.js +++ b/rd_ui/app/scripts/controllers/alerts.js @@ -112,51 +112,48 @@ }; - angular.module('redash.directives').directive('userSubscribers', ['AlertSubscription', 'growl', function (AlertSubscription, growl) { + angular.module('redash.directives').directive('alertSubscriptions', ['$q', '$sce', 'AlertSubscription', 'Destination', 'growl', function ($q, $sce, AlertSubscription, Destination, growl) { return { restrict: 'E', replace: true, - templateUrl: '/views/alerts/userSubscribers.html', + templateUrl: '/views/alerts/alert_subscriptions.html', scope: { 'alertId': '=' }, controller: function ($scope) { - $scope.subscription = {}; - $scope.subscribers = []; - $scope.enabled = !clientConfig.mailSettingsMissing; - - $scope.subscribers = AlertSubscription.query({alertId: $scope.alertId}, function(subscriptions) { - $scope.subscribers = _.filter(subscriptions, function(subscription) { return typeof subscription.destination === "undefined"; }); - }); - } - } - }]); - - angular.module('redash.directives').directive('destinationSubscribers', ['$sce', 'AlertSubscription', 'Destination', 'growl', function ($sce, AlertSubscription, Destination, growl) { - return { - restrict: 'E', - replace: true, - templateUrl: '/views/alerts/destinationSubscribers.html', - scope: { - 'alertId': '=' - }, - controller: function ($scope) { - $scope.subscription = {}; + $scope.newSubscription = {}; $scope.subscribers = []; $scope.destinations = []; + $scope.currentUser = currentUser; - Destination.query(function(destinations) { - $scope.destinations = destinations; - destinations.unshift({name: currentUser.name + ' (Email)', icon: 'fa-envelope', type: 'user'}); - $scope.subscription.destination = destinations[0]; + var destinations = Destination.query().$promise; + var subscribers = AlertSubscription.query({alertId: $scope.alertId}).$promise; + + $q.all([destinations, subscribers]).then(function(responses) { + var destinations = responses[0]; + var subscribers = responses[1]; + + var subscribedDestinations = _.compact(_.map(subscribers, function(s) { return s.destination && s.destination.id })); + var subscribedUsers = _.compact(_.map(subscribers, function(s) { if (!s.destination) { return s.user.id } })); + + $scope.destinations = _.filter(destinations, function(d) { return !_.contains(subscribedDestinations, d.id); }); + + if (!_.contains(subscribedUsers, currentUser.id)) { + $scope.destinations.unshift({user: {name: currentUser.name}}); + } + + $scope.newSubscription.destination = $scope.destinations[0]; + $scope.subscribers = subscribers; }); $scope.destinationsDisplay = function(destination) { - if (destination.destination) { - destination = destination; + if (!destination) { + return ''; } - if (destination.user) { + if (destination.destination) { + destination = destination.destination; + } else if (destination.user) { destination = { name: destination.user.name + ' (Email)', icon: 'fa-envelope', @@ -164,81 +161,51 @@ }; } - if (!destination) { - return ''; - } return $sce.trustAsHtml(' ' + destination.name); }; - $scope.subscribers = AlertSubscription.query({alertId: $scope.alertId}, function(subscriptions) { - // $scope.subscribers = _.filter(subscriptions, function(subscription) { return typeof subscription.destination !== "undefined"; }); - }); - $scope.saveSubscriber = function() { - $scope.sub = new AlertSubscription({alert_id: $scope.alertId, destination_id: $scope.subscription.destination.id}); - $scope.sub.$save(function() { - growl.addSuccessMessage("Subscribed."); - $scope.subscribers.push($scope.sub); - }, function(response) { - growl.addErrorMessage("Failed saving subscription."); - }); + var sub = new AlertSubscription({alert_id: $scope.alertId}); + if ($scope.newSubscription.destination.id) { + sub.destination_id = $scope.newSubscription.destination.id; + } + + sub.$save(function () { + growl.addSuccessMessage("Subscribed."); + $scope.subscribers.push(sub); + $scope.destinations = _.without($scope.destinations, $scope.newSubscription.destination); + if ($scope.destinations.length > 0) { + $scope.newSubscription.destination = $scope.destinations[0]; + } else { + $scope.newSubscription.destination = undefined; + } + console.log("dests: ", $scope.destinations); + }, function (response) { + growl.addErrorMessage("Failed saving subscription."); + }); }; $scope.unsubscribe = function(subscriber) { - $scope.sub = new AlertSubscription({alert_id: subscriber.alert_id, id: subscriber.id}); - $scope.sub.$delete(function() { - growl.addSuccessMessage("Unsubscribed"); - $scope.subscribers = _.without($scope.subscribers, subscriber); - }, function() { - growl.addErrorMessage("Failed unsubscribing."); - }); - }; - } - } - }]); + var destination = subscriber.destination; + var user = subscriber.user; - angular.module('redash.directives').directive('subscribeButton', ['AlertSubscription', 'growl', function (AlertSubscription, growl) { - return { - restrict: 'E', - replace: true, - template: '', - controller: function ($scope) { - var updateMessage = function() { - if ($scope.subscription) { - $scope.message = "Unsubscribe"; - } else { - $scope.message = "Subscribe"; - } - } + subscriber.$delete(function () { + growl.addSuccessMessage("Unsubscribed"); + $scope.subscribers = _.without($scope.subscribers, subscriber); + if (destination) { + $scope.destinations.push(destination); + } else if (user.id == currentUser.id) { + $scope.destinations.push({user: {name: currentUser.name}}); + } - $scope.subscribers.$promise.then(function() { - $scope.subscription = _.find($scope.subscribers, function(subscription) { - return (subscription.user.email == currentUser.email); + if ($scope.destinations.length == 1) { + $scope.newSubscription.destination = $scope.destinations[0]; + } + + }, function () { + growl.addErrorMessage("Failed unsubscribing."); }); - - updateMessage(); - }); - - $scope.toggleSubscription = function() { - if ($scope.subscription) { - $scope.subscription.$delete(function() { - $scope.subscribers = _.without($scope.subscribers, $scope.subscription); - $scope.subscription = undefined; - updateMessage(); - }, function() { - growl.addErrorMessage("Failed saving subscription."); - }); - } else { - $scope.subscription = new AlertSubscription({alert_id: $scope.alertId}); - $scope.subscription.$save(function() { - $scope.subscribers.push($scope.subscription); - console.log($scope.subscribers); - updateMessage(); - }, function() { - growl.addErrorMessage("Unsubscription failed."); - }); - } - } + }; } } }]); diff --git a/rd_ui/app/views/alerts/alert_subscriptions.html b/rd_ui/app/views/alerts/alert_subscriptions.html new file mode 100644 index 000000000..4d3d0a246 --- /dev/null +++ b/rd_ui/app/views/alerts/alert_subscriptions.html @@ -0,0 +1,27 @@ +
+

Notifications

+ +
+ + + + + + +
+
+ + + Create New Destination + +
+ +
+ +
+
+ + +
+
+
diff --git a/rd_ui/app/views/alerts/destinationsubscribers.html b/rd_ui/app/views/alerts/destinationsubscribers.html deleted file mode 100644 index eb3a6c4f4..000000000 --- a/rd_ui/app/views/alerts/destinationsubscribers.html +++ /dev/null @@ -1,18 +0,0 @@ -
-
- - - - - - - -
- -
-
- - -
-
-
diff --git a/rd_ui/app/views/alerts/edit.html b/rd_ui/app/views/alerts/edit.html index 028401bcd..b026548b5 100644 --- a/rd_ui/app/views/alerts/edit.html +++ b/rd_ui/app/views/alerts/edit.html @@ -62,10 +62,7 @@
- Notifications - - - +
diff --git a/rd_ui/app/views/alerts/usersubscribers.html b/rd_ui/app/views/alerts/usersubscribers.html deleted file mode 100644 index 465a297c2..000000000 --- a/rd_ui/app/views/alerts/usersubscribers.html +++ /dev/null @@ -1,11 +0,0 @@ -
-
- {{s.id}} -
-
- -
-
- Subscribed users will receive alert notifications by email. -
-
diff --git a/rd_ui/app/views/app_header.html b/rd_ui/app/views/app_header.html index 713b70446..7648dd5b4 100644 --- a/rd_ui/app/views/app_header.html +++ b/rd_ui/app/views/app_header.html @@ -56,9 +56,6 @@
    -
  • - -
    • diff --git a/rd_ui/app/views/destinations/form.html b/rd_ui/app/views/destinations/form.html deleted file mode 100644 index f7a90edb9..000000000 --- a/rd_ui/app/views/destinations/form.html +++ /dev/null @@ -1,20 +0,0 @@ -
    -
    - - -
    -
    - - -
    -
    - - - - -
    - -
    diff --git a/rd_ui/app/views/destinations/list.html b/rd_ui/app/views/destinations/list.html index 794f6d795..d434e22c4 100644 --- a/rd_ui/app/views/destinations/list.html +++ b/rd_ui/app/views/destinations/list.html @@ -2,7 +2,7 @@

    - New Notification Destination + New Alert Destination

    {{destination.name}} diff --git a/rd_ui/app/views/directives/settings_screen.html b/rd_ui/app/views/directives/settings_screen.html index 9f241f83b..386d99b8d 100644 --- a/rd_ui/app/views/directives/settings_screen.html +++ b/rd_ui/app/views/directives/settings_screen.html @@ -7,7 +7,7 @@
  • Data Sources
  • Users
  • Groups
    • -
  • Notification Destinations
    • +
  • Alert Destinations
diff --git a/redash/handlers/alerts.py b/redash/handlers/alerts.py index a2dee9ff1..8b066d11a 100644 --- a/redash/handlers/alerts.py +++ b/redash/handlers/alerts.py @@ -82,7 +82,8 @@ class AlertSubscriptionListResource(BaseResource): 'action': 'subscribe', 'timestamp': int(time.time()), 'object_id': alert_id, - 'object_type': 'alert' + 'object_type': 'alert', + 'destination': req.get('destination_id') }) return subscription.to_dict()