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/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}