Skip to content
Snippets Groups Projects
Verified Commit 471f27eb authored by Antoine R. Dumont's avatar Antoine R. Dumont
Browse files

opentelemetry: Unify index names in environments

- {staging,production}-swh-logs
- {staging,production}-system-logs

This will fix the misnaming in production [1]. The data stream 'logs-*-*' pattern exists
which prevented the index name to be correctly built (and historically, the staging ones
were named differently too so the issue was not detected earlier).

[1]
```
curl -s ${ES_SERVER}/_cat/indices | grep "staging\|production"
...
green open  .ds-logs-swh-production-2023.05.16-000001    OMdrZ9DXRZ2t2SP4PEhwVA 1 1  5398438      0   2.1gb     1gb
green open  .ds-logs-system-production-2023.05.16-000001 WcV164JHSgOIOWjVUddeHg 1 1
6097451      0   3.4gb     2gb
...
```

Refs. swh/infra/sysadm-environment#4524
parent 867c1cbb
No related branches found
No related tags found
No related merge requests found
......@@ -3,8 +3,8 @@
# in the argocd application defined in application.yaml
{{ if .Values.otlpCollector.enabled -}}
{{- $environment := get .Values "environment" }}
{{- $logs_swh := .Values.otlpCollector.indexes.swh | default ( print "logs-swh-" $environment ) -}}
{{- $logs_system := .Values.otlpCollector.indexes.system | default ( print "logs-system-" $environment ) -}}
{{- $logs_swh := .Values.otlpCollector.indexes.swh | default ( print $environment "-swh-logs" ) -}}
{{- $logs_system := .Values.otlpCollector.indexes.system | default ( print $environment "-system-logs" ) -}}
{{- $activate_debug := .Values.otlpCollector.debug -}}
---
mode: daemonset
......
......@@ -23,9 +23,6 @@ certManager:
otlpCollector:
enabled: true
debug: false
indexes:
swh: logs-swh-production
system: logs-system-production
resources:
cpu: 1024m
memory: 16Gi
......
......@@ -23,11 +23,6 @@ certManager:
otlpCollector:
enabled: true
debug: false
indexes:
# misnamed: should be logs-{swh,system}-staging, kept for retro compatibility with
# development tryouts
swh: staging-logs
system: staging-system-logs
resources:
cpu: 256m
memory: 2Gi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment