Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OPSEXP-2950 Prepare to update to Elasticsearch 8 by switching to the bitnami/elasticsearch chart #1267

Open
wants to merge 27 commits into
base: master
Choose a base branch
from

Conversation

pmacius
Copy link
Contributor

@pmacius pmacius commented Dec 9, 2024

@pmacius pmacius requested review from alxgomz and gionn December 18, 2024 10:13
@pmacius pmacius requested review from alxgomz December 20, 2024 13:12
helm/alfresco-content-services/values.yaml Outdated Show resolved Hide resolved
helm/alfresco-content-services/values.yaml Outdated Show resolved Hide resolved
configuration:
server:
basePath: "/kibana"
publicBaseUrl: "http://localhost/kibana"
Copy link
Contributor

@alxgomz alxgomz Dec 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what this value does but it looks suspicious. Did you check in integration pipeline kibana works ok?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in global.known_urls we assume default deployment target localhost, so at least is consistent

just add more inline docs to make it easy to understand that it must be set for other types of deployment

docker-compose/pre-release-compose.yaml Outdated Show resolved Hide resolved
@gionn gionn removed their request for review January 2, 2025 11:06
@pmacius pmacius changed the title OPSEXP-2950 Bump elasticsearch to 8.16.1 for pre-release OPSEXP-2950 Prepare to update to Elasticsearch 8 by switching to the bitnami/elasticsearch chart Jan 7, 2025
@pmacius pmacius requested review from gionn and alxgomz and removed request for alxgomz January 7, 2025 18:27
test/enterprise-integration-test-values.yaml Show resolved Hide resolved
helm/alfresco-content-services/values.yaml Show resolved Hide resolved
helm/alfresco-content-services/values.yaml Show resolved Hide resolved
replicaCount: 0
ingest:
replicaCount: 0
kibana:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this kibana supports any authentication?

helm/alfresco-content-services/README.md Show resolved Hide resolved
Copy link
Contributor

@alxgomz alxgomz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK for me with Kibana disabled by default and a small doc on how to enable and secure it leveraging mechanisms provided by the bitnami chart

Comment on lines +6 to +11
{{- if .enabled}}
{{- $aasCtx := dict "Values" . "Chart" $.Chart "Release" $.Release }}
{{- $aasServiceName := include "alfresco-audit-storage.fullname" $aasCtx }}
{{- $aasServicePort := .service.port | toString }}
{{- printf "http://%s:%s" $aasServiceName $aasServicePort }}
{{- end }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cosmetics

Suggested change
{{- if .enabled}}
{{- $aasCtx := dict "Values" . "Chart" $.Chart "Release" $.Release }}
{{- $aasServiceName := include "alfresco-audit-storage.fullname" $aasCtx }}
{{- $aasServicePort := .service.port | toString }}
{{- printf "http://%s:%s" $aasServiceName $aasServicePort }}
{{- end }}
{{- if .enabled }}
{{- $aasCtx := dict "Values" . "Chart" $.Chart "Release" $.Release }}
{{- $aasServiceName := include "alfresco-audit-storage.fullname" $aasCtx }}
{{- $aasServicePort := .service.port | toString }}
{{- printf "http://%s:%s" $aasServiceName $aasServicePort }}
{{- end }}

Comment on lines +30 to +54

{{/*
Compute the url for elasticsearch for audit

Usage: include "alfresco-content-services.audit.elasticsearchUrl" $

*/}}
{{- define "alfresco-content-services.audit.elasticsearchUrl" -}}
{{- $elasticsearch_audit_url := "" }}
{{- if .Values.global.auditIndex.url }}
{{- $elasticsearch_audit_url = .Values.global.auditIndex.url }}
{{- else }}
{{- with (index .Values "elasticsearch") }}
{{- if .enabled }}
{{- $auditEsHost := printf "%s-%s" $.Release.Name (($.Values.global.elasticsearch).service.name | default "elasticsearch") }}
{{- $auditEsPort := ($.Values.global.elasticsearch).service.ports.restApi | default 9200 }}
{{- $auditEsProto := .protocol | default "http" }}
{{- $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 elasticsearch.enabled" }}
{{- end }}
{{- end }}
{{- end }}
{{- print $elasticsearch_audit_url }}
{{- end -}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Be blessed for that 🙏 !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants