Replace heka with fluentd in mcp11 models
Bump reclass-system to 0d27d17077d37faa687f0ab55cdc30fe39fe8502
Change-Id: Ie30dba8b40ca2d7fad26d139fdb1712229dc6953
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/init.yml
index 975217b..66a156f 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/init.yml
@@ -1,5 +1,11 @@
classes:
- system.linux.network.dynamic_hosts
+- system.fluentd
+- system.fluentd.label.default_metric
+- system.fluentd.label.default_metric.prometheus
+- system.fluentd.label.default_output.elasticsearch
+- system.fluentd.label.default_output.drop_event
+- system.linux.system.repo.fluentd
- cluster.virtual-mcp11-k8s-calico.kubernetes
- cluster.virtual-mcp11-k8s-calico.stacklight
- cluster.virtual-mcp11-k8s-calico.infra
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
index 6c57f52..9737df7 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
@@ -1,8 +1,6 @@
classes:
- service.grafana.collector
- system.linux.system.repo.mcp.extra
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
- system.prometheus.collector
- system.telegraf.agent
parameters:
@@ -17,6 +15,7 @@
# Prometheus
prometheus_control_address: ${_param:stacklight_monitor_address}
+ stacklight_log_address: ${_param:stacklight_monitor_address}
mysql_admin_user: root
mysql_admin_password: workshop
@@ -27,9 +26,9 @@
galera_server_maintenance_password: workshop
galera_server_admin_password: workshop
- heka_elasticsearch_host: ${_param:stacklight_monitor_address}
elasticsearch_port: 9200
stacklight_environment: ${_param:cluster_domain}
+ fluentd_elasticsearch_host: ${_param:stacklight_log_address}
linux:
network:
host: