Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
67b528c8
Commit
67b528c8
authored
Feb 06, 2020
by
Adrien Kohlbecker
Committed by
Ash McKenzie
Feb 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump logs retention to 30 days
parent
4505da2c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
8 deletions
+13
-8
app/assets/javascripts/monitoring/constants.js
app/assets/javascripts/monitoring/constants.js
+2
-2
changelogs/unreleased/ak-bump-retention.yml
changelogs/unreleased/ak-bump-retention.yml
+5
-0
doc/user/clusters/applications.md
doc/user/clusters/applications.md
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-3
vendor/elastic_stack/values.yaml
vendor/elastic_stack/values.yaml
+2
-2
No files found.
app/assets/javascripts/monitoring/constants.js
View file @
67b528c8
...
...
@@ -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
0 → 100644
View file @
67b528c8
---
title
:
Extend logs retention to period from 15 to 30 days
merge_request
:
24466
author
:
type
:
changed
doc/user/clusters/applications.md
View file @
67b528c8
...
...
@@ -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
View file @
67b528c8
...
...
@@ -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
View file @
67b528c8
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment