Skip to content

Commit 98e7d0b

Browse files
remove loki references in helm-charts and config files
1 parent 81a033a commit 98e7d0b

File tree

4 files changed

+0
-105
lines changed

4 files changed

+0
-105
lines changed

api/kubernetes/deploy_via_helm-dev.sh

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ help() {
2121
echo "- ARGO_POSTGRESQL_VERSION | string | Version for PostgreSQL in Argo. default 12.1.3"
2222
echo "- ARGO_REQUEUE_TIME | string | Workflow requeue time, 1s by default"
2323
echo "- ARGO_MINIO_REQUESTS_MEMORY | units of bytes (default is 4Gi) | Memory requests for the Argo MinIO server"
24-
echo "- LOKI_PERSISTENCE_MEMORY | units of bytes (default is 4Gi) | Memory for persistence of Loki system"
25-
echo "- LOKI_RETENTION_PERIOD | units of hours (default is 720h) | Loki logs retention period"
2624
echo "- PROM_STORAGE_CLASS_NAME | storage class name for the prometheus PVC (default is standard)"
2725
echo "- PROM_STORAGE_RESOURCE_REQUEST | size requested for prometheusPVC (default is 10Gi)"
2826
echo "- PROM_CPU_MEM_LIMITS | memory size limit for prometheus (default is 2Gi)"
@@ -545,63 +543,6 @@ EOF
545543
helm repo add argo https://argoproj.github.io/argo-helm
546544
helm upgrade --install -n ${NAMESPACE} ${ARGO_RELEASE_NAME} argo/argo-workflows --version ${ARGO_CHART_VERSION_ENV} --values values-argo.yaml
547545

548-
LOKI_RELEASE_NAME="loki"
549-
helm repo add grafana https://grafana.github.io/helm-charts
550-
551-
cat <<EOF > loki-values.yaml
552-
loki:
553-
persistence:
554-
enabled: true
555-
accessModes:
556-
- ReadWriteOnce
557-
size: "${LOKI_PERSISTENCE_MEMORY:-4Gi}"
558-
config:
559-
auth_enabled: true
560-
table_manager:
561-
retention_deletes_enabled: true
562-
retention_period: "${LOKI_RETENTION_PERIOD:-720h}"
563-
grafana:
564-
enabled: true
565-
persistence:
566-
type: pvc
567-
enabled: true
568-
# storageClassName: default
569-
accessModes:
570-
- ReadWriteOnce
571-
size: "${LOKI_PERSISTENCE_MEMORY:-4Gi}"
572-
promtail:
573-
config:
574-
clients:
575-
- url: http://loki.${MONITORING_NAMESPACE}:3100/loki/api/v1/push
576-
snippets:
577-
pipelineStages:
578-
- cri: {}
579-
- match:
580-
selector: '{namespace="${NAMESPACE}"}'
581-
stages:
582-
- json:
583-
expressions:
584-
output: log
585-
- json:
586-
source: output
587-
expressions:
588-
tenant_id: ${NAMESPACE}
589-
message: message
590-
level: log.level
591-
- labels:
592-
tenant_id:
593-
message:
594-
namespace:
595-
- tenant:
596-
value: ${NAMESPACE}
597-
- output:
598-
source: message
599-
tolerations:
600-
- effect: NoSchedule
601-
operator: Exists
602-
EOF
603-
helm upgrade --install ${LOKI_RELEASE_NAME} --namespace=${MONITORING_NAMESPACE} grafana/loki-stack -f loki-values.yaml
604-
605546
popd
606547

607548
# cosmotech-api

api/kubernetes/deploy_via_helm.sh

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ help() {
1717
echo "- ARGO_REQUEUE_TIME | string | Workflow requeue time, 1s by default"
1818
echo "- ARGO_MINIO_REQUESTS_MEMORY | units of bytes (default is 4Gi) | Memory requests for the Argo MinIO server"
1919
echo "- ARGO_MINIO_PERSISTENCE_SIZE | units of bytes (default is 500Gi) | Persistence size for the Argo MinIO server"
20-
echo "- LOKI_PERSISTENCE_MEMORY | units of bytes (default is 4Gi) | Memory for persistence of Loki system"
21-
echo "- LOKI_RETENTION_PERIOD | units of hours (default is 720h) | Loki logs retention period"
2220
echo "- NGINX_INGRESS_CONTROLLER_ENABLED | boolean (default is false) | indicating whether an NGINX Ingress Controller should be deployed and an Ingress resource created too"
2321
echo "- NGINX_INGRESS_CONTROLLER_REPLICA_COUNT | int (default is 1) | number of pods for the NGINX Ingress Controller"
2422
echo "- NGINX_INGRESS_CONTROLLER_LOADBALANCER_IP | IP Address String | optional public IP Address to use as LoadBalancer IP. You can create one with this Azure CLI command: az network public-ip create --resource-group <my-rg>> --name <a-name> --sku Standard --allocation-method static --query publicIp.ipAddress -o tsv "
@@ -389,36 +387,6 @@ EOF
389387
helm repo add argo https://argoproj.github.io/argo-helm
390388
helm upgrade --install -n ${NAMESPACE} ${ARGO_RELEASE_NAME} argo/argo-workflows --version ${ARGO_VERSION} --values values-argo.yaml
391389

392-
LOKI_RELEASE_NAME="loki"
393-
helm repo add grafana https://grafana.github.io/helm-charts
394-
395-
cat <<EOF > loki-values.yaml
396-
loki:
397-
persistence:
398-
enabled: true
399-
accessModes:
400-
- ReadWriteOnce
401-
size: "${LOKI_PERSISTENCE_MEMORY:-4Gi}"
402-
config:
403-
table_manager:
404-
retention_deletes_enabled: true
405-
retention_period: "${LOKI_RETENTION_PERIOD:-720h}"
406-
grafana:
407-
enabled: true
408-
persistence:
409-
type: pvc
410-
enabled: true
411-
# storageClassName: default
412-
accessModes:
413-
- ReadWriteOnce
414-
size: "${LOKI_PERSISTENCE_MEMORY:-4Gi}"
415-
promtail:
416-
tolerations:
417-
- effect: NoSchedule
418-
operator: Exists
419-
EOF
420-
helm upgrade --install ${LOKI_RELEASE_NAME} grafana/loki-stack -f loki-values.yaml
421-
422390
popd
423391

424392
# cosmotech-api

api/src/main/resources/application.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,6 @@ csm:
171171
- text/plain
172172
- text/x-yaml
173173
- application/json
174-
loki:
175-
baseUrl: http://loki.phoenix.svc.cluster.local:3100
176174
containerRegistry:
177175
scheme: http
178176
host: localhost:5000

config/application-dev.sample.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,6 @@ csm:
7878
namespace: "[fill-this-value]" # NAMESPACE
7979
service-account-name: "[fill-this-value]" # e.g argo-workflows-$NAMESPACE-service-account
8080
nodePoolLabel: ""
81-
loki:
82-
# base Url of Loki where to query logs
83-
baseUrl: http://localhost:3100
84-
containerRegistry:
85-
host: "[fill-this-value]"
86-
password: "[fill-this-value]"
87-
provider: "[fill-this-value]"
88-
registryPassword: "[fill-this-value]"
89-
registryUrl: "[fill-this-value]"
90-
registryUserName: "[fill-this-value]"
91-
scheme: https
92-
username: "[fill-this-value]"
9381
images:
9482
scenario-fetch-parameters: cosmo-tech/fetch-scenario-parameters
9583
send-datawarehouse: cosmo-tech/azure-data-explorer-connector

0 commit comments

Comments
 (0)