Enable Telegraf output for log_collector
This change also adds the log_collector service to the Kubernetes labs.
Change-Id: I38fd19c6f5c801078c9eb3b99e75fd352bfc3d9f
diff --git a/classes/cluster/virtual-mcp11-contrail/init.yml b/classes/cluster/virtual-mcp11-contrail/init.yml
index 9a5b947..ade1433 100755
--- a/classes/cluster/virtual-mcp11-contrail/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/init.yml
@@ -1,6 +1,7 @@
classes:
- service.grafana.collector
- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
- system.linux.system.repo.mcp.extra
- system.linux.system.single
- system.rsyslog.client.single
diff --git a/classes/cluster/virtual-mcp11-dvr/init.yml b/classes/cluster/virtual-mcp11-dvr/init.yml
index eb107b3..0ac5d8a 100644
--- a/classes/cluster/virtual-mcp11-dvr/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/init.yml
@@ -1,6 +1,7 @@
classes:
- service.grafana.collector
- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
- system.linux.system.repo.mcp.extra
- system.linux.system.single
- system.rsyslog.client.single
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
index 29af1e1..a5d2d26 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
@@ -9,6 +9,8 @@
- system.openssh.server.team.mcp_qa
- system.openssh.server.team.k8s_team
- system.rsyslog.client.single
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
- system.telegraf.agent
- system.prometheus.collector
- service.grafana.collector
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
index a6b4118..243a614 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
@@ -22,6 +22,10 @@
galera_server_cluster_name: monitoring_cluster
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}
linux:
network:
host:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
index 6ef0ebc..092165c 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
@@ -9,6 +9,8 @@
- system.openssh.server.team.mcp_qa
- system.openssh.server.team.k8s_team
- system.rsyslog.client.single
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
- system.telegraf.agent
- system.prometheus.collector
- service.grafana.collector
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
index 3685807..4b37345 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
@@ -20,6 +20,10 @@
galera_server_cluster_name: monitoring_cluster
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}
linux:
network:
host: