WIP: move events serverside #2661

alison985 · 2018-07-01T01:39:10Z

relates to #1501 (though I don't know if it should close it)

This is a port of a change in the Mozilla fork. It was previously reviewed by Arik here: mozilla#246

It does not port the move of the query version events because that feature isn't in upstream.

addresses getredash#1501

arikfr

Thanks! See my comments. It's mainly about which object_type/id/etc to use.

arikfr · 2018-07-02T08:49:59Z

redash/handlers/alerts.py

@@ -14,6 +14,12 @@ class AlertResource(BaseResource):
    def get(self, alert_id):
        alert = get_object_or_404(models.Alert.get_by_id_and_org, alert_id, self.current_org)
        require_access(alert.groups, self.current_user, view_only)
+        self.record_event({
+            'action': 'view',
+            'timestamp': int(time.time()),


timestamp is being added by self.record_event,so no need to pass it manually (of course this applies in all other similar instances).

arikfr · 2018-07-02T08:51:51Z

redash/handlers/data_sources.py

+        self.record_event({
+            'action': 'view',
+            'object_id': page,
+            'object_type': 'api_call',


Here the object_type should be datasource and object_id should be ds.id.

arikfr · 2018-07-02T08:54:04Z

redash/handlers/queries.py

@@ -49,6 +49,12 @@ def get(self):

        include_drafts = request.args.get('include_drafts') is not None

+        self.record_event({
+            'action': 'search',
+            'object_id': term,


We should pass term as its own field, i.e.:

self.record_event({'action': 'search', 'object_type': 'query', 'term': term})

arikfr · 2018-07-02T08:56:05Z

redash/handlers/admin.py

+        'object_type': 'api_call',
+        'object_id': 'admin/outdated_queries',
+        'timestamp': int(time.time()),
+    })


action -> list
object_type -> outdated_queries

(object_id can be null and can be ommited)

arikfr · 2018-07-02T08:56:20Z

redash/handlers/admin.py

+        'object_type': 'api_call',
+        'object_id': 'admin/tasks',
+        'timestamp': int(time.time()),
+    })


action -> list
object_type -> celery_tasks

arikfr · 2018-07-02T08:57:44Z

redash/handlers/alerts.py

+            'timestamp': int(time.time()),
+            'object_id': 'alerts',
+            'object_type': 'api_call'
+        })


Let's convert all the list actions, where you used object_type=api_call to:

action -> list
object_type -> <the relevant resource type> (in this case it will be alert, to be consistent with the other events for this type).

pull upstream to alison's fork july 4

alison985 · 2018-07-08T16:05:49Z

@arikfr Updated. :)

jezdez · 2018-07-19T14:30:57Z

@alison985 This needs another pass to rebase things sadly.

pull upstream to fork 7.22.18

addresses getredash#1501

vercel · 2018-07-22T22:58:52Z

This pull request is automatically deployed with Now.

To access deployments, click Details below or on the icon next to each push.

alison985 · 2018-07-22T23:02:57Z

@jezdez rebased

pull from upstream 7.29.18

pull merge 6 of upstream to branch

This reverts commit bd34db6, reversing changes made to ea91d91.

pull upstream to my fork

jezdez · 2018-08-14T19:28:43Z

