From e900e1836d43ecb899f236cf1f365992c689e45c Mon Sep 17 00:00:00 2001
From: Alejandro Andreu <alejandroandreu@openmailbox.org>
Date: Thu, 1 Jun 2017 17:35:16 +0200
Subject: [PATCH] Enable everything so Insights work when deployed

Also pin puppetlabs-apt, as the newest version of the module breaks all
tests.

Change-Id: Iaf8b390f85c91f84e5157bd11eb061feb53ad9e2
---
 Puppetfile                                 | 2 +-
 manifests/cluster/run.pp                   | 2 ++
 templates/analytics/analytics_settings.erb | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Puppetfile b/Puppetfile
index f454f56..0a8b148 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -13,7 +13,7 @@ mod 'puppet-neutron',
 ## External modules
 
 mod 'puppetlabs/inifile'
-mod 'puppetlabs/apt'
+mod 'puppetlabs/apt', '2.4.0'
 mod 'puppetlabs/java'
 mod 'puppetlabs/stdlib'
 mod 'puppetlabs/apache'
diff --git a/manifests/cluster/run.pp b/manifests/cluster/run.pp
index 45f28ac..f51225a 100644
--- a/manifests/cluster/run.pp
+++ b/manifests/cluster/run.pp
@@ -256,8 +256,10 @@ class midonet::cluster::run (
           content => template('midonet/analytics/analytics_settings.sh.erb'),
           require => Exec['/bin/bash /tmp/analytics_settings.sh']
         } ->
+        # As we will only be deploying MidoNet 5.4 we can set a single notify here
         exec { '/bin/bash /tmp/analytics_settings_local.sh':
           require => File['set_config'],
+          notify  => Service['midonet-cluster'],
         }
       }
     }
diff --git a/templates/analytics/analytics_settings.erb b/templates/analytics/analytics_settings.erb
index 062eaef..d739c41 100644
--- a/templates/analytics/analytics_settings.erb
+++ b/templates/analytics/analytics_settings.erb
@@ -1,7 +1,11 @@
 <% if @new_api %>
   agent.flow_history.enabled : true
-  agent.flow_history.encoding : "binary"
   insights.jmxscraper.enabled : true
+  insights.bigdata.enabled : true
+  insights.flow_tracing.enabled : true
+  insights.analytics_api.enabled : true
+  insights.endpoint.enabled : true
+  agent.flow_history.encoding : "binary"
   insights.jmxscraper.target.endpoint : "<%= @elk_target_endpoint %>"
   insights.elasticsearch.seeds : [<%= @elk_seeds %>]
   <% if @elk_cluster_name %>insights.elasticsearch.cluster_name : "<%= @elk_cluster_name %>"<% end %>