review

Alfresco · Oct 18, 2024 · 515d200 · 515d200
1 parent 6fa0ba1
commit 515d200
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 38 deletions.
diff --git a/helm/alfresco-content-services/7.1.N_values.yaml b/helm/alfresco-content-services/7.1.N_values.yaml
@@ -86,7 +86,7 @@ alfresco-connector-ms365:
     tag: 1.1.1
 alfresco-control-center:
   enabled: false
-elasticsearchAudit:
+elasticsearch-audit:
   enabled: false
 kibana-audit:
   enabled: false

diff --git a/helm/alfresco-content-services/7.2.N_values.yaml b/helm/alfresco-content-services/7.2.N_values.yaml
@@ -85,7 +85,7 @@ alfresco-connector-ms365:
 alfresco-connector-msteams:
   image:
     tag: 1.1.0
-elasticsearchAudit:
+elasticsearch-audit:
   enabled: false
 kibana-audit:
   enabled: false

diff --git a/helm/alfresco-content-services/7.3.N_values.yaml b/helm/alfresco-content-services/7.3.N_values.yaml
@@ -85,7 +85,7 @@ alfresco-connector-ms365:
 alfresco-connector-msteams:
   image:
     tag: 1.1.0
-elasticsearchAudit:
+elasticsearch-audit:
   enabled: false
 kibana-audit:
   enabled: false

diff --git a/helm/alfresco-content-services/7.4.N_values.yaml b/helm/alfresco-content-services/7.4.N_values.yaml
@@ -85,7 +85,7 @@ alfresco-connector-ms365:
 alfresco-connector-msteams:
   image:
     tag: 2.0.3
-elasticsearchAudit:
+elasticsearch-audit:
   enabled: false
 kibana-audit:
   enabled: false

diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock
@@ -56,5 +56,5 @@ dependencies:
 - name: alfresco-audit-storage
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 0.1.0-alpha.0
-digest: sha256:52b7fdb717a261d7a8ba79d502b97d0cd8828e965d57e658cc30b513c5204ae3
-generated: "2024-10-17T21:39:33.276564+02:00"
+digest: sha256:4fc74b1a623e89f47c0033e969ed1fe0f1196142f03445585b09858a5670ac14
+generated: "2024-10-18T10:39:17.693592+02:00"
diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml
@@ -86,10 +86,10 @@ dependencies:
     version: 7.17.3
     condition: elasticsearch.enabled
   - name: elasticsearch
-    alias: elasticsearchAudit
+    alias: elasticsearch-audit
     repository: https://helm.elastic.co
     version: 7.17.3
-    condition: elasticsearchAudit.enabled
+    condition: elasticsearch-audit.enabled
   - name: kibana
     alias: kibana-audit
     repository: https://helm.elastic.co

diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md
@@ -37,7 +37,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-sync-service | 6.1.0-alpha.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-transform-service | 2.1.1 |
 | https://helm.elastic.co | elasticsearch | 7.17.3 |
-| https://helm.elastic.co | elasticsearchAudit(elasticsearch) | 7.17.3 |
+| https://helm.elastic.co | elasticsearch-audit(elasticsearch) | 7.17.3 |
 | https://helm.elastic.co | kibana-audit(kibana) | 7.17.3 |
 | oci://registry-1.docker.io/bitnamicharts | postgresql-sync(postgresql) | 12.8.5 |
 | oci://registry-1.docker.io/bitnamicharts | postgresql | 12.8.5 |
@@ -240,24 +240,21 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | dtas.image.pullPolicy | string | `"IfNotPresent"` |  |
 | dtas.image.repository | string | `"quay.io/alfresco/alfresco-deployment-test-automation-scripts"` |  |
 | dtas.image.tag | string | `"v1.5.5"` |  |
