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.

Sign up for GitHub

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

helm-chart/common: Add logging config for service components #375

Merged
merged 1 commit into from
Sep 4, 2024
+49 −0
Merged

helm-chart/common: Add logging config for service components #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions helm-charts/common/asr/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ data:
{{- else }}
no_proxy: {{ .Values.global.no_proxy | quote }}
{{- end }}
LOGFLAG: {{ .Values.LOGFLAG | quote }}
Copy link
Collaborator

Choose a reason for hiding this comment

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

On second thought, based on the current python code logic1 and logic2, whenever we set the LOGFLAG env as a non-empty string, it will be treated as boolean True.

So we need to change the template accordingly.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Update each values.yaml file to address the issue, please help take a look.

4 changes: 4 additions & 0 deletions helm-charts/common/asr/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ autodependency:

replicaCount: 1

# Set it as a non-null string, such as true, if you want to enable logging facility,
# otherwise, keep it as "" to disable it.
LOGFLAG: ""

ASR_ENDPOINT: ""

image:
Expand Down
1 change: 1 addition & 0 deletions helm-charts/common/data-prep/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@ data:
LANGCHAIN_TRACING_V2: {{ .Values.global.LANGCHAIN_TRACING_V2 | quote }}
LANGCHAIN_API_KEY: {{ .Values.global.LANGCHAIN_API_KEY | quote }}
LANGCHAIN_PROJECT: "opea-dataprep-service"
LOGFLAG: {{ .Values.LOGFLAG | quote }}
4 changes: 4 additions & 0 deletions helm-charts/common/data-prep/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ tolerations: []

affinity: {}

# Set it as a non-null string, such as true, if you want to enable logging facility,
# otherwise, keep it as "" to disable it.
LOGFLAG: ""

# text embedding inference service URL, e.g. http://<service-name>:<port>
TEI_EMBEDDING_ENDPOINT: ""

Expand Down
1 change: 1 addition & 0 deletions helm-charts/common/embedding-usvc/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ data:
LANGCHAIN_TRACING_V2: {{ .Values.global.LANGCHAIN_TRACING_V2 | quote }}
LANGCHAIN_API_KEY: {{ .Values.global.LANGCHAIN_API_KEY }}
LANGCHAIN_PROJECT: "opea-embedding-service"
LOGFLAG: {{ .Values.LOGFLAG | quote }}
4 changes: 4 additions & 0 deletions helm-charts/common/embedding-usvc/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ autodependency:

replicaCount: 1

# Set it as a non-null string, such as true, if you want to enable logging facility,
# otherwise, keep it as "" to disable it.
LOGFLAG: ""

TEI_EMBEDDING_ENDPOINT: ""
image:
repository: opea/embedding-tei
Expand Down
1 change: 1 addition & 0 deletions helm-charts/common/llm-uservice/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ data:
LANGCHAIN_TRACING_V2: {{ .Values.global.LANGCHAIN_TRACING_V2 | quote }}
LANGCHAIN_API_KEY: {{ .Values.global.LANGCHAIN_API_KEY }}
LANGCHAIN_PROJECT: "opea-llm-uservice"
LOGFLAG: {{ .Values.LOGFLAG | quote }}
4 changes: 4 additions & 0 deletions helm-charts/common/llm-uservice/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ autodependency:
replicaCount: 1
TGI_LLM_ENDPOINT: ""

# Set it as a non-null string, such as true, if you want to enable logging facility,
# otherwise, keep it as "" to disable it.
LOGFLAG: ""

image:
repository: opea/llm-tgi
pullPolicy: IfNotPresent
Expand Down
1 change: 1 addition & 0 deletions helm-charts/common/reranking-usvc/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ data:
LANGCHAIN_TRACING_V2: {{ .Values.global.LANGCHAIN_TRACING_V2 | quote }}
LANGCHAIN_API_KEY: {{ .Values.global.LANGCHAIN_API_KEY | quote }}
LANGCHAIN_PROJECT: "opea-reranking-service"
LOGFLAG: {{ .Values.LOGFLAG | quote }}
4 changes: 4 additions & 0 deletions helm-charts/common/reranking-usvc/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ autodependency:

replicaCount: 1

# Set it as a non-null string, such as true, if you want to enable logging facility,
# otherwise, keep it as "" to disable it.
LOGFLAG: ""

TEI_RERANKING_ENDPOINT: ""
image:
repository: opea/reranking-tei
Expand Down
1 change: 1 addition & 0 deletions helm-charts/common/retriever-usvc/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ data:
LANGCHAIN_PROJECT: "opea-retriever-service"
HF_HOME: "/tmp/.cache/huggingface"
HUGGINGFACEHUB_API_TOKEN: {{ .Values.global.HUGGINGFACEHUB_API_TOKEN | quote}}
LOGFLAG: {{ .Values.LOGFLAG | quote }}
4 changes: 4 additions & 0 deletions helm-charts/common/retriever-usvc/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ autodependency:

replicaCount: 1

# Set it as a non-null string, such as true, if you want to enable logging facility,
# otherwise, keep it as "" to disable it.
LOGFLAG: ""

