Merge branch 'ak/bump-retention' into 'master'

Bump logs retention to 30 days

See merge request gitlab-org/gitlab!24466

app/assets/javascripts/monitoring/constants.js

@@ -110,8 +110,8 @@ export const timeRanges = [
     duration: { seconds: 60 * 60 * 24 * 7 * 1 },
   },
   {
-    label: __('2 weeks'),
-    duration: { seconds: 60 * 60 * 24 * 7 * 2 },
+    label: __('1 month'),
+    duration: { seconds: 60 * 60 * 24 * 30 },
   },
 ];
 

changelogs/unreleased/ak-bump-retention.yml

+---
+title: Extend logs retention to period from 15 to 30 days
+merge_request: 24466
+author:
+type: changed

doc/user/clusters/applications.md

@@ -437,7 +437,7 @@ Filebeat will run as a DaemonSet on each node in your cluster, and it will ship
 GitLab will then connect to Elasticsearch for logs instead of the Kubernetes API,
 and you will have access to more advanced querying capabilities.
 
-Log data is automatically deleted after 15 days using [Curator](https://www.elastic.co/guide/en/elasticsearch/client/curator/5.5/about.html).
+Log data is automatically deleted after 30 days using [Curator](https://www.elastic.co/guide/en/elasticsearch/client/curator/5.5/about.html).
 
 To enable log shipping, install Elastic Stack into the cluster with the **Install** button.
 

locale/gitlab.pot

@@ -618,6 +618,9 @@ msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "1 month"
+msgstr ""
+
 msgid "1 open issue"
 msgid_plural "%{issues} open issues"
 msgstr[0] ""
@@ -655,9 +658,6 @@ msgstr ""
 msgid "1st contribution!"
 msgstr ""
 
-msgid "2 weeks"
-msgstr ""
-
 msgid "20-29 contributions"
 msgstr ""
 

vendor/elastic_stack/values.yaml

@@ -48,7 +48,7 @@ elasticsearch-curator:
         1:
           action: delete_indices
           description: >-
-            Delete indices older than 15 days (based on index name), for filebeat-
+            Delete indices older than 30 days (based on index name), for filebeat-
             prefixed indices. Ignore the error if the filter does not result in an
             actionable list of indices (ignore_empty_list) and exit cleanly.
           options:
@@ -62,7 +62,7 @@ elasticsearch-curator:
             direction: older
             timestring: '%Y.%m.%d'
             unit: days
-            unit_count: 15
+            unit_count: 30
 
 elasticsearch-exporter:
   enabled: false