+| elasticsearch-audit.clusterHealthCheckParams | string | `"wait_for_status=yellow&timeout=1s"` |  |
+| elasticsearch-audit.clusterName | string | `"elasticsearch-aas"` |  |
+| elasticsearch-audit.enabled | bool | `true` | Enables the embedded elasticsearch cluster for alfresco-audit-storage |
+| elasticsearch-audit.extraEnvs[0].name | string | `"ELASTIC_USERNAME"` |  |
+| elasticsearch-audit.extraEnvs[0].valueFrom.secretKeyRef.key | string | `"AUDIT_ELASTICSEARCH_USERNAME"` |  |
+| elasticsearch-audit.extraEnvs[0].valueFrom.secretKeyRef.name | string | `"alfresco-aas-elasticsearch-secret"` |  |
+| elasticsearch-audit.extraEnvs[1].name | string | `"ELASTIC_PASSWORD"` |  |
+| elasticsearch-audit.extraEnvs[1].valueFrom.secretKeyRef.key | string | `"AUDIT_ELASTICSEARCH_PASSWORD"` |  |
+| elasticsearch-audit.extraEnvs[1].valueFrom.secretKeyRef.name | string | `"alfresco-aas-elasticsearch-secret"` |  |
+| elasticsearch-audit.ingress.enabled | bool | `false` | toggle deploying elasticsearch-audit ingress for more details about configuration check https://github.com/elastic/helm-charts/blob/main/elasticsearch/values.yaml#L255 |
+| elasticsearch-audit.nameOverride | string | `"elasticsearch-aas"` |  |
+| elasticsearch-audit.replicas | int | `1` |  |
 | elasticsearch.clusterHealthCheckParams | string | `"wait_for_status=yellow&timeout=1s"` |  |
 | elasticsearch.enabled | bool | `true` | Enables the embedded elasticsearch cluster |
 | elasticsearch.replicas | int | `1` |  |
-| elasticsearchAudit.clusterHealthCheckParams | string | `"wait_for_status=yellow&timeout=1s"` |  |
-| elasticsearchAudit.clusterName | string | `"elasticsearch-aas"` |  |
-| elasticsearchAudit.enabled | bool | `true` | Enables the embedded elasticsearch cluster for alfresco-audit-storage |
-| elasticsearchAudit.extraEnvs[0].name | string | `"ELASTIC_USERNAME"` |  |
-| elasticsearchAudit.extraEnvs[0].valueFrom.secretKeyRef.key | string | `"AUDIT_ELASTICSEARCH_USERNAME"` |  |
-| elasticsearchAudit.extraEnvs[0].valueFrom.secretKeyRef.name | string | `"alfresco-aas-elasticsearch-secret"` |  |
-| elasticsearchAudit.extraEnvs[1].name | string | `"ELASTIC_PASSWORD"` |  |
-| elasticsearchAudit.extraEnvs[1].valueFrom.secretKeyRef.key | string | `"AUDIT_ELASTICSEARCH_PASSWORD"` |  |
-| elasticsearchAudit.extraEnvs[1].valueFrom.secretKeyRef.name | string | `"alfresco-aas-elasticsearch-secret"` |  |
-| elasticsearchAudit.ingress.annotations."nginx.ingress.kubernetes.io/rewrite-target" | string | `"/$2"` |  |
-| elasticsearchAudit.ingress.enabled | bool | `false` |  |
-| elasticsearchAudit.ingress.hosts[0].paths[0].path | string | `"/elasticsearch(/|$)(.*)"` |  |
-| elasticsearchAudit.ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
-| elasticsearchAudit.nameOverride | string | `"elasticsearch-aas"` |  |
-| elasticsearchAudit.replicas | int | `1` |  |
 | global.alfrescoRegistryPullSecrets | string | `nil` | If a private image registry a secret can be defined and passed to kubernetes, see: https://github.com/Alfresco/acs-deployment/blob/a924ad6670911f64f1bba680682d266dd4ea27fb/docs/helm/eks-deployment.md#docker-registry-secret |
 | global.auditIndex.existingSecretName | string | `nil` | Name of an existing secret that contains AUDIT_ELASTICSEARCH_USERNAME and AUDIT_ELASTICSEARCH_PASSWORD keys. |
 | global.auditIndex.password | string | `nil` | Elasticsearch password |
@@ -286,7 +283,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | kibana-audit.enabled | bool | `true` |  |
 | kibana-audit.extraEnvs | list | `[{"name":"SERVER_BASEPATH","value":"/kibana"},{"name":"SERVER_REWRITEBASEPATH","value":"true"},{"name":"ELASTICSEARCH_HOSTS","valueFrom":{"configMapKeyRef":{"key":"AUDIT_ELASTICSEARCH_URL","name":"alfresco-infrastructure"}}},{"name":"SERVER_PUBLICBASEURL","valueFrom":{"configMapKeyRef":{"key":"AUDIT_SERVER_PUBLICBASEURL","name":"alfresco-infrastructure"}}},{"name":"ELASTICSEARCH_USERNAME","valueFrom":{"secretKeyRef":{"key":"AUDIT_ELASTICSEARCH_USERNAME","name":"alfresco-aas-elasticsearch-secret"}}},{"name":"ELASTICSEARCH_PASSWORD","valueFrom":{"secretKeyRef":{"key":"AUDIT_ELASTICSEARCH_PASSWORD","name":"alfresco-aas-elasticsearch-secret"}}}]` | All of the values has to be set there to escape the issue with overriding the values |
 | kibana-audit.healthCheckPath | string | `"/kibana/app/kibana"` |  |