@alison985 We can safely ignore the Code Climate issues for now. (especially until #2727 has received some feedback)

jezdez · 2018-08-14T19:29:06Z

Needs another rebase 🤓

jezdez · 2018-08-15T20:16:46Z

redash/handlers/data_sources.py

+        self.record_event({
+            'action': 'list',
+            'object_id': 'admin/data_sources',
+            'object_type': 'data_sources',


The object type for this event is datasource below, but data_sources here. Should this be the same?

Thanks for catching these!

jezdez · 2018-08-15T20:17:28Z

redash/handlers/alerts.py

+        self.record_event({
+            'action': 'list',
+            'object_id': 'alerts',
+            'object_type': 'alerts'


The object type is different to what is used above. Should this be the same?

- Use new master / rc release release strategy (getredash#440) - Migrate Circle CI 2.0 (getredash#488, getredash#502)

)

…dash#290)

…ash#336) * Support authentication for URL data source (re getredash#330) * Refactor authentication support for data sources. Adds a new BaseHTTPQueryRunner class.

In the long run we'll be able to install additional dependencies by having an own Dockerfile to build images based on the Redash image but that installs additional Python dependencies. But until we have a fork with lots of changes ourselves we need to do it this way. Redash-stmo contains the ability to hook up our own Dockerflow library. Refs #13 Refs getredash#37

…dash#311) Extend the Remote User Auth backend with the ability to pass remote user groups via a configurable request header similar to the REMOTE_USER header. Refs getredash#37. If enabled the feature allows checks the header value against a configured list of group names, including the ability to use UNIX shell-style wildcards.

* Use --max-tasks-per-child as per celery documentation * Set --max-memory-per-child to 1/4th of total system memory * Split exec command over multiple lines * Fix memory variable typo

Refs: getredash#379, getredash#415

Merge upstream to my fork's master

addresses getredash#1501

… into alison_1501

alison985 · 2018-08-20T00:38:49Z

@jezdez I made changes based on your comments, rebased again, and address the CodeClimate issues that I deemed reasonable and were in files touched by this PR.

Now there are a TON of other files changed in this PR that I didn't touch. I'm adding WIP to the title of the PR so it doesn't get accidentally merged and will send you a meeting request to discuss.

move events serverside

f31e346

addresses getredash#1501

alison985 mentioned this pull request Jul 1, 2018

Port moving events to server side to upstream mozilla/redash#433

Closed

arikfr requested changes Jul 2, 2018

View reviewed changes

alison985 and others added 2 commits July 4, 2018 01:02

Merge pull request #3 from getredash/master

94fb2d9

pull upstream to alison's fork july 4

updates to object_ids/types

5b0ea8c

alison985 added 2 commits July 9, 2018 22:01

first pass

133283a

show only columns that match the search

f46e668

alison985 and others added 4 commits July 22, 2018 09:40

Merge pull request #5 from getredash/master

c51edd3

pull upstream to fork 7.22.18

move events serverside

4ac7ab8

addresses getredash#1501

updates to object_ids/types

2e748ce

merge

89aa0d6

alison985 and others added 7 commits July 29, 2018 19:21

Merge pull request #6 from getredash/master

ea91d91

pull from upstream 7.29.18

Merge pull request #8 from StantonVentures/master

5f352ef

pull merge 6 of upstream to branch

codeclimate: refactor for similar code

ff848f2

gitignore additional migration & typo

b2d57f8

Merge branch 'alison_2484' into master

bd34db6

Revert "Merge branch 'alison_2484' into master"

86086a9

This reverts commit bd34db6, reversing changes made to ea91d91.

Merge pull request #10 from getredash/master

6c8146c

pull upstream to my fork

jezdez reviewed Aug 15, 2018

View reviewed changes

Allen Short and others added 4 commits August 16, 2018 20:08

In docker-entrypoint ensure tables exist

a66d304

upgrade node and npm in dockerfile

f3c2e44

Update Circle CI for our workflow

2d189d5

- Use new master / rc release release strategy (getredash#440) - Migrate Circle CI 2.0 (getredash#488, getredash#502)

add pyup config document

c09c41f

Allen Short and others added 26 commits August 16, 2018 20:08

Run queries with no cached result in public dashboards (re getredash#220

8f6597c

)

allow x-axis label truncation (re getredash#249)

f899a1b

secure cookies, add X-Content-Type-Options header (bug 1371613)

65eff8d

Merge mozilla schema updates with schema from master

c87ec6a

merge upstream db changes

4add5bb

Propagate query execution errors from Celery tasks properly (re getre…

105e798

…dash#290)

Support authentication for URL data source (re getredash#330) (getred…

16846d7

…ash#336) * Support authentication for URL data source (re getredash#330) * Refactor authentication support for data sources. Adds a new BaseHTTPQueryRunner class.

properly rollback failed db commits

6f3d513

Unique names for query parameters (re getredash#164)

8c176cb

Aggregate query results (re getredash#35) (getredash#339)

e93385e

Updates to docker-entrypoint for worker and scheduler (getredash#364)

c4b9a25

* Use --max-tasks-per-child as per celery documentation * Set --max-memory-per-child to 1/4th of total system memory * Split exec command over multiple lines * Fix memory variable typo

Closes getredash#396: Integration with Flower.

2a09e2d

merge upstream db changes

c202a9a

Add data source health monitoring via an extension.

7a46113

Refs: getredash#379, getredash#415

typo fixes for events

6377dcd

Merge pull request #13 from mozilla/master

ae43558

Merge upstream to my fork's master

move events serverside

5497f0e

addresses getredash#1501

updates to object_ids/types

d9ae75b

move events serverside

ea4d2ab

addresses getredash#1501

codeclimate: refactor for similar code

9b16179

gitignore additional migration & typo

4b99223

typo fixes for events

c735de6

Merge branch 'alison_1501' of https://github.com/StantonVentures/redash…

81287d1

… into alison_1501

fix codeclimate errors on files touched by this PR

85727c1

alison985 changed the title ~~move events serverside~~ WIP: move events serverside Aug 20, 2018

alison985 closed this Aug 26, 2018

alison985 mentioned this pull request Aug 26, 2018

port moving events serverside #2766

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: move events serverside #2661

WIP: move events serverside #2661

alison985 commented Jul 1, 2018

arikfr left a comment

arikfr Jul 2, 2018

arikfr Jul 2, 2018

arikfr Jul 2, 2018

arikfr Jul 2, 2018

arikfr Jul 2, 2018

arikfr Jul 2, 2018

alison985 commented Jul 8, 2018

jezdez commented Jul 19, 2018

vercel bot commented Jul 22, 2018 •

edited

Loading

alison985 commented Jul 22, 2018

jezdez commented Aug 14, 2018

jezdez commented Aug 14, 2018

jezdez Aug 15, 2018

alison985 Aug 19, 2018

jezdez Aug 15, 2018

alison985 commented Aug 20, 2018

WIP: move events serverside #2661

WIP: move events serverside #2661

Conversation

alison985 commented Jul 1, 2018

arikfr left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alison985 commented Jul 8, 2018

jezdez commented Jul 19, 2018

vercel bot commented Jul 22, 2018 • edited Loading

alison985 commented Jul 22, 2018

jezdez commented Aug 14, 2018

jezdez commented Aug 14, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alison985 commented Aug 20, 2018

vercel bot commented Jul 22, 2018 •

edited

Loading