TEI_EMBEDDING_ENDPOINT: ""
EMBED_MODEL: ""

Expand Down
1 change: 1 addition & 0 deletions helm-charts/common/tts/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ data:
{{- else }}
no_proxy: {{ .Values.global.no_proxy | quote }}
{{- end }}
LOGFLAG: {{ .Values.LOGFLAG | quote }}
4 changes: 4 additions & 0 deletions helm-charts/common/tts/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ autodependency:

replicaCount: 1

# Set it as a non-null string, such as true, if you want to enable logging facility,
# otherwise, keep it as "" to disable it.
LOGFLAG: ""

TTS_ENDPOINT: ""

image:
Expand Down
1 change: 1 addition & 0 deletions helm-charts/common/web-retriever/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ data:
no_proxy: {{ .Values.global.no_proxy | quote }}
{{- end }}
HF_HOME: "/tmp/.cache/huggingface"
LOGFLAG: {{ .Values.LOGFLAG | quote }}
4 changes: 4 additions & 0 deletions helm-charts/common/web-retriever/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ autodependency:

replicaCount: 1

# Set it as a non-null string, such as true, if you want to enable logging facility,
# otherwise, keep it as "" to disable it.
LOGFLAG: ""

TEI_EMBEDDING_ENDPOINT: ""
GOOGLE_API_KEY: ""
GOOGLE_CSE_ID: ""
Expand Down
1 change: 1 addition & 0 deletions microservices-connector/config/manifests/asr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ data:
http_proxy: ""
https_proxy: ""
no_proxy: ""
LOGFLAG: ""
---
# Source: asr/templates/service.yaml
# Copyright (C) 2024 Intel Corporation
Expand Down
1 change: 1 addition & 0 deletions microservices-connector/config/manifests/data-prep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ data:
LANGCHAIN_TRACING_V2: "false"
LANGCHAIN_API_KEY: "insert-your-langchain-key-here"
LANGCHAIN_PROJECT: "opea-dataprep-service"
LOGFLAG: ""
---
# Source: data-prep/templates/service.yaml
# Copyright (C) 2024 Intel Corporation
Expand Down
1 change: 1 addition & 0 deletions microservices-connector/config/manifests/docsum-llm-uservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ data:
LANGCHAIN_TRACING_V2: "false"
LANGCHAIN_API_KEY: insert-your-langchain-key-here
LANGCHAIN_PROJECT: "opea-llm-uservice"
LOGFLAG: ""
---
# Source: llm-uservice/templates/service.yaml
# Copyright (C) 2024 Intel Corporation
Expand Down
1 change: 1 addition & 0 deletions microservices-connector/config/manifests/embedding-usvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ data:
LANGCHAIN_TRACING_V2: "false"
LANGCHAIN_API_KEY: insert-your-langchain-key-here
LANGCHAIN_PROJECT: "opea-embedding-service"
LOGFLAG: ""
---
# Source: embedding-usvc/templates/service.yaml
# Copyright (C) 2024 Intel Corporation
Expand Down
1 change: 1 addition & 0 deletions microservices-connector/config/manifests/llm-uservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ data:
LANGCHAIN_TRACING_V2: "false"
LANGCHAIN_API_KEY: insert-your-langchain-key-here
LANGCHAIN_PROJECT: "opea-llm-uservice"
LOGFLAG: ""
---
# Source: llm-uservice/templates/service.yaml
# Copyright (C) 2024 Intel Corporation
Expand Down
1 change: 1 addition & 0 deletions microservices-connector/config/manifests/reranking-usvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ data:
LANGCHAIN_TRACING_V2: "false"
LANGCHAIN_API_KEY: "insert-your-langchain-key-here"
LANGCHAIN_PROJECT: "opea-reranking-service"
LOGFLAG: ""
---
# Source: reranking-usvc/templates/service.yaml
# Copyright (C) 2024 Intel Corporation
Expand Down
1 change: 1 addition & 0 deletions microservices-connector/config/manifests/retriever-usvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ data:
LANGCHAIN_PROJECT: "opea-retriever-service"
HF_HOME: "/tmp/.cache/huggingface"
HUGGINGFACEHUB_API_TOKEN: "insert-your-huggingface-token-here"
LOGFLAG: ""
---
# Source: retriever-usvc/templates/service.yaml
# Copyright (C) 2024 Intel Corporation
Expand Down
1 change: 1 addition & 0 deletions microservices-connector/config/manifests/tts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ data:
http_proxy: ""
https_proxy: ""
no_proxy: ""
LOGFLAG: ""
---
# Source: tts/templates/service.yaml
# Copyright (C) 2024 Intel Corporation
Expand Down
1 change: 1 addition & 0 deletions microservices-connector/config/manifests/web-retriever.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ data:
https_proxy: ""
no_proxy: ""
HF_HOME: "/tmp/.cache/huggingface"
LOGFLAG: ""
---
# Source: web-retriever/templates/service.yaml
# Copyright (C) 2024 Intel Corporation
Expand Down
Loading