Adding celery flower (+redash upgrade)

openspending
Unified Split

Showing with 27 additions and 2 deletions.

+5 −0 docker-config/build.yml

+6 −0 docker-config/common.yml

+4 −0 docker-config/dev.yml

+9 −0 docker-config/frontend/server-rules.conf

+1 −1 docker-config/mq/Dockerfile

+2 −1 docker-config/redash/Dockerfile
diff --git a/docker-config/build.yml b/docker-config/build.yml
@@ -61,6 +61,11 @@ services:
        extends:
            file: dev.yml
            service: mq
+    celery-flower:
+        build: celery-flower/
+        extends:
+            file: dev.yml
+            service: celery-flower
    redis:
        build: redis/
        extends:
diff --git a/docker-config/common.yml b/docker-config/common.yml
@@ -104,6 +104,12 @@ services:
      expose:
          - "5672"
      restart: always
+    celery-flower:
+      image: openspending/celery-flower
+      container_name: "celery-flower"
+      expose:
+          - "8000"
+      restart: always
    redis:
      image: openspending/redis
      container_name: "redis"
diff --git a/docker-config/dev.yml b/docker-config/dev.yml
@@ -116,6 +116,10 @@ services:
        extends:
            file: common.yml
            service: mq
+    celery-flower:
+        extends:
+            file: common.yml
+            service: celery-flower
    redis:
        extends:
            file: common.yml
diff --git a/docker-config/frontend/server-rules.conf b/docker-config/frontend/server-rules.conf
@@ -40,3 +40,12 @@ location /admin/ {
 location /fdp-adapter/ {
    proxy_pass http://os-fdp-adapters:8000/;
 }
+location /status/tasks {
+    proxy_pass http://celery-flower:80/;
+    proxy_http_version 1.1;
+    proxy_set_header Host $host;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    rewrite ^/status/tasks/(.*)$ /$1 break;
+}
+
diff --git a/docker-config/mq/Dockerfile b/docker-config/mq/Dockerfile
@@ -1 +1 @@
-FROM rabbitmq
+FROM rabbitmq:3.6.3-management
diff --git a/docker-config/redash/Dockerfile b/docker-config/redash/Dockerfile
@@ -4,7 +4,8 @@ FROM gliderlabs/alpine:3.4
 RUN apk add --update git libpq python bash sudo
 RUN apk add --no-cache --virtual=build-dependencies \
    python-dev build-base pwgen libffi-dev ca-certificates \
-    wget curl tar mariadb-dev postgresql-dev nodejs postgresql
+    wget curl tar mariadb-dev postgresql-dev nodejs postgresql \
+    libsasl cyrus-sasl-dev
 RUN curl -L https://npmjs.org/install.sh | sh

 # CA Certificates