Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

- Remove the remnants of OpenHIM from the backup & restore scripts. [#9732](https://github.com/opencrvs/opencrvs-core/issues/9732)

- Store system monitoring data for 1 month [#10515](https://github.com/opencrvs/opencrvs-core/issues/10515)

- Restricted filesystem usage for journal service and file rotation strategy [#10518](https://github.com/opencrvs/opencrvs-core/issues/10518))

## 1.8.1
Expand Down
14 changes: 8 additions & 6 deletions infrastructure/docker-compose.deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ services:
configs:
- source: filebeat.{{ts}}
target: /usr/share/filebeat/filebeat.yml
- source: beat-rollover-policy.{{ts}}
target: /usr/share/filebeat/rollover-policy.json
- source: filebeat-rollover-policy.{{ts}}
target: /usr/share/filebeat/filebeat-rollover-policy.json
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /var/lib/docker/containers/:/var/lib/docker/containers/:ro
Expand Down Expand Up @@ -115,7 +115,7 @@ services:
configs:
- source: metricbeat-conf.{{ts}}
target: /usr/share/metricbeat/metricbeat.yml
- source: beat-rollover-policy.{{ts}}
- source: metricbeat-rollover-policy.{{ts}}
target: /usr/share/metricbeat/rollover-policy.json
logging:
driver: gelf
Expand Down Expand Up @@ -1111,7 +1111,7 @@ configs:
hearth-queryparam-extensions-conf.{{ts}}:
file: /opt/opencrvs/infrastructure/hearth-queryparam-extensions.json
metricbeat-conf.{{ts}}:
file: /opt/opencrvs/infrastructure/monitoring/beats/metricbeat.yml
file: /opt/opencrvs/infrastructure/monitoring/metricbeat/metricbeat.yml
filebeat.{{ts}}:
file: /opt/opencrvs/infrastructure/monitoring/filebeat/filebeat.yml
mongo-on-deploy.{{ts}}:
Expand All @@ -1120,8 +1120,10 @@ configs:
file: /opt/opencrvs/infrastructure/postgres/on-deploy.sh
postgres-analytics-on-deploy.{{ts}}:
file: /opt/opencrvs/infrastructure/postgres/setup-analytics.sh
beat-rollover-policy.{{ts}}:
file: /opt/opencrvs/infrastructure/monitoring/beats/rollover-policy.json
filebeat-rollover-policy.{{ts}}:
file: /opt/opencrvs/infrastructure/monitoring/filebeat/filebeat-rollover-policy.json
metricbeat-rollover-policy.{{ts}}:
file: /opt/opencrvs/infrastructure/monitoring/metricbeat/metricbeat-rollover-policy.json
kibana.{{ts}}:
file: /opt/opencrvs/infrastructure/monitoring/kibana/kibana.yml
apm.{{ts}}:
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/monitoring/filebeat/filebeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ monitoring:

#============================== Index lifecycle management ===============================
setup.ilm.enabled: true
setup.ilm.policy_name: 'beat-opencrvs-rollover-policy'
setup.ilm.policy_name: 'filebeat-opencrvs-rollover-policy'
setup.ilm.policy_file: /usr/share/filebeat/rollover-policy.json
setup.ilm.check_exists: true
setup.ilm.overwrite: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"policy": {
"phases": {
"hot": {
"actions": {
"rollover": {
"max_size": "2GB",
"max_age": "1d"
},
"set_priority": {
"priority": 100
}
}
},
"warm": {
"min_age": "3d",
"actions": {
"allocate": {
"number_of_replicas": 0
},
"forcemerge": {
"max_num_segments": 1
},
"set_priority": {
"priority": 50
}
}
},
"cold": {
"min_age": "7d",
"actions": {
"allocate": {
"number_of_replicas": 0
},
"set_priority": {
"priority": 0
}
}
},
"delete": {
"min_age": "30d",
"actions": {
"delete": {}
}
}
},
"_meta": {
"managed": true,
"description": "built-in ILM policy using the hot and warm phases with a retention of 7 days"
}
}
}
Loading