Refactoring of SL related k8s services
Changed the following SL k8s services:
- alertmanager
- fluentd
- prometheus
Change-Id: I461e55d0f607a9aa3476d338f3e38ea642bcc63b
Related-Bug: PROD-23674
diff --git a/kubernetes/common/addons/alertmanager.yml b/kubernetes/common/addons/alertmanager.yml
index c7483cf..dcc6702 100644
--- a/kubernetes/common/addons/alertmanager.yml
+++ b/kubernetes/common/addons/alertmanager.yml
@@ -2,17 +2,14 @@
- system.prometheus.alertmanager.container
parameters:
_param:
- kubernetes_alertmanager_enabled: false
+ kubernetes_alertmanager_enabled: true
kubernetes_alertmanager_image: ${_param:mcp_docker_registry}/openstack-docker/alertmanager:2018.8.0
- kubernetes_alertmanager_namespace: stacklight
- kubernetes_alertmanager_node_port: 31993
kubernetes:
common:
addons:
alertmanager:
enabled: ${_param:kubernetes_alertmanager_enabled}
image: ${_param:kubernetes_alertmanager_image}
- namespace: ${_param:kubernetes_alertmanager_namespace}
dir:
config: ${_param:prometheus_alertmanager_config_directory}
data: ${_param:prometheus_alertmanager_data_directory}
@@ -21,4 +18,3 @@
bind:
address: ${prometheus:alertmanager:bind:address}
port: ${prometheus:alertmanager:bind:port}
- node_port: ${_param:kubernetes_alertmanager_node_port}
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}
diff --git a/kubernetes/common/addons/prometheus.yml b/kubernetes/common/addons/prometheus.yml
index 5f5fcea..b7a0090 100644
--- a/kubernetes/common/addons/prometheus.yml
+++ b/kubernetes/common/addons/prometheus.yml
@@ -3,33 +3,24 @@
parameters:
_param:
kubernetes_prometheus_image: ${_param:mcp_docker_registry}/openstack-docker/prometheus:2018.8.0
- kubernetes_prometheus_enabled: false
- kubernetes_prometheus_namespace: stacklight
- kubernetes_prometheus_server_resources_limits_memory: 500M
- kubernetes_prometheus_server_resources_requests_memory: 500M
- kubernetes_prometheus_server_bind_host_port: 31990
- kubernetes_prometheus_server_storage_local_engine: persisted
- kubernetes_prometheus_server_use_static_datadir: true
+ kubernetes_prometheus_enabled: true
+ kubernetes_prometheus_server_resources_limits_memory: 1G
+ kubernetes_prometheus_server_resources_requests_memory: 1G
kubernetes:
common:
addons:
prometheus:
enabled: ${_param:kubernetes_prometheus_enabled}
- image: ${_param:kubernetes_prometheus_image}
- namespace: ${_param:kubernetes_prometheus_namespace}
server:
+ image: ${_param:kubernetes_prometheus_image}
bind:
port: ${prometheus:server:bind:port}
host: ${prometheus:server:bind:address}
- host_port: ${_param:kubernetes_prometheus_server_bind_host_port}
config:
config_dir: ${prometheus:server:dir:config_in_container}
host_config_dir: ${prometheus:server:dir:config}
data_dir: ${_param:prometheus_server_data_directory}
host_data_dir: ${prometheus:server:dir:data}
- storage_local_engine: ${_param:kubernetes_prometheus_server_storage_local_engine}
- storage_local_retention: ${prometheus:server:storage:local:retention}
- use_static_datadir: ${_param:kubernetes_prometheus_server_use_static_datadir}
resources:
limits:
memory: ${_param:kubernetes_prometheus_server_resources_limits_memory}