fix: search ingestion (#1155)

formancehq · Jan 26, 2024 · 2e0fede · 2e0fede
1 parent 7ceee06
commit 2e0fede
Show file tree

Hide file tree

Showing 71 changed files with 127 additions and 89 deletions.
diff --git a/...estdata/monopod-disabled-one-service/results/configmaps--v1/search-benthos-resources.yaml b/...estdata/monopod-disabled-one-service/results/configmaps--v1/search-benthos-resources.yaml
@@ -42,6 +42,7 @@ data:
             doc: ${! if json().exists("document") { json("document") } else {""} }
             script: ${! if json().exists("script") { json("script") } else {""} }
             upsert: ${! if json().exists("upsert") { json("upsert") } else {""} }
+            params: ${! if json().exists("params") { json("params") } else {""} }
 kind: ConfigMap
 metadata:
     labels:

diff --git a/.../testdata/monopod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml b/.../testdata/monopod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml
diff --git a/...onopod-disabled-one-service/results/deployments-apps-v1/monopod-disabled-one-service.yaml b/...onopod-disabled-one-service/results/deployments-apps-v1/monopod-disabled-one-service.yaml
@@ -575,7 +575,7 @@ spec:
                       value: $(LEDGER_POSTGRES_NO_DATABASE_URI)/$(LEDGER_POSTGRES_DATABASE)?sslmode=disable
                     - name: BROKER
                       value: kafka
-                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.0-es
+                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.1-es
                   imagePullPolicy: IfNotPresent
                   name: search-benthos
                   ports:

diff --git a/...ollers/stack/testdata/monopod-latest/results/configmaps--v1/search-benthos-resources.yaml b/...ollers/stack/testdata/monopod-latest/results/configmaps--v1/search-benthos-resources.yaml
@@ -42,6 +42,7 @@ data:
             doc: ${! if json().exists("document") { json("document") } else {""} }
             script: ${! if json().exists("script") { json("script") } else {""} }
             upsert: ${! if json().exists("upsert") { json("upsert") } else {""} }
+            params: ${! if json().exists("params") { json("params") } else {""} }
 kind: ConfigMap
 metadata:
     labels:

diff --git a/...trollers/stack/testdata/monopod-latest/results/configmaps--v1/search-benthos-streams.yaml b/...trollers/stack/testdata/monopod-latest/results/configmaps--v1/search-benthos-streams.yaml
diff --git a/...controllers/stack/testdata/monopod-latest/results/deployments-apps-v1/monopod-latest.yaml b/...controllers/stack/testdata/monopod-latest/results/deployments-apps-v1/monopod-latest.yaml
@@ -822,7 +822,7 @@ spec:
                       value: $(LEDGER_POSTGRES_NO_DATABASE_URI)/$(LEDGER_POSTGRES_DATABASE)?sslmode=disable
                     - name: BROKER
                       value: kafka
-                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.0-es
+                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.1-es
                   imagePullPolicy: IfNotPresent
                   name: search-benthos
                   ports:

diff --git a/...lers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/search-benthos-resources.yaml b/...lers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/search-benthos-resources.yaml
@@ -42,6 +42,7 @@ data:
             doc: ${! if json().exists("document") { json("document") } else {""} }
             script: ${! if json().exists("script") { json("script") } else {""} }
             upsert: ${! if json().exists("upsert") { json("upsert") } else {""} }
+            params: ${! if json().exists("params") { json("params") } else {""} }
 kind: ConfigMap
 metadata:
     labels:

diff --git a/...ollers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/search-benthos-streams.yaml b/...ollers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/search-benthos-streams.yaml
diff --git a/...rollers/stack/testdata/monopod-ledgerv1/results/deployments-apps-v1/monopod-ledgerv1.yaml b/...rollers/stack/testdata/monopod-ledgerv1/results/deployments-apps-v1/monopod-ledgerv1.yaml
@@ -824,7 +824,7 @@ spec:
                       value: $(LEDGER_POSTGRES_NO_DATABASE_URI)/$(LEDGER_POSTGRES_DATABASE)?sslmode=disable
                     - name: BROKER
                       value: kafka
-                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.0-es
+                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.1-es
                   imagePullPolicy: IfNotPresent
                   name: search-benthos
                   ports:

diff --git a/...onopod-payments-after-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-resources.yaml b/...onopod-payments-after-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-resources.yaml
@@ -42,6 +42,7 @@ data:
             doc: ${! if json().exists("document") { json("document") } else {""} }
             script: ${! if json().exists("script") { json("script") } else {""} }
             upsert: ${! if json().exists("upsert") { json("upsert") } else {""} }
+            params: ${! if json().exists("params") { json("params") } else {""} }
 kind: ConfigMap
 metadata:
     labels:

diff --git a/.../monopod-payments-after-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml b/.../monopod-payments-after-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml
diff --git a/...ter-v1.0.0-alpha.6/results/deployments-apps-v1/monopod-payments-after-v1-0-0-alpha-6.yaml b/...ter-v1.0.0-alpha.6/results/deployments-apps-v1/monopod-payments-after-v1-0-0-alpha-6.yaml
@@ -822,7 +822,7 @@ spec:
                       value: $(LEDGER_POSTGRES_NO_DATABASE_URI)/$(LEDGER_POSTGRES_DATABASE)?sslmode=disable
                     - name: BROKER
                       value: kafka
-                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.0-es
+                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.1-es
                   imagePullPolicy: IfNotPresent
                   name: search-benthos
                   ports:

diff --git a/...nopod-payments-before-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-resources.yaml b/...nopod-payments-before-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-resources.yaml
@@ -42,6 +42,7 @@ data:
             doc: ${! if json().exists("document") { json("document") } else {""} }
             script: ${! if json().exists("script") { json("script") } else {""} }
             upsert: ${! if json().exists("upsert") { json("upsert") } else {""} }
+            params: ${! if json().exists("params") { json("params") } else {""} }
 kind: ConfigMap
 metadata:
     labels:

diff --git a/...monopod-payments-before-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml b/...monopod-payments-before-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml
diff --git a/...re-v1.0.0-alpha.6/results/deployments-apps-v1/monopod-payments-before-v1-0-0-alpha-6.yaml b/...re-v1.0.0-alpha.6/results/deployments-apps-v1/monopod-payments-before-v1-0-0-alpha-6.yaml
@@ -732,7 +732,7 @@ spec:
                       value: $(LEDGER_POSTGRES_NO_DATABASE_URI)/$(LEDGER_POSTGRES_DATABASE)?sslmode=disable
                     - name: BROKER
                       value: kafka
-                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.0-es
+                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.1-es
                   imagePullPolicy: IfNotPresent
                   name: search-benthos
                   ports:

diff --git a/...estdata/monopod-search-before-v0.7.0/results/configmaps--v1/search-benthos-resources.yaml b/...estdata/monopod-search-before-v0.7.0/results/configmaps--v1/search-benthos-resources.yaml
@@ -42,6 +42,7 @@ data:
             doc: ${! if json().exists("document") { json("document") } else {""} }
             script: ${! if json().exists("script") { json("script") } else {""} }
             upsert: ${! if json().exists("upsert") { json("upsert") } else {""} }
+            params: ${! if json().exists("params") { json("params") } else {""} }
 kind: ConfigMap
 metadata:
     labels:

diff --git a/.../testdata/monopod-search-before-v0.7.0/results/configmaps--v1/search-benthos-streams.yaml b/.../testdata/monopod-search-before-v0.7.0/results/configmaps--v1/search-benthos-streams.yaml
diff --git a/...onopod-search-before-v0.7.0/results/deployments-apps-v1/monopod-search-before-v0-7-0.yaml b/...onopod-search-before-v0.7.0/results/deployments-apps-v1/monopod-search-before-v0-7-0.yaml
@@ -822,7 +822,7 @@ spec:
                       value: $(LEDGER_POSTGRES_NO_DATABASE_URI)/$(LEDGER_POSTGRES_DATABASE)?sslmode=disable
                     - name: BROKER
                       value: kafka
-                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.0-es
+                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.1-es
                   imagePullPolicy: IfNotPresent
                   name: search-benthos
                   ports:

diff --git a/...ollers/stack/testdata/multipod-debug/results/configmaps--v1/search-benthos-resources.yaml b/...ollers/stack/testdata/multipod-debug/results/configmaps--v1/search-benthos-resources.yaml
@@ -42,6 +42,7 @@ data:
             doc: ${! if json().exists("document") { json("document") } else {""} }
             script: ${! if json().exists("script") { json("script") } else {""} }
             upsert: ${! if json().exists("upsert") { json("upsert") } else {""} }
+            params: ${! if json().exists("params") { json("params") } else {""} }
 kind: ConfigMap
 metadata:
     labels:

diff --git a/...trollers/stack/testdata/multipod-debug/results/configmaps--v1/search-benthos-streams.yaml b/...trollers/stack/testdata/multipod-debug/results/configmaps--v1/search-benthos-streams.yaml
diff --git a/...controllers/stack/testdata/multipod-debug/results/deployments-apps-v1/search-benthos.yaml b/...controllers/stack/testdata/multipod-debug/results/deployments-apps-v1/search-benthos.yaml
@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: Zas1IqJbhfN4PIGns5xxVW6s2zu7A-qQ0uJgR82mbNQ=
+                stack.formance.cloud/volumes-hash: oAXxeJ9yZ42WF5KLqqbY5iIu425cXeLlIyAQnwTJV_4=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos
@@ -103,7 +103,7 @@ spec:
                       value: $(LEDGER_POSTGRES_NO_DATABASE_URI)/$(LEDGER_POSTGRES_DATABASE)?sslmode=disable
                     - name: BROKER
                       value: kafka
-                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.0-es
+                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.1-es
                   imagePullPolicy: IfNotPresent
                   name: search-benthos
                   ports:

diff --git a/...stdata/multipod-disabled-one-service/results/configmaps--v1/search-benthos-resources.yaml b/...stdata/multipod-disabled-one-service/results/configmaps--v1/search-benthos-resources.yaml
@@ -42,6 +42,7 @@ data:
             doc: ${! if json().exists("document") { json("document") } else {""} }
             script: ${! if json().exists("script") { json("script") } else {""} }
             upsert: ${! if json().exists("upsert") { json("upsert") } else {""} }
+            params: ${! if json().exists("params") { json("params") } else {""} }
 kind: ConfigMap
 metadata:
     labels:

diff --git a/...testdata/multipod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml b/...testdata/multipod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml
diff --git a/...ck/testdata/multipod-disabled-one-service/results/deployments-apps-v1/search-benthos.yaml b/...ck/testdata/multipod-disabled-one-service/results/deployments-apps-v1/search-benthos.yaml
@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: Zas1IqJbhfN4PIGns5xxVW6s2zu7A-qQ0uJgR82mbNQ=
+                stack.formance.cloud/volumes-hash: oAXxeJ9yZ42WF5KLqqbY5iIu425cXeLlIyAQnwTJV_4=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos
@@ -103,7 +103,7 @@ spec:
                       value: $(LEDGER_POSTGRES_NO_DATABASE_URI)/$(LEDGER_POSTGRES_DATABASE)?sslmode=disable
                     - name: BROKER
                       value: kafka
-                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.0-es
+                  image: public.ecr.aws/formance-internal/jeffail/benthos:v4.23.1-es
                   imagePullPolicy: IfNotPresent
                   name: search-benthos
                   ports:

diff --git a/...stdata/multipod-latest-no-monitoring/results/configmaps--v1/search-benthos-resources.yaml b/...stdata/multipod-latest-no-monitoring/results/configmaps--v1/search-benthos-resources.yaml
@@ -42,6 +42,7 @@ data:
             doc: ${! if json().exists("document") { json("document") } else {""} }
             script: ${! if json().exists("script") { json("script") } else {""} }
             upsert: ${! if json().exists("upsert") { json("upsert") } else {""} }
+            params: ${! if json().exists("params") { json("params") } else {""} }
 kind: ConfigMap
 metadata:
     labels: