Merge branch 'hook/#130-elastic-search-indexing' of github.com:secureCodeBox/secureCodeBox into origin/hook/130-elastic-search-indexing

Paul · Paul · commit 1a5ef2fd05ab · 2020-11-25T13:32:03.000+01:00
diff --git a/hooks/persistence-elastic/README.md b/hooks/persistence-elastic/README.md
@@ -40,7 +40,9 @@ helm upgrade --install elkh secureCodeBox/persistence-elastic
 | image.repository | string | `"docker.io/securecodebox/persistence-elastic"` | Image repository for the dashboard importer job |
 | image.tag | string | defaults to the charts version | Image tag for the dashboard importer job |
 | imagePullSecrets | list | `[]` |  |
+| indexAppendNamespace | bool | `true` | Define if the name of the namespace where this hook is deployed to must be added to the index name. The namespace can be used to separate index by tenants (namespaces). |
 | indexPrefix | string | `"scbv2"` | Define a specific index prefix used for all elasticsearch indices. |
+| indexSuffix | string | `"“YYYY-MM-DD”"` | Define a specific index suffix based on date pattern (YEAR (YYYY), MONTH (YYYY-MM), WEEK (YYYY-Www), DATE (YYYY-MM-DD)) |
 | kibana | object | `{"enabled":true}` | Configures included Elasticsearch subchart |
 | kibana.enabled | bool | `true` | Enable if you want to deploy an kibana service (see: https://github.com/elastic/helm-charts/tree/master/kibana) |
 | nameOverride | string | `""` |  |
diff --git a/hooks/persistence-elastic/hook.test.js b/hooks/persistence-elastic/hook.test.js
@@ -81,7 +81,7 @@ test("should send findings to elasticsearch with given prefix", async () => {
     body: [
       {
         index: {
-          _index: `myPrefix_default_${testDate.toISOString().substr(0, 10)}`,
+          _index: `myPrefix_default_2020-11-11`,
         },
       },
       {
@@ -125,7 +125,7 @@ test("should not append namespace if 'appendNamespace' is null", async () => {
   });
 });
 
-test("should append date format YYYY", async () => {
+test("should append date format yyyy", async () => {
   const findings = [];
 
   const getFindings = async () => findings;
@@ -149,7 +149,7 @@ test("should append date format YYYY", async () => {
   });
 });
 
-test("should append week format like YYYY/[W]w -> 2020/W46", async () => {
+test("should append week format like yyyy/'W'W -> 2020/W46", async () => {
   const findings = [];
 
   const getFindings = async () => findings;
