commit 552d1fab320c33d94531d5e9492be434cbf49721
author Mateusz Matuszkowiak <mmatuszkowiak@mirantis.com> Tue Oct 09 14:42:43 2018 +0200
committer Mateusz Matuszkowiak <mmatuszkowiak@mirantis.com> Mon Oct 15 11:29:35 2018 +0000
tree dea3fb076b17b98a31799a1aa5ae8e4e719ffb88
parent 7f222d62e52f9dd6f8cdee1cf38fc2aeb6cf4f9f

Refactoring of SL related k8s services

Changed the following SL k8s services:
- alertmanager
- fluentd
- prometheus

Change-Id: I461e55d0f607a9aa3476d338f3e38ea642bcc63b
Related-Bug: PROD-23674

kubernetes/common/addons/fluentd.yml

diff --git a/kubernetes/common/addons/fluentd.yml b/kubernetes/common/addons/fluentd.yml
index 16a6874..459892c 100644
--- a/kubernetes/common/addons/fluentd.yml
+++ b/kubernetes/common/addons/fluentd.yml
@@ -1,22 +1,19 @@
 parameters:
   _param:
      kubernetes_fluentd_aggregator_image: ${_param:mcp_docker_registry}/mirantis/external/fluentd-kubernetes-daemonset:stable
-     kubernetes_fluentd_enabled: false
-     kubernetes_fluentd_namespace: stacklight
-     kubernetes_fluentd_aggregator_resources_limits_memory: 500Mi
-     kubernetes_fluentd_aggregator_resources_requests_memory: 500Mi
-     kubernetes_fluentd_aggregator_bind_port: 24224
+     kubernetes_fluentd_enabled: true
+     kubernetes_fluentd_aggregator_resources_limits_memory: 512M
+     kubernetes_fluentd_aggregator_resources_requests_memory: 512M
      kubernetes_fluentd_aggregator_bind_host_port: 31950
      kubernetes_fluentd_aggregator_config_output_es_host: 127.0.0.1
      kubernetes_fluentd_aggregator_config_output_es_port: 9200
      kubernetes_fluentd_aggregator_config_output_es_scheme: http
-     kubernetes_fluentd_aggregator_config_dir: /fluentd/etc
+     kubernetes_fluentd_aggregator_config_output_es_log_level: info
   kubernetes:
     common:
       addons:
         fluentd:
           enabled: ${_param:kubernetes_fluentd_enabled}
-          namespace: ${_param:kubernetes_fluentd_namespace}
           aggregator:
             image: ${_param:kubernetes_fluentd_aggregator_image}
             resources:
@@ -25,12 +22,11 @@
               requests:
                 memory: ${_param:kubernetes_fluentd_aggregator_resources_requests_memory}
             bind:
-              port: ${_param:kubernetes_fluentd_aggregator_bind_port}
               host_port: ${_param:kubernetes_fluentd_aggregator_bind_host_port}
             config:
-              config_dir: ${_param:kubernetes_fluentd_aggregator_config_dir}
               output:
-                es:
+                elasticsearch:
                   host: ${_param:kubernetes_fluentd_aggregator_config_output_es_host}
                   port: ${_param:kubernetes_fluentd_aggregator_config_output_es_port}
                   scheme: ${_param:kubernetes_fluentd_aggregator_config_output_es_scheme}
+                  log_level: ${_param:kubernetes_fluentd_aggregator_config_output_es_log_level}