Merge branch 'main' into flow_history

rowanseymour · rowanseymour · commit 6aea69db53cf · 2022-03-31T10:57:34.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+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
diff --git a/indexers/base.go b/indexers/base.go
@@ -255,7 +255,7 @@ func (i *baseIndexer) indexBatch(index string, batch []byte) (int, int, error) {
 			} else if item.Index.Status == 409 {
 				conflictedCount++
 			} else {
-				logrus.WithField("id", item.Index.ID).WithField("batch", batch).WithField("result", item.Index.Result).Error("error indexing document")
+				logrus.WithField("id", item.Index.ID).WithField("status", item.Index.Status).WithField("result", item.Index.Result).Error("error indexing document")
 			}
 		} else if item.Delete.ID != "" {
 			logrus.WithField("id", item.Index.ID).WithField("status", item.Index.Status).Debug("delete response")

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ func (i *baseIndexer) indexBatch(index string, batch []byte) (int, int, error) {`
`255`	`255`	`} else if item.Index.Status == 409 {`
`256`	`256`	`conflictedCount++`
`257`	`257`	`} else {`
`258`		`- logrus.WithField("id", item.Index.ID).WithField("batch", batch).WithField("result", item.Index.Result).Error("error indexing document")`
	`258`	`+ logrus.WithField("id", item.Index.ID).WithField("status", item.Index.Status).WithField("result", item.Index.Result).Error("error indexing document")`
`259`	`259`	`}`
`260`	`260`	`} else if item.Delete.ID != "" {`
`261`	`261`	`logrus.WithField("id", item.Index.ID).WithField("status", item.Index.Status).Debug("delete response")`