-| kibana-audit.ingress.enabled | bool | `false` |  |
+| kibana-audit.ingress.enabled | bool | `true` |  |
 | kibana-audit.ingress.hosts[0].paths[0].path | string | `"/kibana"` |  |
 | kibana-audit.ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
 | messageBroker.brokerName | string | `nil` | name of the message broker as set in the Broker configuration |

diff --git a/helm/alfresco-content-services/community_values.yaml b/helm/alfresco-content-services/community_values.yaml
@@ -59,7 +59,7 @@ alfresco-connector-ms365:
   enabled: false
 alfresco-connector-msteams:
   enabled: false
-elasticsearchAudit:
+elasticsearch-audit:
   enabled: false
 kibana-audit:
   enabled: false

diff --git a/helm/alfresco-content-services/templates/config-infrastructure.yaml b/helm/alfresco-content-services/templates/config-infrastructure.yaml
@@ -73,14 +73,14 @@ data:
     {{- if .Values.global.auditIndex.url }}
       {{- $elasticsearch_audit_url = .Values.global.auditIndex.url }}
     {{- else }}
-      {{- with .Values.elasticsearchAudit }}
+      {{- with (index .Values "elasticsearch-audit") }}
         {{- if .enabled }}
           {{- $auditEsProto := .protocol | default "http" }}
           {{- $auditEsHost := printf "%s-%s" (.clusterName | default "elasticsearch") (.nodeGroup | default "master") }}
           {{- $auditEsPort := .port | default 9200 }}
           {{- $elasticsearch_audit_url = coalesce $.Values.global.auditIndex.url (printf "%s://%s:%v" $auditEsProto $auditEsHost $auditEsPort) }}
         {{- else if index $.Values "alfresco-audit-storage" "enabled" }}
-          {{- fail "Chart is configured to use Alfresco Audit Storage but no index backend has been provided. Set one using either global.auditIndex.url or elasticsearchAudit.enabled" }}
+          {{- fail "Chart is configured to use Alfresco Audit Storage but no index backend has been provided. Set one using either global.auditIndex.url or elasticsearch-audit.enabled" }}
         {{- end }}
       {{- end }}
     {{- end }}

diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml
@@ -551,7 +551,7 @@ elasticsearch:
   enabled: true
   replicas: 1
   clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
-elasticsearchAudit:
+elasticsearch-audit:
   # -- Enables the embedded elasticsearch cluster for alfresco-audit-storage
   enabled: true
   nameOverride: elasticsearch-aas
@@ -570,13 +570,9 @@ elasticsearchAudit:
           name: *aas_elasticsearch_secretName
           key: AUDIT_ELASTICSEARCH_PASSWORD
   ingress:
+    # -- toggle deploying elasticsearch-audit ingress for more details about configuration check
+    # https://github.com/elastic/helm-charts/blob/main/elasticsearch/values.yaml#L255
     enabled: false
-    annotations: 
-      nginx.ingress.kubernetes.io/rewrite-target: /$2
-    hosts:
-      - paths:
-          - path: /elasticsearch(/|$)(.*)
-            pathType: Prefix
 alfresco-audit-storage:
   enabled: true
   image:
@@ -631,7 +627,7 @@ kibana-audit:
           name: *aas_elasticsearch_secretName
           key: AUDIT_ELASTICSEARCH_PASSWORD
   ingress:
-    enabled: false
+    enabled: true
     hosts:
       - paths:
           - path: /kibana

diff --git a/test/community-integration-test-values.yaml b/test/community-integration-test-values.yaml
@@ -90,7 +90,7 @@ postgresql:
       limits:
         cpu: "2"
         memory: "1Gi"
-elasticsearchAudit:
+elasticsearch-audit:
   enabled: false
 kibana-audit:
   enabled: false

diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml
@@ -178,7 +178,7 @@ alfresco-ai-transformer:
       memory: "512Mi"
   livenessProbe:
     initialDelaySeconds: 120
-elasticsearchAudit:
+elasticsearch-audit:
   resources:
     requests:
       cpu: "0.01"