diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 17:21:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 17:21:10 +0300 |
commit | cb0d23c455b73486fd1015f8ca9479b5b7e3585d (patch) | |
tree | d7dc129a407fd74266d2dc561bebf24665197c2f /vendor | |
parent | c3e911be175c0aabfea1eb030f9e0ef23f5f3887 (diff) |
Add latest changes from gitlab-org/gitlab@12-7-stable-ee
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/elastic_stack/values.yaml | 39 | ||||
-rw-r--r--[-rwxr-xr-x] | vendor/gitignore/C++.gitignore | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | vendor/gitignore/Java.gitignore | 0 | ||||
-rw-r--r-- | vendor/prometheus/values.yaml | 4 |
4 files changed, 30 insertions, 13 deletions
diff --git a/vendor/elastic_stack/values.yaml b/vendor/elastic_stack/values.yaml index 9346c0e25e6..ccbff1ab38d 100644 --- a/vendor/elastic_stack/values.yaml +++ b/vendor/elastic_stack/values.yaml @@ -11,14 +11,7 @@ elasticsearch: replicas: 1 kibana: - enabled: true - env: - ELASTICSEARCH_HOSTS: http://elastic-stack-elasticsearch-client:9200 - ingress: - enabled: true - annotations: - kubernetes.io/ingress.class: "nginx" - kubernetes.io/tls-acme: "true" + enabled: false logstash: enabled: false @@ -41,7 +34,35 @@ nginx-ldapauth-proxy: enabled: false elasticsearch-curator: - enabled: false + enabled: true + configMaps: + config_yml: |- + --- + client: + hosts: + - elastic-stack-elasticsearch-client + port: 9200 + action_file_yml: |- + --- + actions: + 1: + action: delete_indices + description: >- + Delete indices older than 15 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: + ignore_empty_list: True + filters: + - filtertype: pattern + kind: prefix + value: filebeat- + - filtertype: age + source: name + direction: older + timestring: '%Y.%m.%d' + unit: days + unit_count: 15 elasticsearch-exporter: enabled: false diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore index 259148fa18f..259148fa18f 100755..100644 --- a/vendor/gitignore/C++.gitignore +++ b/vendor/gitignore/C++.gitignore diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore index a1c2a238a96..a1c2a238a96 100755..100644 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore diff --git a/vendor/prometheus/values.yaml b/vendor/prometheus/values.yaml index be79a0c5380..25384b088a2 100644 --- a/vendor/prometheus/values.yaml +++ b/vendor/prometheus/values.yaml @@ -1,7 +1,5 @@ alertmanager: enabled: false - image: - tag: v0.15.2 kubeStateMetrics: enabled: true @@ -14,8 +12,6 @@ pushgateway: server: fullnameOverride: "prometheus-prometheus-server" - image: - tag: v2.4.3 serverFiles: alerts: {} |