Merge pull request #1 from nyaruka/main

update from upstream

.github/workflows/ci.yml

@@ -1,62 +1,65 @@
 name: CI
 on: [push, pull_request]
+env:
+  go-version: "1.18.x"
+  es-version: "7.17.2"
 jobs:
   test:
     name: Test
     strategy:
       matrix:
-        pg-version: ['10', '11']
+        pg-version: ["12", "13"]
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v1
-
-    - name: Install ElasticSearch
-      uses: nyaruka/elasticsearch-action@master
-      with:
-        elastic version: '6.8.5'
-
-    - name: Install PostgreSQL
-      uses: harmon758/postgresql-action@v1
-      with:
-        postgresql version: ${{ matrix.pg-version }}
-        postgresql db: elastic_test
-        postgresql user: temba
-        postgresql password: temba
-
-    - name: Install Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.13.x
-
-    - name: Run tests
-      run: go test -p=1 -coverprofile=coverage.text -covermode=atomic ./...
-
-    - name: Upload coverage
-      if: success()
-      uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-  
+      - name: Checkout code
+        uses: actions/checkout@v1
+
+      - name: Install ElasticSearch
+        uses: nyaruka/elasticsearch-action@master
+        with:
+          elastic version: ${{ env.es-version }}
+
+      - name: Install PostgreSQL
+        uses: harmon758/postgresql-action@v1
+        with:
+          postgresql version: ${{ matrix.pg-version }}
+          postgresql db: elastic_test
+          postgresql user: nyaruka
+          postgresql password: nyaruka
+
+      - name: Install Go
+        uses: actions/setup-go@v1
+        with:
+          go-version: ${{ env.go-version }}
+
+      - name: Run tests
+        run: go test -p=1 -coverprofile=coverage.text -covermode=atomic ./...
+
+      - name: Upload coverage
+        if: success()
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+
   release:
     name: Release
     needs: [test]
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v1
-
-    - name: Install Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.13.x
-
-    - name: Publish release
-      uses: goreleaser/goreleaser-action@v1
-      with:
-        version: latest
-        args: release --rm-dist
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        fail_ci_if_error: true
+      - name: Checkout code
+        uses: actions/checkout@v1
+
+      - name: Install Go
+        uses: actions/setup-go@v1
+        with:
+          go-version: ${{ env.go-version }}
+
+      - name: Publish release
+        uses: goreleaser/goreleaser-action@v1
+        with:
+          version: v0.147.2
+          args: release --rm-dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          fail_ci_if_error: true

.gitignore

@@ -5,9 +5,8 @@
 *.dylib
 fabfile.py
 fabfile.pyc
-fabconfig.py
-fabconfig.pyc
-fabric
+deploy/
+rp-indexer
 
 # Test binary, build with `go test -c`
 *.test

CHANGELOG.md

@@ -1,3 +1,105 @@
+v7.4.0
+----------
+ * Update README
+ * Tweak startup logging
+
+v7.3.10
+----------
+ * Log app version on startup
+
+v7.3.9
+----------
+ * Use analytics package from gocommon instead of librato directly
+ * Add arm64 as a build target
+
+v7.3.8
+----------
+ * Update dependencies and go version to 1.18
+ * Don't panic on connection failure to ES
+
+v7.3.7
+----------
+ * Better logging within batches during rebuilds
+ * Test with latest ES 7.17
+
+v7.3.6
+----------
+ * Ignore malformed field value numbers
+ * Drop the flow and groups fields which have been replaced by flow_id and group_ids
+
+v7.3.5
+----------
+ * Log batch progress during rebuilds
+
+v7.3.4
+----------
+ * Add group_ids field to replace groups
+
+v7.3.3
+----------
+ * Include flow id history as flow_history_ids and current flow id as flow_id 
+
+v7.3.1
+----------
+ * If indexing fails, log status code from elasticsearch
+ * Poll interval is configurable
+
+v7.3.0
+----------
+ * Add stats reporting cron task and optional librato config
+ * Refactor to support different indexer types
+ * Update golang.org/x/sys
+
+v7.2.0
+----------
+ * Tweak README
+
+v7.1.0
+----------
+ * Index contact.current_flow_id as flow uuid
+ * CI with go 1.17
+
+v7.0.0
+----------
+ * Test on PG12 and 13
+
+v6.5.0
+----------
+ * Include contact.ticket_count as tickets in index
+ * Update to go 1.16
+ * Use embedded file for index settings
+ * Remove no longer used is_blocked and and is_stopped fields
+
+v6.4.0
+----------
+ * 6.4.0 candidate
+
+v6.3.0
+----------
+ * Fix creating of location keyword fields when values have punctuation
+
+v6.2.0
+----------
+ * add rp-indexer to .gitignore
+ * 6.2.0 RC
+
+v6.1.0
+----------
+ * Change ElasticSearch version to v7 (backwards incompatible change)
+
+v6.0.0
+----------
+ * Update README
+
+v5.7.2
+----------
+ * add status field to index for querying
+
+v5.7.1
+----------
+ * Use contact status instead of is_stopped / is_blocked
+ * Retry HTTP calls to ES
+
 v5.7.0
 ----------
  * Index last_seen_on