From 9f78a8fcd935783fe2efae340d24955ab5a31527 Mon Sep 17 00:00:00 2001
From: Matt Inamdar <matt@ayup.agency>
Date: Sun, 15 Nov 2020 19:35:49 +0000
Subject: [PATCH] feature/elasticsearch-upgrade-fix (#276)

* Added kibana to docker-compose

* Added jobs table to use database as queue

* Linted code
---
 .../2020_11_15_190128_create_jobs_table.php   | 32 +++++++++++++++++++
 develop                                       |  1 +
 docker-compose.yml                            | 10 ++++++
 3 files changed, 43 insertions(+)
 create mode 100644 database/migrations/2020_11_15_190128_create_jobs_table.php

diff --git a/database/migrations/2020_11_15_190128_create_jobs_table.php b/database/migrations/2020_11_15_190128_create_jobs_table.php
new file mode 100644
index 00000000..275d35b2
--- /dev/null
+++ b/database/migrations/2020_11_15_190128_create_jobs_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateJobsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::create('jobs', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('queue')->index();
+            $table->longText('payload');
+            $table->unsignedTinyInteger('attempts');
+            $table->unsignedInteger('reserved_at')->nullable();
+            $table->unsignedInteger('available_at');
+            $table->unsignedInteger('created_at');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::dropIfExists('jobs');
+    }
+}
diff --git a/develop b/develop
index b0331f78..ffb6d6c4 100755
--- a/develop
+++ b/develop
@@ -8,6 +8,7 @@ export DB_NAME=${DB_NAME:-connected_kingston}
 export DB_USER=${DB_USER:-connected_kingston}
 export DB_PASS=${DB_PASS:-secret}
 export ELASTICSEARCH_PORT=${ELASTICSEARCH_PORT:-9200}
+export KIBANA_PORT=${KIBANA_PORT:-5601}
 export CFN_TEMPLATE=${CFN_TEMPLATE:-cloudformation}
 
 # Set the docker-compose files to use.
diff --git a/docker-compose.yml b/docker-compose.yml
index 36c0b24e..add872f4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -83,6 +83,16 @@ services:
     ports:
       - "${ELASTICSEARCH_PORT}:9200"
 
+  kibana:
+    image: kibana:7.9.3
+    environment:
+      ELASTICSEARCH_URL: http://elasticsearch:9200
+      ELASTICSEARCH_HOSTS: http://elasticsearch:9200
+    ports:
+      - "${KIBANA_PORT}:5601"
+    depends_on:
+      - elasticsearch
+
   troposphere:
     image: royal-borough-kingston/ck-api/troposphere
     build: